From 1621b79516ac72b9933dd2ea950fe4e267d8a3a7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 05 十二月 2023 20:03:41 +0800
Subject: [PATCH] bug修复 1.四项库入库时找到在库库位 2.四项库订单出库时没有匹配容器码导致报错 3.四项库转历史档失败
---
src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java b/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java
index b74492f..7a29307 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java
@@ -10,10 +10,11 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvWaitPakin;
import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.AgvWaitPakinService;
-import com.zy.asrs.service.WaitPakinService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -29,6 +30,8 @@
@Autowired
private AgvWaitPakinService agvWaitPakinService;
+ @Autowired
+ private AgvBasDevpService agvBasDevpService;
@RequestMapping(value = "/waitPakin/{id}/auth")
@ManagerAuth
@@ -91,7 +94,13 @@
return R.error();
}
for (AgvWaitPakin entity : list){
- agvWaitPakinService.delete(new EntityWrapper<>(entity));
+ 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绔欑偣绠＄悊瑙ｇ粦璇ユ枡绠�");
+ }
+
}
return R.ok();
}
--
Gitblit v1.9.1