Merge branch 'dev' into test

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

@@ -49,6 +49,42 @@ public class MesEnumUtil {
     }
 
     /**
+     * 条码类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_PRODUCE_SN_TYPE {
+
+        NORMAL(10, "正常件"),
+        FIRST_INSPECTION(20, "首检件");
+
+        private int value;
+        private String description;
+
+        MES_PRODUCE_SN_TYPE(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;
+        }
+    }
+
+    /**
      * mes 图片面位
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -41,5 +41,5 @@ public class MesFiCfg extends BaseBean {
 
     @Column(name = "FI_QTY")
     @ApiParam("首检数量")
-    private String fiQty;
+    private Double fiQty;
 }

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

@@ -115,7 +115,7 @@ public class MesProduceSn extends BaseBean {
 
     @Column(name = "SN_TYPE")
     @ApiParam("条码类型 10=正常 20=首检件")
-    private String snType;
+    private Integer snType;
 
     @Column(name = "TRAY")
     @ApiParam("托盘号")
@@ -149,6 +149,10 @@ public class MesProduceSn extends BaseBean {
         return this.printStatus == null ? 0 : this.printStatus;
     }
 
+    public int getSnTypeVal() {
+        return this.snType == null ? 0 : this.snType;
+    }
+
     @Override
     public String toString() {
         return "MesProduceSn{" +
@@ -172,6 +176,8 @@ public class MesProduceSn extends BaseBean {
                 ", custSn='" + custSn + '\'' +
                 ", custPartNo='" + custPartNo + '\'' +
                 ", packageSn='" + packageSn + '\'' +
+                ", snType='" + snType + '\'' +
+                ", tray='" + tray + '\'' +
                 ", resultMsg='" + resultMsg + '\'' +
                 '}';
     }

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

@@ -95,6 +95,10 @@ public class MesQcCheckData extends BaseBean {
     private String custCode;
 
     @Transient
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Transient
     @ApiParam("过程质量检测数据")
     private List<MesQcCheckStandard> mesQcCheckStandardList;
 

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

@@ -139,15 +139,15 @@ public class MesWorkOrder extends BaseBean {
 
     @Column(name = "FI_QTY")
     @ApiParam("首检数量")
-    private Long fiQty;
+    private Double fiQty;
 
     @Column(name = "FI_COMPLETE_QTY")
     @ApiParam("首检完成数量")
-    private Long fiCompleteQty;
+    private Double fiCompleteQty;
 
     @Column(name = "FI_GENERATE_QTY")
     @ApiParam("首检生成数量")
-    private Long fiGenerateQty;
+    private Double fiGenerateQty;
 
     /**********************  冗余字段 *********************************/
     @Transient

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

@@ -136,6 +136,18 @@ public class MesWorkOrderLog extends BaseBean {
     @ApiParam("客户订单号")
     private String custOrderNo;
 
+    @Column(name = "FI_QTY")
+    @ApiParam("首检数量")
+    private Double fiQty;
+
+    @Column(name = "FI_COMPLETE_QTY")
+    @ApiParam("首检完成数量")
+    private Double fiCompleteQty;
+
+    @Column(name = "FI_GENERATE_QTY")
+    @ApiParam("首检生成数量")
+    private Double fiGenerateQty;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.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.MesFiCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesFiCfgRepository extends BaseRepository<MesFiCfg, Long> {
+
+}

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

@@ -41,5 +41,5 @@ public class MesFiCfg extends BaseBean {
 
     @Column(name = "FI_QTY")
     @ApiParam("首检数量")
-    private String fiQty;
+    private Double fiQty;
 }

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

@@ -115,7 +115,7 @@ public class MesProduceSn extends BaseBean {
 
     @Column(name = "SN_TYPE")
     @ApiParam("条码类型")
-    private String snType;
+    private Integer snType;
 
     @Column(name = "TRAY")
     @ApiParam("托盘号")
@@ -145,6 +145,10 @@ public class MesProduceSn extends BaseBean {
         return this.printStatus == null ? 0 : this.printStatus;
     }
 
+    public int getSnTypeVal() {
+        return this.snType == null ? 0 : this.snType;
+    }
+
     @Override
     public String toString() {
         return "MesProduceSn{" +
@@ -168,6 +172,8 @@ public class MesProduceSn extends BaseBean {
                 ", custSn='" + custSn + '\'' +
                 ", custPartNo='" + custPartNo + '\'' +
                 ", packageSn='" + packageSn + '\'' +
+                ", snType='" + snType + '\'' +
+                ", tray='" + tray + '\'' +
                 ", resultMsg='" + resultMsg + '\'' +
                 '}';
     }

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

@@ -139,15 +139,15 @@ public class MesWorkOrder extends BaseBean {
 
     @Column(name = "FI_QTY")
     @ApiParam("首检数量")
-    private String fiQty;
+    private Double fiQty;
 
     @Column(name = "FI_COMPLETE_QTY")
     @ApiParam("首检完成数量")
-    private String fiCompleteQty;
+    private Double fiCompleteQty;
 
     @Column(name = "FI_GENERATE_QTY")
     @ApiParam("首检生成数量")
-    private String fiGenerateQty;
+    private Double fiGenerateQty;
 
     /**********************  冗余字段 *********************************/
     @Transient

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

@@ -136,6 +136,18 @@ public class MesWorkOrderLog extends BaseBean {
     @ApiParam("客户订单号")
     private String custOrderNo;
 
+    @Column(name = "FI_QTY")
+    @ApiParam("首检数量")
+    private Double fiQty;
+
+    @Column(name = "FI_COMPLETE_QTY")
+    @ApiParam("首检完成数量")
+    private Double fiCompleteQty;
+
+    @Column(name = "FI_GENERATE_QTY")
+    @ApiParam("首检生成数量")
+    private Double fiGenerateQty;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")

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

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

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

@@ -1553,4 +1553,24 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 按条件分页查询首检件配置信息
+     * @param mesFiCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesFiCfg(MesFiCfg mesFiCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesFiCfg, organizeCode);
+        if (!StringUtils.isEmpty(mesFiCfg.getWorkCenterCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFiCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFiCfg.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(mesFiCfg.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFiCfg.getCustCode())) {
+            DdlPreparedPack.getStringLikerPack(mesFiCfg.getCustCode(), "custCode", packBean);
+        }
+        return packBean;
+    }
 }