*

lsh

2025-05-29 d9eeceed86c1ce43c73dda00a108595a078a8f3d

 src/main/java/com/zy/asrs/controller/BasJarMastController.java

@@ -36,7 +36,7 @@
    @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("未查询到信息");
        }
@@ -51,7 +51,8 @@
                wrkDetls.add(wrkDetl);
            }
            if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
                return R.error("未查询到任务数据");
//                return R.error("未查询到任务数据");
                continue;
            }

            jarMastTableVo.setId(++idSign);