From 182993f79efa5e27f4f19a4c81104bd9a37779e4 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 11 四月 2025 09:06:35 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 25 ++++++++++++++++++++++---
1 files changed, 22 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 9e849a3..d79b39c 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -5,7 +5,6 @@
/**
* 杈撻�佺嚎plc鍗曚釜绔欑偣璇︾粏淇℃伅
- * Created by vincent on 2020/8/6
*/
@Data
public class StaProtocol implements Cloneable {
@@ -21,12 +20,28 @@
// 鐩爣绔�
private Short staNo;
+ // 瀹岀粨宸ヤ綔鍙�
+ private Short finishWorkNo;
+
// ----------------------------------------------------------------
// 鑷姩
private boolean autoing;
+ //绌洪棽
+ private boolean idle;
+
+ // 鏉＄爜
+ private String barcode;
+
+
+ //閲嶉噺
+ private Integer weight;
+
// 鏈夌墿
private boolean loading;
+
+ // 搴撲綅鍙�
+ private String locNo;
// 鍙叆
private boolean inEnable;
@@ -78,7 +93,7 @@
// 鎵爜澶辫触
private boolean barcodeErr;
- //鍑哄叆搴撴ā寮�1銆佸叆搴擄紝2銆佸嚭搴�
+ //鍑哄叆搴撴ā寮�0銆佹湭鐭� 1銆佸叆搴擄紝2銆佸嚭搴�
private Short outInModel;
//楂樹綆淇″彿 0:鏃� 1:浣� 2:涓� 3:楂�
@@ -91,7 +106,11 @@
basDevp.setAutoing(autoing?"Y":"N");
basDevp.setLoading(loading?"Y":"N");
basDevp.setInEnable(inEnable?"Y":"N");
- basDevp.setOutEnable(outEnable?"Y":"N");
+ if (siteId == 105 || siteId == 205 || siteId == 346) {
+ basDevp.setOutEnable(outInModel == 2 ? "Y" : "N");
+ }else {
+ 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:閲嶅簱浣峿
--
Gitblit v1.9.1