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

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

@@ -2681,7 +2681,8 @@ public class MesPcnEnumUtil {
         ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"),
         ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"),
         TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"),
-        MESSAGE_POOL("messagePool", "消息池");
+        MESSAGE_POOL("messagePool", "消息池"),
+        FORCE_LOGOUT("forceLogout", "websocket强制下线");
 
         private String value;
         private String description;
@@ -6009,6 +6010,7 @@ public class MesPcnEnumUtil {
             }
             return null;
         }
+
         public static String codeOfDescription(String code) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {

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

@@ -12,7 +12,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class SwebEnumUtil {
 
     /**
-     * 单据主表状态(ASN,PO,MOVE,QC)
+     * 采购单据主表状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ORDER_MASTER_STATUS {
@@ -142,8 +142,7 @@ public class SwebEnumUtil {
     public enum ORDER_SN_STATUS {
         CREATE(10, "N", "创建"),
         RECEIPTED(20, "R", "已完成"),
-        CANCEL(30, "C", "行取消"),
+        CANCEL(30, "C", "行取消");
-        PRINTED(40, "C", "已打印");
 
         private int value;
         private String code;
@@ -189,6 +188,126 @@ public class SwebEnumUtil {
     }
 
     /**
+     * 委外单据主表状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MOVEMENT_MASTER_STATUS {
+        CREATE(10, "CREATE", "新建"),
+        PRINTED(20, "PRINTED", "已打印"),
+        DELIVERY(30, "DELIVERY", "已发货");
+
+        private int value;
+        private String code;
+        private String description;
+
+        MOVEMENT_MASTER_STATUS(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 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;
+        }
+
+        public static int codeOf(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 委外订单明细状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MOVEMENT_DETAILS_STATUS {
+        CREATE(10, "CREATE", "新建"),
+        PRINTED(20, "PRINTED", "已打印"),
+        DELIVERY(30, "DELIVERY", "已发货");
+
+        private int value;
+        private String code;
+        private String description;
+
+        MOVEMENT_DETAILS_STATUS(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;
+        }
+
+        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;
+        }
+
+        public static int codeOf(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * PO订单来源
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java

@@ -424,6 +424,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("模具编号集合")
     private String mouldCodeList;
 
+    @Transient
+    @ApiParam("不良数量")
+    private Integer ngQty;
+
 
 
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java

@@ -30,10 +30,12 @@ public class QcOrderCheckDataDetailModel {
 
     private Integer checkResult;
 
+    private String serialNumber;
+
 
     public QcOrderCheckDataDetailModel(Integer checkType, String checkItem, String checkStandard, Integer checkCount,
                                        Integer isConcession, Integer isKeyCheckItem, Double max, Double min,
-                                       String checkValue, Integer checkResult) {
+                                       String checkValue, Integer checkResult, String serialNumber) {
         this.checkType = checkType;
         this.checkItem = checkItem;
         this.checkStandard = checkStandard;
@@ -44,5 +46,6 @@ public class QcOrderCheckDataDetailModel {
         this.min = min;
         this.checkValue = checkValue;
         this.checkResult = checkResult;
+        this.serialNumber = serialNumber;
     }
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.sweb.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -69,7 +70,7 @@ public class SwebDocMovementDetails extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public String item;
+    public Integer item;
 
     @Column(name = "SNP")
     @ApiParam(value = "标准包装", example = "1")
@@ -157,8 +158,8 @@ public class SwebDocMovementDetails extends BaseBean {
     public transient Integer lockVersion;
 
     @Column(name = "IS_SN")
-    @ApiParam(value = "条码生成状态", example = "20")
+    @ApiParam(value = "条码生成状态", example = "2")
-    public Integer isSn;
+    public Integer isSn = CommonEnumUtil.FALSE;
 
     @Column(name = "LOT_NO")
     @ApiParam("批次")

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java

@@ -36,7 +36,7 @@ public class SwebDocMovementSn extends BaseBean {
 
     @Column(name="ITEM")
     @ApiParam("行号")
-    public String item;
+    public Integer item;
 
     @Column(name="PART_NO")
     @ApiParam("物料编码")

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java

@@ -51,6 +51,11 @@ public class SwebPurchaseOrderSn extends BaseBean {
     @ApiParam(value = "零件名称")
     private String partName;
 
+    @Column(name = "ITEM_NO")
+    @ColumnDefault("0")
+    @ApiParam(value = "行号", example = "0")
+    private Integer itemNo;
+
     @ApiParam("零件类型")
     @Column(name = "PART_TYPE")
     private Integer partType;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -205,10 +205,10 @@ public class SwebHqlPack {
 
     public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
-        DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
         DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
-        DdlPreparedPack.getStringLikerPack(details.getVendorNo(), "vendorNo", result);
+        DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
         return buildHql(details, result);
     }