Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -2558,4 +2558,54 @@ public class CommonEnumUtil {
     public enum DYNAMIC_DATA_SOURCE_TYPE {
         MASTER,NODE
     }
+
+
+
+    /**
+     * 业务表：库存条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SESSION_MODE {
+        DEFAULT(10, "默认"),
+        OVERWRITE(20, "覆盖"),
+        SEIZE(30, "抢占");
+
+        private int value;
+        private String description;
+
+        SESSION_MODE(int value, String description) {
+            this.value = value;
+            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 Integer descriptionOfValue(String desc) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -4378,6 +4378,16 @@ public class MesPcnEnumUtil {
             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;
+        }
+
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }

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

@@ -65,7 +65,7 @@ public class IfDefectData extends BaseBean implements Serializable {
 
     @Column(name = "DEFECT_ACTION_TYPE")
     @ApiParam("不良处理类型")
-    private Integer defectActionType;
+    private String defectActionType;
 
     @Column(name = "QTY")
     @ApiParam("数量")

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

@@ -82,7 +82,7 @@ public class MesDefectRecord extends BaseBean implements Serializable {
 
     @Column(name = "DEFECT_ACTION_TYPE")
     @ApiParam("不良处理类型")
-    private Integer defectActionType;
+    private String defectActionType;
 
     @Transient
     private List<MesDefect> mesDefectList;

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

@@ -148,6 +148,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("生产批次")
     private String lotNo;
 
+    @Column(name = "DEFECT_ACTION_TYPE")
+    @ApiParam("不良处理类型")
+    private String defectActionType;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")

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

@@ -180,6 +180,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String productSn;
 
+    @Transient
+    @ApiParam("队列类型")
+    private Integer queueType;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0.0d : this.queueSeq;
     }
@@ -207,7 +211,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
 
     public MesQueueOrderDetail(String orderNo, String vinCode, String partNo, String partNameRdd, String produceCategoryCode,
                                Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime,
-                               String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) {
+                               String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,
+                               String gradeCode,String assyNo,Integer queueType) {
         this.orderNo = orderNo;
         this.vinCode = vinCode;
         this.partNo = partNo;
@@ -224,5 +229,6 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
         this.produceColor = produceColor;
         this.gradeCode = gradeCode;
         this.assyNo = assyNo;
+        this.queueType = queueType;
     }
 }

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

@@ -8,11 +8,7 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * 脚本持久化实体类
@@ -26,7 +22,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "SCRIPT_PERSISTENCE")
+@Table(name = "SCRIPT_PERSISTENCE", uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SCRIPT_NO"})
+})
 @Api("系统动态脚本")
 public class EngineScriptPersistence extends BaseBean {
     private static final long serialVersionUID = 7893111140559759490L;

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

@@ -229,6 +229,10 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam(value = "jis料架号")
     private String queueGroupNo;
 
+    @Column(name = "CUST_ORDER_NO")
+    @ApiParam(value = "客户单号")
+    private String custOrderNo;
+
     @Transient
     private Long shippingId;
 

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

@@ -395,7 +395,16 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringRightLikerPack(wmsPart.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
         DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
+        if (!StringUtil.isEmpty(wmsPart.getPartType()) && wmsPart.getPartType().contains(",")) {
+            String types[] = wmsPart.getPartType().split(",");
+            List<String> partTypes = new ArrayList<>();
+            for (String type : types) {
+                partTypes.add(type);
+            }
+            DdlPreparedPack.getInPackList(partTypes, "partType", result);
+        } else {
             DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result);
+        }
         DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result);
         DdlPreparedPack.getNumEqualPack(wmsPart.getIsValuable(), "isValuable",result);
         getStringBuilderPack(wmsPart, result);