Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo

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

@@ -2899,6 +2899,7 @@ public class MesEnumUtil {
         PART_NO("partNo", "物料号"),
         CUST_PART_NO("custPartNo", "客户物料号"),
         CUST_CODE("custCode", "客户代码"),
+        SERIAL_NUMBER("serialNumber", "过程条码"),
         PROD_LOCATION("prodLocation", "产地"),
         YEAR("year", "年"),
         MOTH("month", "月"),

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

@@ -12,6 +12,92 @@ import org.apache.commons.lang3.StringUtils;
  **/
 public class MesPcnEnumUtil {
 
+    /**
+     * MesProductEncodeCfg 匹配类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_MATCH_TYPE {
+
+        ORGANIZATION("10", "工厂"),
+        PART("20", "物料"),
+        CUST_CODE("30", "客户代码"),
+        CUST_PART_NO("40", "客户物料号"),
+        WORK_CENTER("50", "产线");
+
+        private String value;
+        private String description;
+
+        MES_MATCH_TYPE(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;
+        }
+
+        // 根据value返回枚举类型,主要在switch中使用
+        public static MES_MATCH_TYPE getByValue(String value) {
+            for (MES_MATCH_TYPE mesMatchType : values()) {
+                if (mesMatchType.getValue().equals(value)) {
+                    return mesMatchType;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * MesProductEncodeCfg 编码类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_CODE_TYPE {
+
+        SERIAL_SN("10", "过程条码"),
+        PRODUCT_SN("20", "产品条码"),
+        PACK_SN("30", "包装条码");
+
+        private String value;
+        private String description;
+
+        MES_CODE_TYPE(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;
+        }
+    }
+
 
     /**
      * MesScrap 报废原因

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

@@ -637,7 +637,9 @@ public class WmsEnumUtil {
         KT_RETURN(370, "KT_RETURN", "KT退货"),
         KT_REWORK(380, "KT_REWORK", "KT返工"),
         KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"),
-        KT_SORTING(400, "KT_SORTING", "KT分选");
+        KT_SORTING(400, "KT_SORTING", "KT分选"),
+		VDA_STATIC_CS(400,"VDA_STATIC_CS", "静态盘点"),
+		VDA_CS_SEARCH(410,"VDA_CS_SEARCH", "VDA盘点查询");
 
 
         private int value;

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+
+/**
+ * @Description :mes客户表
+ * @Reference :
+ * @Author : yiming.gu
+ * @CreateDate : 2019-05-20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CUSTOMER_PART")
+@Api("客户零件关系")
+public class MesCustomerPart extends BaseBean {
+    @Column(name = "CUSTOMER_CODE")
+    @ApiParam("客户代码")
+    private String customerCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "CUSTOMER_PART_NO")
+    @ApiParam("客户零件号")
+    private String customerPartNo;
+
+}

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

@@ -73,6 +73,18 @@ public class MesPart extends BaseBean {
     @ApiParam("产品类型")
     private String produceCategory;
 
+    @Column(name = "PORCESS_MATCH_TYPE")
+    @ApiParam("过程编码匹配类型")
+    private String porcessMatchType;
+
+    @Column(name = "PACKAGE_MATCH_TYPE")
+    @ApiParam("包装编码匹配类型")
+    private String packageMatchType;
+
+    @Column(name = "PRODUCT_MATCH_TYPE")
+    @ApiParam("产品编码匹配类型")
+    private String productMatchType;
+
     @Transient
     @ApiParam("分类名称")
     private String categoryName;

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

@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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 javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PRODUCT_ENCODE_CFG")
+@Api("产品编码配置表")
+public class MesProductEncodeCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6641051790330191326L;
+
+    @Column(name = "CODE_TYPE")
+    @ApiParam("编码类型")
+    private Integer codeType;
+
+    @Column(name = "MATCH_TYPE")
+    @ApiParam("匹配类型")
+    private Integer matchType;
+
+    @Column(name = "MATCH_VALUE")
+    @ApiParam("匹配值")
+    private String matchValue;
+
+    @Column(name = "RULE_CODE")
+    @ApiParam("编码规则代码")
+    private String ruleCode;
+
+}

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.pcn.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.mes.pcn.model.MesWorkOrderButtonModel;
+import cn.estsh.i3plus.pojo.mes.pcn.model.MesButtonFlagModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -201,7 +201,7 @@ public class MesWorkOrder extends BaseBean {
 
     @Transient
     @ApiParam("mes生产工单页面按钮控制")
-    private MesWorkOrderButtonModel workOrderButtonModel;
+    private MesButtonFlagModel mesButtonFlagModel;
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;

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

@@ -34,6 +34,9 @@ public class GenSerialNoModel {
     @ApiParam("客户代码")
     private String custCode;
 
+    @ApiParam("过程条码")
+    private String serialNumber;
+
     @ApiParam("产地")
     private String prodLocation;
 

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

@@ -17,8 +17,8 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Api("mes生产工单页面按钮控制model")
-public class MesWorkOrderButtonModel implements Serializable {
+@Api("pcn页面按钮控制model")
+public class MesButtonFlagModel implements Serializable {
 
     @ApiParam("修改按钮")
     private boolean updateButton;

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCustomerPart;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-05-20
+ * @Modify:
+ **/
+@Repository
+public interface MesCustomerPartRepository extends BaseRepository<MesCustomerPart, Long> {
+
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProductEncodeCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-04-17-17:10
+ * @Modify:
+ **/
+@Repository
+public interface MesProductEncodeCfgRepository extends BaseRepository<MesProductEncodeCfg, Long> {
+}

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

@@ -76,4 +76,16 @@ public class MesPart extends BaseBean {
     @Transient
     @ApiParam("产品类型名称")
     private String produceCategoryName;
+
+    @Column(name = "PORCESS_MATCH_TYPE")
+    @ApiParam("过程编码匹配类型")
+    private String porcessMatchType;
+
+    @Column(name = "PACKAGE_MATCH_TYPE")
+    @ApiParam("包装编码匹配类型")
+    private String packageMatchType;
+
+    @Column(name = "PRODUCT_MATCH_TYPE")
+    @ApiParam("产品编码匹配类型")
+    private String productMatchType;
 }

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

@@ -201,7 +201,7 @@ public class MesWorkOrder extends BaseBean {
 
     @Transient
     @ApiParam("mes生产工单页面按钮控制")
-    private MesButtonFlagModel workOrderButtonModel;
+    private MesButtonFlagModel mesButtonFlagModel;
 
     @Transient
     @ApiParam(value = "下达按钮编号")

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

@@ -39,6 +39,9 @@ public class GenSerialNoModel {
     @ApiParam("客户代码")
     private String custCode;
 
+    @ApiParam("过程条码")
+    private String serialNumber;
+
     @ApiParam("产地")
     private String prodLocation;
 

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

@@ -71,7 +71,7 @@ public class MesEquTaskModel implements Serializable {
     private String notifyFlagName;
 
     @ApiParam("mes设备作业任务页面按钮控制")
-    private MesButtonFlagModel equTaskButtonFlagModel;
+    private MesButtonFlagModel mesButtonFlagModel;
 
 
     public MesEquTaskModel() {

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :容器类型
@@ -30,7 +31,6 @@ import javax.persistence.Table;
 @Api("物料包装关系")
 public class WmsPartPackage extends BaseBean {
     private static final long serialVersionUID = 4849044986767609345L;
-    @Column(name = "PART_NO",unique = true)
     @ApiParam(value = "物料编码")
     private String partNo;
 
@@ -48,15 +48,15 @@ public class WmsPartPackage extends BaseBean {
 
     @Column(name = "IS_DEFAULT")
     @ApiParam(value = "是否默认包规")
-    private String isDefault;
+    private Integer isDefault;
 
     @Column(name = "IS_MIXED")
     @ApiParam(value = "是否混包")
-    private String isMixed;
+    private Integer isMixed;
 
     @Column(name = "IS_PRINT")
     @ApiParam(value = "是否打印包装清单")
-    private String isPrint;
+    private Integer isPrint;
 
     @Column(name = "TEMPLATE_NO")
     @ApiParam(value = "包装清单模板")
@@ -65,4 +65,8 @@ public class WmsPartPackage extends BaseBean {
     @Column(name = "POCKET_TYPE")
     @ApiParam(value = "容器类型")
     private String pocketType;
+
+    @ApiParam(value = "包装规格名称")
+    @Transient
+    private String specName;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/PartPackagDto.java

@@ -22,6 +22,8 @@ public class PartPackagDto{
     @ApiParam(value = "物料编码")
     private String partNo;
     @ApiParam(value = "工厂代码")
+    private String organizeCode;
+    @ApiParam(value = "包装关系列表")
     private List<WmsPartPackage> partPackages;
 
 }