From 071f3021f4ba872c572a4c59dd8ce9ea2d3c9106 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 23 四月 2024 18:50:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 71 ++++++++++++++++++++++++++++-------
1 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 7482bec..b72ee5f 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.param.AgvMobileStartPakin;
import com.zy.asrs.entity.param.AgvMobileStartParam;
import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.entity.param.PickParam;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
@@ -56,6 +57,14 @@
agvMobileService.comb(combParam, getUserId());
return R.ok();
+ }
+
+ // 鍐嶆鎷ｆ枡
+ @RequestMapping("/pick/again/auth")
+// @ManagerAuth(memo = "缁勬墭")
+ public R pickAgain(@RequestBody PickParam pickParams){
+ agvMobileService.pickAgain(pickParams, 1l);
+ return R.ok("缁勬墭鎴愬姛");
}
/*
@@ -228,57 +237,71 @@
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));
- if(Cools.eq("F",agvLocMastByContainerCode.getLocSts())
- || Cools.eq("D",agvLocMastByContainerCode.getLocSts())
- || Cools.eq("F",agvLocMastByLocNo.getLocSts())
- || Cools.eq("D",agvLocMastByLocNo.getLocSts())){
+ String barcode1 = agvLocMastByLocNo.getBarcode();
+
+
+
+ if((!Cools.eq("F",agvLocMastByContainerCode.getLocSts())
+ && !Cools.eq("D",agvLocMastByContainerCode.getLocSts()))
+ || (!Cools.eq("F",agvLocMastByLocNo.getLocSts())
+ && !Cools.eq("D",agvLocMastByLocNo.getLocSts()))){
return R.error("搴撲綅鐘舵�佷笉涓篎鎴栬�匘锛屾棤娉曠淮鎶�");
}
-
+ // -------------1-----------------------------
//搴撲綅淇℃伅涓虹┖ 璐ф灦淇℃伅涓嶄负绌�
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");
+ agvLocMastByLocNo.setBarcode(containerCode);
agvLocMastService.updateById(agvLocMastByLocNo);
- if(!Cools.isEmpty(agvLocMastByContainerCode) && Cools.eq("D",agvLocMastByContainerCode.getLocSts())){
+ if(!Cools.isEmpty(agvLocMastByContainerCode) && Cools.eq("F",agvLocMastByContainerCode.getLocSts())){
agvLocMastByContainerCode.setLocSts("D");
+ agvLocMastByContainerCode.setBarcode(barcode1);
agvLocMastService.updateById(agvLocMastByContainerCode);
}
return R.ok("缁存姢鎴愬姛");
}
+
+ // -------------2-----------------------------
//搴撲綅淇℃伅涓嶄负绌� 璐ф灦淇℃伅涓虹┖
if(!Cools.isEmpty(listByLocNo) && Cools.isEmpty(listByContainerCode)){
+ String newLocNo = agvLocMastByContainerCode.getLocNo();
//鏇存柊璐ф灦淇℃伅鐨勫簱浣嶄负褰撳墠搴撲綅
listByLocNo.forEach(agvLocDetl -> {
+ String sourceLoc = agvLocDetl.getLocNo();
agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
- agvLocDetlService.updateLocNo(locNo,agvLocDetl);
+ agvLocDetlService.updateLocNo(newLocNo,sourceLoc,agvLocDetl);
});
agvLocMastByContainerCode.setLocSts("F");
+ agvLocMastByContainerCode.setBarcode(agvLocMastByLocNo.getBarcode());
agvLocMastService.updateById(agvLocMastByContainerCode);
agvLocMastByLocNo.setLocSts("D");
+ agvLocMastByLocNo.setBarcode(containerCode);
agvLocMastService.updateById(agvLocMastByLocNo);
return R.ok("缁存姢鎴愬姛");
@@ -288,16 +311,36 @@
return R.ok("璇ュ簱浣嶄笌瀹瑰櫒搴撳瓨涓�鑷达紝鏃犻渶缁存姢");
}
+
+
+ // --------------3----------------------------
+ String locNo1 = listByContainerCode.get(0).getLocNo();
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);
- });
+ if (!Cools.isEmpty(listByLocNo)) {
+ String suppCode = listByLocNo.get(0).getSuppCode();
+ List<AgvLocDetl> supp_codes = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", suppCode));
+ 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