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());