From e95cc36944a886ccf63f90ccdf883aaf6ab81f90 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 20 七月 2024 16:51:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 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 bc4e716..b6a989e 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -79,13 +79,22 @@
     private boolean barcodeErr;
 
     private short endRow;//灏忚溅鐩爣浣�
-    private short nowRow;//灏忚溅褰撳墠浣�
+    private short nowRow;//灏忚溅褰撳墠浣�   //宸︼細1  涓細 2  鍙筹細3   锛堥潰鏈濆叆鏂欏彛锛�
     private boolean RGV1;//灏忚溅鏃犺揣绌洪棽
     private boolean RGV2;//灏忚溅杈撻�佺嚎鍙栬揣鍒颁綅
     private boolean RGV3;//灏忚溅杩愯涓�
-    private boolean RGV4;//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯   鍙�1锛堝乏锛夎揣鐗�
-    private boolean RGV5;//灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯   鍙�2锛堝彸锛夎揣鐗�
+    private boolean RGV4;//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯   鍙�1锛堝乏锛夎揣鐗�  锛堥潰鏈濆叆鏂欏彛锛�
+    private boolean RGV5;//灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯   鍙�2锛堝彸锛夎揣鐗�  锛堥潰鏈濆叆鏂欏彛锛�
     private boolean RGV6;//涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
+
+    private short RGV11;//灏忚溅鏃犺揣绌洪棽
+    private short RGV22;//灏忚溅杈撻�佺嚎鍙栬揣鍒颁綅
+    private short RGV33;//灏忚溅杩愯涓�
+    private short RGV44;//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯   鍙�1锛堝乏锛夎揣鐗�  锛堥潰鏈濆叆鏂欏彛锛�
+    private short RGV55;//灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯   鍙�2锛堝彸锛夎揣鐗�  锛堥潰鏈濆叆鏂欏彛锛�
+    private short RGV66;//涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
+
+    private String barcode;//鎵樼洏鏉$爜
 
     public BasDevp toSqlModel(){
         BasDevp basDevp = new BasDevp();
@@ -105,6 +114,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(barcode);
         return basDevp;
     }
 

--
Gitblit v1.9.1