From 24e33bb02f9789d5618e12c5e0e70372831c36c7 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 13 一月 2025 14:28:48 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 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 b353b8d..fdfa97c 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -15,7 +15,7 @@
// ----------------------------------------------------------------
// 宸ヤ綔鍙�
- private Integer workNo = 0;
+ private Long workNo = 0L;
// ----------------------------------------------------------------
// 鐩爣绔�
@@ -87,24 +87,30 @@
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();
basDevp.setDevNo(siteId);
basDevp.setWrkNo(workNo);
- basDevp.setAutoing(autoing?"Y":"N");
- basDevp.setLoading(loading?"Y":"N");
- basDevp.setEmptyMk(emptyMk?"Y":"N");
- 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");
- basDevp.setOutEnable(outEnable?"Y":"N");
- basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
- basDevp.setLocType2((short) 0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
- basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
- basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
- basDevp.setInQty(inQty !=null ?(int)inQty : 0);
+// basDevp.setAutoing(autoing?"Y":"N");
+// basDevp.setLoading(loading?"Y":"N");
+// basDevp.setEmptyMk(emptyMk?"Y":"N");
+// basDevp.setInEnable(inEnable?"Y":"N");
+// basDevp.setOutEnable(outEnable?"Y":"N");
+// basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
+// basDevp.setLocType2((short) 0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
+// 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