#

luxiaotao1123

2023-02-01 57448954d59595b87cbb7efad52f59e61fd14d61

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

@@ -95,6 +95,14 @@
            }
        }

        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
//        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode())
//                                            .last(" wrk_no IN ( SELECT wrk_no FROM asr_wrk_mast WHERE wrk_sts != 15 )"));
        if (countLoc > 0 || countWrk > 0) {
            throw new CoolException("工作档/库存条码数据已存在===>>" + param.getBarcode());
        }

        Date now = new Date();

        // 无单组托
@@ -103,12 +111,12 @@
            // 生成入库通知档
            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 (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());
@@ -138,6 +146,7 @@
                waitPakin.setModiTime(now);
                waitPakin.setMemo(detlDto.getMemo());
                waitPakin.setFrozen(param.getFrozen()); // 是否冻结
                waitPakin.setManu(detlDto.getCstmr());
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }