#修复目标站显示错误问题

Junjie

2024-08-24 ece092e4c5d4e968b424421c6f78b065bbb0bd73

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

@@ -73,8 +73,7 @@
    入库
     */
    @Transactional
    @Synchronized
    public StartupDto createWaitPainWrkMastStart(List<AgvBasDevp> agvBasDevpList, Long userId, boolean isConveyor) {
    public synchronized StartupDto createWaitPainWrkMastStart(List<AgvBasDevp> agvBasDevpList, Long userId, boolean isConveyor) {

        Date now = new Date();

@@ -407,6 +406,7 @@
                        adjDetl.setBatch(locDetl.getBatch());
                        adjDetl.setOriQty(locDetl.getAnfme());
                        adjDetl.setAdjQty(adjust.getCount());
                        adjDetl.setMemo(locDetl.getSuppCode());
                        adjDetl.setModiTime(now);
                        adjDetl.setModiUser(userId);
                        adjDetl.setAppeTime(now);
@@ -536,11 +536,13 @@
        }
        //拣料入库 盘点入库不可取消
        if(wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57){
            throw new CoolException("当前任务不可取消");
            if (userId != 9527) {
                throw new CoolException("当前任务不可取消");
            }
        }

        //入库取消
        if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10){
        if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57){
            //源站点
            String devNo = wrkMast.getSourceLocNo();
            //目标库位
@@ -603,6 +605,9 @@
        if (Cools.isEmpty(agvWrkMast)){
            throw new CoolException(workNo+"工作档不存在");
        }
        if (agvWrkMast.getIoType() == 1 || agvWrkMast.getIoType() == 53){
            throw new CoolException(workNo+"入库任务无法转出库");
        }

        agvWrkMast.setIoType(101);
        agvWrkMast.setWrkSts(206L);