From 114657d034c80ca40f08d767a71d169c34bde0b5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 16 四月 2024 23:50:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 55ce92a..be57ed6 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -228,17 +228,22 @@
List<AgvLocDetl> listByLocNo = null;
List<AgvLocDetl> listByContainerCode = null;
-
if(!Cools.isEmpty(locNo)){
+ // 婧愬簱浣�
listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
}
if(!Cools.isEmpty(locNo)){
+ // 鐩爣搴撲綅
listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
}
AgvLocMast agvLocMastByContainerCode = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
AgvLocMast agvLocMastByLocNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
+ String locNo1 = listByContainerCode.get(0).getLocNo();
+ String suppCode = listByLocNo.get(0).getSuppCode();
+
+ List<AgvLocDetl> supp_codes = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", suppCode));
if((!Cools.eq("F",agvLocMastByContainerCode.getLocSts())
&& !Cools.eq("D",agvLocMastByContainerCode.getLocSts()))
|| (!Cools.eq("F",agvLocMastByLocNo.getLocSts())
@@ -252,8 +257,9 @@
if(Cools.isEmpty(listByLocNo) && !Cools.isEmpty(listByContainerCode)){
//鏇存柊璐ф灦淇℃伅鐨勫簱浣嶄负褰撳墠搴撲綅
listByContainerCode.forEach(agvLocDetl -> {
+ String sourceLoc = agvLocDetl.getLocNo();
agvLocDetl.setLocNo(locNo);
- agvLocDetlService.updateLocNo(locNo,agvLocDetl);
+ agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
});
agvLocMastByLocNo.setLocSts("F");
@@ -271,8 +277,9 @@
if(!Cools.isEmpty(listByLocNo) && Cools.isEmpty(listByContainerCode)){
//鏇存柊璐ф灦淇℃伅鐨勫簱浣嶄负褰撳墠搴撲綅
listByLocNo.forEach(agvLocDetl -> {
+ String sourceLoc = agvLocDetl.getLocNo();
agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
- agvLocDetlService.updateLocNo(locNo,agvLocDetl);
+ agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
});
agvLocMastByContainerCode.setLocSts("F");
@@ -288,16 +295,29 @@
return R.ok("璇ュ簱浣嶄笌瀹瑰櫒搴撳瓨涓�鑷达紝鏃犻渶缁存姢");
}
+
+
listByContainerCode.forEach(agvLocDetl -> {
+ String sourceLoc = agvLocDetl.getLocNo();
agvLocDetl.setLocNo(agvLocMastByLocNo.getLocNo());
- agvLocDetlService.updateLocNo(locNo,agvLocDetl);
+ agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
});
- listByLocNo.forEach(agvLocDetl -> {
- agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
- agvLocDetlService.updateLocNo(locNo,agvLocDetl);
- });
+ supp_codes.forEach(agvLocDetl -> {
+ agvLocDetl.setLocNo(locNo1);
+ agvLocDetlService.updateLocNo(locNo1,locNo,agvLocDetl);
+ });
+// listByLocNo.forEach(agvLocDetl -> {
+// String sourceLoc = agvLocDetl.getLocNo();
+// agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
+// agvLocDetlService.updateLocNo(sourceLoc,locNo,agvLocDetl);
+// });
+ agvLocMastByContainerCode.setBarcode(agvLocMastByLocNo.getBarcode());
+ agvLocMastService.updateById(agvLocMastByContainerCode);
+
+ agvLocMastByLocNo.setBarcode(containerCode);
+ agvLocMastService.updateById(agvLocMastByLocNo);
return R.ok("缁存姢鎴愬姛");
--
Gitblit v1.9.1