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/device/dto/DeviceMaintenanceDto.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index de440ca..0a0a977 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -6,7 +6,6 @@
import lombok.Data;
import java.time.LocalDateTime;
-import java.util.Date;
@Data
public class DeviceMaintenanceDto {
@@ -28,13 +27,13 @@
private String maintenancePlanTimeReq;
@ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
- private LocalDateTime maintenancePlanTime;
+ private String maintenancePlanTime;
@ApiModelProperty("瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
@ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
- private LocalDateTime maintenanceActuallyTime;
+ private String maintenanceActuallyTime;
@ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
private String maintenanceActuallyTimeReq;
@@ -42,7 +41,7 @@
@ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
+ @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
private Integer status;
@ApiModelProperty("鍒涘缓鏃堕棿")
@@ -67,4 +66,7 @@
@ApiModelProperty("鍒涘缓浜哄悕绉�")
private String createUserName;
+
+ @ApiModelProperty("澶囨敞")
+ private String Remark;
}
--
Gitblit v1.9.3