From 984039880e1f6ccc4cb61c35e0004147aa46d5bc Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 21 九月 2024 11:20:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 2dd57fc..44c98f3 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.*;
@@ -167,6 +168,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())){
//鍏堝幓鍏ュ簱閫氱煡妗ｆ壘鏄庣粏
@@ -231,6 +235,7 @@
}
agvWrkMast.setWrkSts(206L);
+ agvWrkMast.setModiTime(new Date());
agvWrkMastService.updateById(agvWrkMast);
return R.ok("璐ф灦绂诲満鎴愬姛");
@@ -250,6 +255,7 @@
}
agvWrkMast.setWrkSts(208L);
+ agvWrkMast.setModiTime(new Date());
agvWrkMastService.updateById(agvWrkMast);
return R.ok("璐ф灦绂诲満鎴愬姛");
@@ -259,7 +265,7 @@
鎷ｆ枡/鐩樼偣鍏ュ簱
*/
@RequestMapping(value = "/basDevp/visualized/container/pickIn")
- @ManagerAuth(memo = "鍐嶆鎷ｆ枡")
+ @ManagerAuth(memo = "宸叉嫞鏂欏洖搴�")
public R visualiZedPickIn(@RequestBody Map<String,Object> map){
List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
String devNo = map.get("devNo").toString();
@@ -271,11 +277,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