From 830b5f394b6f5c41d259be38272d578467b53cf1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 19 三月 2025 18:55:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs-erp-4' into phyzasrs-erp-4
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 4e595cd..b74d34b 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -903,7 +903,7 @@
}
}
}
- if (agvLocMast==null){
+ if (agvLocMast == null) {
throw new CoolException("娌℃湁璇ョ被鍨嬬殑绌哄簱浣嶄簡");
}
@@ -959,18 +959,23 @@
if (!Cools.isEmpty(agvWrkMast)) {
throw new CoolException("鏈夎揣鏋跺湪寰�绔欑偣鎼繍" + agvBasDevp.getDevNo() + ",鏃犳硶杩涜绌烘澘鍑哄簱");
}
+ AgvLocMast agvLocMast = null;
+ if (station.startsWith("XI") && station.endsWith("F4") && containerType == 30) {
+ agvLocMast = agvLocMastService.select30EmptyZpallet();
+ } else {
+ //瀵绘壘鐩稿簲绫诲瀷鐨勭┖璐ф灦
+ Integer floor = agvBasDevp.getFloor();
+ if (floor == 4) {
+ floor = 1;
+ }
+ agvLocMast = agvLocMastService.selectEmptyZpallet(containerType, floor);
+ if (containerType == 0) {
+ //绌烘澘鑷姩鍑哄簱锛屾牴鎹珯鐐圭被鍨嬮�夋嫨
+ agvLocMastService.selectEmptyZpalletByLocType1(agvBasDevp.getLocType1());
- //瀵绘壘鐩稿簲绫诲瀷鐨勭┖璐ф灦
- Integer floor = agvBasDevp.getFloor();
- if (floor == 4) {
- floor = 1;
+ }
}
- AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType, floor);
- if (containerType == 0) {
- //绌烘澘鑷姩鍑哄簱锛屾牴鎹珯鐐圭被鍨嬮�夋嫨
- agvLocMastService.selectEmptyZpalletByLocType1(agvBasDevp.getLocType1());
- }
if (Cools.isEmpty(agvLocMast)) {
throw new CoolException("鏆傛棤褰撳墠鍑哄簱绔欑偣绫诲瀷鐨勭┖璐ф灦锛�");
@@ -1345,6 +1350,9 @@
if (wrkMast.getIoType() == 112) {
throw new CoolException("褰撳墠浣滀笟涓嶈兘鍙栨秷锛�");
}
+ if (wrkMast.getIoType() == 108 && wrkMast.getWrkSts() >= 204) {
+ throw new CoolException("婧愬簱浣嶅凡缁忛噴鏀撅紝褰撳墠浣滀笟涓嶈兘鍙栨秷锛�");
+ }
// 婧愬簱浣�
String locNo = wrkMast.getSourceLocNo();
// 鐩爣搴撲綅
@@ -1407,6 +1415,9 @@
// 鍥炴祦鍗曞彇娑�
} else if (wrkMast.getIoType() == 114) {
+ if (wrkMast.getWrkSts() >= 204) {
+ throw new CoolException("婧愬簱浣嶅凡缁忛噴鏀撅紝褰撳墠浣滀笟涓嶈兘鍙栨秷锛�");
+ }
//婧愬簱浣�
String locNo = wrkMast.getSourceLocNo();
// 鐩爣搴撲綅
--
Gitblit v1.9.1