diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
index 10f3c5202..733f880f3 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
@@ -994,7 +994,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             MaterialInventory materialInventory = new MaterialInventory();
             materialInventoryPO.setUpdateTime(new Date());
             com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
-            materialInventoryMapper.updateById(materialInventory);
+            materialInventoryMapper.updateById(materialInventoryPO);
         }
     }
     private void qxff(BigDecimal netWeight, BigDecimal grossWeight, BigDecimal volume, BigDecimal area, BigDecimal quantity, Long materialInventoryId) {
@@ -1092,7 +1092,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             materialInventoryPO.setUpdateTime(new Date());
             MaterialInventory materialInventory = new MaterialInventory();
             com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
-            materialInventoryMapper.updateById(materialInventory);
+            materialInventoryMapper.updateById(materialInventoryPO);
 
             Long warehouseId = materialInventoryPO.getWarehouseId();
             boolean needPush = false;
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 0e07bbf81..57f3cf7d1 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
@@ -860,7 +860,9 @@ public class StockShelfOrderDomainService {
         //修改入库单状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库
         updateStockInOrder(stockShelfOrderPO, 5);
         //上架修改物料库存
-        List<ShelfMaterialDetail> shelfMaterialDetailList = shelfMaterialDetailService.list(new QueryWrapper<ShelfMaterialDetail>().lambda().eq(ShelfMaterialDetail::getShelfOrderNumber, stockShelfOrderPO.getShelfOrderNumber()));
+        List<ShelfMaterialDetail> shelfMaterialDetailList = shelfMaterialDetailService.list(new QueryWrapper<ShelfMaterialDetail>().lambda()
+                .eq(ShelfMaterialDetail::getShelfOrderNumber, stockShelfOrderPO.getShelfOrderNumber())
+                .eq(ShelfMaterialDetail::getDelFlag, 1));
         //修改库存
         StockShelfOrderDO stockShelfOrderDO = new StockShelfOrderDO();
         BeanUtils.copyProperties(stockShelfOrderPO, stockShelfOrderDO);