From 97e045fb1271016af2777580b980f974977909f3 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 17 五月 2024 09:58:20 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs
---
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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..e8b9a8e 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -34,6 +34,8 @@
AgvWaitPakinService agvWaitPakinService;
@Autowired
AgvWorkService agvWorkService;
+ @Autowired
+ AgvLocDetlService agvLocDetlService;
@RequestMapping(value = "/basDevp/list/auth")
@ManagerAuth
@@ -177,6 +179,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()));
--
Gitblit v1.9.1