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

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

@@ -45,7 +45,7 @@ public class MesDbCheckRecord extends BaseBean implements Serializable {
     //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。
     @Column(name = "DB_CHECK_ITEM")
     @ApiParam("DB复核项")
-    private String dbReview;
+    private String dbCheckItem;
 
     @Column(name = "ERROR_FILED_CODE")
     @ApiParam("异常取值字段")

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @CreateDate: 2020/9/22
+ * @Author: simon.song
+ */
+@Data
+public class MesProductDataModel {
+    @ApiParam("生产数据表主键ID")
+    private String id;
+
+    @ApiParam("工位代码")
+    private String workCellCode;
+
+    @ApiParam("工位名称")
+    private String workCellName;
+
+    @ApiParam("产品包装model")
+    private List<ProductDataModel> productDataModelList;
+
+}

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

@@ -341,6 +341,29 @@ public class MesPcnHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (!StringUtils.isEmpty(dbCheckRecord.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(dbCheckRecord.getSerialNumber(), "serialNumber", packBean);
+        }
+        if (!StringUtils.isEmpty(dbCheckRecord.getDbCheckItem())) {
+            DdlPreparedPack.getStringLikerPack(dbCheckRecord.getDbCheckItem(), "dbCheckItem", packBean);
+        }
+        if (!StringUtils.isEmpty(dbCheckRecord.getErrorFiledCode())) {
+            DdlPreparedPack.getStringLikerPack(dbCheckRecord.getErrorFiledCode(), "errorFiledCode", packBean);
+        }
+        if (!StringUtils.isEmpty(dbCheckRecord.getProductDataId())) {
+            DdlPreparedPack.getStringLikerPack(dbCheckRecord.getProductDataId(), "productDataId", packBean);
+        }
+        if (!StringUtils.isEmpty(dbCheckRecord.getIsStopLine())) {
+            DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getIsStopLine(), "isStopLine", packBean);
+        }
+        if (!StringUtils.isEmpty(dbCheckRecord.getStatus())) {
+            DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getStatus(), "status", packBean);
+        }
+        return packBean;
+    }
+
     /**
      * 按条件分页查询产品条码补打印数据
      *