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/stock/dto/StockInRecordDto.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 7a31272..ede69a2 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -3,40 +3,39 @@
import com.ruoyi.stock.pojo.StockInRecord;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import lombok.EqualsAndHashCode;
-
+@EqualsAndHashCode(callSuper = true)
@Data
public class StockInRecordDto extends StockInRecord {
- /**
- * 浜у搧鍚嶇О
- */
+
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- /**
- * 浜у搧瑙勬牸
- */
+
+ @Schema(description = "浜у搧鍨嬪彿")
private String model;
- /**
- * 浜у搧鏂欏彿
- */
+
+ @Schema(description = "鐗╂枡缂栫爜")
private String materialCode;
- /**
- * 浜у搧鍗曚綅
- */
+
+ @Schema(description = "鍗曚綅")
private String unit;
+ @Schema(description = "鏃堕棿瀛楃涓�")
private String timeStr;
+ @Schema(description = "鍒涘缓浜�")
private String createBy;
- //鐜板瓨閲�
+ @Schema(description = "褰撳墠搴撳瓨")
private String currentStock;
- //璁㈠崟
+ @Schema(description = "璁㈠崟缂栧彿")
private String npsNo;
- //宸ュ崟
+ @Schema(description = "宸ュ崟缂栧彿")
private String workOrderNo;
- // 椤堕儴鐖朵骇鍝乮d
+ @Schema(description = "椤剁骇鐖剁骇浜у搧ID")
private Long topParentProductId;
}
--
Gitblit v1.9.3