From 7fb2fa2382a4de194c0e906a8b206f854a3de17f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 07 十月 2025 09:35:59 +0800
Subject: [PATCH] #和得服务器

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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 71d4c4e..5d578ad 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -24,6 +24,8 @@
     // 鐩爣绔�
     private Short staNo;
 
+    private String barcode;
+
     // ----------------------------------------------------------------
     // 鑷姩
     private boolean autoing;
@@ -49,6 +51,9 @@
     // 浣�
     private boolean low;
 
+    // 鍙犵洏鍙犳弧
+    private boolean full;
+
     // 閿佸畾鏍囪
     private boolean pakMk = true;
 
@@ -60,6 +65,10 @@
 
     //lfd鍏ュ簱鍗拌  褰搒tamp>=2鏃舵墠鍏ュ簱
     private Integer stamp = 0;
+
+    private boolean err = false;
+
+
 
     // 澶栧舰妫�娴� ------------------------------------------------------------------------
 
@@ -113,6 +122,7 @@
         BasDevp basDevp = new BasDevp();
         basDevp.setDevNo(siteId);
         basDevp.setWrkNo(workNo.intValue());
+        basDevp.setBarcode(barcode);
         basDevp.setAutoing(autoing?"Y":"N");
         basDevp.setLoading(loading?"Y":"N");
         basDevp.setInEnable(inEnable?"Y":"N");
@@ -122,6 +132,7 @@
         basDevp.setLocType3((short) 0);  // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
         basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
         basDevp.setInQty(inQty !=null ?(int)inQty : 0);
+        basDevp.setBarcode(this.getBarcode());
         return basDevp;
     }
 

--
Gitblit v1.9.1