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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java

@@ -75,7 +75,7 @@ public class AndonBoardModel implements Serializable {
     private String color;
 
     @ApiParam("停线时间比率")
-    private Integer downtimeRate;
+    private String downtimeRate;
 
     public int getTotalTimeVal() {
         return totalTime == null ? 0 : totalTime;

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

@@ -6028,4 +6028,39 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * JIS_回冲标识：BACKFLUSH = 正常回冲扣减，REPAIR = 返修冲料
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum JIS_BACKFLUSH_STATUS {
+        BACKFLUSH("BACKFLUSH", "正常回冲扣减"),
+        REPAIR("REPAIR", "返修冲料");
+
+        private String value;
+        private String description;
+
+        JIS_BACKFLUSH_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -23,7 +23,13 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")
+@Table(name = "MES_PACKAGE", indexes = {
+        @Index(columnList = "PACKAGE_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "WORK_ORDER_NO"),
+        @Index(columnList = "WORK_CENTER_CODE"),
+        @Index(columnList = "WORK_CELL_CODE"),
+        @Index(columnList = "IS_SEALED")
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"})
 })

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

@@ -356,9 +356,10 @@ public class QueueOrderModel implements Serializable {
     }
 
     // getQueueOrderBySerialNumber
-    public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType,
+    public QueueOrderModel(Long id, String orderNo, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType,
                            String partNo, String prodCfgTypeCode) {
         this.id = id;
+        this.orderNo = orderNo;
         this.queueGroupNo = queueGroupNo;
         this.jitLotNo = jitLotNo;
         this.vinCode = vinCode;

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

@@ -41,6 +41,10 @@ public class MgnBjBoardModel implements Serializable {
     private Integer onceQualityRate = 0;
     @ApiParam("待生产订单数量")
     private Integer waitProduceQty = 0;
+    @ApiParam("低于安全库存")
+    private Integer minStockQty;
+    @ApiParam("超出最大库存")
+    private Integer maxStockQty;
 
     @ApiParam(value = "显示颜色")
     private String color;

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

@@ -3540,4 +3540,24 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * MES_看板自定义参数配置查询条件封装
+     *
+     * @param boardCustomParamCfg
+     * @return
+     */
+    public static DdlPackBean getBoardCustomParamCfg(MesBoardCustomParamCfg boardCustomParamCfg) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(boardCustomParamCfg, boardCustomParamCfg.getOrganizeCode());
+        if (!StringUtils.isEmpty(boardCustomParamCfg.getBoardCode())) {
+            DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getBoardCode(), "boardCode", packBean);
+        }
+        if (!StringUtils.isEmpty(boardCustomParamCfg.getParamCode())) {
+            DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getParamCode(), "paramCode", packBean);
+        }
+        if (!StringUtils.isEmpty(boardCustomParamCfg.getParamName())) {
+            DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getParamName(), "paramName", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -324,11 +324,13 @@ public class WmsPOMasterDetails extends BaseBean {
         this.qty = qty;
     }
 
-    public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty,
+    public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty,
                                 Double rcQty, Integer itemStatus) {
         this.orderNo = orderNo;
         this.erpSrcNo = erpSrcNo;
+        this.item = item;
         this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
         this.qty = qty;
         this.rcQty = rcQty;
         this.itemStatus = itemStatus;

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

@@ -362,4 +362,14 @@ public class WmsPart extends BaseBean {
         this.snp = snp;
         this.partSpec = partSpec;
     }
+
+    public WmsPart(String partNo, String partName, String partSpec, Double snp, String buyUnit, Integer snControl, Double qty) {
+        this.partNo = partNo;
+        this.partName = partName;
+        this.partSpec = partSpec;
+        this.snp = snp;
+        this.buyUnit = buyUnit;
+        this.snControl = snControl;
+        this.qty = qty;
+    }
 }

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

@@ -61,7 +61,11 @@ public class WmsPushConfig extends BaseBean{
     @Column(name = "SCRIPT_NO")
     private String scriptNo;
 
-    @ApiParam("附件文件路径获取脚本编号")
+    @ApiParam("脚本入参")
+    @Column(name = "SCRIPT_PARAM")
+    private String scriptParam;
+
+    @ApiParam("附件脚本编号")
     @Column(name = "ATTACH_SCRIPT_NO")
     private String attachScriptNo;
 

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

@@ -874,4 +874,18 @@ public class WmsStockSn extends BaseBean {
         this.partNameRdd = wmsStockSn.getPartNameRdd();
         this.sumQty = sumQty;
     }
+
+    public WmsStockSn( String zoneNo, String locateNo, String partNo,
+                      String partNameRdd, String sn, Double qty, String qualityDate,
+                       Integer snStatus,String lotNo) {
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.sn = sn;
+        this.qty = qty;
+        this.qualityDate = qualityDate;
+        this.snStatus = snStatus;
+        this.lotNo = lotNo;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java

@@ -71,8 +71,8 @@ public class WmsQCStatusModel {
         this.proportion = proportion;
         this.stdCheckTime = stdCheckTime;
     }
-
-    public WmsQCStatusModel() {
-
+    public Double getStdQcTimeVal() {
+        return this.stdQcTime == null ? 0 : this.stdQcTime;
     }
+
 }