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/pojo/EnergyPeriod.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
index 568828f..20c9e8f 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
@@ -1,9 +1,13 @@
package com.ruoyi.equipmentenergyconsumption.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
+
@Data
@TableName("energy_period")
@ApiModel
@@ -11,17 +15,12 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
- * 寮�濮嬫椂闂�
+ * 鏃ユ湡
*/
- @ApiModelProperty("寮�濮嬫椂闂�")
- @Excel(name = "寮�濮嬫椂闂�")
- private String startTime;
- /**
- * 缁撴潫鏃堕棿
- */
- @ApiModelProperty("缁撴潫鏃堕棿")
- @Excel(name = "缁撴潫鏃堕棿")
- private String endTime;
+ @ApiModelProperty("鏃ユ湡")
+ @Excel(name = "鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date date;
/**
* 鍗曚环
*/
@@ -33,4 +32,28 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ /**
+ * 宄版
+ */
+ @ApiModelProperty("宄版")
+ @Excel(name = "宄版")
+ private Double peak;
+ /**
+ * 璋锋
+ */
+ @ApiModelProperty("璋锋")
+ @Excel(name = "璋锋")
+ private Double valley;
+ /**
+ * 骞虫
+ */
+ @ApiModelProperty("骞虫")
+ @Excel(name = "骞虫")
+ private Double flat;
+ /**
+ * 灏栨
+ */
+ @ApiModelProperty("灏栨")
+ @Excel(name = "灏栨")
+ private Double sharp;
}
--
Gitblit v1.9.3