测试时间

yun-zuoyi
钮海涛 4 years ago
parent c09a078ce4
commit 3dd67766b2

@ -48,7 +48,7 @@ public class Work extends BaseAPS {
@Column(name="WORK_TYPE")
@ApiParam(value ="工作类型")
@FieldAnnotation(property = false)
@FieldAnnotation(display = false)
private ApsEnumUtil.WORK_TYPE workType;
@Column(name="count", columnDefinition = "decimal(18,8)")
@ -165,7 +165,7 @@ public class Work extends BaseAPS {
// private Long dynSplitWorkId;
@Column(name="ORIGIN_WORK_ID")
@ApiParam(value ="动态拆分工作ID")
@ApiParam(value ="动态拆分工作ID")
private Long originWorkId;
private transient boolean hasOptimized = false;

@ -669,13 +669,14 @@ public class ApsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_SORT_RULE {
ORDER_LET("ORDER_LET", "订单交货期"),
ORDER_LET("ORDER_LET", "订单最晚结束时刻计算值"),
ORDER_PRIORITY("ORDER_PRIORITY", "订单优先级"),
ORDER_EST("ORDER_EST", "订单最早开始时刻"),
ORDER_COUNT("ORDER_COUNT", "订单数量"),
ORDER_RECEIVE_DATE("ORDER_RECEIVE_DATE", "订单接单日期"),
ORDER_LET_SUB_EST("ORDER_LET_SUB_EST", "订单交货期与订单最早开始时刻之差"),
ORDER_SURPLUS("ORDER_SURPLUS", "订单余裕度"),
ORDER_CODE("ORDER_CODE", "订单编码"),
NOPLAN_OPERATION_SIZE("NOPLAN_OPERATION_SIZE", "残留工序数"),
REMAIN_PRODUCE_TIME("REMAIN_PRODUCE_TIME", "残留生产时间"),
MIN_OPERATION_REMAIN_TIME("MIN_OPERATION_REMAIN_TIME", "最小工序宽裕时间"),
@ -685,7 +686,7 @@ public class ApsEnumUtil {
HAVE_HIGH_WORK("HAVE_HIGH_WORK", "订单中含有高级别工作"),
WORK_RESOURCE_SIZE("WORK_RESOURCE_SIZE", "工作的可用资源数"),
TOP_ORDER_LET("TOP_ORDER_LET", "顶层订单的交货期"),
TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单码"),
TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单码"),
TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级"),
CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式");

Loading…
Cancel
Save