From 4f5133a1aa9ae7842fa808be6d082a036e408f12 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 02 七月 2026 17:09:20 +0800
Subject: [PATCH] 采购退货时,对应批次库存已被销售发货出去一批(比如销售发货时,选择的采购入库的批次库存,剩下38个,但采购退货时,可退货数量还是显示150个。)

---
 src/main/java/com/ruoyi/equipmentenergyconsumption/service/EquipmentEnergyConsumptionService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/EquipmentEnergyConsumptionService.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/EquipmentEnergyConsumptionService.java
index fabe267..830e808 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/EquipmentEnergyConsumptionService.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/EquipmentEnergyConsumptionService.java
@@ -5,7 +5,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.device.pojo.DeviceLedger;
 import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -19,7 +19,7 @@
 
     IPage<EquipmentEnergyConsumption> listPage(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption);
 
-    R<?> importData(MultipartFile file);
+    AjaxResult importData(MultipartFile file);
 
     IPage<EquipmentEnergyConsumption> listPageByTrend(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption);
 

--
Gitblit v1.9.3