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/approve/pojo/ApproveNode.java | 87 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 80 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
index de3a255..78f71ae 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
@@ -1,28 +1,49 @@
package com.ruoyi.approve.pojo;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
/**
* 瀹℃壒鑺傜偣琛�
* @TableName approve_node
*/
@Data
+@TableName("approve_node")
+@ApiModel
public class ApproveNode implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("闄勪欢id")
+ @TableField(exist = false)
+ private List<String> tempFileIds;
+
+ @TableField(exist = false)
+ @ApiModelProperty("闄勪欢鍒楄〃")
+ private String url;
+
/**
*
*/
private Long id;
/**
+ * 瀹℃壒缂栧彿
+ */
+ private String approveProcessId;
+ /**
* 瀹℃壒id
*/
- private Long approveProcessId;
+ private Long processId;
/**
* 瀹℃壒鑺傜偣椤哄簭
@@ -33,6 +54,11 @@
* 瀹℃壒鑺傜偣鐢ㄦ埛鍚嶅瓧
*/
private String approveNodeUser;
+
+ /**
+ * 瀹℃壒鑺傜偣鐢ㄦ埛id
+ */
+ private Long approveNodeUserId;
/**
* 瀹℃壒鑺傜偣鏃堕棿
@@ -48,19 +74,49 @@
@TableField(exist = false)
private Boolean isFirst;
+
+ /**
+ * 鏄惁涓烘渶鍚庝竴姝�
+ */
@TableField(exist = false)
private Boolean isLast;
/**
+ * 鏄惁涓哄綋鍓嶅鏍歌妭鐐�
+ */
+ @TableField(exist = false)
+ private Boolean isShen = false;
+
+ /**
* 绉熸埛id
*/
- @TableField(fill = FieldFill.INSERT)
+// @TableField(fill = FieldFill.INSERT)
private Long tenantId;
/**
* 鍒犻櫎鏍囪:0姝ｅ父锛�1鍒犻櫎
*/
private Integer deleteFlag;
+
+ /**
+ * 鍏ュ簱鐢ㄦ埛id
+ */
+ private Long createUser;
+
+ /**
+ * 鍏ュ簱鏃堕棿
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 淇敼鑰�
+ */
+ private Long updateUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ private LocalDateTime updateTime;
/**
* 瀹℃壒鑺傜偣鎷掔粷鍘熷洜
@@ -72,7 +128,24 @@
*/
private String approveNodeRemark;
- private static final long serialVersionUID = 1L;
+ /**
+ * 鍏ュ簱id
+ */
+ @TableField(exist = false)
+ private Long recordId;
+ /**
+ * 鏄惁鍏ュ簱瀹℃牳閫氳繃
+ */
+ @ApiModelProperty(value = "鏄惁鍏ュ簱瀹℃牳閫氳繃")
+ @TableField(exist = false)
+ private boolean inventoryReview;
+
+ /**
+ * 鍏ュ簱绫诲瀷锛堝悎鏍�/涓嶅悎鏍硷級
+ */
+ @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+ @TableField(exist = false)
+ private String storageType;
}
\ No newline at end of file
--
Gitblit v1.9.3