From 91d7afedf3ea51ee87ee47d4da2e1b6243f8fb84 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 05 一月 2025 21:50:21 +0800
Subject: [PATCH] 1、大理片笼进片任务新增数量校验，当收到进片请求时，拿电气的玻璃数量与mes接收到的数量作比较，相同继续执行，不相同结束本次任务 2、李赛克文件优化，合中空玻璃每个间隔框的类型可能不同，需要在界面上做选择 3、中空设备号与格子号不匹配bug解决 4、自动报工存在接口调用异常，临时将调用接口回退原版本，待最新接口调用无异常后更新接口 5、fixbug:中空大理片详情界面删除接口异常

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWork.java |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWork.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWork.java
index 561b27a..68fc92e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWork.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWork.java
@@ -2,16 +2,16 @@
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author wu
@@ -26,13 +26,13 @@
     /**
      * <鎶ュ伐涓昏〃>
      */
-      @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
      * 鎶ュ伐缂栧彿
      */
-    private String reportingWorkId;
+    private String reportingWorkId = "";
 
     /**
      * 閿�鍞崟鍙�
@@ -54,10 +54,10 @@
      */
     private String thisProcess;
 
-    /**
-     * 璁惧缂栧彿
-     */
-    private byte[] deviceId;
+//    /**
+//     * 璁惧缂栧彿
+//     */
+//    private byte[] deviceId;
 
     /**
      * 璁惧鍚嶇О
@@ -67,12 +67,12 @@
     /**
      * 涓婂伐搴�
      */
-    private String previousProcess;
+//    private String previousProcess;
 
     /**
      * 涓婂伐搴忔暟閲�
      */
-    private Integer previousProcessQuantity;
+//    private Integer previousProcessQuantity;
 
     /**
      * 鏈伐搴忔暟閲�
@@ -112,32 +112,32 @@
     /**
      * 鎶ュ伐鐘舵��
      */
-    private Integer reportingWorkState;
+//    private Integer reportingWorkState;
 
     /**
      * 瀹℃牳浜�
      */
-    private String reviewed;
+//    private String reviewed;
 
     /**
      * 瀹℃牳鐘舵��(榛樿0,瀹℃牳閫氳繃1锛屼笉閫氳繃2,灏忎簬0鍒犻櫎)
      */
-    private Integer reviewedState;
+//    private Integer reviewedState;
 
     /**
      * 澶囨敞
      */
-    private String notes;
+//    private String notes;
 
     /**
      * 璐ㄦ鍛�
      */
-    private String qualityInspector;
+//    private String qualityInspector;
 
     /**
      * 鍖呰鏂瑰紡
      */
-    private String packagingMethod;
+//    private String packagingMethod;
 
     /**
      * 鎶ュ伐鏃堕棿
@@ -147,12 +147,12 @@
     /**
      * 瀹℃牳鏃堕棿
      */
-    private LocalDateTime examineTime;
+//    private LocalDateTime examineTime;
 
     /**
      * 璐ㄦ鏃堕棿
      */
-    private LocalDateTime qualityInsTime;
+//    private LocalDateTime qualityInsTime;
 
     /**
      * 鍒涘缓鑰卛d

--
Gitblit v1.8.0