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/execl/StockInRecordExportData.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java
index d705110..41fc669 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java
@@ -12,17 +12,32 @@
@Excel(name = "鍏ュ簱鎵规")
private String inboundBatches;
+
@Excel(name = "浜у搧鍚嶇О")
private String productName;
- @Excel(name = "瑙勬牸鍨嬪彿")
+
+ @Excel(name = "鍨嬪彿")
private String model;
+
+ @Excel(name = "鐗╂枡缂栫爜")
+ private String materialCode;
+
@Excel(name = "鍗曚綅")
private String unit;
- @Excel(name = "鍏ュ簱鏉ユ簮")
+
+ @Excel(name = "鎴愬搧绫诲埆")
+ private String processCategory;
+
+ @Excel(name = "鐢靛帇")
+ private String voltage;
+
+ @Excel(name = "璁板綍绫诲瀷")
private String recordType;
+
@Excel(name = "鍏ュ簱鏁伴噺")
private String stockInNum;
- @Excel(name = "鍏ュ簱鏃堕棿")
+
+ @Excel(name = "鍒涘缓鏃堕棿")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
--
Gitblit v1.9.3