From 37c04062d11f97f26ec5a48f5f6adb2f96eca7c5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 19 五月 2025 08:16:10 +0800
Subject: [PATCH] 接口编写
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 e6a63d9..a399289 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -752,9 +752,9 @@
String ctnNo = null;
// 鎵撴爣璁帮紝鑻ュ簱浣嶄笉澶燂紝鍏ュ簱鍒板埆鐨勬ゼ灞傦紝閭ｄ箞闇�瑕佽法灞傜Щ搴�
if (!Cools.isEmpty(code)) {
- if (agvLocMast.getLev1() == 1 && !code.equals(AsrsConstants.SANCHANG)) {
- ctnNo = "1";
- } else if (agvLocMast.getLev1() == 2 && !code.equals(AsrsConstants.ERCHANG)) {
+ if (agvLocMast.getLev1() == 1 && code.equals(AsrsConstants.ERCHANG)) {
+ ctnNo = "2";
+ } else if (agvLocMast.getLev1() == 2 && code.equals(AsrsConstants.SANCHANG)) {
ctnNo = "1";
}
}
@@ -1008,7 +1008,7 @@
List<AgvLocDetl> locDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", param.getLocNo()));
List<LocDetlAdjustParam.LocDetlAdjust> list = param.getList();
-
+ String barcode = null;
// 淇敼鏁伴噺
Iterator<AgvLocDetl> iterator = locDetls.iterator();
while (iterator.hasNext()) {
@@ -1095,6 +1095,7 @@
locDetl.setThreeCode(adjust.getThreeCode());
locDetl.setDeadTime(adjust.getDeadTime());
locDetl.setSuppCode(adjust.getSuppCode());
+ barcode = adjust.getSuppCode();
if (!agvLocDetlService.insert(locDetl)) {
throw new CoolException("娣诲姞" + locDetl.getLocNo() + "搴撲綅锛�" + locDetl.getMatnr() + "鍟嗗搧锛�" + locDetl.getBatch() + "搴忓垪鐮佸簱瀛樻槑缁嗗け璐�");
}
@@ -1127,6 +1128,7 @@
if (locMast.getLocSts().equals("D") || locMast.getLocSts().equals("O")) {
if (count > 0) {
locMast.setLocSts("F");
+ locMast.setBarcode(barcode);
}
}
locMast.setModiUser(userId);
@@ -1239,6 +1241,9 @@
String devNo = wrkMast.getSourceLocNo();
//鐩爣搴撲綅
String locNo = wrkMast.getLocNo();
+ if (!Cools.isEmpty(locNo)) {
+ agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+ }
agvLocMastService.updateLocStsByLocNo(locNo, "O", "", null);
if (wrkMast.getIoType() == 58) {
agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo, "F", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
--
Gitblit v1.9.1