测试环境暂时注释

zhangchao

2024-10-23 401da88caef79968c8c0b1cb15487c4a554761ec

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

@@ -284,6 +284,7 @@
            String locNo = agvWrkMast.getLocNo();
            agvWrkMast.setLocNo(agvWrkMast.getSourceLocNo());
            agvWrkMast.setSourceLocNo(locNo);
            agvWrkMast.setModiTime(new Date());
            agvWrkMast.setIoTime(now);
            agvWrkMast.setLogErrMemo("createWaitPainWrkMastStart");
            agvWrkMastService.updateById(agvWrkMast);
@@ -390,7 +391,19 @@
        //生成移库工作档
        AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId,getContainerTypeByloc(sourceLocNo));
        //生成工作党明细
        createWrkDetlReWrite(sourceLocDetl.getMatnr(),wrkMast.getWrkNo(),null,sourceLocDetl.getBatch(),sourceLocDetl.getAnfme(),sourceLocDetl.getZpallet(),now,userId,sourceLocDetl.getThreeCode(),sourceLocDetl.getDeadTime(),sourceLocDetl.getProcessSts());
        createWrkDetlReWrite(
                sourceLocDetl.getMatnr(),
                wrkMast.getWrkNo(),
                null,
                sourceLocDetl.getBatch(),
                sourceLocDetl.getAnfme(),
                sourceLocDetl.getZpallet(),
                now,
                userId,
                sourceLocDetl.getThreeCode(),
                sourceLocDetl.getDeadTime(),
                sourceLocDetl.getProcessSts()
        );
        //修改目标库位状态
        updateAgvLocMast(targetLocMast,"S");
        //修改原库位状态
@@ -533,6 +546,7 @@
        updateAgvLocMast(agvLocMast,"S");
        return agvLocMast.getLocNo();
    }

    /*
    空板出库
     */
@@ -842,9 +856,11 @@
                String targetLocNo = wrkMast.getLocNo();
                agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
                agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
                // 源库位 库位主档
                AgvLocMast sourceLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
                AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", targetLocNo));
                // 当前任务是跨层移库  且目标楼层是1楼的 回滚调拨单
                if (wrkMast.getIoType() == 12 && locMast.getFloor() == 1) {
                if (wrkMast.getIoType() == 12 && locMast.getFloor() == 1 && sourceLocMast.getFloor() != 1) {
                    List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
                    for (AgvLocDetl agvLocDetl : agvLocDetls) {
                        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvLocDetl.getThreeCode()).eq("matnr", agvLocDetl.getMatnr()).eq("order_no", "DB" + agvLocDetl.getOrderNo()));
@@ -932,7 +948,7 @@

            }

            if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType()!=111 && wrkMast.getIoType()!=108 && wrkMast.getIoType() != 12){
            if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType()!=111 && wrkMast.getIoType()!=108 && wrkMast.getIoType() != 12 && wrkMast.getIoType() != 11){
                //订单回滚
                //List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                List<AgvWrkDetl> agvWrkDetlList1 = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
@@ -1053,6 +1069,7 @@
        wrkDetl.setAppeTime(now);
        wrkDetl.setModiUser(userId);
        wrkDetl.setModiTime(now);

        wrkDetl.setThreeCode(csocode);
        wrkDetl.setDeadTime(isoseq);
        if (!agvWrkDetlService.insert(wrkDetl)) {
@@ -1115,7 +1132,6 @@
        wrkMast.setModiUser(userId);
        wrkMast.setModiTime(now);
        wrkMast.setLogErrMemo("createWaitPainWrkMastStart");

        if (!agvWrkMastService.insertByIncrease(wrkMast)) {
            throw new CoolException("保存工作档失败");
        }
@@ -1200,9 +1216,11 @@
        }
        if (wrkMast.getIoType() == 108) {
            wrkMast.setIoType(111);
            wrkMast.setModiTime(new Date());
            agvWrkMastService.update(wrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo));
        } else if(wrkMast.getIoType() == 111) {
            wrkMast.setIoType(108);
            wrkMast.setModiTime(new Date());
            agvWrkMastService.update(wrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo));
        }

@@ -1226,4 +1244,4 @@

    }

}
}