自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zyx
2023-09-09 1596ce91095ad30f781006a2cfa5d856d3ac9416 
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java


@@ -13,6 +13,8 @@


import com.zy.asrs.entity.param.MobileAdjustParam;


import com.zy.asrs.entity.param.OpenOrderPakinParam;


import com.zy.asrs.service.*;


import com.zy.asrs.task.core.ReturnT;


import com.zy.asrs.task.handler.WorkLogHandler;


import com.zy.asrs.utils.MatUtils;


import com.zy.common.constant.MesConstant;


import com.zy.common.entity.Parameter;


@@ -59,6 +61,8 @@


    private SnowflakeIdWorker snowflakeIdWorker;


    @Autowired


    private ApiLogService apiLogService;


    @Autowired


    private WorkLogHandler workLogHandler;




    @Override


    @Transactional


@@ -71,6 +75,16 @@


                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {


            throw new CoolException(param.getBarcode() + "数据正在进行入库");


        }




        // todo: 不下线重新入库


        WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());


        if (wrkMast != null && wrkMast.getWrkSts() == 18) {


            ReturnT<String> start = workLogHandler.start(wrkMast);


            if (!start.isSuccess()) {


                log.error("工作档[workNo={}]历史档处理失败", wrkMast.getWrkNo());


            }


        }




        Date now = new Date();




        // 无单组托


@@ -79,9 +93,11 @@


            // 生成入库通知档


            List<DetlDto> detlDtos = new ArrayList<>();


            param.getCombMats().forEach(elem -> {


                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());


                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getCsocode(), elem.getIsoseq());


                detlDto.setContainerCode(elem.getContainerCode());




                if (DetlDto.has(detlDtos, detlDto)) {


                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());


                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getCsocode(),detlDto.getIsoseq(),detlDto.getContainerCode());


                    assert one != null;


                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());


                } else {


@@ -106,6 +122,10 @@


                waitPakin.setAppeTime(now);


                waitPakin.setModiUser(userId);


                waitPakin.setModiTime(now);




                waitPakin.setThreeCode(detlDto.getCsocode());


                waitPakin.setDeadTime(detlDto.getIsoseq());


                waitPakin.setSuppCode(detlDto.getCsocode());


                if (!waitPakinService.insert(waitPakin)) {


                    throw new CoolException("保存入库通知档失败");


                }


@@ -130,9 +150,11 @@


                    throw new CoolException("修改单据明细数量失败");


                }




                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());


                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getCsocode(),elem.getIsoseq());


                detlDto.setContainerCode(elem.getContainerCode());




                if (DetlDto.has(detlDtos, detlDto)) {


                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());


                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getCsocode(),detlDto.getIsoseq(),detlDto.getContainerCode());


                    assert one != null;


                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());


                } else {


@@ -147,7 +169,7 @@


                WaitPakin waitPakin = new WaitPakin();


                waitPakin.sync(mat);


                waitPakin.setOrderNo(order.getOrderNo());   // 单据编号


                waitPakin.setBatch(detlDto.getBatch());     // 批号


                waitPakin.setBatch(detlDto.getBatch());     // 序列码


                waitPakin.setZpallet(param.getBarcode());   // 托盘码


                waitPakin.setIoStatus("N");     // 入出状态


                waitPakin.setAnfme(detlDto.getAnfme());  // 数量


@@ -156,6 +178,11 @@


                waitPakin.setAppeTime(now);


                waitPakin.setModiUser(userId);


                waitPakin.setModiTime(now);




                waitPakin.setThreeCode(detlDto.getCsocode());


                waitPakin.setDeadTime(detlDto.getIsoseq());


                waitPakin.setSuppCode(detlDto.getCsocode());




                if (!waitPakinService.insert(waitPakin)) {


                    throw new CoolException("保存入库通知档失败");


                }


@@ -199,7 +226,7 @@


                        // todo 盘点记录、保存调整记录


                        // 修改明细


                        if (!wrkDetlService.updateAnfme(wrkDetl1.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {


                            throw new CoolException(wrkMast.getWrkNo() + "盘点任务，" + wrkDetl.getMatnr() + "商品，" + wrkDetl.getBatch() + "批号修改数量失败");


                            throw new CoolException(wrkMast.getWrkNo() + "盘点任务，" + wrkDetl.getMatnr() + "商品，" + wrkDetl.getBatch() + "序列码修改数量失败");


                        }


                    }


                    iterator.remove();


@@ -212,7 +239,7 @@


        for (WrkDetl wrkDetl : wrkDetls) {


            // todo 盘点记录、保存调整记录


            if (!wrkDetlService.updateAnfme(-1.0D, wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {


                throw new CoolException("删除" + wrkMast.getWrkNo() + "盘点任务，" + wrkDetl.getMatnr() + "商品，" + wrkDetl.getBatch() + "批号任务明细失败");


                throw new CoolException("删除" + wrkMast.getWrkNo() + "盘点任务，" + wrkDetl.getMatnr() + "商品，" + wrkDetl.getBatch() + "序列码任务明细失败");


            }


        }




@@ -229,7 +256,7 @@


            wrkDetl.setAppeTime(now);


            wrkDetl.setAppeUser(userId);


            if (!wrkDetlService.insert(wrkDetl)) {


                throw new CoolException("添加" + wrkMast.getWrkNo() + "盘点任务，" + wrkDetl.getMatnr() + "商品，" + wrkDetl.getBatch() + "批号任务明细失败");


                throw new CoolException("添加" + wrkMast.getWrkNo() + "盘点任务，" + wrkDetl.getMatnr() + "商品，" + wrkDetl.getBatch() + "序列码任务明细失败");


            }


        }




@@ -276,10 +303,12 @@


                }


                Mat analyse = MatUtils.analyseMat(elem.getMatnr());


                // 条码、物料代码、序列号、数量


                DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme());


                DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme(),elem.getCsocode(),elem.getIsoseq());


//                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());


                detlDto.setContainerCode(elem.getContainerCode());




                if (DetlDto.has(detlDtos, detlDto)) {


                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());


                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getCsocode(),detlDto.getIsoseq(),detlDto.getContainerCode());


                    assert one != null;


                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());


                } else {


@@ -290,8 +319,11 @@


            if (packDown) {


                MesCombParam mesCombParam = new MesCombParam();


                mesCombParam.setZpallet(param.getBarcode());


                mesCombParam.setCombTime(DateUtils.convert(now));


                mesCombParam.setPakinTime(DateUtils.convert(now));


                mesCombParam.setLgort("5008");


                mesCombParam.setPlantCode("5000");


                mesCombParam.setFromCode("5012-20");


                mesCombParam.setStationCode("JJQ-PFZPDB-XX");


                for (DetlDto detlDto : detlDtos) {


                    mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getOrderNo(), detlDto.getAnfme()));


                }


@@ -381,11 +413,15 @@


                waitPakin.setAppeTime(now);


                waitPakin.setModiUser(userId);


                waitPakin.setModiTime(now);




                waitPakin.setThreeCode(detlDto.getCsocode());


                waitPakin.setDeadTime(detlDto.getIsoseq());


                waitPakin.setSuppCode(detlDto.getContainerCode());


                if (!waitPakinService.insert(waitPakin)) {


                    throw new CoolException("保存入库通知档失败");


                }


                // 修改打包数据状态


                Pack pack = packService.selectByBarcode(detlDto.getMatnr());


                Pack pack = packService.selectByBarcode(detlDto.getOrderNo());


                pack.setSettle(2L);


                pack.setUpdateTime(now);


                pack.setUpdateBy(userId);