From b0a4de74b47e2626f51eb4a844db3e62f6a4bf9d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 18 十二月 2025 10:52:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 111 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 89 insertions(+), 22 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 4b70499..33f08a2 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -86,6 +86,9 @@
<if test="flowCard.processId != null and flowCard.processId != ''">
and a.process_Id regexp #{flowCard.processId}
</if>
+ <if test="flowCard.order.batch != null and flowCard.order.batch != ''">
+ and b.batch regexp #{flowCard.order.batch}
+ </if>
<if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
and c.product_id regexp #{flowCard.orderDetail.productId}
</if>
@@ -725,7 +728,10 @@
concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
concat('瀵瑰簲鎴戝徃鍗曞彿', o.batch) AS otherRemarks,
'' as qrcode,
- ifnull(rack,"") as rack
+ ifnull(rack,"") as rack,
+ o.quantity as orderQuantity,
+ o.area as orderArea,
+ o.order_type
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
@@ -765,7 +771,8 @@
#{technologyNumber} as technologyNumber,
concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
concat('瀵瑰簲鎴戝徃鍗曞彿', o.batch) AS otherRemarks,
- '' as qrcode
+ '' as qrcode,
+ o.order_type
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
@@ -803,7 +810,8 @@
pd.separation,
fc.technology_number,
IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
- od.building_number
+ od.building_number,
+ od.weight
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
@@ -1276,7 +1284,7 @@
</select>
<select id="selectReplenishPrintMp">
- select fc.id,
+ select pl.id,
fc.order_id,
fc.process_id,
o.customer_name,
@@ -1301,7 +1309,8 @@
pl.reporting_work_id,
JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
pl.patch_id,
- date(pl.create_time) as create_time
+ date(pl.create_time) as create_time,
+ pl.print_num
from flow_card as fc
left join sd.order_glass_detail as ogd
@@ -1621,7 +1630,8 @@
pd.separation,
fc.technology_number,
IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
- od.building_number
+ od.building_number,
+ od.weight
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
@@ -1678,7 +1688,8 @@
fc.technology_number,
IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
od.building_number,
- fc.merge as merge
+ fc.merge as merge,
+ od.weight
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
@@ -1765,7 +1776,8 @@
round(SUM(ogd.total_area), 2) as gross_area,
sum(od.weight) as weight,
#{technologyNumber} as technologyNumber,
- concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber
+ concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
+ o.order_type
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
@@ -1811,7 +1823,8 @@
pl.patch_reason,
pl.patch_processes,
pl.responsible_team,
- pl.responsible_personnel
+ pl.responsible_personnel,
+ 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
@@ -1852,7 +1865,8 @@
concat('瀵瑰簲鎴戝徃鍗曞彿', o.batch) AS otherRemarks,
dd.responsible_personnel,
#{mergeTechnologyNumber} as mergeTechnologyNumber,
- pl.patch_id
+ pl.patch_id,
+ o.order_type
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
@@ -2161,9 +2175,20 @@
and fcs.process = #{process}
where fc.process_id = #{processId}
and fc.order_number = #{orderNumber}
- and position(fc.technology_number in #{technologyNumber})
+ <if test="technologyNumber != null and technologyNumber != ''">
+ AND position(fc.technology_number in #{technologyNumber})
+ </if>
group by fc.process_id,od.order_number, ogd.technology_number, ogd.child_width, ogd.child_height
order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
+ </select>
+
+ <select id="getgetPrintCustomDataSemiSp">
+ select * from pp.optimize_detail opd
+ where opd.process_id= #{processId} and opd.order_sort = #{orderNumber}
+ <if test="technologyNumber != null and technologyNumber != ''">
+ and opd.layer = #{technologyNumber}
+ </if>
+
</select>
<select id="selectPrintNotMp">
@@ -2644,7 +2669,10 @@
concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
concat('瀵瑰簲鎴戝徃鍗曞彿', o.batch) AS otherRemarks,
fc.technology_number as qrcode,
- o.other_remarks
+ o.other_remarks,
+ o.quantity as orderQuantity,
+ o.area as orderArea,
+ o.order_type
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
@@ -2991,6 +3019,16 @@
ORDER BY opd.stock_id
</select>
+ <select id="getPrintProjectDetailsMpSp">
+ SELECT opd.project_no,opd.stock_id,opd.polys_id,o_width,o_height,p_width,p_height,opd.glass_id
+ FROM optimize_detail as opd left join optimize_layout as opl on opl.project_no=opd.project_no and opl.stock_id=opd.stock_id
+ where opd.project_no=#{projectNo} and opd.stock_id in
+ <foreach item="item" index="index" collection="stockId" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ order BY opd.stock_id
+ </select>
+
<select id="getPrintCustomDataProjectDetail">
select
opt.glass_id as heat_layout_sort ,
@@ -3011,25 +3049,25 @@
contacts,
delivery_address as deliveryAddress,
od.processing_note as processingNote,
- od.width,
- od.height,
+ opt.o_width,
+ opt.o_height,
opl.glass_count as flowQuantity,
CONCAT(
- TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.width AS CHAR))),
+ opt.o_width,
' X ',
- TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.height AS CHAR))),
+ opt.o_height,
' = ',opl.glass_count ) as size,
CONCAT(
od.order_number,') ',
- TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.width AS CHAR))),
+ opt.o_width,
' X ',
- TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.height AS CHAR))),
+ opt.o_height,
' = ',opl.glass_count ) as numberSize,
CONCAT(
od.order_number,')',' ',
- TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.width AS CHAR))),
+ opt.o_width,
' X ',
- TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.height AS CHAR)))) as numberSizeQuantity,
+ opt.o_height) as numberSizeQuantity,
od.order_number as orderNumber,
fc.technology_number as technologyNumber,
od.building_number as buildingNumber,
@@ -3070,6 +3108,9 @@
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
where opt.project_no=#{projectNo} and opt.stock_id=#{stockId}
+ <if test="polysId != null">
+ and opt.polys_id=#{polysId}
+ </if>
order by opt.stock_id,opt.polys_id
</select>
@@ -3527,7 +3568,8 @@
pd.separation,
#{compound} as technology_number,
IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
- od.building_number
+ od.building_number,
+ od.weight
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
@@ -3584,7 +3626,8 @@
pd.separation,
#{compound} as technology_number,
IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
- od.building_number
+ od.building_number,
+ od.weight
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
@@ -3868,4 +3911,28 @@
and dd.breakage_reason = #{patchReason}
group by fc.process_id
</select>
+
+ <select id="getTerminationQuantity">
+ SELECT order_number,quantity,termination_quantity FROM flow_card where process_id = #{processId} and order_number = #{orderNumber} GROUP BY order_number
+ </select>
+
+ <update id="updateTerminationStatus">
+ update pp.flow_card set termination_status=1 where process_id = #{processId} and order_number = #{orderNumber}
+ </update>
+
+ <update id="updateTerminationNoMp">
+ update pp.flow_card set termination_status=0 , termination_quantity=0 where process_id = #{processId} and order_number = #{orderNumber}
+ </update>
+
+ <select id="getNewProcessMp">
+ select opd.process,bd.sort from sd.order_process_detail as opd
+ left join sd.basic_data as bd on bd.basic_name = opd.process and bd.basic_category='process'
+ where opd.process_id=#{processId} and opd.order_number=#{orderNumber}
+ and opd.technology_number = #{technologyNumber} and reporting_work_num_count>0 ORDER BY opd.id DESC LIMIT 1
+ </select>
+
+ <select id="getProcessInfo">
+ select basic_name as process,sort FROM sd.basic_data as bd
+ where bd.basic_category='process' and bd.basic_name = #{processName}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0