Finish Task #2234 客户JIT预装队列

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

@@ -6438,4 +6438,40 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 客户JIT预装队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIT_PLAN_STATUS {
+        CREATE(10, "创建"),
+        RELEASED(20, "已释放"),
+        ERROR(999, "异常");
+
+        private Integer value;
+        private String description;
+
+        QUEUE_JIT_PLAN_STATUS(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -74,4 +75,40 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
     @Column(name = "VERSION")
     @ApiParam("版本号")
     private String version;
+
+    @Column(name = "JIT_SEQ")
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商编号")
+    private String supplierCode;
+
+    @Column(name = "SUPPLIER_NAME")
+    @ApiParam("供应商名称")
+    private String supplierName;
+
+    @Column(name = "FILE_NAME")
+    @ApiParam("解析文件名")
+    private String fileName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("解析文件路径")
+    private String fileUrl;
+
+    @Transient
+    @ApiParam("计划上线开始时间")
+    private String planStartDate;
+
+    @Transient
+    @ApiParam("计划上线结束时间")
+    private String planEndDate;
 }

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

@@ -50,4 +50,8 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable {
     @Column(name = "QTY")
     @ApiParam("用量")
     private Double qty;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
 }

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

@@ -46,4 +46,16 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable {
     @Column(name = "PART_NAME")
     @ApiParam("产品名称")
     private String partName;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "CUST_PART_NO")
+    @ApiParam("客户物料号")
+    private String custPartNo;
+
+    @Column(name = "FORMULA_CONTENT")
+    @ApiParam("配方内容")
+    private String formulaContent;
 }

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

@@ -3130,4 +3130,72 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 客户JIT预装队列
+     * @param queueJitPlan
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesQueueJitPlan(MesQueueJitPlan queueJitPlan, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlan, organizeCode);
+        if (!StringUtils.isEmpty(queueJitPlan.getJisPlanNo())) {
+            DdlPreparedPack.getStringLikerPack(queueJitPlan.getJisPlanNo(), "jisPlanNo", packBean);
+        }
+        if (!StringUtils.isEmpty(queueJitPlan.getCustPlantCode())) {
+            DdlPreparedPack.getStringLikerPack(queueJitPlan.getCustPlantCode(), "custPlantCode", packBean);
+        }
+        if (!StringUtils.isEmpty(queueJitPlan.getCustFlagNo())) {
+            DdlPreparedPack.getStringLikerPack(queueJitPlan.getCustFlagNo(), "custFlagNo", packBean);
+        }
+        if (!StringUtils.isEmpty(queueJitPlan.getVinCode())) {
+            DdlPreparedPack.getStringLikerPack(queueJitPlan.getVinCode(), "vinCode", packBean);
+        }
+        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.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+        return packBean;
+    }
+
+    /**
+     * 客户JIT预装队列明细
+     * @param queueJitPlanDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesQueueJitPlanDetail(MesQueueJitPlanDetail queueJitPlanDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlanDetail, organizeCode);
+        if (!StringUtils.isEmpty(queueJitPlanDetail.getJisPlanNo())) {
+            DdlPreparedPack.getStringLikerPack(queueJitPlanDetail.getJisPlanNo(), "jisPlanNo", packBean);
+        }
+        if (!StringUtils.isEmpty(queueJitPlanDetail.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(queueJitPlanDetail.getPartNo(), "partNo", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 客户JIT预装队列BOM
+     * @param queueJitPlanBom
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesQueueJitPlanBom(MesQueueJitPlanBom queueJitPlanBom, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlanBom, organizeCode);
+        if (!StringUtils.isEmpty(queueJitPlanBom.getJisPlanNo())) {
+            DdlPreparedPack.getStringLikerPack(queueJitPlanBom.getJisPlanNo(), "jisPlanNo", packBean);
+        }
+        if (!StringUtils.isEmpty(queueJitPlanBom.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(queueJitPlanBom.getPartNo(), "partNo", packBean);
+        }
+        return packBean;
+    }
 }