From 3677c6501ed94234f406d6444bab46e90824dac8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 24 二月 2025 09:58:16 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 10 ++++++++--
1 files changed, 8 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..63460ac 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -78,17 +78,23 @@
// 鎵爜澶辫触
private boolean barcodeErr;
+ // Super鏈夋棤淇℃伅
+ private boolean loadingSuper = true;
+
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
basDevp.setWrkNo(workNo);
basDevp.setAutoing(autoing?"Y":"N");
basDevp.setLoading(loading?"Y":"N");
+ basDevp.setLoadingSuper(loadingSuper?"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