无货主流程;

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/vo/ReservedInventory.java

@@ -1,5 +1,6 @@
 package com.mhd.oms.domain.reserveStockInOrder.repository.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.mhd.oms.domain.reserveStockInOrder.repository.util.StringToBigDecimalConverter;
@@ -72,5 +73,6 @@ public class ReservedInventory {
     /**
      * WMS物料id（解析预览接口根据货物名称匹配后自动填充，匹配不到为空，不映射Excel）
      */
+    @ExcelIgnore
     private Long materialBaseInfoId;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/vo/ReservedInventoryOut.java

@@ -47,4 +47,8 @@ public class ReservedInventoryOut {
      */
     @ExcelIgnore
     private Long materialInventoryId;
+
+
+    @ExcelIgnore
+    private Long materialBaseInfoId;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java

@@ -1385,6 +1385,7 @@ public class ReserveStockOutOrderApplicationService {
                 BigDecimal allocationQuantity = inventory.getAllocationQuantity() == null ? BigDecimal.ZERO : inventory.getAllocationQuantity();
                 if (allocationQuantity.compareTo(importQuantity) > 0) {
                     reservedInventory.setMaterialInventoryId(inventory.getMaterialInventoryId());
+                    reservedInventory.setMaterialBaseInfoId(inventory.getMaterialBaseInfoId());
                     break;
                 }
             }