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/resources/mapper/warehouse/DocumentClassificationMapper.xml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/warehouse/DocumentClassificationMapper.xml b/src/main/resources/mapper/warehouse/DocumentClassificationMapper.xml
index 9274443..e758e4f 100644
--- a/src/main/resources/mapper/warehouse/DocumentClassificationMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentClassificationMapper.xml
@@ -5,14 +5,14 @@
 <mapper namespace="com.ruoyi.warehouse.mapper.DocumentClassificationMapper">
 
     <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.DocumentClassification">
-            <id property="id" column="id" jdbcType="BIGINT"/>
-            <result property="category" column="category" jdbcType="VARCHAR"/>
-            <result property="parentId" column="parent_id" jdbcType="BIGINT"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="createUser" column="create_user" jdbcType="BIGINT"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-            <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
-            <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
+            <id property="id" column="id" />
+            <result property="category" column="category" />
+            <result property="parentId" column="parent_id" />
+            <result property="createTime" column="create_time" />
+            <result property="createUser" column="create_user" />
+            <result property="updateTime" column="update_time" />
+            <result property="updateUser" column="update_user" />
+            <result property="tenantId" column="tenant_id" />
     </resultMap>
 
     <sql id="Base_Column_List">

--
Gitblit v1.9.3