From 8d589bc8baeadc9d29c2523cf766040a5f5e5995 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 07 五月 2024 00:30:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 190 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 189 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 6a08d79..702995d 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -6,9 +6,11 @@
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvLocDetl;
+import com.zy.asrs.entity.AgvLocMast;
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;
@@ -19,6 +21,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -54,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("缁勬墭鎴愬姛");
}
/*
@@ -172,15 +183,192 @@
String orderNo = params.get("orderNo");
String threeCode = params.get("threeCode");
+ String matnr = params.get("matnr");
- Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("order_no", orderNo);
+ Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr);
+
+// wrapper.eq("orderNo",orderNo);
wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
+ AgvLocMast locNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()));
+ agvLocDetl.setLocSts(locNo.getLocSts());
+ agvLocDetl.setLocSts$(locNo.getLocSts$());
+ }
+
return R.ok(agvLocDetls);
}
+ /*
+ 鐩樼偣鎺ュ彛
+ */
+ @PostMapping("/check/detl/v1")
+ public R checkLocDetl(@RequestBody HashMap<String,String> param){
+
+ String locNo = param.get("locNo");
+ String containerCode = param.get("containerCode");
+
+ 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));
+ }
+
+ Map<String,Object> result = new HashMap<String,Object>();
+ result.put("locNo",listByLocNo);
+ result.put("containerCode",listByContainerCode);
+
+ return R.ok(result);
+
+ }
+
+ /*
+ 鐩樼偣搴撲綅閿欎贡缁存姢鎺ュ彛
+ */
+ @PostMapping("/update/detl/v1")
+ public R updateLocDetlLocNo(@RequestBody HashMap<String,String> param){
+ String locNo = param.get("locNo");
+ String containerCode = param.get("containerCode");
+
+ if(Cools.isEmpty(locNo) || Cools.isEmpty(containerCode)){
+ return R.error("鍙傛暟涓嶅叏");
+ }
+
+ 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 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,sourceLoc,agvLocDetl);
+ });
+
+ agvLocMastByLocNo.setLocSts("F");
+ agvLocMastByLocNo.setBarcode(containerCode);
+ agvLocMastService.updateById(agvLocMastByLocNo);
+
+ 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(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("缁存姢鎴愬姛");
+ }
+
+ if((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)){
+ return R.ok("璇ュ簱浣嶄笌瀹瑰櫒搴撳瓨涓�鑷达紝鏃犻渶缁存姢");
+ }
+
+
+
+ // --------------3----------------------------
+ String locNo1 = listByContainerCode.get(0).getLocNo();
+ listByContainerCode.forEach(agvLocDetl -> {
+ String sourceLoc = agvLocDetl.getLocNo();
+ agvLocDetl.setLocNo(agvLocMastByLocNo.getLocNo());
+ agvLocDetlService.updateLocNo(locNo,sourceLoc,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("缁存姢鎴愬姛");
+
+ }
+
+ public static void main(String[] args) {
+ List<AgvLocDetl> agvLocDetls1 = new ArrayList<>();
+ List<AgvLocDetl> agvLocDetls2 = new ArrayList<>();
+
+ AgvLocDetl agvLocDetl1 = new AgvLocDetl();
+ agvLocDetl1.setLocNo("AA");
+ AgvLocDetl agvLocDetl2 = new AgvLocDetl();
+ agvLocDetl2.setLocNo("AA");
+
+ agvLocDetls1.add(agvLocDetl1);
+ agvLocDetls2.add(agvLocDetl2);
+
+ System.out.println(agvLocDetls1.equals(agvLocDetls2));
+
+ List<AgvLocDetl> agvLocDetls22 = null;
+
+ System.out.println(agvLocDetls22.equals(agvLocDetls2));
+ }
}
--
Gitblit v1.9.1