Merge branch 'refs/heads/phyzwms2' into phyzasrs-erp

ZY

2024-10-29 34e0894214280018ac9de1bd0f8fe1ce5cd5a97f

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

@@ -67,6 +67,7 @@
        //判断要修改的工作档状态是否合理，如果不合理则抛出异常
        checkWrkSts(agvWrkMast,wrkSts);
        agvWrkMast.setWrkSts(wrkSts);
        agvWrkMast.setModiTime(new Date());
        this.updateById(agvWrkMast);
    }

@@ -108,6 +109,8 @@
        AgvLocMast locMast = agvCommonService.getLocNo(basDevp.getLocType1(),basDevp.getFloor(),false,true);
        agvWrkMast.setLocNo(locMast.getLocNo());
        agvWrkMast.setWrkSts(201L);
        agvWrkMast.setLogErrMemo("startAllcationIn");
        agvWrkMast.setModiTime(new Date());
        agvWrkMastService.updateById(agvWrkMast);
        // 更目标库位
        locMast.setLocSts("S");