From ed0a79ffec5d25dae6b0b24393c331ab36d7d50b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 04 六月 2024 15:35:12 +0800
Subject: [PATCH] # 自动回流数量限制
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 157 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 126 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 6dd8c54..9f38872 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -12,6 +12,8 @@
import com.zy.common.web.BaseController;
import io.swagger.models.auth.In;
import lombok.Synchronized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +29,8 @@
@RequestMapping("agvMobile")
public class AgvMobileController extends BaseController {
+
+ private static final Logger log = LoggerFactory.getLogger(AgvMobileController.class);
@Autowired
private AgvMobileService agvMobileService;
@Autowired
@@ -41,6 +45,8 @@
private AgvLocDetlService agvLocDetlService;
@Autowired
private AgvWrkMastService agvWrkMastService;
+ @Autowired
+ private AgvWrkDetlService agvWrkDetlService;
/*
@@ -62,7 +68,7 @@
}
/*
- 缁戝畾鎵樼洏鏉＄爜涓庢殏瀛樹綅
+ 缁戝畾璐ф灦鏉＄爜涓庢殏瀛樹綅
*/
@PostMapping("/combBinging/auth")
public R combBinding(@RequestBody Map<String,Object> map){
@@ -70,7 +76,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("璐ф灦缁戝畾绔欑偣鎴愬姛");
}
/*
@@ -116,6 +122,7 @@
@PostMapping("/start/pakin/auth")
@Synchronized
@Transactional
+ @ManagerAuth(memo = "鍚姩鍏ュ簱")
public R startPakin(@RequestBody AgvMobileStartPakin params){
// 缁勬墭
params.getCombParams().forEach(combParam -> {
@@ -132,6 +139,7 @@
*/
@PostMapping("/pakin/empty/auth")
@Synchronized
+ @ManagerAuth(memo = "绌烘澘鍏ュ簱")
public R pakinEmpty(@RequestBody AgvMobileStartParam params){
for (AgvMobileStartParam.Pda pda : params.getPad()) {
@@ -147,6 +155,7 @@
*/
@PostMapping("/pakout/empty/auth")
@Synchronized
+ @ManagerAuth(memo = "绌烘澘鍑哄簱")
public R pakoutEmpty(@RequestBody AgvMobileStartParam params){
for (AgvMobileStartParam.Pda pda : params.getPad()) {
@@ -157,7 +166,7 @@
}
/*
- 绌烘澘鍑哄簱瀹瑰櫒鐮侀�夋嫨
+ 绌烘澘鍑哄簱璐ф灦鐮侀�夋嫨
*/
@PostMapping("/pakout/empty/container/selector/auth")
public R containerType(@RequestBody HashMap<String,String> params){
@@ -213,6 +222,8 @@
鐩樼偣鎺ュ彛
*/
@PostMapping("/check/detl/v1")
+ @ManagerAuth(memo = "搴撳瓨鐩樼偣")
+ @Synchronized
public R checkLocDetl(@RequestBody HashMap<String,String> param){
String locNo = param.get("locNo");
@@ -240,6 +251,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");
@@ -321,7 +334,7 @@
}
if((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)){
- return R.ok("璇ュ簱浣嶄笌瀹瑰櫒搴撳瓨涓�鑷达紝鏃犻渶缁存姢");
+ return R.ok("璇ュ簱浣嶄笌璐ф灦搴撳瓨涓�鑷达紝鏃犻渶缁存姢");
}
@@ -362,6 +375,7 @@
@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));
@@ -398,6 +412,7 @@
@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"));
@@ -410,42 +425,42 @@
if (mT.equals("unAuto")) {
moveType = "2";
ioType = 111;
+ int count = agvWrkMastService.selectCount(new EntityWrapper<AgvWrkMast>().eq("io_type", ioType));
+ if (count>3){
+ log.equals("111浠诲姟鍫靛锛岀◢鍚庡啀璇曪紒锛侊紒褰撳墠闄愬埗鏁伴噺3鏉★紝闄愬埗鏉′欢锛歩o_type = 111");
+ throw new CoolException("111浠诲姟鍫靛锛岀◢鍚庡啀璇曪紒");
+ }
} else {
moveType = "1";
ioType = 108;
}
for (HashMap<String, String> map : dbList) {
String locNo = map.get("locNo");
- String barcode = map.get("barcode");
- //鐢熸垚宸ヤ綔妗�
- AgvWrkMast mast = new AgvWrkMast();
- //宸ヤ綔鐘舵��
- mast.setWrkSts(22L);
- //鍏ュ嚭搴撶被鍨�
- mast.setIoType(ioType);
- mast.setIoTime(now);
- //浼樺厛绾�
- mast.setIoPri(300.0);
- //婧愮珯鐐�
- mast.setSourceLocNo(locNo);
- //鐩爣绔欑偣
- mast.setLocNo("");
- //瀹瑰櫒缂栫爜
- mast.setBarcode(barcode);
- //瀹瑰櫒绫诲瀷
- mast.setWhsType(30);
- // 鐩爣妤煎眰
- mast.setCrnNo(floor);
- mast.setAppeUser(getUserId());
- mast.setAppeTime(now);
- mast.setModiUser(getUserId());
- mast.setModiTime(now);
- if (!agvWrkMastService.insertByIncrease(mast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ 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());
@@ -454,7 +469,9 @@
}
}
// 鏇存柊婧愬簱浣�
-
+ AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
+ locMast.setLocSts("R");
+ agvLocMastService.updateById(locMast);
}
return R.ok();
}
@@ -462,6 +479,7 @@
@PostMapping("/hand/control/locMove")
@Transactional
@ManagerAuth(memo = "鎵嬪姩搴撲綅杞Щ")
+ @Synchronized
public R handControlLocMove(@RequestBody LocMoveParam param){
agvMobileService.handControlLocMove(param, getUserId());
return R.ok();
@@ -470,6 +488,7 @@
@PostMapping("/hand/control/allocationOut")
@Transactional
@ManagerAuth(memo = "璋冩嫧绂诲満")
+ @Synchronized
public R allocationOut(@RequestBody AgvMobileStartPakin param){
agvMobileService.allocationOut(param, getUserId());
return R.ok();
@@ -478,8 +497,48 @@
@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();
}
@@ -501,5 +560,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