#

whycq

2024-05-09 a054ae4d0cb2c8749fd8d440556ad762e8ea02ec

#

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

@@ -192,6 +192,9 @@

        wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);

        if (threeCode.substring(0,2).equals(30)) {
            wrapper.isNull("specs").or().eq("specs","");
        }
        List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);

        for (AgvLocDetl agvLocDetl : agvLocDetls) {

 src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java

@@ -43,7 +43,7 @@
    /*
    定时处理AGV工作档中工作状态为205.工作完成 且 （1.入库 || 53，拣料入库 || 57.盘点入库 || 10.空板入库 || 11.库格移载)的数据
     */
    @Scheduled(cron = "0/10 * * * * ? ")
    @Scheduled(cron = "0/1 * * * * ? ")
    public void excutePutwayWrk(){
        List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
                .eq("wrk_sts", 205)
@@ -51,7 +51,8 @@
                .or().eq("io_type",1)
                .or().eq("io_type",57)
                .or().eq("io_type",10)
                .or().eq("io_type",11));
                .or().eq("io_type",11)
                .or().eq("io_type",108));
        if(!Cools.isEmpty(agvWrkMastList)){
            agvWrkMastList.stream().forEach(agvWrkMast -> {
                agvWrkMastHandler.completedPutWayWrk(agvWrkMast);
@@ -62,7 +63,7 @@
    /*
    定时处理AGV工作档中工作状态为206.出库完成 且 (101.出库 || 110.空板出库)
     */
    @Scheduled(cron = "0/10 * * * * ? ")
    @Scheduled(cron = "0/1 * * * * ? ")
    public void excuteCarryWrk(){
        List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
                .eq("wrk_sts", 206)
@@ -78,7 +79,7 @@
    /*
    定时处理AGV工作档中工作状态为206.出库完成 且 (101.出库 || 110.空板出库)
     */
    @Scheduled(cron = "0/10 * * * * ? ")
    @Scheduled(cron = "0/1 * * * * ? ")
    public void excuteCarryWrk2(){
        List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
                .eq("wrk_sts", 208)
@@ -96,7 +97,7 @@
    putaway：上架
    定时处理AGV工作档中工作状态为201.生成入库任务ID 且(出库类型为 53.拣料再入库 || 1.入库 || 10.空板入库栽 || 57.盘点再入库)的数据
     */
    @Scheduled(cron = "0/10 * * * * ? ")
    @Scheduled(cron = "0/2 * * * * ? ")
    public void startPutwayWrk(){
        List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
                ,new EntityWrapper<AgvWrkMast>()

 src/main/java/com/zy/asrs/task/WorkMastScheduler.java

@@ -26,7 +26,7 @@
    @Autowired
    private WorkMastHandler workMastHandler;

    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0/1 * * * * ? ")
    private void execute(){
        List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
        if (wrkMasts.isEmpty()) {

 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java

@@ -93,6 +93,14 @@
            agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
        }

        //类型为调拨库位移转时
        if(agvWrkMast.getIoType() == 108){
            //更新库存明细
            agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
            //修改源库位状态为O
            agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
        }

        //删除AGV工作档
        agvWrkMastService.deleteById(wrkNo);
        //删除AGV工作明细档

 src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java

@@ -88,6 +88,7 @@
            AgvWrkDetl wrkDetl = new AgvWrkDetl();
            wrkDetl.setWrkNo(mast1.getWrkNo());
            wrkDetl.sync(agvLocDetl);
            wrkDetl.setSpecs("1-" + agvLocMast.getLocType3());
            wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
            wrkDetl.setIoTime(now);
            wrkDetl.setAppeUser(9527L);