Jenkins自动合并

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -736,6 +736,16 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static String codeOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java

@@ -18,63 +18,8 @@ public class QcCheckStandardModel {
 
     private Long id;
 
-    @ApiParam("物料编码")
-    private String partNo;
+    @ApiParam("列头")
+    private String title;
 
-    @ApiParam("工作中心代码")
-    private String workCenterCode;
-
-    @ApiParam("工作单元代码")
-    private String workCellCode;
-
-    @ApiParam("检测类型")
-    private Integer checkType;
-
-    @ApiParam("检测项")
-    private String checkItem;
-
-    @ApiParam("检测标准")
-    private String checkStandard;
-
-    @ApiParam("检测指导")
-    private String checkGuide;
-
-    @ApiParam("频率")
-    private String checkFrequency;
-
-    @ApiParam("物料名称")
-    private String partName;
-
-    @ApiParam("检测结果")
-    private String checkResult;
-
-    @ApiParam("检测值")
-    private String checkValue;
-
-    @ApiParam("检测项类型")
-    private String checkItemType;
-
-    @ApiParam("检测项类型名称")
-    private String checkItemTypeName;
-
-    private List<MesQcCheckStandard> childQcList;
-
-    public QcCheckStandardModel() {
-    }
-
-    public QcCheckStandardModel(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard
-            , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) {
-        this.id = id;
-        this.partNo = partNo;
-        this.workCenterCode = workCenterCode;
-        this.workCellCode = workCellCode;
-        this.checkType = checkType;
-        this.checkItem = checkItem;
-        this.checkStandard = checkStandard;
-        this.checkGuide = checkGuide;
-        this.checkFrequency = checkFrequency;
-        this.partName = partName;
-        this.checkItemType = checkItemType;
-        this.checkItemTypeName = checkItemTypeName;
-    }
+    private List<MesQcCheckStandard> resultList;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java

@@ -98,6 +98,19 @@ public class MesProdBindRecord extends BaseBean {
     @ApiParam(value = "动作类型")
     private String actionType;
 
+    @ApiParam(value = "是否绑定关键件名称")
+    private String isBindKeyName;
+
+    @ApiParam(value = "动作类型名称")
+    private String actionTypeName;
+
+    @ApiParam("产品条码零件名称")
+    private String partName;
+
+    @ApiParam("原材料零件名称")
+    private String itemPartName;
+
+
     public int getIsFeedVal() {
         return this.isFeed == null ? 0 : this.isFeed;
     }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java

@@ -32,8 +32,8 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam("关联单号")
     public String refSrc;
 
-    @ApiParam(value = "关联单据业务类型")
-    private String busiTypeDesc;
+    @ApiParam(value = "关联单据业务类型代码")
+    private String busiTypeCode;
 
     @ApiParam(value = "计划日期")
     private String zdate;
@@ -59,18 +59,21 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam(value = "创建人")
     public String createUser;
 
+    @ApiParam(value = "关联单据类型")
+    public String refType;
+
     public WmsTaskInfoModel() {
     }
 
     public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
-                            String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo,
+                            String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo,
                             String createDatetime, String srcZoneNo, String createUser) {
         this.orderNo = orderNo;
         this.taskStatus = taskStatus;
         this.opTypeName = opTypeName;
         this.transTypeCode = transTypeCode;
         this.refSrc = refSrc;
-        this.busiTypeDesc = busiTypeDesc;
+        this.busiTypeCode = busiTypeCode;
         this.zdate = zdate;
         this.ztime = ztime;
         this.custNo = custNo;

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

@@ -132,13 +132,9 @@ public class WmsTaskDetails extends BaseBean {
     @ApiParam("目的库存地代码")
     public String destAreaNo;
 
-    @Column(name = "BUSI_TYPE")
-    @ApiParam("业务类型")
-    public Integer busiType;
-
-    @Column(name = "BUSI_TYPE_DESC")
-    @ApiParam("业务类型描述")
-    public String busiTypeDesc;
+    @Column(name = "BUSI_TYPE_CODE")
+    @ApiParam("业务类型代码")
+    public String busiTypeCode;
 
     @Column(name = "TRANS_TYPE_CODE_RDD")
     @ApiParam("交易类型")