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/production/dto/ProductWorkOrderDto.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index 7853428..ee9e07b 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -1,18 +1,18 @@
package com.ruoyi.production.dto;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductWorkOrder;
-import com.ruoyi.production.pojo.ProductWorkOrderFile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
-import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Data
public class ProductWorkOrderDto extends ProductWorkOrder {
+
+ @ApiModelProperty(value = "浜у搧ID")
+ private String productId;
//浜у搧鍚嶇О
@ApiModelProperty(value = "浜у搧鍚嶇О")
@@ -22,9 +22,18 @@
@ApiModelProperty(value = "瑙勬牸")
private String model;
+ //鏂欏彿
+ @ApiModelProperty(value = "鏂欏彿")
+ private String materialCode;
+
//宸ュ簭
@ApiModelProperty(value = "宸ュ簭")
private String processName;
+
+ private Long processId;
+
+ @ApiModelProperty(value = "宸ュ簭缂栧彿")
+ private String processNo;
//鍗曚綅
@ApiModelProperty(value = "鍗曚綅")
@@ -38,8 +47,24 @@
@ApiModelProperty(value = "瀹屾垚杩涘害")
private BigDecimal completionStatus;
+ // 鎬讳骇鍑烘暟閲�
+ @ApiModelProperty(value = "鎬讳骇鍑烘暟閲忥紙鍖呭惈鎶ュ簾鏁伴噺锛�")
+ private BigDecimal totalQty;
+
@ApiModelProperty(value = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty;
+
+ // 涓嶈壇鏁伴噺
+ @ApiModelProperty(value = "涓嶈壇鏁伴噺")
+ private BigDecimal defectiveQuantity;
+
+ // 鎶曞叆鏁伴噺
+ @ApiModelProperty(value = "鎶曞叆鏁伴噺")
+ private BigDecimal inputQty;
+
+ // 浜у搧缁撴瀯鎶曞叆鏁伴噺
+ @ApiModelProperty(value = "浜у搧缁撴瀯鎶曞叆鏁伴噺")
+ private BigDecimal bomInputQty;
@ApiModelProperty(value = "宸ュ崟绫诲瀷 姝ｅ父 /杩斿伐杩斾慨")
private String workOrderType;
@@ -52,4 +77,20 @@
@ApiModelProperty(value = "鏄惁鍙互鎶ュ伐")
private Boolean isCanReport;
+
+ // 鍚堟牸鏁伴噺
+ @ApiModelProperty(value = "鍚堟牸鏁伴噺")
+ private BigDecimal completeQty;
+
+ @ApiModelProperty(value = "涓嶈壇鐜�")
+ private BigDecimal defectiveRate;
+
+ @ApiModelProperty(value = "鐘舵�佹枃鏈�")
+ private String statusText;
+
+ @ApiModelProperty(value = "宸ュ簭鍚堟牸鐜�")
+ private BigDecimal processQualifiedRate;
+
+ @ApiModelProperty(value = "瀹為檯鍚堟牸鐜�")
+ private BigDecimal actualQualifiedRate;
}
--
Gitblit v1.9.3