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 | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 0 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 8e28fa3..b217e42 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
@@ -38,4 +38,77 @@
<select id="selectOrderGlassDetail">
select * from order_glass_detail where order_id = #{orderId}
</select>
+
+ <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"/>
+ <result column="child_width" property="childWidth"/>
+ <result column="child_height" property="childHeight"/>
+ <result column="process" property="process"/>
+ <!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
+ <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
+
+ <result column="building_number" property="buildingNumber"/>
+
+ <result column="product_name" property="productName"/>
+ <result column="width" property="width"/>
+ <result column="height" property="height"/>
+ <result column="shape" property="shape"/>
+ <result column="gross_area" property="grossArea"/>
+ <result column="edging_type" property="edgingType"/>
+ <result column="area" property="area"/>
+ <result column="quantity" property="quantity"/>
+ <result column="processing_note" property="processingNote"/>
+ <result column="beizhu" property="remarks"/>
+
+ </association>
+
+ </resultMap>
+
+ <select id="selectOrderGlassDetailByOrderId" resultMap="orderGlassDetailMap">
+ select
+ a.order_id,
+ a.order_number,
+ b.building_number,
+ b.product_name,
+ a.glass_address,
+ a.technology_number,
+ a.glass_child,
+ b.width,
+ b.height,
+ b.shape,
+ b.gross_area,
+ b.edging_type,
+ a.child_width,
+ a.child_height,
+ b.area,
+ b.quantity,
+ a.process,
+ b.remarks as 'beizhu',
+ b.processing_note
+ from order_glass_detail as a
+ left join order_detail as b
+ on a.order_id = b.order_id and a.order_number = b.order_number
+ 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