From dde4573682ad61393da10dcab3aca727ee97eb6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Sat, 18 Apr 2026 14:37:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E7=94=9F=E6=88=90=E5=A4=8D?=
 =?UTF-8?q?=E6=A0=B8=E5=8D=95=E6=98=8E=E7=BB=86=E4=B8=AD=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ReviewOrderDomainService.java          | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java
index 5cc4fd5e0..a94523ea3 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java
@@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -225,6 +226,19 @@ public class ReviewOrderDomainService {
             }
             if (outMd != null) {
                 d.setMaterialDetailId(outMd.getMaterialDetailId());
+                // 物料编码/名称：拣货明细行若未落库或未映射出值，从出库明细兜底（避免复核单、复核作业任务明细为空）
+                if (!StringUtils.hasText(d.getMaterialCode())) {
+                    d.setMaterialCode(outMd.getMaterialCode());
+                }
+                if (!StringUtils.hasText(d.getMaterialName())) {
+                    d.setMaterialName(outMd.getMaterialName());
+                }
+                if (!StringUtils.hasText(d.getBarCode())) {
+                    d.setBarCode(outMd.getBarCode());
+                }
+                if (d.getMaterialBaseInfoId() == null) {
+                    d.setMaterialBaseInfoId(outMd.getMaterialBaseInfoId());
+                }
                 // 批次属性：拣货明细未带出时，从出库明细兜底（项目内同口径）
                 if (d.getProductionDate() == null) {
                     d.setProductionDate(outMd.getProductionDate());