墨西哥WMS报工业务新增功能：通用脚本定制业务+生产计划主表添加单据类型和产线名称+添加生产工单类型枚举

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

@@ -5142,6 +5142,59 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 生产工单类型
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_PLAN_TYPE {
+        REPORT(10, "REPORT", "生产报工"),
+        PACKING(20, "PACKING", "打箱包装");
+
+        private int value;
+        private String code;
+        private String description;
+
+        WORK_ORDER_PLAN_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 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;
+        }
+    }
+
     /**
      * 是否贵重物料
      * 默认为2

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

@@ -68,4 +68,8 @@ public class MesPpDetails extends BaseBean{
     public Double getQty() {
         return qty == null ? 0D : this.qty.doubleValue();
     }
+
+    public Double getTransQty() {
+        return transQty == null ? 0D : this.transQty.doubleValue();
+    }
 }

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

@@ -45,6 +45,13 @@ public class MesPpMaster extends BaseBean{
             searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode")
     private String pdlineNo;
 
+    @Column(name="PDLINE_NAME_RDD")
+    @ApiParam("产线名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter",
+            searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterName")
+    private String pdlineNameRdd;
+
     @Column(name="PLAN_PRODUCT_TIME")
     @ApiParam("生产日期")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
@@ -72,6 +79,11 @@ public class MesPpMaster extends BaseBean{
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_MASTER_STATUS")
     private Integer orderStatus = 0;
 
+    @Column(name="ORDER_TYPE")
+    @ApiParam(value = "单据类型", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_TYPE")
+    private Integer orderType = 0;
+
     @Column(name="SEQ")
     @ApiParam(value = "排序号", example = "0")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)