From 3df03c486fde77ab36b9298a94bdbb0aa065a7e2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 08 四月 2025 09:07:40 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java
index c1a8775..5030bf3 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java
@@ -21,6 +21,17 @@
private Short staNo;
// ----------------------------------------------------------------
+
+ //宸插畬鎴愬伐浣滃彿
+ private Short finishWorkNo = 0;
+ //绌洪棽
+ private boolean idle;
+
+ //鏉＄爜
+ private String barcode;
+
+ //閲嶉噺
+ private Integer weight;
// 鑷姩
private boolean autoing;
@@ -74,6 +85,9 @@
// 宸ヤ綔妯″紡
private Integer workMode;
+ // 搴撲綅鍙�
+ private String locNo;
+
@Override
public StaProtocol clone() {
try {
@@ -92,6 +106,7 @@
station.setInEnable(inEnable?"Y":"N");
station.setOutEnable(outEnable?"Y":"N");
station.setWorkMode(workMode);
+ station.setStaNo((int) staNo);
station.setLocType1(0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
station.setLocType2(0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
station.setLocType3(0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
@@ -99,15 +114,18 @@
}
public Integer getLocType1() {
- if (!this.high && !this.low) {
- return 0;//鏈煡
+ if (!this.low && !this.high){
+ return 0;
+ }
+ if (this.low && !this.high) {
+ return 1;
+ }else if (this.high && !this.low) {
+ return 2;
+ }else if (this.high && this.low) {
+ return 2;
}
- if (this.low) {
- return 1;//浣�
- }else {
- return 2;//楂�
- }
+ return 0;
}
}
--
Gitblit v1.9.1