From ab43a814da847a9e533732191b4ed54c01b95d09 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期五, 12 七月 2024 22:11:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 74 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 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 8f0d60c..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,9 +114,68 @@
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;
}
+ 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