#1

lsh

2024-05-31 d417e332b39e7da99f637e94ebacf199fb158a72

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

@@ -66,6 +66,8 @@
    private AgvWrkMastLogService agvWrkMastLogService;
    @Autowired
    private AgvWrkDetlLogService agvWrkDetlLogService;
    @Autowired
    private WrkMastExecuteService wrkMastExecuteService;


    /*
@@ -568,7 +570,23 @@
        //} else {
        //    agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"手动完成",userId);
        //}
        agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"手动完成",userId);

        if (wrkMast.getIoType()==121){
            if (wrkMast.getWrkSts()<12L){
                agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"手动完成",userId);
            }else if (wrkMast.getWrkSts()==12L){
                agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),12,"手动完成",userId);

                WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectOne(new EntityWrapper<WrkMastExecute>().eq("wrk_no", workNo));
                wrkMastExecute.setWrkSts(3L);
                wrkMastExecute.setNowPosition(3);
                wrkMastExecuteService.updateById(wrkMastExecute);
            }
            return;

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

        //出库任务 101.出库 || 103.拣料出库 || 107.盘点出库
        if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 111){
@@ -596,192 +614,228 @@
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException(workNo+"工作档不存在");
        }
        //拣料入库 盘点入库不可取消
        if(wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57){
            throw new CoolException("当前任务不可取消");
        }
        if (wrkMast.getIoType()==121){
            if (wrkMast.getWrkSts()<12L){
                //源库位
                String locNo = wrkMast.getSourceLocNo();

        //入库取消
        if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 58){
            //源站点
            String devNo = wrkMast.getSourceLocNo();
            //目标库位
            String locNo = wrkMast.getLocNo();
            agvLocMastService.updateLocStsByLocNo(locNo,"O","",null);
            if (wrkMast.getIoType() == 58) {
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
            } else {
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",wrkMast.getWhsType().shortValue());
            }
                // 目标库位
                String targetLocNo = wrkMast.getLocNo();
                agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
                agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);

            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("入库通知档取消失败");
                    }
                }


            }


            // 移库取消
        } else if( wrkMast.getIoType() == 11 || wrkMast.getIoType() == 12) {
            //源库位
            String locNo = wrkMast.getSourceLocNo();

            // 目标库位
            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 || wrkMast.getIoType() == 112) {
            if (wrkMast.getIoType() == 112) {
                throw new CoolException("当前作业不能取消！");
            }
            // 源库位
            String locNo = wrkMast.getSourceLocNo();
            // 目标库位
            String targetLocNo = wrkMast.getLocNo();
            agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo),"",(short)0);
            if (wrkMast.getIoType() == 108) {
                if (wrkMast.getWrkSts() != 22) {
                    agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
                }
            } else {
                if (wrkMast.getWrkSts() != 207L && wrkMast.getWrkSts() != 205L) {
                    if (wrkMast.getWrkSts() != 22) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo,"O","",wrkMast.getWhsType().shortValue());
                    }
                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("删除失败，请联系管理员");
                }

                if (type == 2) {
                    //调用agv取消任务接口
                    agvWrkMastService.callCancelTask(wrkMast.getWrkNo());
                }
            }else {
                throw new CoolException("当前任务正在执行，不可取消");
            }
        }else {
            //拣料入库 盘点入库不可取消
            if(wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57){
                throw new CoolException("当前任务不可取消");
            }

            //入库取消
            if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 58){
                //源站点
                String devNo = wrkMast.getSourceLocNo();
                //目标库位
                String locNo = wrkMast.getLocNo();
                agvLocMastService.updateLocStsByLocNo(locNo,"O","",null);
                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("入库通知档取消失败");
                        }
                    }


                }


                // 移库取消
            } else if( wrkMast.getIoType() == 11 || wrkMast.getIoType() == 12) {
                //源库位
                String locNo = wrkMast.getSourceLocNo();

                // 目标库位
                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 || wrkMast.getIoType() == 112) {
                if (wrkMast.getIoType() == 112) {
                    throw new CoolException("当前作业不能取消！");
                }


            }

            List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
            // 更新订单
            for (AgvLocDetl agvLocDetl : agvLocDetls) {
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
                orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                    throw new CoolException("修改订单明细失败，请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
                }
            }
            //出库取消
        } else {
            //源库位
            String locNo = wrkMast.getSourceLocNo();
            //目标站点
            String devNo = wrkMast.getLocNo();
            if (wrkMast.getIoType() == 110 || wrkMast.getIoType() == 109) {
                if (wrkMast.getIoType() == 109){
                    // 源库位是站点
                    if ("DB".equals(locNo.substring(0,2))) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
                        agvLocMastService.updateLocStsByLocNo(devNo,"O","",null);
                    // 源库位是库位 目标库位是站点
                    } else if ("DB".equals(devNo.substring(0,2))) {
                        agvLocMastService.updateLocStsByLocNo(locNo,"D",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"O","",null);
                    // 源库位是库位
                    } else {
                        agvLocMastService.updateLocStsByLocNo(locNo,"D",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
                        agvLocMastService.updateLocStsByLocNo(devNo,"O","",null);
                // 源库位
                String locNo = wrkMast.getSourceLocNo();
                // 目标库位
                String targetLocNo = wrkMast.getLocNo();
                agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo),"",(short)0);
                if (wrkMast.getIoType() == 108) {
                    if (wrkMast.getWrkSts() != 22) {
                        agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
                    }

                }else {
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
                }
            } else if (wrkMast.getIoType() == 113) {
                if (wrkMast.getWrkSts() == 212 || wrkMast.getWrkSts() == 213) {
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
                } else {
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
                    if (!Cools.isEmpty(devNo)) {
                        agvLocMastService.updateLocStsByLocNo(devNo,"0","",null);
                    if (wrkMast.getWrkSts() != 207L && wrkMast.getWrkSts() != 205L) {
                        if (wrkMast.getWrkSts() != 22) {
                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo,"O","",wrkMast.getWhsType().shortValue());
                        }
                    } else {
                        throw new CoolException("当前作业不能取消！");
                    }


                }

            } else  {
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
                agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
            }

        }

        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()));
            agvWrkDetlList1.forEach(agvWrkDetl -> {

                if(!Cools.isEmpty(agvWrkDetl.getOrderNo())){
                    String orderNo = agvWrkDetl.getOrderNo();
                    if(orderNo.contains("{")){
                        JSONArray orderArray = JSON.parseArray(orderNo);
                        for (Object o : orderArray){
                            JSONObject jsonobject = (JSONObject) o;
                            OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(jsonobject.get("orderNo").toString(),agvWrkDetl.getMatnr(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
                            orderDetl.setQty(orderDetl.getQty() - agvWrkDetl.getAnfme());
                            orderDetlService.updateById(orderDetl);
                List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
                // 更新订单
                for (AgvLocDetl agvLocDetl : agvLocDetls) {
                    OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
                    orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
                    if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                        throw new CoolException("修改订单明细失败，请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
                    }
                }
                //出库取消
            } else {
                //源库位
                String locNo = wrkMast.getSourceLocNo();
                //目标站点
                String devNo = wrkMast.getLocNo();
                if (wrkMast.getIoType() == 110 || wrkMast.getIoType() == 109) {
                    if (wrkMast.getIoType() == 109){
                        // 源库位是站点
                        if ("DB".equals(locNo.substring(0,2))) {
                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
                            agvLocMastService.updateLocStsByLocNo(devNo,"O","",null);
                            // 源库位是库位 目标库位是站点
                        } else if ("DB".equals(devNo.substring(0,2))) {
                            agvLocMastService.updateLocStsByLocNo(locNo,"D",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"O","",null);
                            // 源库位是库位
                        } else {
                            agvLocMastService.updateLocStsByLocNo(locNo,"D",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
                            agvLocMastService.updateLocStsByLocNo(devNo,"O","",null);
                        }

                    }else {
                        OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(agvWrkDetl.getOrderNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
                        orderDetl.setQty(orderDetl.getQty() - agvWrkDetl.getAnfme());
                        orderDetlService.updateById(orderDetl);
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
                    }
                } else if (wrkMast.getIoType() == 113) {
                    if (wrkMast.getWrkSts() == 212 || wrkMast.getWrkSts() == 213) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
                    } else {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
                        if (!Cools.isEmpty(devNo)) {
                            agvLocMastService.updateLocStsByLocNo(devNo,"0","",null);
                        }
                    }

                } else  {
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
                    agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
                }
            });

            }

            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()));
                agvWrkDetlList1.forEach(agvWrkDetl -> {

                    if(!Cools.isEmpty(agvWrkDetl.getOrderNo())){
                        String orderNo = agvWrkDetl.getOrderNo();
                        if(orderNo.contains("{")){
                            JSONArray orderArray = JSON.parseArray(orderNo);
                            for (Object o : orderArray){
                                JSONObject jsonobject = (JSONObject) o;
                                OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(jsonobject.get("orderNo").toString(),agvWrkDetl.getMatnr(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
                                orderDetl.setQty(orderDetl.getQty() - agvWrkDetl.getAnfme());
                                orderDetlService.updateById(orderDetl);
                            }

                        }else {
                            OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(agvWrkDetl.getOrderNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
                            orderDetl.setQty(orderDetl.getQty() - agvWrkDetl.getAnfme());
                            orderDetlService.updateById(orderDetl);
                        }
                    }
                });
            }
            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("删除失败，请联系管理员");
            }

            if (type == 2) {
                //调用agv取消任务接口
                agvWrkMastService.callCancelTask(wrkMast.getWrkNo());
            }
        }
        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("删除失败，请联系管理员");
        }

        if (type == 2) {
            //调用agv取消任务接口
            agvWrkMastService.callCancelTask(wrkMast.getWrkNo());
        }


    }

    /*