From b06b9d3dd87bbb6f41d08cdb65890b4c1f80564b Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 16 五月 2024 14:50:06 +0800
Subject: [PATCH] # 手动调拨
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 307 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 296 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 69e0bb0..74bf28b 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -1,18 +1,22 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.entity.AgvBasDevp;
-import com.zy.asrs.entity.param.AgvMobileStartParam;
-import com.zy.asrs.entity.param.CombParam;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
+import io.swagger.models.auth.In;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,6 +40,8 @@
private AgvLocMastService agvLocMastService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
/*
@@ -43,8 +49,17 @@
*/
@PostMapping("/comb/auth")
public R comb(@RequestBody CombParam combParam){
- String message = agvMobileService.comb(combParam, 1l);
- return R.ok(message);
+ 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("鎷ｆ枡鎴愬姛");
}
/*
@@ -54,7 +69,7 @@
public R combBinding(@RequestBody Map<String,Object> map){
String barcode = map.get("barcode").toString();
String stationCode = map.get("stationCode").toString();
- Short containerType = Short.valueOf(map.get("containerType").toString());
+ Short containerType = Short.valueOf(barcode.substring(0,2));
agvMobileService.combBinding(barcode,stationCode,containerType);
return R.ok("鎵樼洏缁戝畾绔欑偣鎴愬姛");
}
@@ -97,6 +112,23 @@
}
/*
+ 鍚姩鍏ュ簱锛岀粍鎵� + 鐢熶骇宸ヤ綔妗�
+ */
+ @PostMapping("/start/pakin/auth")
+ @Synchronized
+ @Transactional
+ public R startPakin(@RequestBody AgvMobileStartPakin params){
+ // 缁勬墭
+ params.getCombParams().forEach(combParam -> {
+ agvMobileService.comb(combParam,getUserId());
+ });
+ params.setContainerType(Short.valueOf(params.getContainerCode().substring(0,2)));
+ workService.emptyPlateIn(params.getDevNo(),params.getContainerCode(),params.getContainerType(), getUserId(),false);
+
+ return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
+ }
+
+ /*
鍏ュ簱
*/
@PostMapping("/pakin/empty/auth")
@@ -105,7 +137,7 @@
for (AgvMobileStartParam.Pda pda : params.getPad()) {
pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0,2)));
- workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId());
+ workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId(),false);
}
return R.ok();
@@ -137,5 +169,258 @@
return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));
}
+
+ /*
+ 鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
+ */
+ @PostMapping("/query/locDetl/v1")
+ public R queryAgvLocDetl(@RequestBody HashMap<String,String> params){
+
+ String orderNo = params.get("orderNo");
+ String threeCode = params.get("threeCode");
+ String matnr = params.get("matnr");
+ String floor = params.get("floor");
+
+ 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);
+
+ if (threeCode.substring(0,2).equals(30)) {
+ wrapper.isNull("specs").or().eq("specs","").eq("floor",1);
+ }
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
+ List<AgvLocDetl> locDetls = new ArrayList<>();
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
+ AgvLocMast agvLocMast = new AgvLocMast();
+ if (Cools.isEmpty(floor)) {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));
+ } else {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
+ }
+
+ if (Cools.isEmpty(agvLocMast)) continue;
+ agvLocDetl.setLocSts(agvLocMast.getLocSts());
+ agvLocDetl.setLocSts$(agvLocMast.getLocSts$());
+ locDetls.add(agvLocDetl);
+ }
+
+
+ return R.ok(locDetls);
+ }
+
+ /*
+ 鐩樼偣鎺ュ彛
+ */
+ @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("缁存姢鎴愬姛");
+
+ }
+
+ @PostMapping("/agv/v1/locMove")
+ @Transactional
+ @ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
+ public R agvLocMove(@RequestBody HashMap<String,Object> params){
+ String fl = String.valueOf(params.get("floor"));
+ short floor =(short)Integer.parseInt(fl.substring(0, 1));
+ List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
+ params.get("dbList");
+ Object mT = params.get("moveType");
+ String moveType = "";
+ if (mT.equals("unAuto")) {
+ moveType = "2";
+ } else {
+ moveType = "1";
+ }
+ for (HashMap<String, String> map : dbList) {
+ String locNo = map.get("locNo");
+ Wrapper<AgvLocMast> wrapper = new EntityWrapper<AgvLocMast>().eq("loc_no", locNo);
+ AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper);
+ agvLocMast.setLocType(moveType);
+ agvLocMast.setLocType3(floor);
+ agvLocMastService.update(agvLocMast,wrapper);
+ // 鍚屾璋冩嫧鍗�
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
+ // 鏇存柊璁㈠崟
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
+ orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
+ if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
+ throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
+ }
+ }
+ }
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/locMove")
+ @Transactional
+ @ManagerAuth(memo = "鎵嬪姩搴撲綅杞Щ")
+ public R handControlLocMove(@RequestBody LocMoveParam param){
+ agvMobileService.handControlLocMove(param, getUserId());
+ 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