From 15b6a3e0d236ade3d4bd69f3b6ca9e4e420e455c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 20 一月 2025 15:17:34 +0800
Subject: [PATCH] 标记agvLocMove方法为Deprecated
---
src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java b/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java
index bc9d49e..5be7616 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java
@@ -11,6 +11,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvWaitPakin;
import com.zy.asrs.entity.OrderDetl;
@@ -20,6 +21,7 @@
import com.zy.asrs.service.OrderDetlService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -85,7 +87,7 @@
@ManagerAuth
public R update(AgvWaitPakin waitPakin){
if (Cools.isEmpty(waitPakin)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
agvWaitPakinService.updateById(waitPakin);
return R.ok();
@@ -93,18 +95,27 @@
@RequestMapping(value = "/waitPakin/delete/auth")
@ManagerAuth
+ @Transactional
public R delete(@RequestParam String param){
List<AgvWaitPakin> list = JSONArray.parseArray(param, AgvWaitPakin.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
for (AgvWaitPakin entity : list){
AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("barcode", entity.getSuppCode()));
- if(Cools.isEmpty(agvBasDevp)){
- agvWaitPakinService.delete(new EntityWrapper<>(entity));
- }else {
- return R.error("鏂欑鐮佷负" + entity.getSuppCode() + "宸茬粦瀹氱珯鐐癸紝璇峰厛浠嶢GV绔欑偣绠＄悊瑙ｇ粦璇ユ枡绠�");
+
+ if(!Cools.isEmpty(agvBasDevp)){
+ if(!Cools.eq("F",agvBasDevp.getLocSts())){
+ throw new CoolException("璇ュ叆搴撻�氱煡妗ｅ凡缁忓湪浣滀笟涓紝鏃犳硶鍒犻櫎");
+ }
+ //瑙ｇ粦绔欑偣
+ agvBasDevp.setLocSts("O");
+ agvBasDevp.setBarcode("");
+ agvBasDevp.setLocType2(null);
+ agvBasDevpService.update(agvBasDevp,new EntityWrapper<AgvBasDevp>().eq("dev_no",agvBasDevp.getDevNo()));
}
+ agvWaitPakinService.delete(new EntityWrapper<>(entity));
+
//璁㈠崟鍥炴粴
if(!Cools.isEmpty(entity.getOrderNo())){
String orderNo = entity.getOrderNo();
--
Gitblit v1.9.1