库存调整支持修改客户信息和备注

Junjie

2023-05-16 ee4643ab09a85661532fd75ddb45a1b44e92f530

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

@@ -77,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: 不下线重新入库
@@ -89,6 +93,15 @@
            if (!start.isSuccess()) {
                log.error("工作档[workNo={}]历史档处理失败", wrkMast.getWrkNo());
            }
        }

        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 (wrkMast != null && wrkMast.getWrkSts()==18) countWrk = 0;
        if (countLoc > 0 || countWrk > 0) {
            throw new CoolException("工作档/库存条码数据已存在===>>" + param.getBarcode());
        }

        Date now = new Date();
@@ -195,7 +208,7 @@
    }
    @Override
    @Transactional
    public void adjustNew(MobileAdjustParam param, Long userId) {
    public void adjustNew(MobileAdjustParam param, Boolean re, Long userId) {
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException("托盘码:"+param.getBarcode()+" 无有效工作档");
@@ -240,12 +253,15 @@
            checkRecord.setConfirmQty(wrkDetl.getAnfme());
            if (Cools.isEmpty(wrkDetlOld)){
                wrkDetl.setWrkNo(wrkMast.getWrkNo());
                wrkDetl.setZpallet(wrkMast.getBarcode());
                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);
                if (!re) {
                    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();
@@ -253,7 +269,9 @@
                adjDetlService.insert(adjDetl);

                checkRecord.setAnfme(wrkDetlOld.getAnfme());
                checkRecordService.insert(checkRecord);
                if (!re) {
                    checkRecordService.insert(checkRecord);
                }
            }else if (wrkDetlOld.getAnfme()==wrkDetl.getAnfme()){
                recordRecordLog=recordRecordLog+"\n"+"一条明细保持不变:"+"\t商品编号："+wrkDetl.getMatnr()+"\t批号："+wrkDetl.getBatch()+"\t数量："+wrkDetlOld.getAnfme();
                continue;