Merge remote-tracking branch 'pojo/dev' into dev

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

@@ -5087,4 +5087,67 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 交易类型-单据回退类型
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_BACK_TYPE {
+        REC_QTY(10, "REC_QTY", "已收货数量"),
+        PICK_QTY(20, "PICK_QTY", "已拣货数量"),
+        MOVE_QTY(30, "MOVE_QTY", "已移库数量"),
+        OUT_QTY(40, "OUT_QTY", "已出库数量");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ORDER_BACK_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static ORDER_BACK_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -160,6 +160,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("客户订单号")
     public String custOrderNo;
 
+    @Column(name = "ASSIGN_DATE_CODE")
+    @ApiParam(value = "指定生产日期")
+    private String assignDateCode;
+
     @Transient
     @ApiParam("实际批次")
     private String actualLot;

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

@@ -399,4 +399,12 @@ public class WmsStockSn extends BaseBean {
         this.modifyDatetime = modifyDatetime;
         this.modifyUser = modifyUser;
     }
+
+    public WmsStockSn (String partNo, String packageNo,String locateNo,  String createDatetime, String modifyDatetime) {
+        this.partNo = partNo;
+        this.packageNo =packageNo;
+        this.locateNo = locateNo;
+        this.createDatetime=createDatetime;
+        this.modifyDatetime = modifyDatetime;
+    }
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -70,6 +72,11 @@ public class WmsTransType extends BaseBean {
     @ApiParam(value = "是否发送异常邮件")
     private Integer isSendErrorEmail;
 
+    @Column(name = "ORDER_BACK_TYPE")
+    @ApiParam(value = "单据回退类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_BACK_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer orderBackType;
+
     @Transient
     @ApiParam("菜单URL")
     private String menuUrl;
@@ -78,7 +85,6 @@ public class WmsTransType extends BaseBean {
     @ApiParam("交易处理组件调用类")
     private String callClass;
 
-
     public String getMenuUrl() {
         return "/handle?transTypeCode=" + this.transTypeCode;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -418,6 +418,7 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getStringRightLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
         DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result);
+        DdlPreparedPack.getNumEqualPack(wmsTransType.getOrderBackType(),"orderBackType",result);
         DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result);
 
         getStringBuilderPack(wmsTransType, result);