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

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

@@ -3264,7 +3264,11 @@ public class MesEnumUtil {
         JIT_ORDER(50, "JIT工单"),
         STOCK_ORDER(60, "库存工单"),
         REPAIR(70, "返修插单"),
-        FICTIVE(80, "虚拟工单");
+        EMERGENCY_ORDER(80, "紧急插单"),
+        FICTIVE(90, "虚拟工单"),
+        SPARE_PART_PRODUCTION(100, "备件生产"),
+        REPRODUCTION_RMS(110, "重新生产-报功"),
+        REPRODUCTION_NOT_RMS(120, "重新生产-不报功");
 
         private int value;
         private String description;
@@ -6486,18 +6490,17 @@ public class MesEnumUtil {
     }
 
     /**
-     * 客户JIT预装队列 工单类型
+     * 客户JIT队列下达配置 缓存类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum QUEUE_JIT_PLAN_WORK_ORDER_TYPE {
-        SPARE_PART_PRODUCTION(10, "备件生产"),
-        REPRODUCTION_RMS(20, "重新生产-报功"),
-        REPRODUCTION_NOT_RMS(30, "重新生产-不报功");
+    public enum JIT_ISSUE_CFG_TYPE {
+        ORDER_CACHE(10, "订单池"),
+        LOCK_CACHE(20, "锁定池");
 
         private Integer value;
         private String description;
 
-        QUEUE_JIT_PLAN_WORK_ORDER_TYPE(Integer value, String description) {
+        JIT_ISSUE_CFG_TYPE(Integer value, String description) {
             this.value = value;
             this.description = description;
         }

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

@@ -1787,7 +1787,8 @@ public class MesPcnEnumUtil {
         PAUSE(40, "暂停"),
         CANCEL(50, "取消"),
         CLOSE(60, "关闭"),
-        COMPLETE(70, "完成");
+        COMPLETE(70, "完成"),
+        FICTIVE(80, "虚拟工单");
 
         private int value;
         private String description;
@@ -1829,7 +1830,11 @@ public class MesPcnEnumUtil {
         JIT_ORDER(50, "JIT工单"),
         STOCK_ORDER(60, "库存工单"),
         REPAIR(70, "返修插单"),
-        EMERGENCY_ORDER(80, "紧急插单");
+        EMERGENCY_ORDER(80, "紧急插单"),
+        FICTIVE(90, "虚拟工单"),
+        SPARE_PART_PRODUCTION(100, "备件生产"),
+        REPRODUCTION_RMS(110, "重新生产-报功"),
+        REPRODUCTION_NOT_RMS(120, "重新生产-不报功");
 
         private int value;
         private String description;

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

@@ -125,7 +125,7 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 	private String itemUnit;
 
 	@Column(name = "JIT_SEQ")
-	@ApiParam("jit排序号")
+	@ApiParam("JIT排序号")
 	private String jitSeq;
 
 	@Column(name = "JIT_TYPE_FLAG")

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/3 5:06 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_JIT_ISSUE_CFG")
+@Api("MES_客户JIT队列下达配置")
+public class MesJitIssueCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1475207048628221791L;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户工厂代码")
+    private String custPlantCode;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Integer qty;
+
+    @Column(name = "THRESHOLD_QTY")
+    @ApiParam("触发阈值")
+    private Integer thresholdQty;
+
+    @Column(name = "CFG_TYPE")
+    @ApiParam("缓存类型")
+    private Integer cfgType;
+}

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/3 5:14 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_JIT_LOCK_CACHE")
+@Api("MES_JIT队列锁定池")
+public class MesJitLockCache extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -308930683558229105L;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户工厂代码")
+    private String custPlantCode;
+
+    @Column(name = "JIT_ACTUAL_NO")
+    @ApiParam("队列编号")
+    private String jitActualNo;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin")
+    private String vinCode;
+
+    @Column(name = "WO_TYPE")
+    @ApiParam("工单类型")
+    private Integer woType;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+}

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

@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/3 5:11 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_JIT_ORDER_CACHE")
+@Api("MES_JIT队列订单池")
+public class MesJitOrderCache extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -613326904053045367L;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户工厂代码")
+    private String custPlantCode;
+
+    @Column(name = "JIT_ACTUAL_NO")
+    @ApiParam("队列编号")
+    private String jitActualNo;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin")
+    private String vinCode;
+
+    @Column(name = "WO_TYPE")
+    @ApiParam("工单类型")
+    private Integer woType;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+}

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:

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

@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/4 10:26 上午
+ * @Modify:
+ */
+@Data
+public class JitIssueCfgModel {
+
+    @ApiParam("客户工厂代码")
+    private String custPlantCode;
+
+    @ApiParam("数量")
+    private Integer qty;
+
+    @ApiParam("触发阈值")
+    private Integer thresholdQty;
+
+    @ApiParam("当前JIT缓存数")
+    private Integer currentJitCacheNum;
+
+    @ApiParam("其他工单数")
+    private Integer otherWorkNum;
+
+    @ApiParam("缓存类型")
+    private String cfgType;
+}

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

@@ -53,4 +53,7 @@ public class PaintCheckModel {
 
     @ApiParam("界面组件参数数据")
     List<MesWindowModuleParam> windowModuleParamList;
+
+    private String defectType;
+    private String defectDesc;
 }

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

@@ -61,4 +61,6 @@ public class PaintWorkOrderSnModel extends BaseBean {
     private String parentPartName;
 
     private List<ProdPackModel> prodPackageList;
+
+    private String partNameRdd;
 }

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

@@ -250,12 +250,14 @@ public class QueueOrderModel implements Serializable {
         this.produceCategoryCode = produceCategoryCode;
     }
 
-    public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode) {
+    // getQueueOrderBySerialNumber
+    public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode, String workType) {
         this.id = id;
         this.queueGroupNo = queueGroupNo;
         this.jitLotNo = jitLotNo;
         this.vinCode = vinCode;
         this.organizeCode = organizeCode;
         this.produceCategoryCode = produceCategoryCode;
+        this.workType = workType;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitIssueCfgRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesJitIssueCfg;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/3 5:21 下午
+ * @Modify:
+ */
+public interface MesJitIssueCfgRepository extends BaseRepository<MesJitIssueCfg, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitLockCacheRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesJitLockCache;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/3 5:23 下午
+ * @Modify:
+ */
+public interface MesJitLockCacheRepository extends BaseRepository<MesJitLockCache, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitOrderCacheRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesJitOrderCache;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/3 5:22 下午
+ * @Modify:
+ */
+public interface MesJitOrderCacheRepository extends BaseRepository<MesJitOrderCache, Long> {
+}

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

@@ -3198,4 +3198,21 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 客户JIT队列下达配置
+     * @param jitIssueCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesJitIssueCfg(MesJitIssueCfg jitIssueCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(jitIssueCfg, organizeCode);
+        if (!StringUtils.isEmpty(jitIssueCfg.getCustPlantCode())) {
+            DdlPreparedPack.getStringLikerPack(jitIssueCfg.getCustPlantCode(), "custPlantCode", packBean);
+        }
+        if (jitIssueCfg.getCfgType() != null) {
+            DdlPreparedPack.getNumEqualPack(jitIssueCfg.getCfgType(), "cfgType", packBean);
+        }
+        return packBean;
+    }
 }