From d60e84cbedb554555578f071de95c4a8049183db Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 13 六月 2025 15:16:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/BasJarMastController.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 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..45977ff 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
@@ -36,23 +36,33 @@
     @RequestMapping(value = "/basJarMast/JatId/auth")
     @ManagerAuth
     public R getJatIdList(@RequestParam Integer id){
-        List<BasJarMast> jarMasts = basJarMastService.selectList(new EntityWrapper<BasJarMast>().eq("jar_id", id));
+        List<BasJarMast> jarMasts = basJarMastService.selectList(new EntityWrapper<BasJarMast>().eq("jar_id", id).orderBy("jar_loc_digit",true));
         if (Cools.isEmpty(jarMasts)){
             return R.error("鏈煡璇㈠埌淇℃伅");
         }
         ArrayList<JarMastTableVo> jarMastTableVos = new ArrayList<>();
+        int idSign = 0;
         for (BasJarMast jarMast : jarMasts) {
             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 (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
-                return R.error("鏈煡璇㈠埌浠诲姟鏁版嵁");
+            if (wrkDetls.isEmpty()){
+                WrkDetl wrkDetl = new WrkDetl();
+                wrkDetls.add(wrkDetl);
             }
+            if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
+//                return R.error("鏈煡璇㈠埌浠诲姟鏁版嵁");
+                continue;
+            }
+
+            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