From 32e4bb4ba7112e4c9d86c91dad21385666bff7d2 Mon Sep 17 00:00:00 2001
From: "simon.song" <CSw12X45>
Date: Mon, 24 May 2021 18:14:37 +0800
Subject: [PATCH] =?UTF-8?q?15872=2020027--PCN=E7=AB=AF=E5=B7=A5=E4=BD=8D?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=A0=B8=E5=B7=A5=E6=AD=A5=EF=BC=8C=E6=A0=A1=E9=AA=8C=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AE=8C=E6=95=B4=E6=80=A7?=
 =?UTF-8?q?=E5=92=8C=E6=95=B0=E6=8D=AE=E8=B4=A8=E9=87=8F=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=90=88=E6=A0=BC--2021-05-22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/bean/MesDbCheckRecord.java     | 41 ++++++++++------------
 .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java     |  4 +--
 2 files changed, 20 insertions(+), 25 deletions(-)

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 3ad988c..71152d1 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
@@ -33,10 +33,6 @@ public class MesDbCheckRecord extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 6727925715356900171L;
 
-    @Column(name = "SERIAL_NUMBER")
-    @ApiParam("过程条码")
-    private String serialNumber;
-
     @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;
@@ -45,32 +41,31 @@ public class MesDbCheckRecord extends BaseBean implements Serializable {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
-    //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。
-    @Column(name = "DB_CHECK_ITEM")
-    @ApiParam("DB复核项")
-    private String dbCheckItem;
-
     @Column(name = "ERROR_FILED_CODE")
     @ApiParam("异常取值字段")
     private String errorFiledCode;
 
-    @Column(name = "ERROR_DESC")
-    @ApiParam("异常描述")
-    private String errorDesc;
+    @Column(name = "ERROR_FILED_DESC")
+    @ApiParam("异常取值字段描述")
+    private String errorFiledDesc;
+
+    //10数字、20字符串
+    @Column(name = "ERROR_FILED_TYPE")
+    @ApiParam("异常取值字段类型")
+    private String errorFiledType;
+
+    @Column(name = "ERROR_FILED_VALUE")
+    @ApiParam("异常取值字段值")
+    private String errorFiledValue;
 
-    @Column(name = "PRODUCT_DATA_ID")
-    @ApiParam("生产记录表主键ID")
-    private Long productDataId;
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码（第三方库表名）")
+    private String objectCode;
 
-    //是否停线：1=是，2=否
-    @Column(name = "IS_STOP_LINE")
-    @ApiParam("是否停线")
-    private Integer isStopLine;
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
 
-    //审批状态：10=待审批，20=已审批
-    @Column(name = "STATUS")
-    @ApiParam("审批状态")
-    private Integer status;
 
     @Transient
     @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 15049c3..139b5f0 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,7 +341,7 @@ public class MesPcnHqlPack {
         return packBean;
     }
 
-    public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) {
+    /*public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
         if (!StringUtils.isEmpty(dbCheckRecord.getSerialNumber())) {
             DdlPreparedPack.getStringLikerPack(dbCheckRecord.getSerialNumber(), "serialNumber", packBean);
@@ -362,7 +362,7 @@ public class MesPcnHqlPack {
             DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getStatus(), "status", packBean);
         }
         return packBean;
-    }
+    }*/
 
     /**
      * 按条件分页查询产品条码补打印数据