From b376450d4b1c5ef37439b7f1de7fbabcef5dc933 Mon Sep 17 00:00:00 2001
From: songss <songss>
Date: Thu, 24 Sep 2020 14:55:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E5=A4=8D?=
 =?UTF-8?q?=E6=A0=B8=E5=BC=82=E5=B8=B8=E7=9A=84=E6=95=B0=E6=8D=AE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/bean/MesDbCheckRecord.java     |  2 +-
 .../pojo/mes/model/MesDbCheckRecordModel.java      | 35 ++++++++++++++++++++++
 .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java     |  2 +-
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java

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 fd18f12..5a8223f 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
@@ -57,7 +57,7 @@ public class MesDbCheckRecord extends BaseBean implements Serializable {
 
     @Column(name = "PRODUCT_DATA_ID")
     @ApiParam("生产记录表主键ID")
-    private String productDataId;
+    private Long productDataId;
 
     //是否停线：1=是，2=否
     @Column(name = "IS_STOP_LINE")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java
new file mode 100644
index 0000000..2b5b50c
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java
@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @CreateDate: 2020/9/24
+ * @Author: simon.song
+ */
+@Data
+public class MesDbCheckRecordModel {
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partDesc;
+
+    @ApiParam("异常取值字段")
+    private String errorFiledCode;
+
+    @ApiParam("异常描述")
+    private String errorDesc;
+
+    public MesDbCheckRecordModel(String serialNumber, String partNo, String partDesc, String errorFiledCode, String errorDesc) {
+        this.serialNumber = serialNumber;
+        this.partNo = partNo;
+        this.partDesc = partDesc;
+        this.errorFiledCode = errorFiledCode;
+        this.errorDesc = errorDesc;
+    }
+}
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 46b468c..3e7316f 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
@@ -353,7 +353,7 @@ public class MesPcnHqlPack {
             DdlPreparedPack.getStringLikerPack(dbCheckRecord.getErrorFiledCode(), "errorFiledCode", packBean);
         }
         if (!StringUtils.isEmpty(dbCheckRecord.getProductDataId())) {
-            DdlPreparedPack.getStringLikerPack(dbCheckRecord.getProductDataId(), "productDataId", packBean);
+            DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getProductDataId(), "productDataId", packBean);
         }
         if (!StringUtils.isEmpty(dbCheckRecord.getIsStopLine())) {
             DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getIsStopLine(), "isStopLine", packBean);