From e3f28006cdd48c8f8f3494ef61bae2d6b516de2e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 22 二月 2024 09:25:46 +0800
Subject: [PATCH] 提交商品创建界面
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 154 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 105 insertions(+), 49 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index cbfc46d..b0b3925 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -27,6 +27,21 @@
<result column="product_name" property="productName"/>
<result column="compute_gross_area" property="computeGrossArea"/>
<result column="processing_note" property="processingNote"/>
+ <result column="quantity" property="quantity"/>
+ <result column="compute_gross_area" property="computeGrossArea"/>
+ <result column="perimeter" property="perimeter"/>
+ <result column="order_number" property="orderNumber"/>
+ <result column="width" property="width"/>
+ <result column="height" property="height"/>
+ <result column="shape" property="shape"/>
+ <result column="weight" property="weight"/>
+ </association>
+ <association property="orderGlassDetail" javaType="com.example.erp.entity.sd.OrderGlassDetail">
+ <result column="production_id" property="productionId"/>
+ </association>
+ <association property="product" javaType="com.example.erp.entity.sd.Product">
+ <result column="total_thickness" property="totalThickness"/>
+ <result column="thickness" property="thickness"/>
</association>
<!--<result column="g_typeId" property="glassTypes.typeId"/>
@@ -46,49 +61,7 @@
c.processing_note
from flow_card as a left join sd.`order` as b on a.order_Id=b.order_id
left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number
- where a.create_time between #{selectTime1} and #{selectTime2}
-<!-- <where>-->
-<!-- <if test="flowCard.orderId != null and flowCard.orderId != ''">-->
-<!-- and a.order_id regexp #{flowCard.orderId}-->
-<!-- </if>-->
-<!-- <if test="flowCard.productionId != null and flowCard.productionId != ''">-->
-<!-- and a.process_Id regexp #{flowCard.productionId}-->
-<!-- </if>-->
-<!-- <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">-->
-<!-- and c.product_id regexp #{flowCard.orderDetail.productId}-->
-<!-- </if>-->
-<!-- <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName!= ''">-->
-<!-- and c.product_name regexp #{flowCard.orderDetail.productName}-->
-<!-- </if>-->
-
-<!-- <if test="flowCard.order.project != null and flowCard.order.project!= ''">-->
-<!-- and b.project regexp #{flowCard.order.project}-->
-<!-- </if>-->
-
-
-<!-- <if test="flowCard.createTime != null and flowCard.createTime != ''">-->
-<!-- and DATE_FORMAT((a.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }-->
-<!-- </if>-->
-
-<!-- </where>-->
- group by a.process_Id;
- </select>
-
-
-
- <select id="selectFlowCardMp">
- select o.order_id,
- o.customer_name,
- o.project,
- o.batch,
- o.other_remarks,
- o.icon,
- o.order_type,
- o.salesman,
- o.processing_note,
- o.delivery_address
- from sd.`order` as o
- where o.create_time between #{selectTime1} and #{selectTime2}
+ where a.create_time between #{selectTime1} and #{selectTime2}
<!-- <where>-->
<!-- <if test="flowCard.orderId != null and flowCard.orderId != ''">-->
<!-- and a.order_id regexp #{flowCard.orderId}-->
@@ -113,10 +86,47 @@
<!-- </if>-->
<!-- </where>-->
- ;
+ group by a.process_Id;
</select>
-
- <select id="DetailsSelectMp">
+
+
+ <select id="selectFlowCardMp" resultMap="flowCardMap">
+ select o.order_id,
+ o.customer_name,
+ o.project,
+ o.batch,
+ o.other_remarks,
+ o.icon,
+ o.order_type,
+ o.salesman,
+ o.processing_note,
+ o.delivery_address
+ from sd.`order` as o
+ where o.production_order=2 and o.create_time between #{selectTime1} and #{selectTime2}
+ <!-- <where>-->
+ <!-- <if test="flowCard.orderId != null and flowCard.orderId != ''">-->
+ <!-- and a.order_id regexp #{flowCard.orderId}-->
+ <!-- </if>-->
+ <!-- <if test="flowCard.productionId != null and flowCard.productionId != ''">-->
+ <!-- and a.process_Id regexp #{flowCard.productionId}-->
+ <!-- </if>-->
+ <!-- <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">-->
+ <!-- and c.product_id regexp #{flowCard.orderDetail.productId}-->
+ <!-- </if>-->
+ <!-- <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName!= ''">-->
+ <!-- and c.product_name regexp #{flowCard.orderDetail.productName}-->
+ <!-- </if>-->
+
+ <!-- <if test="flowCard.order.project != null and flowCard.order.project!= ''">-->
+ <!-- and b.project regexp #{flowCard.order.project}-->
+ <!-- </if>-->
+
+
+ <!-- </where>-->
+ ;
+ </select>
+
+ <select id="DetailsSelectMp" resultMap="flowCardMap">
select od.order_id,
ogd.production_id,
od.product_id,
@@ -125,9 +135,55 @@
od.compute_gross_area,
od.perimeter
from sd.order_detail as od
- left join sd.order_glass_detail as ogd
- on od.order_id = ogd.order_id and od.order_number = ogd.order_number
+ left join sd.order_glass_detail as ogd
+ on od.order_id = ogd.order_id
where od.order_id = #{orderId}
- group by od.order_id,ogd.production_id
+ group by od.order_id, ogd.production_id
</select>
+
+
+ <update id="DeleteFlowCardMp">
+ update sd.order_detail as od left join sd.order_glass_detail as ogd
+ on od.order_id = ogd.order_id and od.order_number = ogd.order_number
+ set ogd.production_id=null,
+ ogd.production_time=null,
+ ogd.founder=null
+ where od.order_id = #{orderId}
+ and od.product_name = #{productName}
+ </update>
+
+ <select id="SelectNoCardMp" resultMap="flowCardMap">
+ select
+ od.order_number,
+ od.width,
+ od.height,
+ od.shape,
+ od.quantity,
+ od.compute_gross_area,
+ p.total_thickness,
+ p.thickness,
+ od.weight
+ from
+ sd.order_detail as od
+ left join sd.order_glass_detail as ogd on od.order_id=ogd.order_id
+ left join sd.product as p on od.product_name=p.product_name
+ where od.order_id=#{orderId}and ogd.production_id=#{productionId}
+ <if test="flowCard.orderDetail.orderNumber != null and flowCard.orderDetail.orderNumber != ''">
+ and od.order_number regexp #{flowCard.orderDetail.orderNumber}
+ </if>
+ <if test="flowCard.orderDetail.width != null and flowCard.orderDetail.width != ''">
+ and od.width regexp #{flowCard.orderDetail.width}
+ </if>
+ <if test="flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">
+ and od.height regexp #{flowCard.orderDetail.height}
+ </if>
+ <if test="flowCard.orderDetail.shape != null and flowCard.orderDetail.shape != ''">
+ and od.shape regexp #{flowCard.orderDetail.shape}
+
+ </if>
+ GROUP BY od.order_number;
+
+
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0