#

whycq

2023-01-30 2f932f2675b0e7cfa7c5466b058d93aec67d6f3c

 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
@@ -98,6 +100,12 @@
            List<DetlDto> detlDtos = new ArrayList<>();
            param.getCombMats().forEach(elem -> {
                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;
@@ -192,9 +200,9 @@
            throw new CoolException("托盘码:"+param.getBarcode()+" 无有效工作档");
        }else if (wrkMast.getIoType()!=107){
            throw new CoolException("托盘码:"+param.getBarcode()+" 所属工作档非盘点任务");
        }/*else if (barcode.getWrkSts()!=17){
        }else if (wrkMast.getWrkSts()!=17.0){
            throw new CoolException("托盘码:"+param.getBarcode()+" 所属工作档工作状态不是出库完成");
        }*/else { }
        }else { }

        List<WrkDetl> wrkDetls = param.getWrkDetls();
        String recordRecordLog="托盘码"+param.getBarcode()+"盘点记录：";
@@ -203,17 +211,23 @@
        adjDetl.setAppeUser(userId);
        adjDetl.setModiTime(new Date());
        adjDetl.setModiUser(userId);
        adjDetl.setLocNo(wrkMast.getLocNo());
        adjDetl.setLocNo(wrkMast.getSourceLocNo());
        CheckRecord checkRecord=new CheckRecord();
        checkRecord.setLocNo(wrkMast.getLocNo());
        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",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());