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

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

@@ -3126,6 +3126,41 @@ public class MesEnumUtil {
     }
 
     /**
+     * 工步参数 是否必填
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_STEP_PARAM_IS_NEED {
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        MES_STEP_PARAM_IS_NEED(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * mes工作单元参数类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -869,8 +869,9 @@ public class WmsEnumUtil {
         WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"),
         OTHER_IN(730, "OTHER_IN", "其它入库"),
         OTHER_OUT(740, "OTHER_OUT", "其它出库"),
-        COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"),
-        SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR
+        COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"),
+        SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"),
+        COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库");//默认DMR
 
         private int value;
         private String code;

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

@@ -132,12 +132,13 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     }
 
     public MesDefectRecord(String partNo, String workOrderNo, String partName, String workCenterCode,
-                           String workCellCode, String modifyUser, String modifyDatetime) {
+                           String workCellCode, String serialNumber, String modifyUser, String modifyDatetime) {
         this.partNo = partNo;
         this.workOrderNo = workOrderNo;
         this.partName = partName;
         this.workCenterCode = workCenterCode;
         this.workCellCode = workCellCode;
+        this.serialNumber = serialNumber;
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
     }

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

@@ -26,10 +26,10 @@ import java.io.Serializable;
         @Index(columnList = "PACKAGE_NO"),
         @Index(columnList = "SERIAL_NUMBER"),
         @Index(columnList = "PART_NO"),
-        @Index(columnList = "PACKAGE_NO2")
-}/*, uniqueConstraints = {
-        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"})
-}*/)
+        @Index(columnList = "PACKAGE_NO2"),
+        @Index(columnList = "ORGANIZE_CODE,PACKAGE_NO,SERIAL_NUMBER"),
+        @Index(columnList = "PACKAGE_NO,SERIAL_NUMBER")
+})
 @Api("包装规格明细")
 public class MesPackageDetail extends BaseBean implements Serializable {
     private static final long serialVersionUID = 6980459490465566975L;

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

@@ -26,6 +26,7 @@ import java.math.BigDecimal;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PRODUCE_SN", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
         @Index(columnList = "PRODUCT_SN"),
         @Index(columnList = "CREATE_DATE_TIME"),
         @Index(columnList = "PART_NO"),

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

@@ -145,4 +145,15 @@ public class MesQcOrder extends BaseBean implements Serializable {
     @ApiParam("本批次生产总数")
     private Double locSrcLotNoQty;
 
+    @Transient
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @Transient
+    @ApiParam("班次")
+    private String shiftName;
+
+    @Transient
+    @ApiParam("班长")
+    private String squadLeader;
 }

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

@@ -125,7 +125,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("检测值")
-    private String checkValue;
+    private String checkValue = "";
 
     @Transient
     @ApiParam("质检单检测记录id")

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

@@ -65,6 +65,10 @@ public class MesStepParam extends BaseBean implements Serializable {
     @ApiParam("参数对象")
     private String objectCode;
 
+    @Column(name = "IS_NEED")
+    @ApiParam("是否必需")
+    private Integer isNeed = 1;
+
     @Column(name = "TYPE")
     @ApiParam("type")
     private Integer type = 0;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java

@@ -11,7 +11,7 @@ import lombok.Data;
 @Data
 public class SparePartStockModel {
 
-    private Integer maxQty;
+    private String maxQty;
 
-    private Integer minQty;
+    private String minQty;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -3327,9 +3327,9 @@ public class MesHqlPack {
         if (queueJitPlan.getStatus() != null) {
             DdlPreparedPack.getNumEqualPack(queueJitPlan.getStatus(), "status", packBean);
         }
-        if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) {
-            DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(),
-                    "createDatetime", packBean, true);
+        if (!StringUtils.isEmpty(queueJitPlan.getPlanStartDate()) || !StringUtils.isEmpty(queueJitPlan.getPlanEndDate())) {
+            DdlPreparedPack.timeBuilder(queueJitPlan.getPlanStartDate(), queueJitPlan.getPlanEndDate(),
+                    "planDate", packBean, true);
         }
         if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(),

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -63,9 +64,15 @@ public class SysOrderNoRule extends BaseBean {
 
     @Column(name = "IS_CYCLE")
     @ApiParam(value = "达到最大值后是否循环",example = "1")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
     private Integer isCycle;
 
+    @Column(name = "IS_FIXED_LENGTH")
+    @ColumnDefault("2")
+    @ApiParam(value = "是否固定序号长度长度",example = "1")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    private Integer isFixedLength;
+
     @Column(name = "SERIAL_NO")
     @ApiParam(value = "当前流水号",example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)