From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人，维护时间默认当前 2.销售报价审核非必填，产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间，修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了，增加生产订单当前工序 3.库存导入模板规格改成图纸编号，产品名称可以为空，加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量（只统计二级）
---
src/main/resources/vm/xml/mapper.xml.vm | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/vm/xml/mapper.xml.vm b/src/main/resources/vm/xml/mapper.xml.vm
index 5b704e7..84ce337 100644
--- a/src/main/resources/vm/xml/mapper.xml.vm
+++ b/src/main/resources/vm/xml/mapper.xml.vm
@@ -12,12 +12,12 @@
#if($table.sub)
<resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
- <collection property="${subclassName}List" notNullColumn="sub_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />
+ <collection property="${subclassName}List" ofType="${subClassName}" column="${pkColumn.columnName}" select="select${subClassName}List" />
</resultMap>
<resultMap type="${subClassName}" id="${subClassName}Result">
#foreach ($column in $subTable.columns)
- <result property="${column.javaField}" column="sub_${column.columnName}" />
+ <result property="${column.javaField}" column="${column.columnName}" />
#end
</resultMap>
#end
@@ -63,15 +63,20 @@
<include refid="select${ClassName}Vo"/>
where ${pkColumn.columnName} = #{${pkColumn.javaField}}
#elseif($table.sub)
- select#foreach($column in $columns) a.$column.columnName#if($foreach.count != $columns.size()),#end#end,
- #foreach($column in $subTable.columns) b.$column.columnName as sub_$column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
-
- from ${tableName} a
- left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
- where a.${pkColumn.columnName} = #{${pkColumn.javaField}}
+ select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end
+ from ${tableName}
+ where ${pkColumn.columnName} = #{${pkColumn.javaField}}
#end
</select>
-
+#if($table.sub)
+
+ <select id="select${subClassName}List" resultMap="${subClassName}Result">
+ select#foreach ($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
+ from ${subTableName}
+ where ${subTableFkName} = #{${subTableFkName}}
+ </select>
+#end
+
<insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
insert into ${tableName}
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -127,7 +132,7 @@
<insert id="batch${subClassName}">
insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values
- <foreach item="item" index="index" collection="list" separator=",">
+ <foreach item="item" index="index" collection="list" separator=",">
(#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end)
</foreach>
</insert>
--
Gitblit v1.9.3