From 0dc90999cbac38a3afb55ab7b9f3578a6f0d58ce Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 07 二月 2024 09:24:53 +0800
Subject: [PATCH] 输送线改造
---
src/main/java/com/zy/common/web/WcsController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 4d4f5f2..a365ddb 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -65,6 +65,8 @@
private WrkMastMapper wrkMastMapper;
@Autowired
private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private AgvWrkDetlService agvWrkDetlService;
// @Autowired
// private ErpService erpService;
@@ -680,12 +682,12 @@
//鏌ユ壘璇ュ鍣ㄧ殑宸ヤ綔妗�
AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
if(!Cools.isEmpty(agvWrkMast)){
- return R.ok(agvWrkMast);
+ return R.ok(agvWrkDetlService.selectByWrkNo(agvWrkMast.getWrkNo()));
}
//鏌ユ壘璇ュ鍣ㄧ殑鍏ュ簱閫氱煡妗�
- AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectByContainerCode(containerCode);
- if(!Cools.isEmpty(agvWaitPakin)){
- return R.ok(agvWaitPakin);
+ List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", containerCode));
+ if(!Cools.isEmpty(agvWaitPakinList)){
+ return R.ok(agvWaitPakinList);
}
return R.error("娌℃湁璇ュ鍣ㄧ殑鍑哄簱銆佹嫞鏂欍�佸叆搴撲俊鎭瓑");
--
Gitblit v1.9.1