#

zjj

2024-11-18 d854b17b4133577fe3e41bdf33f5fc46bfb81fe4

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

@@ -92,19 +92,19 @@
                            locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                                    .eq("gro1", locMast.getGro1())
                                    .eq("crn_no", 7)
                                    .eq("lev1",locMast.getLocType1())
                                    .eq("loc_type1",locMast.getLocType1())
                                    .orderBy("bay1", false));
                        }else if (locMast.getBay1() >=4 && locMast.getBay1()<=12){
                            locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                                    .eq("gro1", locMast.getGro1())
                                    .eq("crn_no", 7)
                                    .eq("lev1",locMast.getLocType1())
                                    .eq("loc_type1",locMast.getLocType1())
                                    .orderBy("bay1", true));
                        }else {
                            locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                                    .eq("gro1", locMast.getGro1())
                                    .eq("crn_no", 7)
                                    .eq("lev1",locMast.getLocType1())
                                    .eq("loc_type1",locMast.getLocType1())
                                    .orderBy("bay1", false));
                        }
                        for (LocMast locMast1 : locMasts){
@@ -152,7 +152,7 @@
                            }
                            locDto.setStaNos(maps);
                            locDtos.add(locDto);
                            exist.add(locDetl.getLocNo());
//                            exist.add(locDetl.getLocNo());
                            // 剩余待出数量递减
                            issued = issued - locDetl.getAnfme();
                        }else {