#

lsh

2024-07-10 3120580b039b57fd788b826dc1764aa7967d4392

#

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

@@ -273,10 +273,15 @@

        // 靠近摆放规则 --- 空托 //互通版
        if (staDescId == 10  && Utils.BooleanWhsTypeStaIoType(whsType)) {
            System.out.println("123whsType:"+whsType+"locMast:"+locMast);

            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
            if (locMasts.size() > 0) {
                System.out.println("234whsType:"+whsType+"locMast:"+locMast);


                for (LocMast loc : locMasts) {
                    if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
                    if (!Utils.isDeepLoc(slaveProperties, loc.getLocNo())) {
                        continue;
                    }
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
@@ -285,6 +290,8 @@
                    if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
                        if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
                            if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
                                System.out.println("345whsType:"+whsType+"locMast:"+locMast);

                                locMast = shallowLoc;
                                crnNo = locMast.getCrnNo();
                                break;
@@ -335,14 +342,12 @@
                    .eq("row1", nearRow)
                    .eq("loc_sts", "O")
                    .orderBy("inv_wh",false).orderBy("lev1",true).orderBy("bay1",true));
            System.out.println("00000000000000000000whsType:"+whsType);

            for (LocMast locMast1 : locMasts) {
                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                    continue;
                }
                if (Utils.BooleanWhsTypeStaIoType(whsType)){
                    System.out.println("111111111111111whsType:"+whsType);
                    String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
                    LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
                            .eq("loc_no", shallowLoc).eq("loc_sts", "O"));
@@ -351,7 +356,6 @@
                        break;
                    }
                } else {
                    System.out.println("22222222222222222222whsType:"+whsType);
                    if (!Cools.isEmpty(locMast1)) {
                        locMast = locMast1;
                        break;