15872 20027--PCN端工位扫描增加数据复核工步，校验采集的数据完整性和数据质量是否合格--2021-05-22

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("按钮名称")

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;
-    }
+    }*/
 
     /**
      * 按条件分页查询产品条码补打印数据