From eb50a153846d9c673e947fa4af7eb8748230cf8f Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期六, 13 四月 2024 16:58:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 9 +++++++--
1 files changed, 7 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..69f2bef 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,10 +88,12 @@
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);
}
+ if (siteId == 213 && autoing && (loadingSuper || loading)){
+ basDevp.setReportSign(1);
+ }
basDevp.setInEnable(inEnable?"Y":"N");
basDevp.setOutEnable(outEnable?"Y":"N");
basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
--
Gitblit v1.9.1