From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
index 5dc5686..e71fe31 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
@@ -6,6 +6,7 @@
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.pojo.DeviceLedger;
+import com.ruoyi.equipmentenergyconsumption.dto.EquipmentEnergyConsumptionDto;
import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
import com.ruoyi.equipmentenergyconsumption.service.EquipmentEnergyConsumptionService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -14,12 +15,14 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -59,6 +62,14 @@
return save ? AjaxResult.success() : AjaxResult.error();
}
+ @PostMapping("/addBatch")
+ @ApiOperation("璁惧鑳借��-鎵归噺鏂板")
+ @Log(title = "璁惧鑳借��-鎵归噺鏂板", businessType = BusinessType.INSERT)
+ public AjaxResult addBatch(@RequestBody List<EquipmentEnergyConsumption> list) {
+ boolean save = equipmentEnergyConsumptionService.saveBatch(list);
+ return save ? AjaxResult.success() : AjaxResult.error();
+ }
+
@PostMapping("/update")
@ApiOperation("璁惧鑳借��-淇敼")
@Log(title = "璁惧鑳借��-淇敼", businessType = BusinessType.UPDATE)
@@ -93,8 +104,11 @@
@PostMapping("/export")
@ApiOperation("瀵煎嚭璁惧鑳借��")
public void export(HttpServletResponse response) {
+ Page page = new Page<>(-1,-1);
+ EquipmentEnergyConsumption equipmentEnergyConsumption = new EquipmentEnergyConsumption();
+ IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPage(page, equipmentEnergyConsumption);
ExcelUtil<EquipmentEnergyConsumption> util = new ExcelUtil<EquipmentEnergyConsumption>(EquipmentEnergyConsumption.class);
- util.exportExcel(response, null , "瀹㈡埛妗ｆ鏁版嵁");
+ util.exportExcel(response, listPage.getRecords() , "瀵煎嚭璁惧鑳借��");
}
@GetMapping("/listPageByTrend")
@@ -105,6 +119,26 @@
return AjaxResult.success(listPage);
}
+ /**
+ * 瀵煎嚭鑳芥簮瓒嬪娍
+ */
+ @Log(title = "瀵煎嚭鑳芥簮瓒嬪娍", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportTwo")
+ @ApiOperation("瀵煎嚭鑳芥簮瓒嬪娍")
+ public void exportTwo(HttpServletResponse response) {
+ Page page = new Page<>(-1,-1);
+ EquipmentEnergyConsumption equipmentEnergyConsumption = new EquipmentEnergyConsumption();
+ IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPageByTrend(page, equipmentEnergyConsumption);
+ List<EquipmentEnergyConsumptionDto> list = new ArrayList<>();
+ listPage.getRecords().forEach(item -> {
+ EquipmentEnergyConsumptionDto dto = new EquipmentEnergyConsumptionDto();
+ BeanUtils.copyProperties(item, dto);
+ list.add(dto);
+ });
+ ExcelUtil<EquipmentEnergyConsumptionDto> util = new ExcelUtil<EquipmentEnergyConsumptionDto>(EquipmentEnergyConsumptionDto.class);
+ util.exportExcel(response, list , "瀵煎嚭鑳芥簮瓒嬪娍");
+ }
+
}
--
Gitblit v1.9.3