#出入库统计计数

zjj

2025-02-20 b08837ad4e64348a27e21b2bb621352a523e2b7b

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

@@ -418,13 +418,13 @@
                            locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
                                    .eq("loc_no", shallowLoc).eq("loc_sts", "F").eq("whs_type",rowLastnoType.getType().longValue()));
                            if (!Cools.isEmpty(locMast2)) {
                                locMast = locMast2;
                                locMast = locMast1;
                                break;
                            } else {
                                locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
                                        .eq("loc_no", shallowLoc).eq("loc_sts", "D").eq("whs_type",rowLastnoType.getType().longValue()));
                                if (!Cools.isEmpty(locMast2)) {
                                    locMast = locMast2;
                                    locMast = locMast1;
                                    break;
                                }
                            }
@@ -621,7 +621,7 @@
        if (Cools.isEmpty(locMast) && crnNo != 0) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("bay1", nearRow)
                    .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
                    .in("loc_sts", "O","X").eq("whs_type",rowLastnoType.getType().longValue())
                    .eq("crn_no",7)
                    .eq("loc_type1",locTypeDto.getLocType1())
                    .orderBy("lev1",true).orderBy("row1",false));//最浅库位