From d40170ddacd861d4e003ec69f7a87ea1431be4cd Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 13 一月 2025 15:54:42 +0800
Subject: [PATCH] 优化定时任务，添加自动接单（未完成，逻辑还不清楚），调整环境配置
---
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 20 +++++++++++++++++---
1 files changed, 17 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 c1a6a5c..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.*;
@@ -83,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());
@@ -96,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));
@@ -108,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("褰撳墠绔欑偣璐т綅鐘舵�佷笉涓哄湪搴擄紝鏃犳硶瑙ｉ櫎缁戝畾");
@@ -167,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())){
//鍏堝幓鍏ュ簱閫氱煡妗ｆ壘鏄庣粏
@@ -226,11 +232,15 @@
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.鍑哄簱锛屾棤娉曟墽琛岃揣鏋剁鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
}
agvWrkMast.setWrkSts(206L);
+ agvWrkMast.setModiTime(new Date());
agvWrkMastService.updateById(agvWrkMast);
return R.ok("璐ф灦绂诲満鎴愬姛");
@@ -245,11 +255,15 @@
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.鍑哄簱锛屾棤娉曟墽琛岃揣鏋剁鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
}
agvWrkMast.setWrkSts(208L);
+ agvWrkMast.setModiTime(new Date());
agvWrkMastService.updateById(agvWrkMast);
return R.ok("璐ф灦绂诲満鎴愬姛");
--
Gitblit v1.9.1