Merge branch 'phyzasrs-erp' into phyzasrs-erp-4

zhangc

2024-12-23 dcc9b7294a7f47c00445d2b8dec0097b6b3b0e5e

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

@@ -114,7 +114,13 @@

        try{
            // 开始查找库位 ==============================>>
            locMast = getLocNoRule(type,floor,isEmpty,isCurrLev);
            //如果是半成品箱壳
            if (type == 6) {

            }else {
                //不动这个逻辑
                locMast = getLocNoRule(type,floor,isEmpty,isCurrLev);
            }
            if (locMast != null) {
                return locMast;
            }
@@ -238,7 +244,10 @@
        Boolean orderBy = false;
        int levCount = 0;
        int times = 1;
        if (floor == 1) {
        if (floor == 1 || floor >= 4) {
            if (floor >= 4 ) {
                floor = 1;
            }
            orderBy = true;
            levCount = 2;
        } else {
@@ -253,7 +262,11 @@
            if (isEmpty) {
                wrapper.eq("floor", floor).eq("lev1",1);
            } else {
                wrapper.eq("floor", floor).orderBy("lev1",!orderBy);
                if (isCurrLev) {
                    wrapper.eq("floor", floor).eq("lev1",1);
                } else {
                    wrapper.eq("floor", floor).orderBy("lev1",!orderBy);
                }
            }