From e4fe69941b2dd4582ec0bd82c32b8dfbc30d85b5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 二月 2024 08:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
index 7a5e859..b217e42 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
@@ -42,6 +42,7 @@
<resultMap id="orderGlassDetailMap" type="com.example.erp.entity.sd.OrderGlassDetail" >
<id column="id" property="id"/>
<result column="order_id" property="orderId"/>
+ <result column="order_number" property="orderNumber"/>
<result column="glass_address" property="glassAddress"/>
<result column="technology_number" property="technologyNumber"/>
<result column="glass_child" property="glassChild"/>
@@ -50,7 +51,7 @@
<result column="process" property="process"/>
<!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
<association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
- <result column="order_number" property="orderNumber"/>
+
<result column="building_number" property="buildingNumber"/>
<result column="product_name" property="productName"/>
@@ -71,7 +72,7 @@
<select id="selectOrderGlassDetailByOrderId" resultMap="orderGlassDetailMap">
select
a.order_id,
- b.order_number,
+ a.order_number,
b.building_number,
b.product_name,
a.glass_address,
@@ -95,4 +96,19 @@
where a.order_id = #{orderId}
order by a.order_number,a.technology_number
</select>
+
+ <update id="updateSizeAndProcess" parameterType="java.util.List">
+ <foreach collection="orderGlassDetails" item="item" index="index" open="" close="" separator=";">
+ update order_glass_detail
+ set
+ child_width = #{item.childWidth},
+ child_height = #{item.childHeight},
+ process = #{item.process}
+ where
+ order_id = #{item.orderId}
+ and order_number = #{item.orderNumber}
+ and technology_number = #{item.technologyNumber}
+ </foreach>
+
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0