diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java
index 9956aa61..3979dc34 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java
@@ -260,7 +260,7 @@ public class MaterialControllerService {
         MaterialSearchQO qo = new MaterialSearchQO();
         qo.setPageSize(Integer.MAX_VALUE);
         List<MaterialVO> dbMaterials = materialService.search(qo).getRecords();
-        List<BomMaterialDTO> bomMaterials = bomMaterialService.getList(data.stream().map(MaterialExcelImportDTO::getNo).collect(Collectors.toSet()));
+        List<MaterialMainDTO> bomMaterials = bomMaterialService.getList(data.stream().map(MaterialExcelImportDTO::getNo).collect(Collectors.toSet()));
         List<UserSupplier> suppliers = userSupplierService.list();
         int index = 0;
         for (MaterialExcelImportDTO dto : data) {
@@ -287,7 +287,7 @@ public class MaterialControllerService {
             if (StrUtil.isBlank(dto.getNo())) {
                 sb.append("SAP料号不能为空;");
             } else {
-                BomMaterialDTO bomMaterial = bomMaterials.stream().filter(m -> StrUtil.equals(dto.getNo(), m.getMaterialNo())).findFirst().orElse(null);
+                MaterialMainDTO bomMaterial = bomMaterials.stream().filter(m -> StrUtil.equals(dto.getNo(), m.getMaterialNo())).findFirst().orElse(null);
                 if (Objects.isNull(bomMaterial)) {
                     sb.append("SAP料号无效;");
                 } else {
diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/DeliveryController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/DeliveryController.java
index 36e93012..2d903a03 100644
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/DeliveryController.java
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/DeliveryController.java
@@ -6,14 +6,18 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
-import com.nflg.wms.common.pojo.dto.BomMaterialDTO;
+import com.nflg.wms.common.pojo.dto.MaterialMainDTO;
 import com.nflg.wms.common.pojo.qo.*;
 import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeItemVO;
 import com.nflg.wms.common.pojo.vo.ShipmentPackagingCodeVO;
 import com.nflg.wms.common.util.UserUtil;
 import com.nflg.wms.common.util.VUtil;
-import com.nflg.wms.repository.entity.*;
-import com.nflg.wms.repository.service.*;
+import com.nflg.wms.repository.entity.WmsShipmentDelivery;
+import com.nflg.wms.repository.entity.WmsShipmentDeliveryItem;
+import com.nflg.wms.repository.entity.WmsShipmentPackagingCode;
+import com.nflg.wms.repository.service.IWmsShipmentDeliveryItemService;
+import com.nflg.wms.repository.service.IWmsShipmentDeliveryService;
+import com.nflg.wms.repository.service.IWmsShipmentPackagingCodeService;
 import com.nflg.wms.shipment.pojo.dto.CrmDeliveryDTO;
 import com.nflg.wms.shipment.pojo.dto.DeliveryExportDTO;
 import com.nflg.wms.shipment.pojo.qo.DeliverySearchFromCRMQO;
@@ -30,7 +34,6 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RestTemplate;
 import org.ttzero.excel.entity.ListSheet;
 import org.ttzero.excel.entity.TemplateSheet;
 import org.ttzero.excel.entity.Workbook;
@@ -39,10 +42,8 @@ import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -76,7 +77,7 @@ public class DeliveryController extends BaseController {
     @PostMapping("searchFromCRM")
     public ApiResult<List<DeliverAddQO>> searchFromCRM(@RequestBody DeliverySearchFromCRMQO qo) {
         List<CrmDeliveryDTO> datas = crmService.getDeliverys(qo);
-        List<BomMaterialDTO> materials = bomMaterialService.getList(datas.stream().map(CrmDeliveryDTO::getProductNumber__c).collect(Collectors.toSet()));
+        List<MaterialMainDTO> materials = bomMaterialService.getList(datas.stream().map(CrmDeliveryDTO::getProductNumber__c).collect(Collectors.toSet()));
         return ApiResult.success(
                 datas.stream().map(d -> new DeliverAddQO()
                         .setSoNo(d.getOrderNumber())
@@ -88,7 +89,7 @@ public class DeliveryController extends BaseController {
                                 materials.stream()
                                         .filter(m -> StrUtil.equals(m.getMaterialNo(), d.getProductNumber__c()))
                                         .findFirst()
-                                        .map(BomMaterialDTO::getDrawingNo)
+                                        .map(MaterialMainDTO::getDrawingNo)
                                         .orElse("")
                         )
                 ).toList()
diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java
index b270a4c0..1c5f448a 100644
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
-import com.nflg.wms.common.pojo.dto.BomMaterialDTO;
+import com.nflg.wms.common.pojo.dto.MaterialMainDTO;
 import com.nflg.wms.common.pojo.qo.ShipmentMaterialAddQO;
 import com.nflg.wms.common.pojo.qo.ShipmentMaterialSearchQO;
 import com.nflg.wms.common.pojo.qo.ShipmentMaterialSyncSaveQO;
@@ -92,7 +92,7 @@ public class MaterialController extends BaseController {
                 .list()
                 .stream()
                 .collect(Collectors.toMap(WmsShipmentMaterial::getNo, WmsShipmentMaterial::getId));
-        List<BomMaterialDTO> dtos = bomMaterialService.getList(materialMaps.keySet());
+        List<MaterialMainDTO> dtos = bomMaterialService.getList(materialMaps.keySet());
         if (CollectionUtil.isNotEmpty(dtos)) {
             shipmentMaterialService.updateBatchById(
                     dtos.stream().map(dto -> {