From 94405ed24bdbe9ea4b1da6c93bdc04037943fb56 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 22 七月 2025 09:24:46 +0800
Subject: [PATCH] 新增倒计时弹窗
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index a6f9389..8684907 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -38,6 +38,7 @@
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
+import com.zy.core.thread.ScaleThread;
import com.zy.core.thread.SiemensDevpThread;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
@@ -340,6 +341,7 @@
errMsg = "鎵爜澶辫触";
back = true;
}
+
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
@@ -374,12 +376,23 @@
}
}
+ ScaleThread scaleThread = (ScaleThread) SlaveConnection.get(SlaveType.Scale, inSta.getBarcode());
+ if(scaleThread != null) {
+ storageEscalationParam.setWeight(scaleThread.getScale());
+ }
storageEscalationParam.setBoxNo(BoxNo);
//鏄惁婊℃澘 1婊℃澘 0绌烘澘
storageEscalationParam.setStaType(staProtocol.isEmptyMk() ? 0 : 1);
- //搴撲綅绫诲瀷 1楂樺簱浣� 0浣庡簱浣�
- storageEscalationParam.setLocType(staProtocol.isHigh() ? 1 : 0);
+ //搴撲綅绫诲瀷 2涓簱浣� 1楂樺簱浣� 0浣庡簱浣�
+ if(staProtocol.isHigh()){
+ storageEscalationParam.setLocType(1);
+ }else if(staProtocol.isLow()){
+ storageEscalationParam.setLocType(0);
+ }else if (staProtocol.isCentre()){
+ storageEscalationParam.setLocType(2);
+ }
+
storageEscalationParam.setTerminalNo(staProtocol.getSiteId());
log.info("缁勬墭鍏ュ簱={}", storageEscalationParam);
String response = "";
@@ -1832,7 +1845,7 @@
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
taskWrk.setIoType(1);//浠诲姟绫诲瀷 鍏ュ簱
- taskWrk.setIoPri(13);//浼樺厛绾�
+ taskWrk.setIoPri(10);//浼樺厛绾�
taskWrk.setBarcode(barcode);//鏉＄爜
taskWrk.setTargetPoint(locNo);
taskWrk.setStartPoint(staNo+"");
@@ -1916,14 +1929,21 @@
// 鑾峰彇led绾跨▼
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
// led鏄剧ず榛樿鍐呭
- if (reset && !ledThread.isLedMk()) {
+ if (reset) {
ledThread.setLedMk(true);
- if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(4, new ArrayList<>()))) {
+ if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) {
log.error(""+mark+" - 1"+" - {}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
} else {
}
}
+// if (reset) {
+// if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) {
+// log.error(""+mark+" - 1"+" - {}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
+// } else {
+//
+// }
+// }
}
// log.info(""+mark+" - 0"+" - 鎵ц瀹屾垚锛氬叾浠� ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅");
}
--
Gitblit v1.9.1