Merge remote-tracking branch 'origin/phyzwms2' into phyzwms2

whycq

2024-06-28 52805a2308f901610e3c2e26ad2212138bca8070

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

@@ -225,7 +225,6 @@
        switch (agvWrkMast.getIoType()) {
            case 108:
            case 12:
            case 57:
                agvTaskCreateParam.setTaskTyp("F06");
                break;
            case 109:
@@ -236,14 +235,28 @@
                }
                break;
            case 1:
            case 57:
                // 入库任务是只有 接驳位 -- > 库位
                AgvLocMast loc = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvWrkMast.getLocNo()));
                String locSub = loc.getLocNo().substring(loc.getLocNo().length() - 4).substring(0, 2).substring(0, 2);
                AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo());
                if ("02".equals(locSub)) {
                    if (agvBasDevp.getFloor() == 4) {
                        agvTaskCreateParam.setTaskTyp("F01");
                    } else {
                        agvTaskCreateParam.setTaskTyp("F06");
                    }

                } else {
                    // 目标楼层位1楼 但源库位（接驳位）在吸塑二楼
                    if (agvBasDevp.getFloor() == 4) {
                    agvTaskCreateParam.setTaskTyp("F06");
                } else {
                    agvTaskCreateParam.setTaskTyp("F01");
                }


                }
                break;
            default:
                agvTaskCreateParam.setTaskTyp("F01");