Merge remote-tracking branch 'origin/devlop' into devlop

zjj

3 天以前 25f91c2eb2e458ee065e787bd547f8fe0625e918

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java

@@ -192,6 +192,9 @@
            return R.error("物料码为空");
        }
        Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, matnrCode));
        if (null == matnr){
            return R.error("未找到编码对应的明细");
        }
        CheckDiffItem checkDiffItem = new CheckDiffItem()
                .setMatnrCode(matnr.getCode())
                .setMaktx(matnr.getName())