From 50e5164f1dc957eba4494bda01171afdc86d5782 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 10 七月 2024 08:27:06 +0800
Subject: [PATCH] 入库托盘有任务则写组托信号
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 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 3a0a9f4..16c25ad 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -177,18 +177,32 @@
// if (getCrnByStaNo(inSta.getStaNo())) {
// continue;
// }
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
+ }
+ String barcode = barcodeThread.getBarcode();
+ staProtocol.setBarcode(barcode);
+
+ if(Cools.isEmpty(barcode) || barcode.equals("00000000")) {
+ continue;
+ }
+
+ TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode));
+
+ if (!Cools.isEmpty(taskWrk) && staProtocol.isLoading()){
+ // 鍐欑粍鎷撲俊鍙�
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, staProtocol));
+// Thread.sleep(500);
+// continue;
+ }
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
&& !staProtocol.isEmptyMk() && (workNo >= 0)
&& staProtocol.isPakMk()) {
- // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
- if (barcodeThread == null) {
- continue;
- }
- String barcode = barcodeThread.getBarcode();
- staProtocol.setBarcode(barcode);
+
if(!Cools.isEmpty(barcode)) {
StaDescService staDescService = SpringUtils.getBean(StaDescService.class);
@@ -196,11 +210,7 @@
Map<String, Object> map = new HashMap<>();
map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
- TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode));
- if (Cools.isEmpty(taskWrk)){
- continue;
- }
//StaDesc staDesc1 = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no",inSta.getBackSta()));
boolean sign = true;
--
Gitblit v1.9.1