From 7e8c8abedab8d33ea5faff80545e566aa71306d6 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 21 五月 2024 14:48:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 122 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 118 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 74bf28b..d5e8940 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -16,10 +16,7 @@
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;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -42,6 +39,10 @@
private OrderDetlService orderDetlService;
@Autowired
private AgvLocDetlService agvLocDetlService;
+ @Autowired
+ private AgvWrkMastService agvWrkMastService;
+ @Autowired
+ private AgvWrkDetlService agvWrkDetlService;
/*
@@ -396,11 +397,88 @@
return R.ok();
}
+ @PostMapping("/agv/v2/locMove")
+ @Transactional
+ @ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
+ public R agvLocMove2(@RequestBody HashMap<String,Object> params){
+ Date now = new Date();
+ String fl = String.valueOf(params.get("floor"));
+ Integer floor = 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 = "";
+ Integer ioType = 0;
+ if (mT.equals("unAuto")) {
+ moveType = "2";
+ ioType = 111;
+ } else {
+ moveType = "1";
+ ioType = 108;
+ }
+ for (HashMap<String, String> map : dbList) {
+ String locNo = map.get("locNo");
+ String barcode = map.get("suppCode");
+ AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), 30,floor);
+ // 鍚屾璋冩嫧鍗�
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
+ AgvWrkDetl wrkDetl = new AgvWrkDetl();
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.sync(agvLocDetl);
+ wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAppeUser(getUserId());
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiUser(getUserId());
+ wrkDetl.setModiTime(now);
+ if (!agvWrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ // 鏇存柊璁㈠崟
+ 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());
+ }
+ }
+ // 鏇存柊婧愬簱浣�
+ AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
+ locMast.setLocSts("R");
+ agvLocMastService.updateById(locMast);
+ }
+ return R.ok();
+ }
+
@PostMapping("/hand/control/locMove")
@Transactional
@ManagerAuth(memo = "鎵嬪姩搴撲綅杞Щ")
public R handControlLocMove(@RequestBody LocMoveParam param){
agvMobileService.handControlLocMove(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/allocationOut")
+ @Transactional
+ @ManagerAuth(memo = "璋冩嫧绂诲満")
+ public R allocationOut(@RequestBody AgvMobileStartPakin param){
+ agvMobileService.allocationOut(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/allocationIn")
+ @Transactional
+ @ManagerAuth(memo = "璋冩嫧杩涘満")
+ public R allocationIn(@RequestBody AgvMobileStartPakin param){
+ agvMobileService.allocationIn(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/doBack")
+ @Transactional
+ @ManagerAuth(memo = "绔欑偣鍥為��")
+ public R doBack(@RequestBody AgvMobileStartPakin param){
+ agvMobileService.doBack(param, getUserId());
return R.ok();
}
@@ -422,5 +500,41 @@
System.out.println(agvLocDetls22.equals(agvLocDetls2));
}
+ /*
+ 鐢熸垚宸ヤ綔妗�
+ */
+ private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType,int floor){
+ AgvWrkMast wrkMast = new AgvWrkMast();
+ //宸ヤ綔鐘舵��
+ wrkMast.setWrkSts(wrkSts);
+ //鍏ュ嚭搴撶被鍨�
+ wrkMast.setIoType(ioType);
+ wrkMast.setIoTime(now);
+ //浼樺厛绾�
+ wrkMast.setIoPri(300.0);
+ //婧愮珯鐐�
+ wrkMast.setSourceLocNo(sourceLocNo);
+ //鐩爣绔欑偣
+ wrkMast.setLocNo(locNo);
+ //瀹瑰櫒缂栫爜
+ wrkMast.setBarcode(barcode);
+ //瀹瑰櫒绫诲瀷
+ wrkMast.setWhsType(containerType);
+ // 鐩爣妤煎眰
+ wrkMast.setCrnNo(floor);
+
+ wrkMast.setAppeUser(userId);
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+
+ if (!agvWrkMastService.insertByIncrease(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+
+ wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no",sourceLocNo));
+
+ return wrkMast;
+ }
}
--
Gitblit v1.9.1