From e90dba0edc93be26e1509cfb2ec1d0681eb86e48 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 27 八月 2025 08:37:04 +0800
Subject: [PATCH] 合并出库添加日志
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 d53164d..614b63a 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -999,6 +999,17 @@
if (Cools.isEmpty(agvLocMast)) {
throw new CoolException("鏆傛棤褰撳墠鍑哄簱绔欑偣绫诲瀷鐨勭┖璐ф灦锛�");
}
+ if (!Cools.isEmpty(agvBasDevp.getArea())) {
+ if (!Cools.isEmpty(agvLocMast.getBarcode())) {
+ if (!agvBasDevp.getArea().contains(agvLocMast.getBarcode().substring(0, 2))) {
+ throw new CoolException("1褰撳墠鍑哄簱绔欑偣涓嶅厑璁稿彨璇ョ被鍨嬬殑璐ф灦锛�" + agvLocMast.getBarcode());
+ }
+ }else {
+ if (!agvBasDevp.getArea().contains(agvLocMast.getLocType1$().toString())) {
+ throw new CoolException("2褰撳墠鍑哄簱绔欑偣涓嶅厑璁稿彨璇ョ被鍨嬬殑璐ф灦锛�" + agvLocMast.getBarcode());
+ }
+ }
+ }
//鐢熸垚宸ヤ綔妗�
createWrkMast(110, 21L, agvLocMast.getLocNo(), agvBasDevp.getDevNo(), agvLocMast.getBarcode(), now, userId, containerType, agvLocMast.getPltType());
@@ -1010,6 +1021,7 @@
}
+
@Transactional
public void adjustLocDetl(LocDetlAdjustParam param, Long userId) {
param.integrate();
--
Gitblit v1.9.1