From 8b8a2086509e28bb902166aa35e4c287eb906621 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期一, 30 六月 2025 15:28:39 +0800 Subject: [PATCH] #禁止跨层 --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 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 d3d46e2..b6f6e20 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 @@ -30,6 +30,8 @@ // 鍙叆 private boolean inEnable; + private Short isIn = 0; + // 鍙嚭 private boolean outEnable; @@ -71,6 +73,9 @@ // 鎵爜澶辫触 private boolean barcodeErr; + // 宸ヤ綔妯″紡 + private Integer workMode; + @Override public StaProtocol clone() { try { @@ -88,6 +93,8 @@ station.setLoading(loading?"Y":"N"); 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:閲嶅簱浣峿 @@ -95,9 +102,6 @@ } public Integer getLocType1() { - if (!this.high && !this.low) { - return 0;//鏈煡 - } if (this.low) { return 1;//浣� -- Gitblit v1.9.1