From d9eeceed86c1ce43c73dda00a108595a078a8f3d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 29 五月 2025 18:44:53 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/BasJarMastLogController.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarMastLogController.java b/src/main/java/com/zy/asrs/controller/BasJarMastLogController.java
index f43400f..cba3e67 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarMastLogController.java
@@ -41,6 +41,7 @@
return R.error("鏈煡璇㈠埌淇℃伅");
}
ArrayList<JarMastTableVo> jarMastTableVos = new ArrayList<>();
+ int idSign = 0;
for (BasJarMastLog jarMast : jarMasts) {
JarMastTableVo jarMastTableVo = new JarMastTableVo();
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()).eq("io_time",jarMast.getIoTime()));
@@ -69,11 +70,14 @@
if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
return R.error("鏈煡璇㈠埌浠诲姟鏁版嵁");
}
+ jarMastTableVo.setId(++idSign);
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