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/pojo/DeviceRepair.java | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index 3d68c65..a567366 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -3,12 +3,11 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.Api;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import nonapi.io.github.classgraph.json.Id;
+import org.springframework.format.annotation.DateTimeFormat;
-import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
@@ -16,53 +15,62 @@
@TableName("device_repair")
public class DeviceRepair {
+ @ApiModelProperty("璁惧鎶ヤ慨id")
private Long id;
- @TableField(value = "device_ledger_id")
@ApiModelProperty("璁惧鍙拌处id")
- private String deviceLedgerId;
+ private Long deviceLedgerId;
- @TableField(value = "repair_time")
- @ApiModelProperty("缁翠慨鏃堕棿")
+ private String deviceName;
+
+ private String deviceModel;
+
+ @ApiModelProperty("鎶ヤ慨鏃堕棿")
private Date repairTime;
- @TableField(value = "repair_name")
- @ApiModelProperty("缁翠慨浜�")
+ @ApiModelProperty("鎶ヤ慨浜�")
private String repairName;
- @TableField(value = "remark")
- @ApiModelProperty("澶囨敞")
+ @ApiModelProperty("鎶ヤ慨鍐呭")
private String remark;
- @TableField(value = "maintenance_name")
@ApiModelProperty("缁翠慨浜�")
private String maintenanceName;
- @TableField(value = "maintenance_time")
@ApiModelProperty("缁翠慨鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime maintenanceTime;
- @TableField(value = "maintenance_result")
@ApiModelProperty("缁翠慨缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵��")
+ @ApiModelProperty("鐘舵�� 0 寰呯淮淇� 1瀹岀粨 2 澶辫触")
private Integer status;
- @TableField(value = "create_time" ,fill = FieldFill.INSERT)
@ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("淇敼鏃堕棿")
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
@ApiModelProperty("鍒涘缓浜�")
- private String createUser;
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
- @ApiModelProperty("淇敼浜�")
- private String updateUser;
+ @ApiModelProperty("鏇存柊浜�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
@ApiModelProperty("绉熸埛id")
+ @TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
}
--
Gitblit v1.9.3