From f513af7c0a8c334ca73c540afd443c821bbc6a54 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 26 九月 2025 15:19:44 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 8b2e293..e13d542 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2088,6 +2088,7 @@
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setPltType(getCrnStation(wrkMast.getSourceLocNo()));
crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
@@ -2660,7 +2661,14 @@
LocMast loc = null;
for (Integer row : rows) {
if (Utils.isDeepLoc(slaveProperties, row)) {
- loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
+ if (shallowLoc.getBay1() == 1) {
+ loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 1);
+ } else if (shallowLoc.getRow1() == 29) {
+ loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 29);
+ } else {
+ loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
+ }
+
if (loc != null) {
if (Utils.isDeepLoc(slaveProperties, loc.getLocNo())) {
@@ -2679,7 +2687,14 @@
if (null == loc) {
for (Integer row : rows) {
if (Utils.isShallowLoc(slaveProperties, row)) {
- loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
+ if (shallowLoc.getBay1() == 1) {
+ loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 1);
+ } else if (shallowLoc.getRow1() == 29) {
+ loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 29);
+ } else {
+ loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
+ }
+
if (null != loc) {//瀵瑰簲娣卞簱浣嶉潪鍦ㄥ簱鐘舵��,涓嶈兘绉诲簱
String deepLoc = Utils.getDeepLoc(slaveProperties, loc.getLocNo());
--
Gitblit v1.9.1