From cfee9013159152736fcf74011abcf8ff1108ffbb Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 23 六月 2024 19:38:55 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |   93 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 92 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..bc4e716 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;//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯   鍙�1锛堝乏锛夎揣鐗�
+    private boolean RGV5;//灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯   鍙�2锛堝彸锛夎揣鐗�
+    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");
@@ -75,6 +108,64 @@
         return basDevp;
     }
 
+    public boolean rgvBoolean(Integer type){
+        if (type==1){
+            if (!RGV1){
+                return false;
+            }
+        } else {
+            if (RGV1){
+                return false;
+            }
+        }
+        if (type==2){
+            if (!RGV2){
+                return false;
+            }
+        } else {
+            if (RGV2){
+                return false;
+            }
+        }
+        if (type==3){
+            if (!RGV3){
+                return false;
+            }
+        } else {
+            if (RGV3){
+                return false;
+            }
+        }
+        if (type==4){
+            if (!RGV4){
+                return false;
+            }
+        } else {
+            if (RGV4){
+                return false;
+            }
+        }
+        if (type==5){
+            if (!RGV5){
+                return false;
+            }
+        } else {
+            if (RGV5){
+                return false;
+            }
+        }
+        if (type==6){
+            if (!RGV6){
+                return false;
+            }
+        } else {
+            if (RGV6){
+                return false;
+            }
+        }
+        return true;
+    }
+
     @Override
     public StaProtocol clone() {
         try {

--
Gitblit v1.9.1