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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java

@@ -30,6 +30,9 @@ import javax.persistence.Transient;
 @EqualsAndHashCode(callSuper = true)
 @Api("通知记录")
 public class AndonMessageRecord extends BaseBean {
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心")
+    private String workCenterCode;
 
     @Column(name = "ANDON_ORDER_NO")
     @ApiParam(value = "安灯队列编号")

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

@@ -2072,6 +2072,46 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 工位程序交互时的数据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STATION_DATA_TYPE {
+        TABLE("table", "表格"),
+        TEXT("text", "正常文本"),
+        EXP_TEXT("exp_text", "异常文本"),
+        FILE("file", "定制内容文件"),
+        IMAGE("image", "图片"),
+        BUTTON("button", "按钮");
+
+        private String value;
+        private String description;
+
+        STATION_DATA_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 (val.equals(values()[i].value)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ONLINE_SEND_TYPE {
@@ -2141,6 +2181,44 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 包装层级 MES_PACKAGE
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PACKAGE_PACKLEVEL {
+
+        FIRST(1, "第一层"),
+        SECOND(2, "第二层"),
+        THIRD(3, "第三层"),
+        FOURTH(4, "第四层");
+
+        private int value;
+        private String description;
+
+        PACKAGE_PACKLEVEL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
+
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRODUCT_PATTERN_PARAMS {

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

@@ -641,7 +641,8 @@ public class WmsEnumUtil {
 		VDA_STATIC_CS(410,"VDA_STATIC_CS", "静态盘点"),
 		VDA_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"),
         KT_DEFINITE(430,"KT_DEFINITE", "KT合格"),
-		VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理");
+		VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"),
+        KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货");
 
 
         private int value;

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

@@ -48,7 +48,7 @@ public class MesPackage extends BaseBean {
     private Double packSpecQty;
 
     @Column(name = "UNIT")
-    @ApiParam("包装规格数量")
+    @ApiParam("danwei")
     private String unit;
 
     @Column(name = "LOT_NO")

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

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/9/23 8:06 PM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("产品包装model")
+public class ProdPackageModel {
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("单位")
+    private String unit;
+
+    @ApiParam("工单数量")
+    private Double workOrderQty;
+
+    @ApiParam("完成数量")
+    private Double completeQty;
+
+    @ApiParam("包装规格数量")
+    private Double packSpecQty;
+
+    @ApiParam("包装规格")
+    private String packSpec;
+
+    @ApiParam("包装集合")
+    private List<MesPackage> packageList;
+
+    @ApiParam("工单集合")
+    private List<MesWorkOrder> workOrderList;
+
+}

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

@@ -973,9 +973,6 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(packSpec.getSpecName())) {
             DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean);
         }
-//        if (!StringUtils.isEmpty(packSpec.getSpecCode())) {
-//            DdlPreparedPack.getStringEqualPack(packSpec.getSpecCode(), "parentSpec", packBean);
-//        }
 
         return packBean;
     }
@@ -1670,7 +1667,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(mesProdPack.getPartNo(), "partNo", packBean);
         }
         if (!StringUtils.isEmpty(mesProdPack.getCustomerCode())) {
-            DdlPreparedPack.getStringEqualPack(mesProdPack.getCustomerCode(), "customerCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesProdPack.getCustomerCode(), "customerCode", packBean);
         }
         if (!StringUtils.isEmpty(mesProdPack.getPackSpec())) {
             DdlPreparedPack.getStringLikerPack(mesProdPack.getPackSpec(), "packSpec", packBean);

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

@@ -32,7 +32,6 @@ import javax.persistence.Transient;
 @Api("容器类型")
 public class WmsContainerType extends BaseBean {
     private static final long serialVersionUID = 4849044986767609347L;
-    @Column(name = "CT_CODE",unique = true)
     @ApiParam(value = "容器类型代码")
     private String ctCode;
 

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

@@ -233,13 +233,13 @@ public class WmsMoveSn extends BaseBean {
         this.refSrc = refSrc;
     }
 
-    public WmsMoveSn(String partNo, String srcLocateNo, String destLocateNo, String createUser, String createDatetime, Integer busiTypeCode, Double destQty) {
+    public WmsMoveSn(String partNo, String srcLocateNo, String destLocateNo, String createUser, String createDatetime, String transTypeName, Double destQty) {
         this.partNo = partNo;
         this.srcLocateNo = srcLocateNo;
         this.destLocateNo = destLocateNo;
         this.createUser = createUser;
         this.createDatetime = createDatetime;
-        this.busiTypeCode = busiTypeCode;
+        this.transTypeName = transTypeName;
         this.destQty = destQty;
     }