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 | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 169 insertions(+), 11 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 1dad616..8834155 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -263,7 +263,8 @@
ods.S02,
ods.S03,
ods.S04,
- ods.S05
+ ods.S05,
+ od.building_number
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
@@ -307,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">
@@ -442,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
@@ -477,7 +484,7 @@
</select>
<select id="selectPrintFlowCard">
- select *
+ select project_no,glass_total,glass_total_area
from pp.optimize_project
where date(create_time)>=#{selectTime1} and date(create_time) <= #{selectTime2}
and state >= 20
@@ -665,7 +672,9 @@
round(ogd.child_width) as width,
round(ogd.child_height) as height,
pd.separation,
- fc.technology_number
+ fc.technology_number,
+ IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
+ od.building_number
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
@@ -1214,7 +1223,9 @@
round(ogd.child_width) as width,
round(ogd.child_height) as height,
pd.separation,
- fc.technology_number
+ fc.technology_number,
+ IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
+ od.building_number
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
@@ -2015,6 +2026,7 @@
/*ogd.technology_number,*/
ogd.glass_address,
(fc.quantity) as quantity,
+ (fc.quantity) as printQuantity,
round((ogd.child_width * ogd.child_height * fc.quantity / 1000000), 2) as total_area,
od.product_name,
ogd.glass_child,
@@ -2045,6 +2057,7 @@
ogd.technology_number,
ogd.glass_address,
(fc.quantity) as quantity,
+ (fc.quantity) as printQuantity,
round((ogd.child_width * ogd.child_height * fc.quantity / 1000000), 2) as total_area,
od.product_name,
ogd.glass_child,
@@ -2086,7 +2099,7 @@
od.processing_note as processingNote,
width,
height,
- fc.quantity,
+ #{printQuantity} as quantity,
od.order_number as orderNumber,
fc.technology_number as technologyNumber,
od.building_number as buildingNumber,
@@ -2155,7 +2168,7 @@
od.processing_note as processingNote,
od.width,
od.height,
- fc.quantity,
+ fc.quantity as flowQuantity,
od.order_number as orderNumber,
fc.technology_number as technologyNumber,
od.building_number as buildingNumber,
@@ -2182,7 +2195,8 @@
'鏂囨湰' as custom2,
'鏂囨湰' as custom3,
'鏂囨湰' as custom4,
- '鏂囨湰' as custom5
+ '鏂囨湰' as custom5,
+ od.quantity
from optimize_detail as opt
left join flow_card as fc on opt.project_no=fc.project_no and opt.process_id=fc.process_id and opt.layer=fc.technology_number and opt.order_sort=fc.order_number
left join sd.order as o on o.order_id=fc.order_id
@@ -2302,7 +2316,7 @@
od.processing_note as processingNote,
od.width,
od.height,
- fc.quantity,
+ fc.quantity as flowQuantity,
od.order_number as orderNumber,
fc.technology_number as technologyNumber,
od.building_number as buildingNumber,
@@ -2329,7 +2343,8 @@
'鏂囨湰' as custom2,
'鏂囨湰' as custom3,
'鏂囨湰' as custom4,
- '鏂囨湰' as custom5
+ '鏂囨湰' as custom5,
+ od.quantity
from optimize_detail as opt
left join flow_card as fc on opt.project_no=fc.project_no and opt.process_id=fc.process_id and opt.layer=fc.technology_number and opt.order_sort=fc.order_number
left join sd.order as o on o.order_id=fc.order_id
@@ -2342,4 +2357,147 @@
order by opt.stock_id,opt.polys_id
</select>
+ <select id="getPrintCustomDataProject">
+ select
+ o.order_id as orderId,
+ project,
+ customer_id as customerId,
+ o.customer_name as customerName,
+ order_type as orderType,
+ order_classify as orderClassify,
+ batch,
+ o.icon,
+ pack_type as packType,
+ delivery_date as deliveryDate,
+ al_type as alType,
+ money,
+ contract_id as contractId,
+ customer_batch customerBatch,
+ contacts,
+ delivery_address as deliveryAddress,
+ od.processing_note as processingNote,
+ od.width,
+ od.height,
+ fc.quantity as flowQuantity,
+ od.order_number as orderNumber,
+ fc.technology_number as technologyNumber,
+ od.building_number as buildingNumber,
+ od.product_name as productName,
+ od.edging_type as edgingType,
+ od.remarks,
+ c.customer_abbreviation as customerAbbreviation,
+ p.product_abbreviation as productAbbreviation,
+ fc.process_id as processId,
+ o.create_time as createTime,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')) AS figureNumber,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S03')) AS colourCeramicGlaze,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')) AS remarks1,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S05')) AS remarks2,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S06')) AS remarks3,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S07')) AS remarks4,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S08')) AS remarks5,
+ p.remarks as filmNumber,
+ od.bend_radius as bendRadius,
+ od.other_columns,
+ JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color')) AS color,
+ '鏂囨湰' as custom1,
+ '鏂囨湰' as custom2,
+ '鏂囨湰' as custom3,
+ '鏂囨湰' as custom4,
+ '鏂囨湰' as custom5,
+ od.quantity,
+ o.order_id,
+ c.customer_abbreviation as customer_name,
+ od.building_number,
+ od.processing_note,
+ ogd.child_width as childWidth,
+ ogd.child_height as childHeight,
+ ogd.glass_child as glassChild,
+ ogd.process,
+ e.type_name,
+ opt.stock_id,
+ od.bend_radius,
+ a.id as flow_card_sort,
+ concat(opt.heat_layout_id,'') as heat_layout_id ,
+ opt.heat_layout_sort
+ from optimize_detail as opt
+ left join flow_card as fc on opt.project_no=fc.project_no and opt.process_id=fc.process_id and opt.layer=fc.technology_number and opt.order_sort=fc.order_number
+ left join sd.order as o on o.order_id=fc.order_id
+ left join sd.order_detail as od on fc.order_id = od.order_id and od.order_number = fc.order_number
+ left join sd.order_glass_detail as ogd on ogd.order_id=o.order_id and ogd.order_number=od.order_number and ogd.technology_number=fc.technology_number
+ left join sd.product as p on p.id = od.product_id
+ left join sd.basic_glass_type e on e.type_id = p.type_id
+ left join sd.customer as c on c.id = o.customer_id
+ left join sd.product_detail as pd on pd.prod_id = p.id and pd.sort_num = od.order_number and
+ pd.glass_sort = fc.technology_number
+ 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=opt.process_id
+ where opt.project_no=#{projectNo}
+ 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