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

modules/i3plus-pojo-andon/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -3291,6 +3291,16 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -6438,4 +6448,76 @@ 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;
+        }
+    }
+
+    /**
+     * 客户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, "重新生产-不报功");
+
+        private Integer value;
+        private String description;
+
+        QUEUE_JIT_PLAN_WORK_ORDER_TYPE(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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -2407,6 +2407,16 @@ public class MesPcnEnumUtil {
             }
             return tmp;
         }
+
+        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;
+        }
     }
 
 
@@ -4266,8 +4276,8 @@ public class MesPcnEnumUtil {
     public enum BAD_HANDLE_TYPE {
         BACK_SPRAY(10, "BACK_SPRAY", "返喷"),
         SCRAPPED(20, "SCRAPPED", "报废"),
-        POLISH(30, "POLISH", "抛光"),
-        DETERMINED(40, "DETERMINED", "待定");
+        POLISHING(30, "POLISHING", "抛光"),
+        DETERMIND(40, "DETERMIND", "待定");
 
         private int value;
         private String code;

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

@@ -1367,7 +1367,8 @@ public class WmsEnumUtil {
         PART_COVERAGE(110, "物料分类覆盖"),
         TOUCH(120, "动碰"),
         ZORE_STOCK(130, "零库存"),
-        MATERIAL_COVERAGE(140, "物料覆盖");
+        MATERIAL_COVERAGE(140, "物料覆盖"),
+        CHECK(150, "点检");
 
         private int value;
         private String description;
@@ -8146,16 +8147,16 @@ public class WmsEnumUtil {
 
     /**
      * 动作类型
-     * 10-锁定库存，20-解锁库存、30-锁定库位、40-解锁库位、50-锁定料车、60-解锁料车、70-生成任务、
+     * 10-锁定库位，20-锁定库存、30-锁定料车、40-解锁库存、50-解锁库位、60-解锁料车、70-生成任务、
      * 80-取消任务、90-递进交换
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STRATEGY_ACTION_TYPE {
-        LOCKING_IN_STOCK(10, "LOCKING_IN_STOCK", "锁定库存"),
-        UNLOCK_IN_STOCK(20, "UNLOCK_IN_STOCK", "解锁库存"),
-        LOCKING_LOCATE(30, "LOCKING_LOCATE", "锁定库位"),
-        UNLOCK_LOCATE(40, "UNLOCK_LOCATE", "解锁库位"),
-        LOCKING_FEED_CAR(50, "LOCKING_FEED_CAR", "锁定料车"),
+        LOCKING_LOCATE(10, "LOCKING_LOCATE", "锁定库位"),
+        LOCKING_IN_STOCK(20, "LOCKING_IN_STOCK", "锁定库存"),
+        LOCKING_FEED_CAR(30, "LOCKING_FEED_CAR", "锁定料车"),
+        UNLOCK_IN_STOCK(40, "UNLOCK_IN_STOCK", "解锁库存"),
+        UNLOCK_LOCATE(50, "UNLOCK_LOCATE", "解锁库位"),
         UNLOCK_FEED_CAR(60, "UNLOCK_FEED_CAR", "解锁料车"),
         GENERATE_TASK(70, "GENERATE_TASK", "生成任务"),
         CANCEL_TASK(80, "CANCEL_TASK", "取消任务"),
@@ -8330,7 +8331,7 @@ public class WmsEnumUtil {
 
 
     /**
-     * 发运看板状态
+     * AUTO 命令状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AUTO_FORK_TASK_STATUS {
@@ -8374,4 +8375,83 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 自动化日志记录-操作类型
+     * 10-单据生成，20-策略动作、30-任务生成、40-START、50-END、60-其它
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OPERATE_TYPE {
+        ORDER_GENERATE(10, "ORDER_GENERATE", "单据生成"),
+        STRATEGIC_ACTION(20, "STRATEGIC_ACTION", "策略动作"),
+        TASK_GENERATE(30, "TASK_GENERATE", "任务生成"),
+        START(40, "START", "START"),
+        END(50, "END", "END"),
+        OTHER(60, "OTHER", "其它");
+
+        private int value;
+        private String code;
+        private String description;
+
+        OPERATE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static OPERATE_TYPE codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 }

modules/i3plus-pojo-form/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-hardswitch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-ics/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-jobflow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-lac/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mdm/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mes/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -111,4 +111,8 @@ public class IfPackageDetail extends BaseBean  implements Serializable {
     @Column(name = "CUST_DELIVERY_LOCATION")
     @ApiParam("客户发往地")
     private String custDeliveryLocation;
+
+    @Column(name = "CUSTOMER_CODE")
+    @ApiParam("客户代码")
+    private String customerCode;
 }

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

@@ -127,4 +127,8 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @Column(name = "CT_NO")
     @ApiParam("容器编号")
     private String ctNo;
+
+    @Column(name = "CUSTOMER_CODE")
+    @ApiParam("客户代码")
+    private String customerCode;
 }

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

@@ -126,10 +126,10 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 
 	@Column(name = "JIT_SEQ")
 	@ApiParam("jit排序号")
-	private String jitSeq;
+	private Double jitSeq;
 
 	@Column(name = "JIT_TYPE_FLAG")
-	@ApiParam("jit类型标识")
+	@ApiParam("JIT类型标识")
 	private String jitTypeFlag;
 
 	@Column(name = "CUST_POINT_DATE")
@@ -138,7 +138,7 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 
 	@Column(name = "CUST_PLANT_CODE")
 	@ApiParam("客户工厂代码")
-	private String custPlantDate;
+	private String custPlantCode;
 
 	@Column(name = "DOCK_NO")
 	@ApiParam("道口")

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

@@ -31,7 +31,6 @@ import java.io.Serializable;
 @Api("工位投料信息")
 public class MesCellFeed extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1947971369479107782L;
-
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;

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

@@ -45,4 +45,8 @@ public class MesCustomerPart extends BaseBean implements Serializable {
     @Column(name = "CUSTOMER_PART_NAME")
     @ApiParam("客户零件描述")
     private String customerPartName;
+
+    @Column(name = "CUSTOMER_CFG_CODE")
+    @ApiParam("客戶配置代碼")
+    private String customerCfgCode;
 }

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

@@ -123,6 +123,11 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("包装标签模板")
     private String packageLabelTemplate;
 
+    // 二维码
+    @Column(name = "QR_CODE")
+    @ApiParam("包装二维码")
+    private String qrCode;
+
     public MesPackage() {
     }
 

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

@@ -185,6 +185,11 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码打印状态名称")
     private String printStatusName;
 
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public Integer lockVersion;
+
     public MesProduceSn() {
     }
 

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

@@ -12,6 +12,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Lob;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -84,13 +85,12 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
 
-    @Lob
     @Column(name = "MEMO")
     @ApiParam("备注")
     private String memo;
 
     @Column(name = "SUPPLIER_CODE")
-    @ApiParam("供应商代码")
+    @ApiParam("供应商编号")
     private String supplierCode;
 
     @Column(name = "SUPPLIER_NAME")
@@ -98,11 +98,22 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
     private String supplierName;
 
     @Column(name = "FILE_NAME")
-    @ApiParam("文件名称")
+    @ApiParam("解析文件名")
     private String fileName;
 
     @Column(name = "FILE_URL")
-    @ApiParam("文件url")
+    @ApiParam("解析文件路径")
     private String fileUrl;
 
+    @Column(name = "WORK_ORDER_TYPE")
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @Transient
+    @ApiParam("计划上线开始时间")
+    private String planStartDate;
+
+    @Transient
+    @ApiParam("计划上线结束时间")
+    private String planEndDate;
 }

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

@@ -44,7 +44,7 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable {
     private String partNo;
 
     @Column(name = "PART_NAME")
-    @ApiParam("产品名称")
+    @ApiParam("物料名称")
     private String partName;
 
     @Column(name = "PRODUCE_CTGY_CODE")
@@ -58,5 +58,4 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable {
     @Column(name = "FORMULA_CONTENT")
     @ApiParam("配方内容")
     private String formulaContent;
-
 }

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

@@ -2,19 +2,16 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
-import com.alibaba.fastjson.JSONObject;
 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 org.springframework.util.StringUtils;
 
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description:
@@ -159,7 +156,7 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @Lob
     @Column(name = "EXTEND")
     @ApiParam("扩展数据")
-    private String extend;
+    public String extend;
 
     @Column(name = "RESERVED1")
     @ApiParam("预留字段1")
@@ -273,10 +270,6 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     public String comButtonCode;
 
     @Transient
-    @ApiParam(value = "扩展数据MAP")
-    public Map<String, Object> extendMap;
-
-    @Transient
     @ApiParam("工单源序号")
     private Double srcSeq;
 
@@ -320,15 +313,4 @@ public class MesWorkOrder extends BaseBean implements Serializable {
         return this.approvalStatus == null ? 0 : this.approvalStatus;
     }
 
-    public Map<String, Object> getExtendMap() {
-        try {
-            if (!StringUtils.isEmpty(this.extend)) {
-                return JSONObject.parseObject(this.extend, Map.class);
-            } else {
-                return null;
-            }
-        } catch (Exception e) {
-            return null;
-        }
-    }
 }

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

@@ -55,4 +55,7 @@ public class ButtonComponentReqModel {
     @ApiParam("用户信息")
     private String userInfo;
 
+    @ApiParam("json数据")
+    private String data;
+
 }

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("注塑生产控制MODEL")
+public class InjectionProductionControlModel {
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("当前合格数量")
+    private String standardQtyCur;
+
+    @ApiParam("当前合格数量")
+    private String completeQty;
+
+    @ApiParam("总不合格数量")
+    private String scrapQty;
+
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @ApiParam("数量")
+    private String qty;
+
+    @ApiParam("包装时间")
+    private String createDatetime;
+
+    @ApiParam("箱条码状态")
+    private String printStatusName;
+
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.Transient;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description : 生产工单扩展
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2020-03-30 13:42
+ * @Modify:
+ **/
+@Data
+@Api(value="生产工单扩展",description = "生产工单扩展")
+public class MesWorkOrderExtendModel extends MesWorkOrder {
+
+    @Transient
+    @ApiParam(value = "扩展数据MAP")
+    public Map<String, Object> extendMap;
+
+    public Map<String, Object> getExtendMap() {
+        try {
+            if (!StringUtils.isEmpty(super.extend)) {
+                return JSONObject.parseObject(super.extend, Map.class);
+            } else {
+                return new HashMap<>();
+            }
+        } catch (Exception e) {
+            return new HashMap<>();
+        }
+    }
+
+}

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

@@ -1,12 +1,12 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import cn.estsh.i3plus.pojo.mes.bean.MesDefect;
 import cn.estsh.i3plus.pojo.mes.bean.MesWindowModuleParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Column;
 import java.util.List;
 
 /**
@@ -39,22 +39,18 @@ public class PaintCheckModel {
     @ApiParam("界面编号")
     private String windowNo;
 
-    @ApiParam("缺陷类型")
-    private String defectType;
-
-    @ApiParam("缺陷描述")
-    private String defectDesc;
-
     @ApiParam("缺陷标识值")
     private String defectFlagValue;
 
     @ApiParam("不良品处理类型")
     private Integer defectActionType;
 
-    @Column(name = "PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
 
+    @ApiParam("缺陷列表")
+    private List<MesDefect> defectList;
+
     @ApiParam("界面组件参数数据")
     List<MesWindowModuleParam> windowModuleParamList;
 }

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

@@ -29,7 +29,7 @@ public class PaintWorkOrderSnModel extends BaseBean {
     private String partNo;
 
     @ApiParam("物料名称")
-    private String partNameRdd;
+    private String partName;
 
     @ApiParam("颜色代码")
     private String colorCode;

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

@@ -156,6 +156,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("状态机代码")
     private String smCode;
 
+    @ApiParam("区域代码")
+    private String areaCode;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -58,4 +59,7 @@ public class StationResultBean<T> implements Serializable {
 
     @ApiParam("特殊展示数据")
     private Object specialDisplayData;
+
+    @ApiParam("工位参数")
+    private Map<String, String> wcpcMap = new HashMap<>();
 }

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;
+    }
 }

modules/i3plus-pojo-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-platform/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-ptl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-report/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-softswitch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-sweb/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-wms/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -45,6 +47,11 @@ public class WmsAutoTaskLog extends BaseBean {
     @ApiParam("策略动作")
     public String strategyAction;
 
+    @Column(name = "OPERATE_TYPE")
+    @ApiParam("操作类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OPERATE_TYPE.class)
+    public String operateType;
+
     @Column(name = "ERROR_MSG")
     @ApiParam("错误信息")
     public String errorMsg;

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.modelbean;
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsAutoTaskLog;
 import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails;
 import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
 import io.swagger.annotations.ApiParam;
@@ -64,6 +65,9 @@ public class WmsAutoTaskModel {
     @ApiParam("锁定条码")
     private List<WmsStockSn> lockStockSnList;
 
+    @ApiParam("动作日志记录")
+    private WmsAutoTaskLog wmsAutoTaskLog;
+
     @ApiParam("任务生成数量")
     private Double taskQty;
 

modules/i3plus-pojo-workflow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>