From 5acf37ca213a7012d8fea2854c6c32203ef21b5e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 07 二月 2024 18:35:17 +0800
Subject: [PATCH] agv电视机输送线显示
---
src/main/java/com/zy/common/web/WcsController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 45f3aff..29030c7 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -689,7 +689,7 @@
if(!Cools.isEmpty(agvWrkMast)){
List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
- for (AgvWrkDetl agvWrkDetl : AgvWrkDetlList){
+ for (AgvWrkDetl agvWrkDetl : agvWrkDetlList){
agvWrkDetl.setVolume(agvWrkDetl.getAnfme());
if(agvWrkMast.getIoType() == 103){
//瀵绘壘鏄惁鏈夌浉鍚岀墿鏂欑殑宸ヤ綔妗ｆ槑缁嗭紝骞惰繑鍥炴暟閲忎箣鍜�
@@ -708,16 +708,16 @@
}
};
-
- return R.ok(agvWrkDetlList).add(agvWrkMast);
+ agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
+ agvBasDevpDto.setAgvWrkMast(agvWrkMast);
}
//鏌ユ壘璇ュ鍣ㄧ殑鍏ュ簱閫氱煡妗�
List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", containerCode));
if(!Cools.isEmpty(agvWaitPakinList)){
- return R.ok(agvWaitPakinList);
+ agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
}
- return R.error("娌℃湁璇ュ鍣ㄧ殑鍑哄簱銆佹嫞鏂欍�佸叆搴撲俊鎭瓑");
+ return R.ok(agvBasDevpDto);
}
private double getAllAnfmeInAgvWrkDetlList(List<AgvWrkDetl> agvWrkDetlList, AgvWrkDetl wd0) {
--
Gitblit v1.9.1