From a8557c74bba5f4f7ff9b2f3c9d84db5d24bb43cd Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 05 十二月 2024 10:33:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 2 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 3ab8d64..8834155 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -308,7 +308,7 @@
<select id="reportingWorkCount">
select COUNT(rw.process_id)
from reporting_work as rw
- where rw.process_id = #{processId}
+ where rw.process_id = #{processId} and reviewed_state>=0
</select>
<!-- 鎻掑叆Flow_card琛�-->
<insert id="addFlowCardMp">
@@ -443,12 +443,18 @@
od.product_name,
ogd.glass_child,
fc.founder,
- date(fc.splitFrame_time) as splitFrame_time
+ date(fc.splitFrame_time) as splitFrame_time,
+ ogd.process,
+ c.concatNumber
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
fc.technology_number = ogd.technology_number
left join sd.order_detail as od on od.order_id = ogd.order_id and od.order_number = ogd.order_number
+ left join (
+ select process_id,technology_number, GROUP_CONCAT(order_number) as concatNumber from
+ flow_card where process_id = #{processId} GROUP BY process_id,technology_number
+ ) as c on c.process_id=fc.process_id
where fc.process_id = #{processId}
GROUP BY fc.order_id, fc.process_id, fc.order_number, fc.technology_number
order by fc.order_number, fc.technology_number
@@ -2431,4 +2437,67 @@
order by opt.heat_layout_id, opt.heat_layout_sort desc
</select>
+ <select id="getPrintLabel3">
+ select o.order_id,
+ c.customer_abbreviation as customer_name,
+ o.project,
+ od.building_number,
+ od.processing_note,
+ ogd.child_width as width,
+ ogd.child_height as height,
+ od.product_name as glass_child,
+ ogd.process,
+ e.type_name,
+ opd.stock_id,
+ od.quantity,
+ od.other_columns,
+ od.bend_radius,
+ od.order_number as heat_layout_id,
+ a.id as heat_layout_sort
+ from pp.optimize_detail opd
+ left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
+ left join sd.order_detail od
+ on SUBSTR(opd.process_id, 1, 10) = od.order_id and opd.order_sort = od.order_number
+ left join sd.order_glass_detail ogd
+ on SUBSTR(opd.process_id, 1, 10) = ogd.order_id and opd.order_sort = ogd.order_number and
+ opd.layer = ogd.technology_number
+ left join sd.product p on od.product_id = p.id
+ left join sd.basic_glass_type e on e.type_id = p.type_id
+ left join sd.customer c on c.id = o.customer_id
+ left join
+ (select (@row_number := @row_number + 1) as id,process_id as process_id from (select process_id from pp.optimize_detail tt where project_no =#{projectNo} group by process_id) tt,(select @row_number := 0) as t) a
+ on a.process_id=opd.process_id
+ where opd.project_no = #{projectNo}
+ group by order_id,od.order_number
+ order by ogd.child_width desc,ogd.child_height desc
+ </select>
+
+ <delete id="deleteProcessMp">
+ delete from sd.order_process_detail where process_id = #{processId} and technology_number= #{technologyNumber}
+ </delete>
+
+ <insert id="updateProcessMp">
+ insert into sd.order_process_detail (order_id,
+ process_id,
+ order_number,
+ technology_number,
+ process,
+ create_time)
+ select fc.order_id,
+ fc.process_id,
+ fc.order_number,
+ #{technologyNumber},
+ #{process},
+ NOW()
+ from pp.flow_card as fc
+ where fc.process_id = #{processId}
+ and fc.order_number = #{number}
+ and fc.technology_number = #{technologyNumber}
+ GROUP BY fc.order_number
+ </insert>
+
+ <update id="updateOrderProcessMp">
+ update sd.order_glass_detail set process=#{orderprocess}
+ where order_id=#{orderId} and order_number=#{number} and technology_number=#{technologyNumber}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0