# 操作日志

whycq

2024-05-29 b8f320c817c486c33613ca196ceab7c8fd354bae

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

@@ -561,7 +561,9 @@
//            throw new CoolException("目标库位或者源库位暂未分配，无法取消");
//        }
        //修改AGV工作档的工作状态为205.工作完成
        agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205);
        //agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205);

        agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"手动完成",userId);

        //出库任务 101.出库 || 103.拣料出库 || 107.盘点出库
        if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 111){
@@ -597,7 +599,30 @@
            //目标库位
            String locNo = wrkMast.getLocNo();
            agvLocMastService.updateLocStsByLocNo(locNo,"O","",null);
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
            if (wrkMast.getIoType() == 58) {
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
            } else {
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",wrkMast.getWhsType().shortValue());
            }

            if (wrkMast.getIoType() == 1) {
                List<AgvWaitPakin> agvWaitPakins = agvWaitPakinService.selectByContainerCode2(wrkMast.getBarcode());

                for (AgvWaitPakin agvWaitPakin : agvWaitPakins) {
                    // 回滚入库订单
                    OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvWaitPakin.getThreeCode()).eq("matnr", agvWaitPakin.getMatnr()).eq("order_no", agvWaitPakin.getOrderNo()));
                    orderDetl.setQty(orderDetl.getQty() - agvWaitPakin.getAnfme());
                    if (!orderDetlService.updateById(orderDetl)) {
                        throw new CoolException("订单回滚失败");
                    }
                    // 删除组托档
                    if (!agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",agvWaitPakin.getSuppCode()).eq("matnr",agvWaitPakin.getMatnr()).eq("three_code",agvWaitPakin.getThreeCode()))) {
                        throw new CoolException("入库通知档取消失败");
                    }
                }


            }


            // 移库取消
@@ -609,6 +634,18 @@
            String targetLocNo = wrkMast.getLocNo();
            agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
            agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
            AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", targetLocNo));
            // 当前任务是跨层移库  且目标楼层是1楼的 回滚调拨单
            if (wrkMast.getIoType() == 12 && locMast.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()));
                    orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
                    if (!orderDetlService.updateById(orderDetl)) {
                        throw new CoolException("保存工作明细失败");
                    }
                }
            }
            // 自动调拨出库取消
        } else if(wrkMast.getIoType() == 108 || wrkMast.getIoType() == 111) {
            // 源库位
@@ -646,10 +683,19 @@
            } else {
                agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
            }
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
            if (wrkMast.getIoType() == 109){
                if (Cools.isEmpty(wrkMast.getLocNo())) {

                } else {
                    agvLocMastService.updateLocStsByLocNo(devNo,"O","",(short)getContainerTypeByloc(devNo));
                }

            }else {
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
            }
        }

        if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10){
        if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType()!=111 && wrkMast.getIoType()!=108 && wrkMast.getIoType() != 12){
            //订单回滚
            //List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
            List<AgvWrkDetl> agvWrkDetlList1 = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
@@ -674,11 +720,21 @@
                }
            });
        }
        wrkMast.setModiUser(userId);
        wrkMast.setModiTime(new Date());
        if (type == 2) {
            wrkMast.setManuType("手动取消（agv）");
        } else {
            wrkMast.setManuType("手动取消");
        }


        //保存工作档以及明细
        agvWrkMastLogService.save(wrkMast);
        agvWrkDetlLogService.save(wrkMast.getWrkNo());



        //删除工作档以及明细
        if(!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) || !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())){
            throw new CoolException("删除失败，请联系管理员");