#

TQS

2023-01-11 0abb8fc8c901a9aedf70c7c0e5bb86dbd2bd4031

 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,14 @@
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private ApiLogService apiLogService;
    @Autowired
    private WorkLogHandler workLogHandler;
    @Autowired
    private AdjDetlService adjDetlService;
    @Autowired
    private CheckRecordService checkRecordService;
    @Autowired
    private LocDetlService locDetlService;

    @Override
    @Transactional
@@ -71,6 +81,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,7 +99,13 @@
            // 生成入库通知档
            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.getMemo());

                if (Cools.isEmpty(detlDto.getBatch())){
                    String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd);
                    detlDto.setBatch(batch);
                }

                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                    assert one != null;
@@ -106,6 +132,8 @@
                waitPakin.setAppeTime(now);
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                waitPakin.setMemo(detlDto.getMemo());
                waitPakin.setFrozen(param.getFrozen()); // 是否冻结
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
@@ -147,7 +175,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());  // 数量
@@ -163,6 +191,76 @@
            orderService.updateSettle(order.getId(), 2L, userId);
        }

    }
    @Override
    @Transactional
    public void adjustNew(MobileAdjustParam param, Long userId) {
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException("托盘码:"+param.getBarcode()+" 无有效工作档");
        }else if (wrkMast.getIoType()!=107){
            throw new CoolException("托盘码:"+param.getBarcode()+" 所属工作档非盘点任务");
        }else if (wrkMast.getWrkSts()!=17.0){
            throw new CoolException("托盘码:"+param.getBarcode()+" 所属工作档工作状态不是出库完成");
        }else { }

        List<WrkDetl> wrkDetls = param.getWrkDetls();
        String recordRecordLog="托盘码"+param.getBarcode()+"盘点记录：";
        AdjDetl adjDetl=new AdjDetl();
        adjDetl.setAppeTime(new Date());
        adjDetl.setAppeUser(userId);
        adjDetl.setModiTime(new Date());
        adjDetl.setModiUser(userId);
        adjDetl.setLocNo(wrkMast.getSourceLocNo());
        CheckRecord checkRecord=new CheckRecord();
        checkRecord.setLocNo(wrkMast.getSourceLocNo());
        checkRecord.setBarcode(param.getBarcode());
        checkRecord.setCreateTime(new Date());
        for (WrkDetl wrkDetl:wrkDetls){
            WrkDetl wrkDetlOld = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
                    .eq("wrk_no", wrkMast.getWrkNo())
                    .eq("matnr",wrkDetl.getMatnr())
//                    .eq("batch",Cools.isEmpty(wrkDetl.getBatch())?"":wrkDetl.getBatch())
            );
//            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
//                            .eq("loc_no", wrkMast.getLocNo())
//                            .eq("matnr",wrkDetl.getMatnr())
//                            .eq("batch",wrkDetl.getBatch())
//            );

            adjDetl.setMatnr(wrkDetl.getMatnr());
            adjDetl.setBatch(wrkDetl.getBatch());
            adjDetl.setAdjQty(wrkDetl.getAnfme());

            checkRecord.setMatnr(wrkDetl.getMatnr());
            checkRecord.setMaktx(wrkDetl.getMaktx());
            checkRecord.setSpecs(wrkDetl.getSpecs());
            checkRecord.setBatch(wrkDetl.getBatch());
            checkRecord.setConfirmQty(wrkDetl.getAnfme());
            if (Cools.isEmpty(wrkDetlOld)){
                wrkDetl.setWrkNo(wrkMast.getWrkNo());
                wrkDetlService.insert(wrkDetl);
                recordRecordLog=recordRecordLog+"\n"+"新增一条明细:"+"\t商品编号："+wrkDetl.getMatnr()+"\t批号："+wrkDetl.getBatch()+"\t数量："+wrkDetl.getAnfme();
                adjDetl.setOriQty(0.0);
                adjDetlService.insert(adjDetl);
                checkRecord.setAnfme(0.0);
                checkRecordService.insert(checkRecord);
            }else if (wrkDetlOld.getAnfme()!=wrkDetl.getAnfme()){
                wrkDetlService.updateAnfme(wrkDetl.getAnfme(),wrkMast.getWrkNo(),wrkDetl.getMatnr(),wrkDetl.getBatch());
                recordRecordLog=recordRecordLog+"\n"+"更新一条明细:"+"\t商品编号："+wrkDetl.getMatnr()+"\t批号："+wrkDetl.getBatch()+"\t原数量："+wrkDetlOld.getAnfme()+"\t新数量："+wrkDetl.getAnfme();
                adjDetl.setOriQty(wrkDetlOld.getAnfme());
                adjDetlService.insert(adjDetl);

                checkRecord.setAnfme(wrkDetlOld.getAnfme());
                checkRecordService.insert(checkRecord);
            }else if (wrkDetlOld.getAnfme()==wrkDetl.getAnfme()){
                recordRecordLog=recordRecordLog+"\n"+"一条明细保持不变:"+"\t商品编号："+wrkDetl.getMatnr()+"\t批号："+wrkDetl.getBatch()+"\t数量："+wrkDetlOld.getAnfme();
                continue;
            }else {
                throw new CoolException("托盘码:"+param.getBarcode()+" 未知异常，请联系管理员");
            }
        }
        log.info(recordRecordLog);
    }

    @Override
@@ -199,7 +297,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 +310,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 +327,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() + "序列码任务明细失败");
            }
        }

@@ -290,8 +388,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()));
                }
@@ -397,4 +498,9 @@
        }
    }

    @Override
    @Transactional
    public void pikingToFull(String barcode) {
        wrkMastService.selectByBarcode(barcode);
    }
}