添加工厂判断逻辑及优化库位查找

zhangc

2024-12-25 aa3476e8ff45d168f0bb9376ed3a114610a65f12

 src/main/java/com/zy/asrs/controller/AgvOpenController.java

@@ -28,6 +28,7 @@
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Date;
import java.util.EnumSet;
import java.util.Map;

@@ -182,6 +183,7 @@
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                agvWrkMast.setWrkSts(206L);
            }
            agvWrkMast.setModiTime(new Date());
            agvWrkMastService.updateById(agvWrkMast);
        }
    },
@@ -193,6 +195,7 @@
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
            //修改AGV工作档的工作状态为203.任务开始
            agvWrkMast.setWrkSts(203L);
            agvWrkMast.setModiTime(new Date());
            agvWrkMastService.updateById(agvWrkMast);
        }
    },
@@ -203,11 +206,22 @@
        @Transactional
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

            //入库任务 || 拣料入库任务 ||盘点再入库 ||空板入库
            if(agvWrkMast.getIoType() == 1 || agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57 || agvWrkMast.getIoType() == 10){
                //修改源站点状态为O.空，以及解绑托盘条码
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",null);
            switch(agvWrkMast.getIoType()) {
                //入库任务
                case 1:
                // 空板入库
                case 10:
                // 拣料入库任务
                case 53:
                // 盘点再入库
                case 57:
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",null);
                    break;
            }
            //if(agvWrkMast.getIoType() == 1 || agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57 || agvWrkMast.getIoType() == 10){
            //    //修改源站点状态为O.空，以及解绑托盘条码
            //    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",null);
            //}

            //修改AGV工作档的工作状态为203.RCS放货中
            agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204);