From e609c7adf42ef6eea053ff33a8e59abaf0767df6 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 17 一月 2025 08:54:52 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 968f3eb..feba49f 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -14,6 +14,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.CodeDetectionUtil;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -34,6 +35,8 @@
AgvWaitPakinService agvWaitPakinService;
@Autowired
AgvWorkService agvWorkService;
+ @Autowired
+ AgvLocDetlService agvLocDetlService;
@RequestMapping(value = "/basDevp/list/auth")
@ManagerAuth
@@ -81,7 +84,7 @@
@ManagerAuth(memo = "绔欑偣淇敼")
public R update(AgvBasDevp basDevp){
if (Cools.isEmpty(basDevp) || null==basDevp.getDevNo()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
basDevp.setModiUser(getUserId());
basDevp.setModiTime(new Date());
@@ -94,7 +97,7 @@
public R delete(@RequestParam String param){
List<AgvBasDevp> list = JSONArray.parseArray(param, AgvBasDevp.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
for (AgvBasDevp entity : list){
agvBasDevpService.delete(new EntityWrapper<>(entity));
@@ -106,7 +109,9 @@
@ManagerAuth(memo = "绔欑偣瑙ｇ粦")
public R unbind(@RequestParam String param){
AgvBasDevp agvBasDevp = JSONArray.parseObject(param,AgvBasDevp.class);
-
+ if (agvBasDevp==null){
+ return R.error("鍙傛暟缂哄け");
+ }
//鑻ュ綋鍓嶇珯鐐硅揣浣嶇姸鎬佷笉涓篎.鍦ㄥ簱鐘舵�侊紝鍒欒繑鍥為敊璇�
if(!agvBasDevp.getLocSts().equals("F")){
return R.error("褰撳墠绔欑偣璐т綅鐘舵�佷笉涓哄湪搴擄紝鏃犳硶瑙ｉ櫎缁戝畾");
@@ -165,6 +170,9 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
String devNo = param.get("devNo").toString();
+ if (Cools.isEmpty(devNo) || !CodeDetectionUtil.carCodeDetection(devNo)){
+ throw new CoolException(devNo + "灏忚溅鍦扮爜鏈夎锛岃姝ｇ‘鎵爜锛侊紒锛�");
+ }
AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
if("F".equals(agvBasDevp.getLocSts()) || "R".equals(agvBasDevp.getLocSts())){
//鍏堝幓鍏ュ簱閫氱煡妗ｆ壘鏄庣粏
@@ -177,6 +185,15 @@
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
.eq("loc_no", agvBasDevp.getDevNo())
.or().eq("source_loc_no",agvBasDevp.getDevNo()));
+ if (Cools.isEmpty(agvWrkMast)) {
+ Page<AgvLocDetl> agvLocDetlPage = agvLocDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<AgvLocDetl>()
+ .eq("supp_code", agvBasDevp.getBarcode()));
+ if (agvLocDetlPage.getRecords().size() > 0) {
+ return R.ok(agvLocDetlPage);
+ } else {
+ return R.error("褰撳墠璐ф灦鐮佸紓甯革紒");
+ }
+ }
Page<AgvWrkDetl> agvWrkDetlPage = agvWrkDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<AgvWrkDetl>()
.eq("wrk_no", agvWrkMast.getWrkNo()));
@@ -210,42 +227,53 @@
浠诲姟瀹屾垚
*/
@RequestMapping(value = "/basDevp/visualized/container/moveOut")
+ @ManagerAuth(memo = "纭鍑哄簱")
public R visualiZedContainerMoveOut(@RequestBody Map<String,Object> map) {
String barcode = map.get("barcode").toString();
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts",205L));
+ if (agvWrkMast == null){
+ R.error("宸ヤ綔妗ｄ笉瀛樺湪");
+ }
if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
- throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛岃揣鏋剁鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
}
agvWrkMast.setWrkSts(206L);
+ agvWrkMast.setModiTime(new Date());
agvWrkMastService.updateById(agvWrkMast);
- return R.ok("瀹瑰櫒绂诲満鎴愬姛");
+ return R.ok("璐ф灦绂诲満鎴愬姛");
}
/*
浠诲姟瀹屾垚
*/
@RequestMapping(value = "/basDevp/visualized/container/moveOut2")
+ @ManagerAuth(memo = "纭鍑哄簱2")
public R visualiZedContainerMoveOut2(@RequestBody Map<String,Object> map) {
String barcode = map.get("barcode").toString();
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts",205L));
+ if (agvWrkMast == null){
+ return R.error("宸ヤ綔妗ｄ笉瀛樺湪");
+ }
if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
- throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛岃揣鏋剁鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
}
agvWrkMast.setWrkSts(208L);
+ agvWrkMast.setModiTime(new Date());
agvWrkMastService.updateById(agvWrkMast);
- return R.ok("瀹瑰櫒绂诲満鎴愬姛");
+ return R.ok("璐ф灦绂诲満鎴愬姛");
}
/*
鎷ｆ枡/鐩樼偣鍏ュ簱
*/
@RequestMapping(value = "/basDevp/visualized/container/pickIn")
+ @ManagerAuth(memo = "宸叉嫞鏂欏洖搴�")
public R visualiZedPickIn(@RequestBody Map<String,Object> map){
List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
String devNo = map.get("devNo").toString();
@@ -257,11 +285,14 @@
}
agvWrkMast.setLocNo(devNo);
agvWrkMastList.add(agvWrkMast);
+ agvWorkService.pickIn(agvWrkMastList);
+ } else {
+ return R.error("鏌ヤ笉鍒版嫞鏂欏嚭搴撲换鍔�");
}
- agvWorkService.pickIn(agvWrkMastList);
- return R.ok("鐢熸垚鎷ｆ枡鍑哄簱浠诲姟鎴愬姛");
+
+ return R.ok("鐢熸垚鎷ｆ枡鍥炲簱浠诲姟鎴愬姛");
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
--
Gitblit v1.9.1