自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhangchao
2024-11-08 11909a2bb1d898f4824c03172fb040852830770f 
 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java


@@ -361,7 +361,12 @@


            List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));


            for (AgvWrkDetl agvWrkDetl : agvWrkDetlList) {


                agvWrkDetl.setIoTime(now);


                agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));


                boolean bl = agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>()


                        .eq("wrk_no", agvWrkDetl.getWrkNo())


                        .eq("matnr",agvWrkDetl.getMatnr())


                        .eq("order_no",agvWrkDetl.getOrderNo())


                        .eq("three_code",agvWrkDetl.getThreeCode()));


//                        .eq("dead_time",agvWrkDetl.getDeadTime()));


            }


            AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());


            //List<AgvLocDetl> agvLocDetlList = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvLocMast.getLocNo()));


@@ -586,34 +591,6 @@


            long flowId = snowflakeIdWorker.nextId();


            agvWaitPakinList.forEach(wp -> {


                createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime(),wp.getProcessSts());


                // 流水 -- 新增订单明细


                OrderDetl orderDetl = orderDetlService.selectItem(wp.getOrderNo(), wp.getMatnr(), wp.getThreeCode());


//                FlowLog flowLog = new FlowLog();


//                flowLog.setFid(String.valueOf(flowId));


//                flowLog.setSpare2(wrkMast.getWrkNo().toString());


//                flowLog.setLocNo(locNo);


//                flowLog.setSpare1(containerCode);


//                flowLog.setOpType(3L);


//                flowLog.setOrderNo(wp.getOrderNo());


//                flowLog.setThreeCode(wp.getThreeCode());


//                flowLog.setMatnr(wp.getMatnr());


//                flowLog.setMaktx(wp.getMaktx());


//                flowLog.setOrderPrevious(orderDetl.getAnfme());


//                flowLog.setOrderCurrent(orderDetl.getAnfme());


//                flowLog.setOrderChanged(0.0);


//                flowLog.setQtyPrevious(orderDetl.getQty()-wp.getAnfme());


//                flowLog.setQtyCurrent(orderDetl.getQty());


//                flowLog.setQtyChanged(wp.getAnfme());


//


//                flowLog.setLocPrevious(0.0D);


//                flowLog.setLocCurrent(wp.getAnfme());


//                flowLog.setLocChanged(wp.getAnfme());


//


//                flowLog.setUserId(userId);


//                flowLog.setAppeTime(now);


//                if (!flowLogService.insert(flowLog)) {


//                    throw new CoolException("同步半成品调拨单流水记录失败");


//                }


            });


            //修改入库通知档状态


            agvWaitPakinService.updateIoStatus(containerCode,"Y");


@@ -712,6 +689,7 @@


                        adjDetl.setLocNo(locDetl.getLocNo());


                        adjDetl.setMatnr(locDetl.getMatnr());


                        adjDetl.setBatch(locDetl.getBatch());


                        adjDetl.setMaktx(locDetl.getMaktx());


                        adjDetl.setOriQty(locDetl.getAnfme());


                        adjDetl.setAdjQty(adjust.getCount());


                        adjDetl.setModiTime(now);


@@ -743,6 +721,7 @@


            adjDetl.setLocNo(locDetl.getLocNo());


            adjDetl.setMatnr(locDetl.getMatnr());


            adjDetl.setBatch(locDetl.getBatch());


            adjDetl.setMaktx(locDetl.getMaktx());


            adjDetl.setOriQty(locDetl.getAnfme());


            adjDetl.setAdjQty(0.0D);


            adjDetl.setModiTime(now);


@@ -779,6 +758,7 @@


            adjDetl.setLocNo(locMast.getLocNo());


            adjDetl.setMatnr(adjust.getMatnr());


            adjDetl.setBatch(adjust.getBatch());


            adjDetl.setMaktx(locDetl.getMaktx());


            adjDetl.setOriQty(0.0D);


            adjDetl.setAdjQty(adjust.getCount());


            adjDetl.setModiTime(now);


@@ -1031,15 +1011,15 @@


                String locNo = wrkMast.getSourceLocNo();


                // 目标库位


                String targetLocNo = wrkMast.getLocNo();


                agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo),"",(short)0);


                agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo), "", (short) 0);


                if (wrkMast.getIoType() == 108) {


                    if (wrkMast.getWrkSts() != 22) {


                        agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);


                        agvLocMastService.updateLocStsByLocNo(targetLocNo, "O", "", null);


                    }


                } else {


                    if (wrkMast.getWrkSts() != 207L && wrkMast.getWrkSts() != 205L) {


                        if (wrkMast.getWrkSts() != 22) {


                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo,"O","",wrkMast.getWhsType().shortValue());


                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo, "O", "", wrkMast.getWhsType().shortValue());


                        }


                    } else {


                        throw new CoolException("当前作业不能取消！");


@@ -1051,10 +1031,10 @@


                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 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());


                    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());


                    }


//                    FlowLog flowLog = new FlowLog();


//                    flowLog.setFid(String.valueOf(flowId));


@@ -1083,6 +1063,27 @@


//                    if (!flowLogService.insert(flowLog)) {


//                        throw new CoolException("同步半成品调拨单流水记录失败");


//                    }


                }




                // 回流单取消


            } else if (wrkMast.getIoType() == 114) {


                //源库位


                String locNo = wrkMast.getSourceLocNo();


                // 目标库位


                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楼的 回滚调拨单


                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("source", 17));


                    orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());


                    if (!orderDetlService.updateById(orderDetl)) {


                        throw new CoolException("更新订单明细失败");


                    }


                }


                //出库取消


            } else {


@@ -1127,7 +1128,7 @@




            }




            if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType()!=111 && wrkMast.getIoType()!=108 && wrkMast.getIoType() != 12 && wrkMast.getIoType() != 11){


            if(wrkMast.getIoType() != 114 && 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()));