From 7b2233d1dab53574facc66b3bebffcd8ca5919de Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 21 三月 2026 14:27:19 +0800
Subject: [PATCH] yys 1.已退货完毕的出库单号不要展示在关联出库单中 2.退货管理唯一处理 3.生产订单-库存数量回显 4.发货管理回显退货数量 5.发货增加详情接口 6.生产核算清理脏数据 7.生产报工-删除生产报工记录报错 8.筛选客户名称数据展示有误
---
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
index ddda227..1c4842f 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
@@ -41,6 +41,14 @@
return save ? AjaxResult.success() : AjaxResult.error();
}
+ @PostMapping("/addBatch")
+ @ApiOperation("鐢ㄧ數鏃舵-鎵归噺鏂板")
+ @Log(title = "鐢ㄧ數鏃舵-鎵归噺鏂板", businessType = BusinessType.INSERT)
+ public AjaxResult addBatch(@RequestBody List<EnergyPeriod> energyPeriods) {
+ boolean save = energyPeriodService.saveBatch(energyPeriods);
+ return save ? AjaxResult.success() : AjaxResult.error();
+ }
+
@PostMapping("/update")
@ApiOperation("鐢ㄧ數鏃舵-淇敼")
@Log(title = "鐢ㄧ數鏃舵-淇敼", businessType = BusinessType.UPDATE)
@@ -66,8 +74,11 @@
@PostMapping("/export")
@ApiOperation("瀵煎嚭鐢ㄧ數鏃舵")
public void export(HttpServletResponse response) {
+ Page page = new Page(-1,-1);
+ EnergyPeriod energyPeriod = new EnergyPeriod();
+ IPage<EnergyPeriod> listPage = energyPeriodService.listPage(page, energyPeriod);
ExcelUtil<EnergyPeriod> util = new ExcelUtil<EnergyPeriod>(EnergyPeriod.class);
- util.exportExcel(response, null , "鐢ㄧ數鏃舵鏁版嵁");
+ util.exportExcel(response, listPage.getRecords() , "鐢ㄧ數鏃舵鏁版嵁");
}
}
--
Gitblit v1.9.3