From b71744d0f1da771a4c8817b1ec2069ec7bb06a93 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 11 六月 2024 16:56:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasJarMastController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarMastController.java b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
index bb8f517..e98531a 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
@@ -41,11 +41,20 @@
return R.error("鏈煡璇㈠埌淇℃伅");
}
ArrayList<JarMastTableVo> jarMastTableVos = new ArrayList<>();
- jarMasts.forEach(jarMast -> {
+ for (BasJarMast jarMast : jarMasts) {
JarMastTableVo jarMastTableVo = new JarMastTableVo();
- wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()));
- wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", jarMast.getWrkNo()));
- });
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()));
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", jarMast.getWrkNo()));
+ if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
+ return R.error("鏈煡璇㈠埌浠诲姟鏁版嵁");
+ }
+ jarMastTableVo.setJarId(jarMast.getJarId());
+ jarMastTableVo.setJarWrkNo(jarMast.getWrkNo().toString());
+ jarMastTableVo.setStatus(jarMast.getStatus());
+ jarMastTableVo.setMatnr(wrkDetls.get(0).getMatnr());
+ jarMastTableVo.setMaktx(wrkDetls.get(0).getMaktx());
+ jarMastTableVos.add(jarMastTableVo);
+ }
return R.ok(jarMastTableVos);
}
--
Gitblit v1.9.1