From 2082845f1a06a552a39ddd62fee3887dd6854c67 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 09 十月 2024 13:41:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpswcs' into phpswcs
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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 99dbde5..869716f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -514,6 +514,28 @@
|| Cools.isEmpty(wrkMast.getStaNo()) || Cools.isEmpty(wrkMast.getSourceStaNo())) {
continue;
}
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("barcode", barcode));
+ if (Cools.isEmpty(locMast1)) {
+ continue;
+ } else {
+ if (locMast1.getLocType1().equals((short)2)) {
+ if (staProtocol.isWeight()) {
+ staProtocol.setWorkNo(wrkNo);
+ wrkNo++;
+ staProtocol.setStaNo(pickSta.getBackSta().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ // led 寮傚父鏄剧ず
+ if (ledThread != null) {
+ String errorMsg = "骞舵澘鍏ュ簱閲嶉噺澶т簬搴撲綅閲嶉噺锛岃閲嶆柊璋冩暣";
+ News.error(methodName + ":骞舵澘鍏ュ簱閲嶉噺澶т簬搴撲綅閲嶉噺锛岃閲嶆柊璋冩暣");
+ MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
+ }
+ continue;
+ }
+ }
+ }
+
// 鎷ｃ�佺洏銆佸苟 浣滀笟绔欒浆鎹�
// int stnNo = 0;
--
Gitblit v1.9.1