From fcb71b8fc63f74cd00d3faa76c73f4c5566ee352 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 07 五月 2025 23:23:09 +0800
Subject: [PATCH] 解决提升机在本层，而没有锁提升机的问题
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 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 467ebc1..e87cf3e 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,29 @@
// 鐩爣绔�
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;
@@ -39,6 +55,12 @@
// 婊℃墭鐩�
private boolean fullPlt;
+
+ //鎻愬崌鏈哄埌浣嶄俊鍙�
+ private boolean liftArrival;
+
+ //鍥涘悜绌挎杞﹀彲鍙栦俊鍙�
+ private boolean shuttleTakeEnable;
// 楂�
private boolean high;
@@ -72,17 +94,28 @@
// 鎵爜澶辫触
private boolean barcodeErr;
- //鍑哄叆搴撴ā寮�
+ // 鏁呴殰
+ private boolean error;
+
+ //鍑哄叆搴撴ā寮�0銆佹湭鐭� 1銆佸叆搴擄紝2銆佸嚭搴�
private Short outInModel;
- public BasDevp toSqlModel(){
+ //楂樹綆淇″彿 0:鏃� 1:浣� 2:涓� 3:楂�
+ private Short locType1;
+
+ 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.setOutEnable(outEnable?"Y":"N");
+ basDevp.setAutoing(autoing ? "Y" : "N");
+ basDevp.setLoading(loading ? "Y" : "N");
+ basDevp.setInEnable(inEnable ? "Y" : "N");
+ basDevp.setWrkNo1(finishWorkNo.intValue());
+ 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