From 138b5fc883c3ccb25f4bed7114a60f93e78aaa9a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 02 六月 2024 13:30:37 +0800
Subject: [PATCH] #条码检测
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 259 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 227 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 47bfee1..9819e36 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -2,30 +2,21 @@
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.AgvLocDetl;
-import com.zy.asrs.entity.AgvLocMast;
-import com.zy.asrs.entity.LocMast;
-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.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.transaction.annotation.Transactional;
-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.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;
/**
@@ -35,6 +26,8 @@
@RestController
@RequestMapping("agvMobile")
public class AgvMobileController extends BaseController {
+
+
@Autowired
private AgvMobileService agvMobileService;
@@ -48,6 +41,10 @@
private OrderDetlService orderDetlService;
@Autowired
private AgvLocDetlService agvLocDetlService;
+ @Autowired
+ private AgvWrkMastService agvWrkMastService;
+ @Autowired
+ private AgvWrkDetlService agvWrkDetlService;
/*
@@ -62,14 +59,14 @@
// 鍐嶆鎷ｆ枡
@RequestMapping("/pick/again/auth")
-// @ManagerAuth(memo = "缁勬墭")
+ @ManagerAuth(memo = "鍐嶆鎷ｆ枡")
public R pickAgain(@RequestBody PickParam pickParams){
agvMobileService.pickAgain(pickParams, 1l);
- return R.ok("缁勬墭鎴愬姛");
+ return R.ok("鎷ｆ枡鎴愬姛");
}
/*
- 缁戝畾鎵樼洏鏉＄爜涓庢殏瀛樹綅
+ 缁戝畾璐ф灦鏉＄爜涓庢殏瀛樹綅
*/
@PostMapping("/combBinging/auth")
public R combBinding(@RequestBody Map<String,Object> map){
@@ -77,7 +74,7 @@
String stationCode = map.get("stationCode").toString();
Short containerType = Short.valueOf(barcode.substring(0,2));
agvMobileService.combBinding(barcode,stationCode,containerType);
- return R.ok("鎵樼洏缁戝畾绔欑偣鎴愬姛");
+ return R.ok("璐ф灦缁戝畾绔欑偣鎴愬姛");
}
/*
@@ -123,6 +120,7 @@
@PostMapping("/start/pakin/auth")
@Synchronized
@Transactional
+ @ManagerAuth(memo = "鍚姩鍏ュ簱")
public R startPakin(@RequestBody AgvMobileStartPakin params){
// 缁勬墭
params.getCombParams().forEach(combParam -> {
@@ -139,6 +137,7 @@
*/
@PostMapping("/pakin/empty/auth")
@Synchronized
+ @ManagerAuth(memo = "绌烘澘鍏ュ簱")
public R pakinEmpty(@RequestBody AgvMobileStartParam params){
for (AgvMobileStartParam.Pda pda : params.getPad()) {
@@ -154,6 +153,7 @@
*/
@PostMapping("/pakout/empty/auth")
@Synchronized
+ @ManagerAuth(memo = "绌烘澘鍑哄簱")
public R pakoutEmpty(@RequestBody AgvMobileStartParam params){
for (AgvMobileStartParam.Pda pda : params.getPad()) {
@@ -164,7 +164,7 @@
}
/*
- 绌烘澘鍑哄簱瀹瑰櫒鐮侀�夋嫨
+ 绌烘澘鍑哄簱璐ф灦鐮侀�夋嫨
*/
@PostMapping("/pakout/empty/container/selector/auth")
public R containerType(@RequestBody HashMap<String,String> params){
@@ -185,6 +185,7 @@
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);
@@ -192,21 +193,35 @@
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 locNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()));
- agvLocDetl.setLocSts(locNo.getLocSts());
- agvLocDetl.setLocSts$(locNo.getLocSts$());
+ 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(agvLocDetls);
+
+ return R.ok(locDetls);
}
/*
鐩樼偣鎺ュ彛
*/
@PostMapping("/check/detl/v1")
+ @ManagerAuth(memo = "搴撳瓨鐩樼偣")
+ @Synchronized
public R checkLocDetl(@RequestBody HashMap<String,String> param){
String locNo = param.get("locNo");
@@ -234,6 +249,8 @@
鐩樼偣搴撲綅閿欎贡缁存姢鎺ュ彛
*/
@PostMapping("/update/detl/v1")
+ @ManagerAuth(memo = "绾犳搴撲綅")
+ @Synchronized
public R updateLocDetlLocNo(@RequestBody HashMap<String,String> param){
String locNo = param.get("locNo");
String containerCode = param.get("containerCode");
@@ -315,7 +332,7 @@
}
if((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)){
- return R.ok("璇ュ簱浣嶄笌瀹瑰櫒搴撳瓨涓�鑷达紝鏃犻渶缁存姢");
+ return R.ok("璇ュ簱浣嶄笌璐ф灦搴撳瓨涓�鑷达紝鏃犻渶缁存姢");
}
@@ -355,24 +372,166 @@
@PostMapping("/agv/v1/locMove")
@Transactional
+ @ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
+ @Synchronized
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 moveType = params.get("moveType");
- if (moveType == "unAuto") {
- return R.error("鎵嬪姩鍔熻兘鏆傛椂鏃犳硶浣跨敤");
+ 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("1");
+ agvLocMast.setLocType(moveType);
agvLocMast.setLocType3(floor);
agvLocMastService.update(agvLocMast,wrapper);
- //System.out.println(locNo);
+ // 鍚屾璋冩嫧鍗�
+ 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("/agv/v2/locMove")
+ @Transactional
+ @ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
+ @Synchronized
+ 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 source_loc_no = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", locNo));
+ if (!Cools.isEmpty(source_loc_no)) {
+ throw new CoolException("褰撳墠搴撲綅宸茬敓鎴愪换鍔★紒");
+ }
+ AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts","F"));
+ if (Cools.isEmpty(locMastS)) {
+ throw new CoolException("褰撳墠搴撲綅闈炲湪搴撶姸鎬侊紒搴撲綅鍙�="+locNo);
+ }
+ 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 = "鎵嬪姩搴撲綅杞Щ")
+ @Synchronized
+ public R handControlLocMove(@RequestBody LocMoveParam param){
+ agvMobileService.handControlLocMove(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/allocationOut")
+ @Transactional
+ @ManagerAuth(memo = "璋冩嫧绂诲満")
+ @Synchronized
+ public R allocationOut(@RequestBody AgvMobileStartPakin param){
+ agvMobileService.allocationOut(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/allocationIn")
+ @Transactional
+ @ManagerAuth(memo = "璋冩嫧杩涘満")
+ @Synchronized
+ public R allocationIn(@RequestBody AgvMobileStartPakin param){
+ agvMobileService.allocationIn(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/empOut")
+ @Transactional
+ @ManagerAuth(memo = "绌烘灦绂诲満")
+ @Synchronized
+ public R empOut(@RequestBody AgvMobileStartPakin param){
+ agvMobileService.empOut(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/empIn")
+ @Transactional
+ @ManagerAuth(memo = "绌烘灦杩涘満")
+ @Synchronized
+ public R empIn(@RequestBody AgvMobileStartPakin param){
+ agvMobileService.empIn(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/doBack")
+ @Transactional
+ @ManagerAuth(memo = "绔欑偣鍥為��")
+ @Synchronized
+ public R doBack(@RequestBody AgvMobileStartPakin param){
+ if (Cools.isEmpty(param)){
+ return R.error("鍙傛暟涓虹┖");
+ }
+ agvMobileService.doBack(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/handBack")
+ @Transactional
+ @ManagerAuth(memo = "杞墜鍔ㄥ洖娴�")
+ @Synchronized
+ public R handBack(@RequestBody AgvMobileStartPakin param){
+ agvMobileService.handBack(param, getUserId());
return R.ok();
}
@@ -394,5 +553,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