From 4ec87f4d9d873487adda85686a1bfd7fa620f857 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 12 四月 2025 08:41:31 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 227242f..44ec201 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -20,12 +20,28 @@
// 鐩爣绔�
private Short staNo;
+ // 瀹岀粨宸ヤ綔鍙�
+ private Short finishWorkNo;
+
// ----------------------------------------------------------------
// 鑷姩
private boolean autoing;
+ //绌洪棽
+ private boolean idle;
+
+ // 鏉＄爜
+ private String barcode;
+
+
+ //閲嶉噺
+ private Integer weight = 0;
+
// 鏈夌墿
private boolean loading;
+
+ // 搴撲綅鍙�
+ private String locNo;
// 鍙叆
private boolean inEnable;
@@ -83,16 +99,16 @@
//楂樹綆淇″彿 0:鏃� 1:浣� 2:涓� 3:楂�
private Short locType1;
- public BasDevp toSqlModel(){
+ public BasDevp toSqlModel() {
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
basDevp.setWrkNo(workNo.intValue());
- basDevp.setAutoing(autoing?"Y":"N");
- basDevp.setLoading(loading?"Y":"N");
- basDevp.setInEnable(inEnable?"Y":"N");
+ basDevp.setAutoing(autoing ? "Y" : "N");
+ basDevp.setLoading(loading ? "Y" : "N");
+ basDevp.setInEnable(inEnable ? "Y" : "N");
if (siteId == 105 || siteId == 205 || siteId == 346) {
basDevp.setOutEnable(outInModel == 2 ? "Y" : "N");
- }else {
+ } else {
basDevp.setOutEnable(outEnable ? "Y" : "N");
}
basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
--
Gitblit v1.9.1