From efcab71349383ef2bb98ad3826a72518dde62d18 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 25 七月 2024 12:46:24 +0800
Subject: [PATCH] 空板入库回退
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/resources/application.yml | 3 +++
2 files changed, 4 insertions(+), 1 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 976588f..98168b2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1613,7 +1613,7 @@
Thread.sleep(500);
} else {
staProtocol.setWorkNo((short)9991);
- staProtocol.setStaNo((short)100);
+ staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (!result) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 411e226..6974771 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -138,11 +138,13 @@
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 104
+ backSta: 103
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
staNo: 204
+ backSta: 203
barcode: ${wcs-slave.barcode[1].id}
led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�1
@@ -181,6 +183,7 @@
staNo: 304
barcode: ${wcs-slave.barcode[2].id}
led: ${wcs-slave.led[3].id}
+ backSta: 303
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 304
--
Gitblit v1.9.1