From 01e44ad191f1a9756640d0baec00987009281ecf Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 20 八月 2024 13:44:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
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 ac070a3..c3f4301 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1084,6 +1084,7 @@
for (Mat obj : list) {
WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(obj);
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setAnfme(1.0);
// 閲嶆柊瀹氫綅鏈ㄧ浣嶇疆
@@ -1098,7 +1099,6 @@
break;
}
}
- wrkDetl.sync(obj);
wrkDetl.setIoTime(now);
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
@@ -1180,6 +1180,22 @@
return R.parse("鏃犵墿鏂欐槑缁嗕俊鎭�");
}
List<String> collect = wrkDetls.stream().map(WrkDetl::getUnit).distinct().collect(Collectors.toList());
+ return R.ok(collect);
+ }
+
+ @Override
+ public R dd(TbParam param) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("barcode", param.getBarcode()));
+ if (wrkDetls.isEmpty()) {
+ return R.parse("鏃犵墿鏂欐槑缁嗕俊鎭�");
+ }
+ List<DdParam> collect = wrkDetls.stream().map(wrkDetl -> {
+ DdParam ddParam = new DdParam();
+ ddParam.setBoxPos(wrkDetl.getOrigin());
+ ddParam.setBoxType(wrkDetl.getColor());
+ return ddParam;
+ }).distinct().collect(Collectors.toList());
+
return R.ok(collect);
}
@@ -1560,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