From 6efee0aeb0bada6e10af55e13d469ff52572fdfb Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期四, 25 一月 2024 13:51:31 +0800
Subject: [PATCH] #

---
 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 1d0c7c9..2cff7fb 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -58,10 +58,12 @@
     public BasDevp toSqlModel(){
         BasDevp basDevp = new BasDevp();
         basDevp.setDevNo(siteId);
-        basDevp.setWrkNo(workNo.intValue());
+        basDevp.setWrkNo(workNo);
         basDevp.setAutoing(autoing?"Y":"N");
         basDevp.setLoading(loading?"Y":"N");
-        if (basDevp.getLoading().equals("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);
             basDevp.setReportSign(0);
         }
         basDevp.setInEnable(inEnable?"Y":"N");

--
Gitblit v1.9.1