From 9c7e5bc10f242b71f3d94e2c700cb7de79feda17 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 25 二月 2025 08:45:14 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/BasJarMastController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarMastController.java b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
index 6576d7e..45977ff 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
@@ -36,11 +36,12 @@
@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()));
@@ -50,8 +51,11 @@
wrkDetls.add(wrkDetl);
}
if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
- return R.error("鏈煡璇㈠埌浠诲姟鏁版嵁");
+// return R.error("鏈煡璇㈠埌浠诲姟鏁版嵁");
+ continue;
}
+
+ jarMastTableVo.setId(++idSign);
jarMastTableVo.setJarId(jarMast.getJarId());
jarMastTableVo.setJarWrkNo(jarMast.getWrkNo().toString());
jarMastTableVo.setStatus(jarMast.getStatus());
--
Gitblit v1.9.1