From 0ee57f985891f4a9d828c33274af0348a8fddab9 Mon Sep 17 00:00:00 2001
From: zhaoqing <1670883518@qq.com>
Date: Thu, 14 May 2026 16:10:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=BF=90=E8=BE=93=E5=8D=95?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=20=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99id?=
 =?UTF-8?q?=EF=BC=88=E4=BF=AE=E6=94=B9=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/BusinessDocumentCargoMulti.java                      | 2 +-
 .../service/BusinessDocumentOrderDomainService.java             | 2 +-
 .../BusinessDocumentCargoMultiDTO.java                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/entity/BusinessDocumentCargoMulti.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/entity/BusinessDocumentCargoMulti.java
index 78c3e9527..22880a0b9 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/entity/BusinessDocumentCargoMulti.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/entity/BusinessDocumentCargoMulti.java
@@ -97,7 +97,7 @@ public class BusinessDocumentCargoMulti extends BaseVOEntity{
     private String materialCode;
 
     @ApiModelProperty("物料id")
-    private Long materialId;
+    private Long materialBaseInfoId;
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
index 777988b2f..94a8f67f2 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
@@ -640,7 +640,7 @@ public class BusinessDocumentOrderDomainService {
                     tmsCargoInfo.setCargoWeight(tmsCargoInfoDTO.getWeight()==null ? BigDecimal.ZERO: tmsCargoInfoDTO.getWeight());
                     tmsCargoInfo.setCargoNum(tmsCargoInfoDTO.getCargoNum()==null ? BigDecimal.ZERO: tmsCargoInfoDTO.getCargoNum());
                     tmsCargoInfo.setMaterialVolume(tmsCargoInfoDTO.getMaterialVolume()==null ? BigDecimal.ZERO: tmsCargoInfoDTO.getMaterialVolume());
-                    tmsCargoInfo.setMaterialId(tmsCargoInfoDTO.getMaterialId());
+                    tmsCargoInfo.setMaterialBaseInfoId(tmsCargoInfoDTO.getMaterialBaseInfoId());
                     businessDocumentCargoMultiMapper.insert(tmsCargoInfo);
                 }
 
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentCargoMulti/BusinessDocumentCargoMultiDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentCargoMulti/BusinessDocumentCargoMultiDTO.java
index aa2424b7e..d9f04a307 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentCargoMulti/BusinessDocumentCargoMultiDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentCargoMulti/BusinessDocumentCargoMultiDTO.java
@@ -100,7 +100,7 @@ public class BusinessDocumentCargoMultiDTO extends BaseVOEntity{
     private String materialCode;
 
     @ApiModelProperty("物料id")
-    private Long materialId;
+    private Long materialBaseInfoId;
 
     @ApiModelProperty("体积")
     private BigDecimal materialVolume;