#

LSH

2023-01-30 17dfda3a88e556fa9416f4597153495110aa2aa8

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -67,6 +67,8 @@
    private AdjDetlService adjDetlService;
    @Autowired
    private CheckRecordService checkRecordService;
    @Autowired
    private LocDetlService locDetlService;

    @Override
    @Transactional
@@ -75,9 +77,13 @@
            throw new CoolException(BaseRes.PARAM);
        }
        // 判断是否有相同条码的数据
//        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
//                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
//            throw new CoolException(param.getBarcode() + "数据正在进行入库");
//        }
        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
            throw new CoolException(param.getBarcode() + "数据正在进行入库");
                eq("zpallet", param.getBarcode())) > 0) {
            throw new CoolException(param.getBarcode() + "组托数据已存在");
        }

        // todo: 不下线重新入库
@@ -97,7 +103,13 @@
            // 生成入库通知档
            List<DetlDto> detlDtos = new ArrayList<>();
            param.getCombMats().forEach(elem -> {
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo());
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo(), elem.getCstmr());

//                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;
@@ -126,6 +138,7 @@
                waitPakin.setModiTime(now);
                waitPakin.setMemo(detlDto.getMemo());
                waitPakin.setFrozen(param.getFrozen()); // 是否冻结
                waitPakin.setManu(detlDto.getCstmr());
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
@@ -212,8 +225,14 @@
            WrkDetl wrkDetlOld = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
                    .eq("wrk_no", wrkMast.getWrkNo())
                    .eq("matnr",wrkDetl.getMatnr())
                    .eq("batch",wrkDetl.getBatch())
//                    .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());