From 67cbba6a2fcba931216ea3cb6d0080f8db10dab7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 19 八月 2024 17:05:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 8 ++++----
src/main/java/com/zy/asrs/entity/result/ZphjcdgzVo.java | 3 +++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/result/ZphjcdgzVo.java b/src/main/java/com/zy/asrs/entity/result/ZphjcdgzVo.java
index b9ab790..f2a0f72 100644
--- a/src/main/java/com/zy/asrs/entity/result/ZphjcdgzVo.java
+++ b/src/main/java/com/zy/asrs/entity/result/ZphjcdgzVo.java
@@ -12,6 +12,9 @@
private Integer workNo; // 宸ヤ綔鍙�
+ // 鏈ㄧ绫诲瀷
+ private String boxType;
+
private String position; // 瑕佹媶鐨勪綅缃�,宸︽垨鍙�
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 0d76faa..c3f4301 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1576,13 +1576,13 @@
// 鏌ヨ瑕佹媶鐨勪綅缃紝鍙湁涓�涓�
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- List<String> collect = wrkDetls.stream().map(WrkDetl::getOrigin).distinct().collect(Collectors.toList());
- String position = collect.get(0);
+ WrkDetl wrkDetl = wrkDetls.get(0);
// 杩斿洖鎷嗗灈瑙勫垯
ZphjcdgzVo zphjcdgzVo = new ZphjcdgzVo();
- zphjcdgzVo.setWorkNo(wrkMast.getWrkNo());
- zphjcdgzVo.setPosition(position);
+ zphjcdgzVo.setWorkNo(wrkDetl.getWrkNo());
+ zphjcdgzVo.setBoxType(wrkDetl.getColor());
+ zphjcdgzVo.setPosition(wrkDetl.getOrigin());
return R.ok(zphjcdgzVo);
}
--
Gitblit v1.9.1