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

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

@@ -6,7 +6,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @Description : 模块枚举类
+ * @Description : 模块报表枚举类
  * @Reference :
  * @Author : alwaysfrin
  * @CreateDate : 2018-12-25 21:08

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

@@ -21,6 +21,9 @@ public class CommonEnumUtil {
         WMS(3, "i3wms", "仓库管理软件"),
         MES(4, "i3mes", "生产管理软件"),
         QMS(5, "i3qms", "质量管理软件"),
+        MES_PCN(6, "i3mes-pcn", "生产管理软件-节点中心"),
+        SWEB(7, "i3sweb", "供应商服务"),
+
         FORM(20,"block-form","智能表单"),
         REPORT(21,"block-report","智能报表"),
         WORKFLOW(22,"block-workflow","智能工作流"),

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

@@ -1913,6 +1913,35 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 通用条码枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMMON_SN {
+        PO_SN("PO_SN", "PO条码");
+
+        private String code;
+        private String description;
+        int value;
+
+        COMMON_SN(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 可选项类型枚举
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -2191,4 +2220,37 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 包装类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PACKAGE_TYPE {
+        BOX(10 , "BOX", "BOX（盒）"),
+        CARTON(20 , "CARTON", "CARTON（箱）"),
+        PALLET(30 , "PALLET", "PALLET（栈板）"),
+        CONTAINER(40 , "PALLET", "PALLET（集装箱）");
+
+        private String code;
+        private String description;
+        int value;
+
+        PACKAGE_TYPE(int value , String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-DEV-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-mes-pcn</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-base</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>

modules/i3plus-pojo-sweb/pom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-DEV-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-sweb</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-base</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>

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

@@ -46,7 +46,7 @@ public class WmsQCTrans extends BaseBean {
 
     @Column(name="REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     @Column(name="PASS_QTY")
     @ApiParam("合格数量")

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

@@ -92,10 +92,11 @@ public class WmsHqlPack {
     /**
      * 查询任务合并的移库单明细 查询条件封装
      *
+     * @param colName
      * @param orderNos
      * @return
      */
-    public static String packWmsOrderDetailsByOrderNos(List<String> orderNos) {
+    public static String packWmsOrderDetailsByOrderNos(String colName, List<String> orderNos) {
         StringBuffer result = new StringBuffer();
         StringBuffer orderNoStr = new StringBuffer();
         for (int i = 0; i < orderNos.size(); i++) {
@@ -104,7 +105,7 @@ public class WmsHqlPack {
         orderNoStr.deleteCharAt(orderNoStr.length() - 1);
         result.append(" and model.isDeleted=" + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() +
                 " and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() +
-                " and model.orderNo in (" + orderNoStr + ")" + " order by model.partNo,model.orderNo");
+                " and model.orderNo in (" + orderNoStr + ")" + " order by model." + colName + ",model.orderNo");
         return result.toString();
     }
 

pom.xml

@@ -29,6 +29,8 @@
         <module>modules/i3plus-pojo-report</module>
         <module>modules/i3plus-pojo-softswitch</module>
         <module>modules/i3plus-pojo-workflow</module>
+        <module>modules/i3plus-pojo-mes-pcn</module>
+        <module>modules/i3plus-pojo-sweb</module>
     </modules>
 
     <dependencies>