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

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

@@ -19,6 +19,7 @@ public class ImppEnumUtil {
     public enum ORGANIZE_YTPE {
 
         TYPE_GROUP(1, "集团", "集团"),
+        TYPE_DIVISION(4, "事业部", "事业部"),
         TYPE_COMPANY(2, "公司", "公司"),
         TYPE_FACTORY(3, "工厂", "工厂");
 

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

@@ -8383,4 +8383,52 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 产品位置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCE_CATEGORY_NAME {
+
+        FL("FL", "前左"),
+        FR("FR", "前右"),
+        RL("RL", "后左"),
+        RR("RR", "后右");
+
+        private String description;
+        private String value;
+
+        PRODUCE_CATEGORY_NAME(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -9215,7 +9215,9 @@ public class WmsEnumUtil {
         FIVE_SECONDs("0/5 * * * * ?", "FIVE_SECONDs", "五秒一次"),
         TWENTY_SECONDS("0/20 * * * * ?", "TWENTY_SECONDS", "二十秒一次"),
         EVERY_DAY("0 0 0 * * ?", "EVERY_DAY", "每天零点"),
-        EVERY_HOUR("0 0 * * * ?", "EVERY_HOUR", "每小时");
+        EVERY_HOUR("0 0 * * * ?", "EVERY_HOUR", "每小时"),
+        NINE_AND_NINTEEN("0 0 9,21 * * ?", "NINE_AND_NINTEEN", "早上九点晚上九点");
+
 
         private String value;
         private String code;

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

@@ -57,6 +57,9 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam(value = "源存储区代码")
     private String srcZoneNo;
 
+    @ApiParam(value = "目标存储区代码")
+    private String destZoneNo;
+
     @ApiParam(value = "创建日期")
     public String createDatetime;
 

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

@@ -7,8 +7,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -16,6 +14,8 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
@@ -117,9 +117,9 @@ public class SapDocFgSum extends BaseBean {
     @ApiParam(value = "备注")
     private String errorMsg;
 
-    @Transient
+    @Column(name = "LINE_NO")
-    @ApiParam(value = "生产线")
+    @ApiParam("生产线")
-    private String lineNo;
+    public String lineNo;
 
     @JsonSerialize(using = ToStringSerializer.class)
     @Transient
@@ -210,4 +210,13 @@ public class SapDocFgSum extends BaseBean {
         this.isLock = isLock;
         this.effStartTime = effStartTime;
     }
+
+    //wdfd.partNo,wdfd.lineNo,sum(wdfd.qty),sum(wdfd.createDatetime)
+    public SapDocFgSum(String partNo, String lineNo, Double qty, String createDatetime) {
+        this.partNo = partNo;
+        this.lineNo = lineNo;
+        this.qty = qty;
+        this.createDatetime = createDatetime;
+    }
+
 }

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

@@ -86,6 +86,10 @@ public class WmsCSOrderMaster extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     public Integer isSyncErp;
 
+    @Column(name = "CS_LOCATE")
+    @ApiParam("盘点中库位")
+    public String cslocate;
+
     @Transient
     @ApiParam(value = "盘点明细集")
     public List<WmsCSOrderDetails> wmsCSOrderDetailsList;