From f4c288c55d08c04cd026508b358beebfcdce5fc2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 09:29:09 +0800
Subject: [PATCH] feat(product): 添加产品型号向下复制功能并优化生产报工重量计算 - 在ProductController中新增downCopy接口实现产品型号批量复制功能 - 将ProductionProductMainDto中的bomInputQty字段重命名为inputWeight - 在ProductionProductMainServiceImpl中添加JSON解析逻辑支持从otherData中提取投入重量 - 新增resolveInputWeight、findParameterValue、findFieldValue等工具方法处理复杂参数解析 - 为ProductModelDto添加targetProductId字段用于指定复制目标 - 修复销售台账按调度员ID和姓名分组的SQL查询问题 - 优化库存服务中剩余数量计算的空值处理逻辑 - 完善生产投料数量为空时的默认值处理机制
---
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