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/quality/pojo/QualityUnqualified.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index 2479add..12c058e 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,7 +19,7 @@
*/
@TableName(value = "quality_unqualified")
@Data
-public class QualityUnqualified implements Serializable {
+public class QualityUnqualified extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -30,10 +31,10 @@
/**
- * 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)
+ * 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鎴愬搧妫�楠�)
*/
@NotBlank(message = "绫诲埆涓嶈兘涓虹┖!!!")
- @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
+ @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鎴愬搧妫�楠�")
private Integer inspectType;
/**
@@ -74,6 +75,13 @@
private String model;
/**
+ * 鐗╂枡缂栧彿
+ */
+ @Excel(name = "鏂欏彿")
+ @TableField(exist = false)
+ private String materialCode;
+
+ /**
* 鍗曚綅
*/
@Excel(name = "鍗曚綅")
@@ -90,6 +98,12 @@
*/
@Excel(name = "涓嶅悎鏍肩幇璞�")
private String defectivePhenomena;
+
+ /**
+ * 鏄惁宸插彇娑堥殧绂�
+ */
+ @Excel(name = "鏄惁宸插彇娑堥殧绂�")
+ private Boolean quarantineLifted;
/**
* 澶勭悊缁撴灉
@@ -110,7 +124,8 @@
@Excel(name = "澶勭悊鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date dealTime;
-
+ @Excel(name = "澶囨敞")
+ private String remark;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@@ -132,5 +147,20 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty("鍏宠仈妫�娴媔d")
+ private Long inspectId;
+ @ApiModelProperty("鏄惁涓嶅悎鏍煎鐞嗚嚜宸辨柊澧�")
+ @TableField(exist = false)
+ private Boolean method;
+
+ @ApiModelProperty("宸ュ簭")
+ @TableField(exist = false)
+ private String process;
+
+ @TableField(exist = false)
+ private Long productOrderId;
+
+ @TableField(exist = false)
+ private String productOrderNpsNo;
}
--
Gitblit v1.9.3