Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -6933,4 +6933,52 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 产品位置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCE_CATEGORY {
+
+        FL("FL", "DOOR_FRONT_LEFT"),
+        FR("FR", "DOOR_FRONT_RIGHT"),
+        RL("RL", "DOOR_REAR_LEFT"),
+        RR("RR", "DOOR_REAR_RIGHT");
+
+        private String description;
+        private String value;
+
+        PRODUCE_CATEGORY(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.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -63,7 +63,8 @@ public class MesPcnEnumUtil {
         BUTTON_MODULE(30, "按钮组件"),
         TIMING_MODULE(40, "定时组件"),
         PCS_BACK_MODULE(50, "工序后台组件"),
-        PLC_CALLBACK_MODULE(60, "PLC回调工位参数");
+        PLC_CALLBACK_MODULE(60, "PLC回调工位参数"),
+        ASSIST_MODULE(70, "辅助组件");
 
         private int value;
         private String description;
@@ -2578,7 +2579,10 @@ public class MesPcnEnumUtil {
         STEP_LIST("stepList", "工步列表"),
         STATE_LIST("stateList", "状态列表"),
         STEP_CONTENT("stepContent", "工步内容"),
-        MODULE_CONTENT("moduleContent", "组件内容"),
+        MODULE_CONTENT("moduleContent", "展示组件内容"),
+        MODULE_HEAD("moduleHead", "展示组件头"),
+        GUIDE_CONTENT("guideContent", "指导内容"),
+        ASSISTANT_CONTENT("assistantContent", "辅助展示组件"),
         CUSTOM_COMPONENT("customComponent", "定制内容"),
         TASK_COMPLETE("taskComplete", "整个扫描完成"),
         STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
@@ -2634,6 +2638,8 @@ public class MesPcnEnumUtil {
         FORM("form", "文本按钮"),
         SPEC_TEXT("spec_text", "工步弹框文本"),
         IMAGE_LIST("image_list", "图片列表"),
+        MODULE_HEAD("module_head", "展示组件头部"),
+        MODULE_GUIDE("module_guide", "展示组件知道内容"),
         SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"),
         BACKGROUND_COLOR_TEXT("BACKGROUND_COLOR_TEXT", "背景色文字");
 
@@ -4808,4 +4814,39 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * JIT队列锁定池 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ASSISTANT_MODULE_DISPLAY {
+        MULTIMEDIA_PLUG(10, "多媒体插头"),
+        ATTENTION_INFO(20, "关注内容");
+
+        private Integer value;
+        private String description;
+
+        ASSISTANT_MODULE_DISPLAY(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 == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -856,7 +856,9 @@ public class WmsEnumUtil {
         INTERNAL_WORK_ORDER_MATERIAL_OUT_STOCK(650, "INTERNAL_SHIPPING", "内部工单物料出库"),
         CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"),
         MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"),
-        PROD_SCRAP(680, "PROD_SCRAP", "生产报废");
+        PROD_SCRAP(680, "PROD_SCRAP", "生产报废"),
+        OUT_RETURN_SOURCING(690, "PROD_SCRAP", "委外返工发料");
+
         private int value;
         private String code;
         private String description;
@@ -9023,4 +9025,50 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+
+    /**
+     * 成品条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCT_STATUS {
+        NORMAL(10, "正常"),
+        REPAIRE(20, "返工"),
+        SCRAP(30, "报废");
+
+        private int value;
+        private String description;
+
+        PRODUCT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PRODUCT_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
 }

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

@@ -139,4 +139,8 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @Column(name = "QC_STATUS")
     @ApiParam("质量状态")
     private Integer qcStatus = 10;
+
+    @Column(name = "JIS_BACKFLUSH_STATUS")
+    @ApiParam("回冲状态")
+    private String jisBackflushStatus;
 }

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

@@ -116,8 +116,4 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
     @Transient
     @ApiParam("计划上线结束时间")
     private String planEndDate;
-
-    @Transient
-    @ApiParam("版本")
-    private String ifVersion;
 }

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

@@ -185,7 +185,7 @@ public class QueueOrderModel implements Serializable {
 
     // getPrintSnQueueOrderModel
     public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo,
-                           String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq) {
+                           String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq, String serialNumber) {
         this.id = id;
         this.queDetailSeq = queDetailSeq;
         this.pgCode = pgCode;
@@ -200,6 +200,7 @@ public class QueueOrderModel implements Serializable {
         this.vinCode = vinCode;
         this.queueSeq = queueSeq;
         this.groupSeq = groupSeq;
+        this.serialNumber = serialNumber;
     }
 
     public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,

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

@@ -29,7 +29,7 @@ public class Part implements Serializable {
     private String qty;
 
     @ApiParam("是否是baseModule")
-    private boolean isBaseModule;
+    private Integer isBaseModule;
 
     @ApiParam("前左数量")
     private String flQty;

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

@@ -37,7 +37,7 @@ public class Pn implements Serializable {
     private List<Part> parts;
 
     @XStreamAlias("optioncode")
-    private List<CodeRule> codeRules = new ArrayList<>();
+    private List<CodeRule> codeRules;
 
     @ApiParam("新vin号")
     private String newVin;

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

@@ -631,9 +631,6 @@ public class MesPcnHqlPack {
         if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
         }
-        if (!CollectionUtils.isEmpty(mesWorkOrder.getCustList())) {
-            DdlPreparedPack.getInPackList(mesWorkOrder.getCustList(), "custCode", packBean);
-        }
         if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
         }

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

@@ -1,8 +1,10 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -190,6 +192,12 @@ public class WmsDocFgDetail extends BaseBean {
     @ApiParam(value = "离开时间")
     private String processTime;
 
+    @Column(name = "PRODUCT_STATUS")
+    @ApiParam(value = "成品条码状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PRODUCT_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer productStatus;
+
+
     public WmsDocFgDetail(String jisNo) {
         this.jisNo = jisNo;
     }

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

@@ -244,6 +244,18 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "备注2")
     private String secondaryRemake;
 
+    @Column(name = "THIRD_REMAKE")
+    @ApiParam(value = "备注3")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_REMARK_PERSON", listColumnName = "name", explicitColumnName = "dictionaryValue")
+    private String thirdRemake;
+
+    @Column(name = "FOURTH_REMAKE")
+    @ApiParam(value = "备注4")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_DEPARTMENT_REMARK", listColumnName = "name", explicitColumnName = "dictionaryValue")
+    private String fourthRemake;
+
     @Transient
     @ApiParam(value = "发运单号")
     private String shipOrderNo;

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

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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;
+
+/**
+ * @Description : 零件装换信息
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-08-19 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_PART_CHANGE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "零件装换信息", description = "零件装换信息")
+public class WmsPartChange extends BaseBean {
+    private static final long serialVersionUID = -2857107665974689720L;
+
+    @Column(name = "BEF_PART_NO")
+    @ApiParam(value = "转换前物料编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
+    private String befPartNo;
+
+    @Column(name = "AFT_PART_NO")
+    @ApiParam(value = "转换后物料编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
+    private String aftPartNo;
+
+
+    @Column(name = "REMARK")
+    @ApiParam(value = "备注")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String remark;
+
+}

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

@@ -104,4 +104,14 @@ public class WmsListElement extends BaseBean {
     @Column(name = "EXPLICIT_COLUMN_NAME")
     @ApiParam(value = "回显列名")
     private String explicitColumnName;
+
+    public WmsListElement() {
+    }
+
+    public WmsListElement(Integer seq, String userCode, Long functionId, String organizeCode) {
+        this.seq = seq;
+        this.userCode = userCode;
+        this.functionId = functionId;
+        this.organizeCode = organizeCode;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartChangeRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPartChange;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 零件装换信息数据访问层
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-08-19
+ * @Modify:
+ **/
+@Repository
+public interface WmsPartChangeRepository extends BaseRepository<WmsPartChange, Long> {
+}