From c2144e00a981be9093c2b1fe257881203d800810 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 22 六月 2024 16:01:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 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 3e7a89f..9dd2d40 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -55,6 +55,38 @@
// 闅斿绔欑偣锛堝彴杞︿綅缃級
private String nearbySta;
+ // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+ // 鍓嶈秴闄�
+ private boolean frontErr;
+
+ // 鍚庤秴闄�
+ private boolean backErr;
+
+ // 楂樿秴闄�
+ private boolean highErr;
+
+ // 宸﹁秴闄�
+ private boolean leftErr;
+
+ // 鍙宠秴闄�
+ private boolean rightErr;
+
+ // 瓒呴噸
+ private boolean weightErr;
+
+ // 鎵爜澶辫触
+ private boolean barcodeErr;
+
+ private short endRow;//灏忚溅鐩爣浣�
+ private short nowRow;//灏忚溅褰撳墠浣�
+ private boolean RGV1;//灏忚溅鏃犺揣绌洪棽
+ private boolean RGV2;//灏忚溅杈撻�佺嚎鍙栬揣鍒颁綅
+ private boolean RGV3;//灏忚溅杩愯涓�
+ private boolean RGV4;//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
+ private boolean RGV5;//灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
+ private boolean RGV6;//涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
+
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
@@ -62,7 +94,8 @@
basDevp.setAutoing(autoing?"Y":"N");
basDevp.setLoading(loading?"Y":"N");
basDevp.setEmptyMk(emptyMk?"Y":"N");
- if (basDevp.getLoading().equals("N") && basDevp.getAutoing().equals("Y")){
+ 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