From 23dad6ec6a8496feab15c2c95e8f9b6593c05ef7 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 12 四月 2024 15:28:13 +0800
Subject: [PATCH] #SuperLoaded

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 1fb2cc4..de9cf54 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -78,6 +78,9 @@
     // 鎵爜澶辫触
     private boolean barcodeErr;
 
+    // Super鏈夋棤淇℃伅
+    private boolean loadingSuper = true;
+
     public BasDevp toSqlModel(){
         BasDevp basDevp = new BasDevp();
         basDevp.setDevNo(siteId);
@@ -85,8 +88,7 @@
         basDevp.setAutoing(autoing?"Y":"N");
         basDevp.setLoading(loading?"Y":"N");
         basDevp.setEmptyMk(emptyMk?"Y":"N");
-        if (basDevp.getLoading().equals("N") && basDevp.getAutoing().equals("Y") && (basDevp.getWrkNo()==0 || !basDevp.getWrkNo().equals(basDevp.getWrkNo1()))){
-            basDevp.setWrkNo1(workNo);
+        if (autoing && !loadingSuper && !loading){
             basDevp.setReportSign(0);
         }
         basDevp.setInEnable(inEnable?"Y":"N");

--
Gitblit v1.9.1