From a7c9e410db03f9ffd6eb8ccda9b295844302fe32 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 25 七月 2024 16:08:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasJarMastController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarMastController.java b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
index e98531a..6576d7e 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
@@ -45,14 +45,20 @@
JarMastTableVo jarMastTableVo = new JarMastTableVo();
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 (wrkDetls.isEmpty()){
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetls.add(wrkDetl);
+ }
if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
return R.error("鏈煡璇㈠埌浠诲姟鏁版嵁");
}
jarMastTableVo.setJarId(jarMast.getJarId());
jarMastTableVo.setJarWrkNo(jarMast.getWrkNo().toString());
jarMastTableVo.setStatus(jarMast.getStatus());
+ jarMastTableVo.setStatus$(jarMast.getStatus$());
jarMastTableVo.setMatnr(wrkDetls.get(0).getMatnr());
jarMastTableVo.setMaktx(wrkDetls.get(0).getMaktx());
+ jarMastTableVo.setWeight(wrkDetls.get(0).getWeight());
jarMastTableVos.add(jarMastTableVo);
}
return R.ok(jarMastTableVos);
--
Gitblit v1.9.1