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/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java
index b0082b3..96803c5 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java
@@ -104,7 +104,7 @@
* 鐘舵�侊紙1-鏈夋晥 2-閫炬湡锛�
*/
@ApiModelProperty("鐘舵�侊紙1-鏈夋晥 2-閫炬湡锛�")
- @Excel(name = "鐘舵��", readConverterExp = "1=鏈夋晥,2=閫炬湡,3=鍗冲皢鍒版湡")
+ @Excel(name = "鐘舵��", readConverterExp = "1=鏈夋晥,2=閫炬湡")
private Integer status;
/**
@@ -137,16 +137,16 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @ApiModelProperty("鍗曚綅")
+ private String unit;
+
@ApiModelProperty("閮ㄩ棬id")
private Long deptId;
@ApiModelProperty("瀹夎浣嶇疆")
- private String installationLocation;
+ private String instationLocation;
- @ApiModelProperty("妫�瀹氬崟浣�")
- private String unit;
-
- @ApiModelProperty("妫�瀹氬懆鏈�(澶�)")
- private Long cycle;
+ private String cycle;
}
--
Gitblit v1.9.3