From 32d56a9a1d8c502a52fc8345ffed498300c7297a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Fri, 8 May 2026 09:03:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/OutMaterialDetailImpl.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index 2a483b3f5..29de9624a 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -201,12 +201,18 @@ public class OutMaterialDetailImpl extends ServiceImpl materialBaseInfos = materialBaseInfoMapper.selectList(new QueryWrapper().lambda().eq(MaterialBaseInfo::getMaterialCode, materialNo)); if (!CollectionUtils.isEmpty(materialBaseInfos) && materialBaseInfos.size() > 0) { - outMaterialDetail.setCommodityName(materialBaseInfos.get(0).getMaterialName()); - outMaterialDetail.setBarCode(materialBaseInfos.get(0).getBarCode()); - outMaterialDetail.setPackName(materialBaseInfos.get(0).getPackName()); - outMaterialDetail.setPackCode(materialBaseInfos.get(0).getPackCode()); - outMaterialDetail.setUnitCode(materialBaseInfos.get(0).getUnitCode()); - outMaterialDetail.setUnitName(materialBaseInfos.get(0).getUnitName()); + MaterialBaseInfo mbi = materialBaseInfos.get(0); + outMaterialDetail.setCommodityName(mbi.getMaterialName()); + // 主数据未维护条码时不写入明细，避免误带主表 bar_code（如历史脏数据）；有维护再回填 + if (StringUtils.isNotBlank(mbi.getBarCode())) { + outMaterialDetail.setBarCode(mbi.getBarCode().trim()); + } else { + outMaterialDetail.setBarCode(null); + } + outMaterialDetail.setPackName(mbi.getPackName()); + outMaterialDetail.setPackCode(mbi.getPackCode()); + outMaterialDetail.setUnitCode(mbi.getUnitCode()); + outMaterialDetail.setUnitName(mbi.getUnitName()); } outMaterialDetailList.add(outMaterialDetail); }