diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryQueryListPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryQueryListPO.java
index 0d5b8b575..1ee31ffcd 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryQueryListPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryQueryListPO.java
@@ -130,6 +130,14 @@ public class MaterialInventoryQueryListPO extends MaterialBasePO {
     @Excel(name = "批次号")
     private String batchNumber;
 
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("批号/LOT")
+    @Excel(name = "批号")
+    private String lotNumber;
+
     @ApiModelProperty("物料状态编码")
     @Excel(name = "物料状态编码")
     private String materialStatusCode;
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
index 691004ab0..755faff0d 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
@@ -694,7 +694,8 @@ public class StockShelfOrderDomainService {
         updateShelfMaterialDetailShelvesStatusWhenOrderCompleted(stockShelfOrderPO, loginUser, userRealNameComplete);
         //推送业务数据到BMS系统
 //        pushSyncBmsDomainService.pushInShelfOrder(stockShelfOrderPO.getInOrderNumber());
-        stockShelfOrderService.updateOmsOrder(stockShelfOrderPO.getInOrderNumber(),4,stockShelfOrderPO.getShelvesQuantity());
+        stockShelfOrderService.updateOmsOrder(stockShelfOrderPO.getInOrderNumber(), 4,
+                shelvesQuantity == null ? null : shelvesQuantity.intValue());
         return true;
     }
 
diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
index fef0a4ce9..c4a45d740 100644
--- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
@@ -295,6 +295,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="storageLocationName"    column="storage_location_name"    />
         <result property="materialBaseInfoId"    column="material_base_info_id"    />
         <result property="batchNumber"    column="batch_number"    />
+        <result property="inOrderNumber"    column="in_order_number"    />
+        <result property="lotNumber"    column="lot_number"    />
         <result property="materialStatusCode"    column="material_status_code"    />
         <result property="materialStatusName"    column="material_status_name"    />
         <result property="containerId"    column="container_id"    />