Merge remote-tracking branch 'origin/dev' into test

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

@@ -806,7 +806,10 @@ public class WmsEnumUtil {
         VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"),
         VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"),
         VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"),
-        VDA_SN_("VDA_SN_MERGE", "VDA条码合并");
+        VDA_SN_("VDA_SN_MERGE", "VDA条码合并"),
+        VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"),
+        VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询");
+
         private String value;
         private String description;
 

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

@@ -224,7 +224,6 @@ public class WmsMoveSn extends BaseBean {
         this.transTypeCode = transTypeCode;
         this.refSrc = refSrc;
     }
-
     public WmsMoveSn(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
@@ -233,6 +232,16 @@ public class WmsMoveSn extends BaseBean {
         this.refSrc = refSrc;
     }
 
+    public WmsMoveSn(String partNo, String srcLocateNo, String destLocateNo, String createUser, String createDatetime, Integer busiTypeCode, Double qty) {
+        this.partNo = partNo;
+        this.srcLocateNo = srcLocateNo;
+        this.destLocateNo = destLocateNo;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.busiTypeCode = busiTypeCode;
+        this.qty = qty;
+    }
+
     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,