#

zc

2025-05-17 3c340fd00f4979a2041bdebef741163eabd2b9cf

 src/main/java/com/zy/common/service/CommonService.java

@@ -887,14 +887,12 @@
                            .ge("bay1", 3).le("bay1", 6)
                            .eq("crn_no", 7)
                            .eq("loc_type1", locTypeDto.getLocType1())
                            .eq("lev1", locMastWrk.getLev1())
                            .orderBy("bay1", true));
                } else {
                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                            .eq("bay1", locMastWrk.getBay1())
                            .eq("crn_no", 7)
                            .eq("loc_type1", locTypeDto.getLocType1())
                            .eq("lev1", locMastWrk.getLev1())
                            .orderBy("bay1", false));
                }
                if (Cools.isEmpty(locMasts)) {
@@ -985,11 +983,11 @@
                        if (locMastGro1.getLocSts().equals("F")) {
                            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_No", locMastGro1.getLocNo()));
                            if (!locDetl.getMatnr().equals(matnr) || !locDetl.getBatch().equals(batch)) {
                                break;
                                continue;
                            }
                        }
                        if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R")) {
                            break;
                            continue;
                        }
                        if (locMastGro1.getLocSts().equals("O")) {
                            locMast = locMastGro1;