自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
whycq
2024-11-25 bcb19e8c93c3cabf0d8eb3ee34ed819b3c5a10ef 
 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java


@@ -4,6 +4,7 @@


import com.baomidou.mybatisplus.mapper.EntityWrapper;


import com.core.common.Cools;


import com.core.common.R;


import com.core.common.SnowflakeIdWorker;


import com.core.exception.CoolException;


import com.zy.asrs.entity.*;


import com.zy.asrs.service.*;


@@ -51,9 +52,17 @@


    private AgvBasDevpService agvBasDevpService;


    @Autowired


    private AgvWorkService agvWorkService;


    @Autowired


    private OrderDetlService orderDetlService;


    @Autowired


    private SnowflakeIdWorker snowflakeIdWorker;


    @Autowired


    private FlowLogService flowLogService;




    @Transactional


    public ReturnT<String> completedPutWayWrk(AgvWrkMast agvWrkMast) {


        long flowId = snowflakeIdWorker.nextId();


        Date now = new Date();


        try{


            int wrkNo = agvWrkMast.getWrkNo();


            String barcode = agvWrkMast.getBarcode();


@@ -66,6 +75,7 @@


            }






            agvWrkMast.setModiTime(new Date());


            //修改工作档状态为207.库存更新完成


            agvWrkMast.setWrkSts(207L);


            agvWrkMastService.updateById(agvWrkMast);


@@ -111,6 +121,34 @@


                        AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());


                        if (!Cools.isEmpty(agvLocDetl)) {


                            double updateAnfme = agvLocDetl.getAnfme() - agvWrkDetl.getAnfme();


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


//                            FlowLog flowLog = new FlowLog();


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


//                            flowLog.setSpare2(String.valueOf(agvWrkMast.getWrkNo()));


//                            flowLog.setLocNo(agvWrkMast.getLocNo());


//                            flowLog.setSpare1(agvWrkDetl.getSuppCode());


//                            flowLog.setOpType(53L);


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


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


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


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


//


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


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


//                            flowLog.setOrderChanged(0.0);


//


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


//                            flowLog.setQtyCurrent(updateAnfme);


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


//


//                            flowLog.setLocPrevious(agvLocDetl.getAnfme());


//                            flowLog.setLocCurrent(updateAnfme);


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


//


//                            flowLog.setAppeTime(now);


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


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


//                            }


                            agvLocDetlService.updateAnfme(updateAnfme,agvLocDetl.getLocNo(),agvLocDetl.getMatnr(),agvLocDetl.getBatch(),agvLocDetl.getThreeCode(),agvLocDetl.getDeadTime());


                        }


                        //AgvLocDetl agvLocDetl = agvLocDetlService.selectLocdetl(agvWrkMast.getLocNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getBatch(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());


@@ -119,11 +157,29 @@


                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());


                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue());


                    break;


                case 57:


                    // 更新库存明细


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


                    wrkDetlList.forEach(agvWrkDetl -> {


                        AgvLocDetl agvLocDetl = new AgvLocDetl();


                        agvLocDetl.setLocNo(agvWrkMast.getLocNo());


                        agvLocDetl.sync(agvWrkDetl);


                        agvLocDetl.setModiTime(now);


                        agvLocDetl.setAppeTime(now);


                        if (!agvLocDetlService.insert(agvLocDetl)) {


                            throw new CoolException("保存工作明细失败");


                        }


                    });


                    // 更新站点 + 库位状态     源库位是站点


                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue());


                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());


                    break;


                case 58:


                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());


                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue());


                    break;


                case 108:


                case 114:


                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());


                    //更新库存明细


                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());


@@ -210,6 +266,13 @@


                //删除AGV工作明细档


                agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));


            }


//            else {


//                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"O","",agvWrkMast.getWhsType().shortValue());


//                if (!agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {


//                    agvWrkMast.setSourceLocNo("");


//                }


//                agvWrkMastService.updateById(agvWrkMast);


//            }




            if(!isJSON(orderNo)){


                //检查订单是否已完成


@@ -238,6 +301,7 @@


            String orderNo = getOrderNoByWrkNo(wrkNo);


            //修改工作档状态为207.库存更新完成


            agvWrkMast.setWrkSts(207L);


            agvWrkMast.setModiTime(new Date());


            agvWrkMastService.updateById(agvWrkMast);


            //修改源库位状态为O


            if (agvWrkMast.getIoType() == 110) {


@@ -271,6 +335,7 @@


                    wrkMast.setAppeTime(now);


                    wrkMast.setModiUser(9527L);


                    wrkMast.setModiTime(now);


                    wrkMast.setLogErrMemo("completedCarryWrk");




                    if (!agvWrkMastService.insertByIncrease(wrkMast)) {


                        throw new CoolException("保存工作档失败");


@@ -328,6 +393,7 @@


            }


            //修改工作档状态为207.库存更新完成


            agvWrkMast.setWrkSts(207L);


            agvWrkMast.setModiTime(new Date());


            agvWrkMastService.updateById(agvWrkMast);


            //修改源库位状态为O


            agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);


@@ -373,6 +439,7 @@


            }




            agvWrkMast.setWrkSts(202L);


            agvWrkMast.setModiTime(new Date());


            agvWrkMastService.updateById(agvWrkMast);


            if(agvWrkMast.getIoType() == 1){


                //修改AGV入库通知档状态入出状态为Y


@@ -438,6 +505,7 @@


            Map<String, Object> devNoMap = devNoMaps.get(0);


            if((int)devNoMap.get("num") < maxWrokNum){


                agvWrkMast.setLocNo(devNoMap.get("dev_no").toString());


                agvWrkMast.setModiTime(new Date());


                agvWrkMastService.updateById(agvWrkMast);


                log.info("after：" + devNoMap.toString()  +  ", wrkNo:" + agvWrkMast.getWrkNo() + ", locNo: " + agvWrkMast.getLocNo());


            }