From 3f1d871318231ebabb3be06c4ca2ca770b5b0220 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 19 三月 2026 09:59:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/consumables/service/impl/ConsumablesInRecordServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/consumables/service/impl/ConsumablesInRecordServiceImpl.java b/src/main/java/com/ruoyi/consumables/service/impl/ConsumablesInRecordServiceImpl.java
index a5f3d21..0424b5f 100644
--- a/src/main/java/com/ruoyi/consumables/service/impl/ConsumablesInRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/consumables/service/impl/ConsumablesInRecordServiceImpl.java
@@ -79,7 +79,7 @@
}else {
ConsumablesInventoryDto consumablesInRecordDto = new ConsumablesInventoryDto();
consumablesInRecordDto.setProductModelId(consumablesInventory.getProductModelId());
- consumablesInRecordDto.setQualitity(consumablesInRecord.getConsumablesInNum());
+ consumablesInRecordDto.setQualitity(consumablesInRecord.getStockInNum());
consumablesInventoryMapper.updateSubtractConsumablesInventory(consumablesInRecordDto);
}
}else if (consumablesInRecord.getType().equals("1")) {
@@ -89,7 +89,7 @@
}else {
ConsumablesUnInventoryDto consumablesUnInventoryDto = new ConsumablesUnInventoryDto();
consumablesUnInventoryDto.setProductModelId(consumablesUnInventory.getProductModelId());
- consumablesUnInventoryDto.setQualitity(consumablesInRecord.getConsumablesInNum());
+ consumablesUnInventoryDto.setQualitity(consumablesInRecord.getStockInNum());
consumablesUnInventoryMapper.updateSubtractConsumablesUnInventory(consumablesUnInventoryDto);
}
}
--
Gitblit v1.9.3