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/warehouse/pojo/DocumentationBorrowManagement.java | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
index 1dfa7bd..a6c560f 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
@@ -3,11 +3,17 @@
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.dto.DateQueryDto;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 鏂囨。鍊熼槄-褰掕繕琛�
@@ -15,8 +21,10 @@
*/
@TableName(value ="documentation_borrow_management")
@Data
-@ApiModel(value = "鏂囨。鍊熼槄-褰掕繕琛�")
-public class DocumentationBorrowManagement implements Serializable {
+@ApiModel(value = "鏂囨。鍊熼槄琛�")
+public class DocumentationBorrowManagement extends DateQueryDto implements Serializable {
+
+ private static final long serialVersionUID = 1L;
/**
* 涓婚敭
*/
@@ -26,41 +34,67 @@
/**
* 鏂囨。id
*/
+ @ApiModelProperty(value = "鏂囨。id")
private Long documentationId;
/**
- * 鍊熼槄浜篿d
+ * 鍊熼槄浜�
*/
- private Long borrowerId;
+ @ApiModelProperty(value = "鍊熼槄浜�")
+ @Excel(name = "鍊熼槄浜�")
+ private String borrower;
+ /**
+ * 褰掕繕浜�
+ */
+ @ApiModelProperty(value = "褰掕繕浜�")
+ @Excel(name = "褰掕繕浜�")
+ private String returner;
/**
* 鍊熼槄鐩殑
*/
+ @Excel(name = "鍊熼槄鐩殑")
+ @ApiModelProperty(value = "鍊熼槄鐩殑")
private String borrowPurpose;
/**
* 鍊熼槄鏃ユ湡
*/
- private LocalDateTime borrowDate;
+
+ @ApiModelProperty(value = "鍊熼槄鏃ユ湡")
+ @Excel(name = "鍊熼槄鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate borrowDate;
/**
* 搴斿綊杩樻棩鏈�
*/
- private LocalDateTime dueReturnDate;
+ @ApiModelProperty(value = "搴斿綊杩樻棩鏈�")
+ @Excel(name = "搴斿綊杩樻棩鏈�", dateFormat = "yyyy-MM-dd", width = 30)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate dueReturnDate;
/**
* 瀹為檯褰掕繕鏃ユ湡
*/
- private LocalDateTime returnDate;
+ @ApiModelProperty(value = "瀹為檯褰掕繕鏃ユ湡")
+ @Excel(name = "瀹為檯褰掕繕鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate returnDate;
/**
* 鍊熼槄鐘舵��
*/
+ @ApiModelProperty(value = "鍊熼槄鐘舵��")
+ @Excel(name = "鍊熼槄鐘舵��")
private String borrowStatus;
/**
* 澶囨敞
*/
+ @ApiModelProperty(value = "澶囨敞")
+ @Excel(name = "澶囨敞")
private String remark;
/**
@@ -73,25 +107,23 @@
* 鍒涘缓鐢ㄦ埛
*/
@TableField(fill = FieldFill.INSERT)
- private Long createUser;
+ private Integer createUser;
/**
* 淇敼鏃堕棿
*/
- @TableField(fill = FieldFill.UPDATE)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
/**
* 淇敼鐢ㄦ埛
*/
- @TableField(fill = FieldFill.UPDATE)
- private Long updateUser;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
/**
* 绉熸埛id
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
-
- private static final long serialVersionUID = 1L;
}
\ No newline at end of file
--
Gitblit v1.9.3