Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java

@@ -285,7 +285,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 		} else {
 			//查询库存品信息
 			DistributionStockListEntity stockListEntity = new DistributionStockListEntity();
-			stockListEntity.setStoreId(warehousingEntryDTO.getStoreId());
+			stockListEntity.setIncomingBatch(warehousingEntryDTO.getReceiptBatch());
 			stockListEntity.setMarketId(warehousingEntryDTO.getClientId());
 			stockListEntity.setMaterialId(warehousingDetail.getMaterialId());
 			stockListEntity.setIncomingBatch(warehousingEntryDTO.getReceiptBatch());