From b25ccda9d61fd7e902fd99ff7e85bfe9e0971d83 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 23 七月 2024 09:15:47 +0800
Subject: [PATCH] 分架界面修改
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 76 +++++++++++++++++++++++++++++++++++---
1 files changed, 70 insertions(+), 6 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 7ae0bf9..fb4669b 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -747,7 +747,8 @@
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
+ p.remarks as filmNumber,
+ od.bend_radius as bendRadius
from sd.order as o
left join sd.order_detail as od on o.order_id = od.order_id
left join flow_card as fc on o.order_id = fc.order_id and
@@ -780,7 +781,8 @@
pl.patch_processes,
od.product_name,
ogd.glass_child,
- fc.print_status
+ fc.print_status,
+ pl.reporting_work_id
from flow_card as fc
left join sd.order_glass_detail as ogd
on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
@@ -913,7 +915,7 @@
</select>
<select id="selectorderOtherMoney">
- select * from sd.basic_other_money where (id=21 or id>31)
+ select * from sd.basic_other_money where id between 21 and 35
</select>
<select id="selectReworkPrintMp">
@@ -934,7 +936,8 @@
pl.rework_reason,
pl.rework_processes,
od.product_name,
- ogd.glass_child
+ ogd.glass_child,
+ pl.reporting_work_id
from flow_card as fc
left join sd.order_glass_detail as ogd
on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
@@ -944,8 +947,8 @@
left join rework as pl on pl.order_id = fc.order_id and pl.process_id = fc.process_id and
pl.order_sort = fc.order_number and
pl.technology_number = fc.technology_number
- where pl.create_time between #{selectTime1} and #{selectTime2} and pl.review_status>0
- GROUP BY fc.process_id, ogd.technology_number
+ where pl.create_time between #{selectTime1} and #{selectTime2}
+ GROUP BY fc.process_id, ogd.technology_number,pl.reporting_work_id
order by pl.id desc,fc.process_id, ogd.technology_number
</select>
@@ -1036,6 +1039,7 @@
where fc.process_id = #{processId}
and fc.order_number = #{orderNumber}
and position(fc.technology_number in #{technologyNumber})
+ and pl.reporting_work_id=#{reportingWorkId}
group by fc.process_id, fc.order_number,fc.technology_number
order by IF(sort != NULL || sort != '', sort, fc.order_number)
</select>
@@ -1103,6 +1107,7 @@
where fc.process_id = #{processId}
and fc.order_number = #{orderNumber}
and position(fc.technology_number in #{technologyNumber})
+ and pl.reporting_work_id=#{reportingWorkId}
group by fc.process_id, fc.order_number,fc.technology_number
order by IF(sort != NULL || sort != '', sort, fc.order_number)
</select>
@@ -1170,6 +1175,7 @@
where fc.process_id = #{processId}
and fc.order_number = #{orderNumber}
and position(fc.technology_number in #{technologyNumber})
+ and pl.reporting_work_id=#{reportingWorkId}
group by fc.process_id, fc.order_number,fc.technology_number
order by IF(sort != NULL || sort != '', sort, fc.order_number)
</select>
@@ -1236,7 +1242,65 @@
where fc.process_id = #{processId}
and fc.order_number = #{orderNumber}
and position(fc.technology_number in #{technologyNumber})
+ and pl.reporting_work_id=#{reportingWorkId}
group by fc.process_id, fc.order_number,fc.technology_number
order by IF(sort != NULL || sort != '', sort, fc.order_number)
</select>
+
+ <select id="getPrintCustomDataSemi">
+ 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,
+ width,
+ height,
+ od.quantity,
+ 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,
+ p.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,
+ ogd.glass_child as glassChild,
+ ogd.glass_address as glassAddress
+ from sd.order as o
+ left join sd.order_detail as od on o.order_id = od.order_id
+ left join flow_card as fc on o.order_id = fc.order_id and
+ od.order_number = fc.order_number
+ left join sd.product as p on p.id=od.product_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
+ left join sd.order_glass_detail ogd on ogd.order_id=o.order_id and ogd.order_number=od.order_number and ogd.technology_number=fc.technology_number
+ where fc.process_id = #{processId}
+ and fc.technology_number = #{technologyNumber}
+ group by od.order_number,ogd.technology_number, width, height
+ order by IF(fc.sort != NULL || fc.sort != '', fc.sort, fc.order_number)
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0