From 2f953ac22344252c696b95994c400b19f5d3dae5 Mon Sep 17 00:00:00 2001
From: songss <songss>
Date: Tue, 22 Sep 2020 11:57:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=B8=AD=E8=88=AADB=E5=A4=8D=E6=A0=B8=E9=A1=B9=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E3=80=82=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/bean/MesDbCheckRecord.java     |  2 +-
 .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java     | 23 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java
index f25605d..fd18f12 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java
+++ b/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("异常取值字段")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
index a364f73..46b468c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
+++ b/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;
+    }
+
     /**
      * 按条件分页查询产品条码补打印数据
      *

From d0502744508758f3bf8c894e221b07641bade31d Mon Sep 17 00:00:00 2001
From: songss <songss>
Date: Tue, 22 Sep 2020 16:04:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/model/MesProductDataModel.java | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataModel.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataModel.java
new file mode 100644
index 0000000..ce492d7
--- /dev/null
+++ b/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;
+
+}