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

zhangc

2024-12-23 dcc9b7294a7f47c00445d2b8dec0097b6b3b0e5e

 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java

@@ -507,6 +507,9 @@
            case 30:
                br = 3;
                break;
            case 31:
                br = 6;
                break;
            case 40:
                br = 5;
                break;
@@ -525,7 +528,9 @@
            locType = 2;
        } else if (containerType == 30) {
            locType = 3;
        } else {
        }  else if (containerType == 31) {
            locType = 6;
        }else {
            locType = agvBasDevp.getLocType1();
        }