From 901f9ca15fb0ce3bcf2ebf956c569c260050c561 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 07 四月 2025 13:10:54 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
index 1ceaf1b..cbc2831 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -170,18 +170,23 @@
continue;
}
- // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
- DeviceBarcode deviceBarcode = deviceBarcodeService.getById(basConveyorSta.getBarcodeId());
- if(deviceBarcode == null) {
- continue;
- }
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, Integer.parseInt(deviceBarcode.getDeviceId()));
- if (barcodeThread == null) {
- continue;
- }
- String barcode = barcodeThread.getBarcode();
+// // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+// DeviceBarcode deviceBarcode = deviceBarcodeService.getById(basConveyorSta.getBarcodeId());
+// if(deviceBarcode == null) {
+// continue;
+// }
+// BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, Integer.parseInt(deviceBarcode.getDeviceId()));
+// if (barcodeThread == null) {
+// continue;
+// }
+// String barcode = barcodeThread.getBarcode();
+// if (!Cools.isEmpty(barcode)) {
+// News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", deviceBarcode.getId(), barcode);
+// }
+
+ String barcode = staProtocol.getBarcode();
if (!Cools.isEmpty(barcode)) {
- News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", deviceBarcode.getId(), barcode);
+ News.info("鏉＄爜鎵弿鍣ㄦ娴嬫潯鐮佷俊鎭細{}", barcode);
}
// 鍒ゆ柇閲嶅宸ヤ綔妗�
@@ -192,7 +197,7 @@
if (task1 != null) {
News.error("宸ヤ綔妗ｅ凡瀛樺湪,宸ヤ綔鍙�={}", task1.getTaskNo());
if (staProtocol.getWorkNo().intValue() != Integer.parseInt(task1.getTaskNo())) {
- devpThread.writeWorkSta(staProtocol.getSiteId(), Short.parseShort(task1.getTaskNo()), Short.parseShort(task1.getDestSite()));
+ devpThread.writeWorkSta(staProtocol.getSiteId(), Short.parseShort(task1.getTaskNo()), Short.parseShort(task1.getOriginSite()));
devpThread.setPakMk(staProtocol.getSiteId(), false);
News.info("杈撻�佺嚎鍏ュ簱鍛戒护涓嬪彂锛屼换鍔℃暟鎹�={}", JSON.toJSON(task1));
}
@@ -519,6 +524,11 @@
//绌挎杞﹁繘鎻愬崌鏈哄緟鏈轰綅搴撲綅鍙� 杈撻�佺嚎浣嶇疆
String standbyLocNoTo = shuttleStandbyTo.getDeviceStandbyLoc();
+ //涓嶈蛋鎻愬崌鏈�
+ if (staProtocol.getSiteId() == 1015 || staProtocol.getSiteId() == 1026) {
+ standbyLocNoTo = staProtocol.getLocNo();
+ }
+
if (Cools.isEmpty(task.getShuttleNo())) {
//鍒嗛厤灏忚溅
//璋冨害绌洪棽杞﹀幓鍙栬揣寰呮満浣�
--
Gitblit v1.9.1