Merge remote-tracking branch 'origin/master'

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

@@ -20,6 +20,7 @@ public class CommonEnumUtil {
         CORE(2, "i3core", "i3业务平台"),
         WMS(3, "i3wms", "仓库管理软件"),
         MES(4, "i3mes", "生产管理软件"),
+        CLOUD(97,"i3cloud","微服务"),
         SURFACE(98,"i3surface","对外服务"),
         CENTER(99,"icloud-server","云服务中心");
 

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

@@ -703,19 +703,17 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PART_ABC {
-        A(1, "A", "正常"),
-        B(2, "B", "正常"),
-        C(3, "C", "取消"),
-        D(4, "D", "取消"),
-        E(5, "E", "取消");
+        A(1, "A"),
+        B(2, "B"),
+        C(3, "C"),
+        D(4, "D"),
+        E(5, "E");
 
         private int value;
-        private String code;
         private String description;
 
-        PART_ABC(int value, String code, String description) {
+        PART_ABC(int value, String description) {
             this.value = value;
-            this.code = code;
             this.description = description;
         }
 
@@ -727,10 +725,6 @@ public class WmsEnumUtil {
             return description;
         }
 
-        public String getCode() {
-            return code;
-        }
-
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -1166,7 +1160,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CS_ITEM_STATUS {
-        CREATE(1, "创建"),FINISH(10, "已盘");
+        CREATE(1, "创建"),FINISH(10, "已处理");
 
         private int value;
         private String description;

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

@@ -45,7 +45,7 @@ public class WmsCSFactTrans extends BaseBean {
     public String locateNo;
 
     @Column(name="PART_NO")
-    @ApiParam("物料编码")
+    @ApiParam("物料代码")
     public String partNo;
 
     @Column(name="PART_NAME_RDD")

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

@@ -45,7 +45,7 @@ public class WmsCSOrderDetails extends BaseBean {
     public String locateNo;
 
     @Column(name="PART_NO")
-    @ApiParam("物料编码")
+    @ApiParam("物料代码")
     public String partNo;
 
     @Column(name="PART_NAME_RDD")

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

@@ -57,7 +57,7 @@ public class WmsQCDetails extends BaseBean {
     public Double factQty;
 
     @Column(name="PASS_QTY")
-    @ApiParam(value = "实检数量", example = "0")
+    @ApiParam(value = "合格数量", example = "0")
     public Double passQty;
 
     @Column(name="REJECT_QTY")

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

@@ -49,11 +49,11 @@ public class WmsQCTrans extends BaseBean {
 
     @Column(name="PASS_QTY")
     @ApiParam("合格数量")
-    public String passQty;
+    public double passQty;
 
     @Column(name="REJECT_QTY")
     @ApiParam("不合格数量")
-    public String rejectQty;
+    public double rejectQty;
 
     @Column(name="UNIT")
     @ApiParam("单位")

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -118,6 +119,7 @@ public class WmsStockSn extends BaseBean {
 
     @Column(name = "PDATE")
     @ApiParam(value = "打印时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date pdate;
     /**
      * 1=ASN,10=PO,20=SO

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

@@ -70,5 +70,5 @@ public class WmsTransSn extends BaseBean {
 
     @Column(name="TRANS_NO")
     @ApiParam("事务编号")
-    public String transNo;
+    public Long transNo;
 }

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

@@ -820,10 +820,10 @@ public class WmsHqlPack {
      * @param tranNo
      * @return
      */
-    public static String packWmsTransSn(String tranNo) {
+    public static String packWmsTransSn(Long tranNo) {
         StringBuffer result = new StringBuffer();
         //查询参数封装
-        HqlPack.getStringEqualPack(tranNo, "tranNo", result);
+        HqlPack.getNumEqualPack(tranNo, "transNo", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
         return result.toString();
     }
@@ -1020,6 +1020,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
+        HqlPack.getStringLikerPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result);
         getStringBuilderPack(wmsCSOrderDetails, result);
 
         return result.toString();
@@ -1035,6 +1036,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
+        HqlPack.getStringLikerPack(wmsCSFactTrans.getOrderNo(), "orderNo", result);
         getStringBuilderPack(wmsCSFactTrans, result);
 
         return result.toString();