Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java

@@ -41,7 +41,7 @@ public class FieldInfo extends BaseCode {
     private FIELD_TYPE type;
 
     @Column(name="TYPE_NAME")
-    @ApiParam(value ="类型全称")
+    @ApiParam(value ="类型名称")
     private String typeName;
 
     @Column(name="CUSTOMIZE")
@@ -84,6 +84,9 @@ public class FieldInfo extends BaseCode {
     @ApiParam(value ="字段默认值")
     private String defaultValue;
 
+    @ApiParam(value ="枚举项内容")
+    private transient Enum<?>[] enumItems;
+
     @JsonIgnore
     private transient Class<? extends BaseBean> clazz;
     @JsonIgnore

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java

@@ -59,6 +59,10 @@ public class OperResource extends BaseAPS {
     @ApiParam(value ="优先级")
     private Integer priority;
 
+    @Column(name="USER_MATCH_NUMBER")
+    @ApiParam(value ="资源使用配套号")
+    private String userMatchNumber;
+
     @Column(name="OPERATION_ID")
     @ApiParam(value ="工序")
     @FieldAnnotation(property = false)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java

@@ -58,6 +58,10 @@ public class WorkResource extends BaseAPS {
     @ApiParam(value ="最大后设置中断时间")
     private String maxPostSdTime;
 
+    @Column(name="USER_MATCH_NUMBER")
+    @ApiParam(value ="资源使用配套号")
+    private String userMatchNumber;
+
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
     @FieldAnnotation(property = false)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java

@@ -1,4 +1,22 @@
 package cn.estsh.i3plus.pojo.aps.enums;
 
+/**
+ * @Description :预置的资源选择规则
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public enum RESOURCE_CHOISE_RULE {
+    PREV_SET_TIME,      // 前设置时间
+    PRODUCE_TIME,       // 生产时间
+    POST_SET_TIME,      // 后设置时间
+    WORK_WAIT_TIME,     // 工作等待时间
+    RES_BALANCE,        // 资源均衡度
+    SAME_MATERIAL,      // 相同物料
+    SAME_ORDER,         // 相同订单
+    NEARLY_WORK,        // 前后工作
+    POST_RESOURCE,      // 后资源制约
+    SAME_ASS_RESOURCE,  // 相同副资源
+    RESOURCE_PRIORITY;  // 资源优先级
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java

@@ -9,23 +9,24 @@ package cn.estsh.i3plus.pojo.aps.enums;
  **/
 public enum WORK_SORT_RULE {
     NONE,
-    ORDER_DELIVERY,	// 订单交货期
+    ORDER_LET,	// 订单交货期
     ORDER_PRIORITY,	// 订单优先级
-    ORDER_ESTSTART,	// 订单最早开始时刻
+    ORDER_EST,	// 订单最早开始时刻
     ORDER_COUNT,		// 订单数量
     ORDER_RECEIVE_DATE,// 订单接单日期
-    ORDER_LET_MINUS_EST,// 订单交货期与订单最早开始时刻之差
+    ORDER_LET_SUB_EST,// 订单交货期与订单最早开始时刻之差
     ORDER_PRESSURE,	// 订单紧迫程度
     ORDER_SURPLUS,	// 订单余裕度
-    REMAIN_OPERATION_COUNT,// 残留工序数
-    REMAIN_PRODUCT,	// 残留生产时间
-    MINSTE_PREMAIN,// 最小工序宽裕时间
+    NOPLAN_OPERATION_SIZE,// 残留工序数
+    REMAIN_PRODUCE_TIME,	// 残留生产时间
+    MIN_OPERATION_REMAIN_TIME,// 最小工序宽裕时间
     WORK_LET,		// 工作最晚结束时刻
     WORK_EST,		// 工作最早开始时刻
-    ORDER_STOCK_RELA,	// 订单物品库存量相对值
-    ORDER_FIRST_WORK_START,// 订单首工作上次开始时刻
+    INVENTORY_RELA,	// 订单物品库存量相对值
+    FIRST_WORK_BEGIN,// 订单首工作上次开始时刻
     HAVE_HIGH_WORK,	// 订单中含有高级别工作
-    WORK_RESOURCE_COUNT,		// 工作的可用资源数
-    WORK_SCHED_APPROX,// 与已排工作近视度
-    TOP_ORDER_DELIVERY;// 顶层订单的交货期
+    WORK_RESOURCE_SIZE,		// 工作的可用资源数
+    TOP_ORDER_LET,// 顶层订单的交货期
+    TOP_ORDER_CODE, // 顶层订单代码
+    TOP_ORDER_PRIORITY; // 顶层订单优先级
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java

@@ -149,12 +149,23 @@ public class WmsCSFactTrans extends BaseBean {
         this.srcZoneNo = srcZoneNo;
         this.srcWhNo = srcWhNo;
     }
-
+    public WmsCSFactTrans(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) {
+        this.partNo=partNo;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.orderNo = orderNo;
+        this.organizeCode = organizeCode;
+        this.qty=qty;
+    }
     public WmsCSFactTrans(Long countBoxQty,Double sumPartQty,String zoneNo, String partNo, String partNameRdd) {
         this.countBoxQty = countBoxQty;
         this.sumPartQty = sumPartQty;
         this.zoneNo = zoneNo;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
+      
     }
+    
+    
+    
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java

@@ -178,4 +178,12 @@ public class WmsCSOrderDetails extends BaseBean {
         this.organizeCode = organizeCode;
         this.transStatus = transStatus;
     }
+    public WmsCSOrderDetails(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) {
+        this.partNo=partNo;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.orderNo = orderNo;
+        this.organizeCode = organizeCode;
+        this.qty=qty;
+    }
 }