Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.base.enumutil;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.StringUtils;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -774,7 +775,7 @@ public class WmsEnumUtil {
                 return null;
             } else {
                 for (int i = 0; i < values().length; i++) {
-                    if (values()[i].value == value) {
+                    if (StringUtils.equalsIgnoreCase(values()[i].value,value)) {
                         return values()[i];
                     }
                 }

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

@@ -81,6 +81,10 @@ public class MesPcnTask extends BaseBean {
     @ApiParam("任务状态")
     private Integer taskStatus;
 
+    @Column(name="TASK_PARAM")
+    @ApiParam("任务参数")
+    private String taskParam;
+
     public int getTaskTypeVal() {
         return this.taskType == null ? 0 : this.taskType;
     }

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

@@ -81,6 +81,10 @@ public class MesPcnTask extends BaseBean {
     @ApiParam("任务状态")
     private Integer taskStatus;
 
+    @Column(name="TASK_PARAM")
+    @ApiParam("任务参数")
+    private String taskParam;
+
     public int getTaskTypeVal() {
         return this.taskType == null ? 0 : this.taskType;
     }

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

@@ -229,7 +229,7 @@ public class WmsMoveDetails extends BaseBean {
             ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo,
                           String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo,
                           Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode,
-                          String createUser,String createDatetime){
+                          String createUser,String createDatetime,String modifyDatetime,String modifyUser){
         this.organizeCode = organizeCode;
         this.partNo = partNo;
         this.orderNo = orderNo;
@@ -253,5 +253,7 @@ public class WmsMoveDetails extends BaseBean {
         this.busiTypeCode = busiTypeCode;
         this.createUser = createUser;
         this.createDatetime = createDatetime;
+        this.modifyDatetime =modifyDatetime;
+        this.modifyUser =modifyUser;
     }
 }

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

@@ -148,7 +148,7 @@ public class WmsMoveMaster extends BaseBean {
 
     public WmsMoveMaster(String orderNo, Integer orderStatus,  String transTypeCode, String errorMessage,
                          Integer isUrgent,String carNo, Integer busiTypeCode, String refOrderNo, String refSrc,String partNo, Integer itemStatus,String remark,
-                         String organizeCode,String createDatetime,String createUser,String modifyDatetime,String modifyUser) {
+                         String organizeCode,String createDatetime,String createUser,String modifyDatetime,String modifyUser,String fixId) {
         this.orderNo = orderNo;
         this.orderStatus = orderStatus;
         this.remark = remark;
@@ -166,10 +166,12 @@ public class WmsMoveMaster extends BaseBean {
         this.createUser = createUser;
         this.modifyDatetime =modifyDatetime;
         this.modifyUser =modifyUser;
+        this.fixId = fixId;
     }
 
     public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
-                         String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc) {
+                         String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc,
+                        String createDatetime,String createUser,String modifyDatetime,String modifyUser) {
         this.id = id;
         this.orderNo = orderNo;
         this.organizeCode = organizeCode;
@@ -188,5 +190,9 @@ public class WmsMoveMaster extends BaseBean {
         this.fixId = fixId;
         this.busiTypeCode = busiTypeCode;
         this.refSrc = refSrc;
+        this.createDatetime= createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime =modifyDatetime;
+        this.modifyUser =modifyUser;
     }
 }

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

@@ -214,10 +214,11 @@ public class WmsMoveSn extends BaseBean {
         this.transTypeCode = transTypeCode;
         this.refSrc = refSrc;
     }
+
     public  WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,
             String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus,
             Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode,String sn,
-            String createUser,String createDatetime){
+            String createUser,String createDatetime,String modifyDatetime,String modifyUser){
             this.organizeCode=organizeCode;
             this.orderNo=orderNo;
             this.item=item;
@@ -245,5 +246,7 @@ public class WmsMoveSn extends BaseBean {
             this.sn = sn;
             this.createUser = createUser;
             this.createDatetime = createDatetime;
-}
+            this.modifyDatetime =modifyDatetime;
+            this.modifyUser =modifyUser;
+    }
 }