From fda672b4fd0ef3bd4f0759e5c58fdca8f243e550 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 31 五月 2024 14:58:31 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 77 ++++++++++++++++++++++++++++++++++----
1 files changed, 68 insertions(+), 9 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 4e6b812..7362a69 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -81,7 +81,15 @@
<if test="flowCard.order.project != null and flowCard.order.project!= ''">
and b.project regexp #{flowCard.order.project}
</if>
-
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '涓嶅彲鎺掔増'">
+ and a.layout_status regexp 0
+ </if>
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '鍙帓鐗�'">
+ and a.layout_status regexp 1
+ </if>
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '宸叉帓鐗�'">
+ and a.layout_status regexp 2
+ </if>
group by a.process_Id
ORDER BY a.id desc
@@ -99,8 +107,8 @@
<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 test="flowCard.processId != null and flowCard.processId != ''">
+ and a.process_Id regexp #{flowCard.processId}
</if>
<if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
and c.product_id regexp #{flowCard.orderDetail.productId}
@@ -111,6 +119,15 @@
<if test="flowCard.order.project != null and flowCard.order.project!= ''">
and b.project regexp #{flowCard.order.project}
+ </if>
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '涓嶅彲鎺掔増'">
+ and a.layout_status regexp 0
+ </if>
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '鍙帓鐗�'">
+ and a.layout_status regexp 1
+ </if>
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '宸叉帓鐗�'">
+ and a.layout_status regexp 2
</if>
ORDER BY a.id desc
@@ -407,6 +424,7 @@
select * from sd.order where create_time between #{selectTime1} and #{selectTime2} and
position(#{orderId} in order_id ) and position(#{project} in project)
and processing_card=2
+ order by create_time desc
</select>
<select id="selectPrintMp">
@@ -417,8 +435,8 @@
o.project,
ogd.technology_number,
ogd.glass_address,
- od.quantity,
- ogd.total_area,
+ sum(od.quantity) as quantity,
+ sum(ogd.total_area) as total_area,
od.product_name,
ogd.glass_child,
fc.founder,
@@ -445,8 +463,10 @@
o.processing_note,
fc.process_id,
SUM( od.quantity) as quantity,
- SUM(od.gross_area) as gross_area,
- #{technologyNumber} as technologyNumber
+ SUM(ogd.total_area) as gross_area,
+ SUM(od.weight) as weight,
+ #{technologyNumber} as technologyNumber,
+ concat(fc.process_id,'/',#{technologyNumber}) as processIdNumber
from flow_card as fc
left join sd.order_glass_detail as ogd
on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -462,7 +482,7 @@
select fc.order_number,
concat(ogd.child_width, "*", ogd.child_height) as child_width,
od.quantity,
- ogd.total_area,
+ round(ogd.total_area,2) as total_area,
od.perimeter,
od.bend_radius,
od.remarks
@@ -475,7 +495,6 @@
and fc.technology_number = #{technologyNumber}
group by fc.process_id, fc.order_number
order by fc.order_number
- limit 15
</select>
<select id="getProcessList">
@@ -485,4 +504,44 @@
and technology_number = #{technologyNumber}
group by process
</select>
+
+ <update id="updateInventory">
+ update flow_card set inventory_quantity=#{completedQuantity}
+ where process_id = #{processId} and order_number = #{orderNumber} and technology_number = #{technologyNumber}
+ </update>
+
+<!-- 澶嶉�夋淇敼鎺掔増鐘舵��-->
+ <update id="updateComposing">
+ update flow_card as fc
+ set fc.layout_status=1
+ where fc.process_id = #{processId}
+ </update>
+
+ <select id="getPrintLabel">
+ select c.customer_name,
+ c.order_id,
+ e.type_name,
+ b.remarks,
+ c.project,
+ a.child_width,
+ a.child_height,
+ sum(b.quantity) as quantity,
+ a.glass_child,
+ b.processing_note
+ from sd.order_glass_detail as a
+ left join sd.order_detail as b
+ on a.order_id = b.order_id
+ and a.order_number = b.order_number
+ left join sd.`order` as c
+ on c.order_id = a.order_id
+ left join flow_card as d
+ on d.order_id = a.order_id and d.order_number = a.order_number and
+ d.technology_number = a.technology_number
+ left join sd.basic_glass_type e
+ on e.type_id = b.product_id
+ where d.process_id = #{processId}
+ and d.technology_number = #{technologyNumber}
+ group by a.glass_child, a.child_width, a.child_height
+ order by d.technology_number
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0