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


@@ -105,7 +105,7 @@


            //检索库位，选择合适的库位


            AgvLocMast agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1(),agvBasDevp.getFloor(),false,false);


            //生成工作档


            AgvWrkMast wrkMast = createWrkMast(1,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),agvBasDevp.getBarcode(),now,userId, agvBasDevp.getLocType2());


            AgvWrkMast wrkMast = createWrkMast(1,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),agvBasDevp.getBarcode(),now,userId, agvBasDevp.getLocType2(),agvLocMast.getPltType());


            //标记是否为输送线入库


            wrkMast.setMk(isConveyor ? "Y" : "N");


            //生成工作档明细


@@ -144,11 +144,11 @@


            //String barcode = agvLocDetls.get(0).getSuppCode();


            String containerCode = taskDto.getLocDtos().get(0).getContainerCode();






            AgvLocMast agvLocMast = agvLocMastService.selectById(sourceLocNo);


            //判断是否全板出库


            int ioType = isPakOut(sourceLocNo,taskDto) ?  101 : 103;


            //生成工作档


            AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)));


            AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)),agvLocMast.getPltType());


            //生成工作档明细


            long flowId = snowflakeIdWorker.nextId();


            taskDto.getLocDtos().forEach(locDto -> {


@@ -250,11 +250,11 @@


            //String barcode = agvLocDetls.get(0).getSuppCode();


            String containerCode = taskDto.getLocDtos().get(0).getContainerCode();






            AgvLocMast agvLocMast = agvLocMastService.selectById(sourceLocNo);


            //判断是否全板出库


            int ioType = 107;


            //生成工作档


            AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)));


            AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)),agvLocMast.getPltType());


            //生成工作档明细


            long flowId = snowflakeIdWorker.nextId();


            taskDto.getLocDtos().forEach(locDto -> {


@@ -353,12 +353,21 @@


            String locNo = agvWrkMast.getLocNo();


            agvWrkMast.setLocNo(agvWrkMast.getSourceLocNo());


            agvWrkMast.setSourceLocNo(locNo);


            agvWrkMast.setModiTime(new Date());


            agvWrkMast.setModiTime(now);


            agvWrkMast.setIoTime(now);


            agvWrkMast.setLogErrMemo("createWaitPainWrkMastStart");


            agvWrkMastService.updateById(agvWrkMast);




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


            for (AgvWrkDetl agvWrkDetl : agvWrkDetlList) {


                agvWrkDetl.setIoTime(now);


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


            AgvBasDevp agvBasDevp = agvBasDevpService.selectById(agvWrkMast.getSourceLocNo());


@@ -415,7 +424,7 @@


            int containerType = getContainerTypeByloc(taskDto.getLocNo());




            //生成工作档


            AgvWrkMast wrkMast = createWrkMast(107, 21L,taskDto.getLocNo(),taskDto.getAgvStaNo(),taskDto.getLocDtos().get(0).getContainerCode(),now,userId,containerType);


            AgvWrkMast wrkMast = createWrkMast(107, 21L,taskDto.getLocNo(),taskDto.getAgvStaNo(),taskDto.getLocDtos().get(0).getContainerCode(),now,userId,containerType,null);


            //生成工作档明细


            taskDto.getLocDtos().forEach(locDto -> {


                //明细档所需参数


@@ -458,7 +467,7 @@


        Date now = new Date();




        //生成移库工作档


        AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId,getContainerTypeByloc(sourceLocNo));


        AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId,getContainerTypeByloc(sourceLocNo),targetLocMast.getPltType());


        //生成工作党明细


        createWrkDetlReWrite(sourceLocDetl.getMatnr(),wrkMast.getWrkNo(),null,sourceLocDetl.getBatch(),sourceLocDetl.getAnfme(),sourceLocDetl.getZpallet(),now,userId,sourceLocDetl.getThreeCode(),sourceLocDetl.getDeadTime(),sourceLocDetl.getProcessSts());


        //修改目标库位状态


@@ -577,39 +586,11 @@


            String locNo = agvLocMast.getLocNo();




            //生成工作档


            AgvWrkMast wrkMast = createWrkMast(1,201L,devNo,locNo,containerCode,now,userId, containerType);


            AgvWrkMast wrkMast = createWrkMast(1,201L,devNo,locNo,containerCode,now,userId, containerType,agvLocMast.getPltType());


            //生成工作档明细


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


@@ -623,7 +604,7 @@


            }


            agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),true,true);


            // 生成工作档 10.空板入库


            createWrkMast(10,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),containerCode,now,userId,containerType);


            createWrkMast(10,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),containerCode,now,userId,containerType,agvLocMast.getPltType());


            //更新源站点状态


            updateAgvBasDevp(agvBasDevp,"R",containerType,containerCode);


        }


@@ -632,6 +613,7 @@


        updateAgvLocMast(agvLocMast,"S");


        return agvLocMast.getLocNo();


    }




    /*


    空板出库


     */


@@ -661,7 +643,7 @@


            throw new CoolException("暂无当前出库站点类型的空货架！");


        }


        //生成工作档


        createWrkMast(110,21L,agvLocMast.getLocNo(),agvBasDevp.getDevNo(),agvLocMast.getBarcode(),now,userId,containerType);


        createWrkMast(110,21L,agvLocMast.getLocNo(),agvBasDevp.getDevNo(),agvLocMast.getBarcode(),now,userId,containerType,agvLocMast.getPltType());




        //修改源库位状态


        updateAgvLocMast(agvLocMast,"R");


@@ -708,6 +690,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);


@@ -739,6 +722,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);


@@ -775,6 +759,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);


@@ -1027,15 +1012,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("当前作业不能取消！");


@@ -1047,10 +1032,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));


@@ -1079,6 +1064,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 {


@@ -1123,7 +1129,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()));


@@ -1244,6 +1250,7 @@


        wrkDetl.setAppeTime(now);


        wrkDetl.setModiUser(userId);


        wrkDetl.setModiTime(now);




        wrkDetl.setThreeCode(csocode);


        wrkDetl.setDeadTime(isoseq);


        if (!agvWrkDetlService.insert(wrkDetl)) {


@@ -1283,7 +1290,7 @@


    /*


    生成工作档


     */


    private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode,  Date now, Long userId, int containerType){


    private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode,  Date now, Long userId, int containerType,Integer pltType){


        AgvWrkMast wrkMast = new AgvWrkMast();


        //工作状态


        wrkMast.setWrkSts(wrkSts);


@@ -1305,6 +1312,7 @@


        wrkMast.setAppeTime(now);


        wrkMast.setModiUser(userId);


        wrkMast.setModiTime(now);


        wrkMast.setPltType(pltType);


        wrkMast.setLogErrMemo("createWaitPainWrkMastStart");




        if (!agvWrkMastService.insertByIncrease(wrkMast)) {


@@ -1419,4 +1427,4 @@




    }




}


}