ERP_override.git

			@@ -767,7 +767,8 @@
			pl.patch_reason,
			pl.patch_processes,
			od.product_name,
			ogd.glass_child
			ogd.glass_child,
			fc.print_status
			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
			@@ -777,9 +778,9 @@
			left join patch_log 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}
			GROUP BY fc.process_id, ogd.technology_number
			order by pl.id,fc.process_id, ogd.technology_number
			where pl.create_time between #{selectTime1} and #{selectTime2} and pl.review_status>0
			GROUP BY pl.id,fc.process_id, ogd.technology_number
			order by pl.id desc,fc.process_id, ogd.technology_number
			</select>

			<select id="getRepairPrintCustomData">
			@@ -931,9 +932,9 @@
			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}
			where pl.create_time between #{selectTime1} and #{selectTime2} and pl.review_status>0
			GROUP BY fc.process_id, ogd.technology_number
			order by pl.id,fc.process_id, ogd.technology_number
			order by pl.id desc,fc.process_id, ogd.technology_number
			</select>

			<select id="getDetailListLike">
			@@ -970,7 +971,7 @@
			od.product_name,
			o.processing_note,
			fc.process_id,
			SUM(od.quantity) as quantity,
			pl.patch_num as quantity,
			round(SUM(ogd.total_area), 2) as gross_area,
			sum(od.weight) as weight,
			#{technologyNumber} as technologyNumber,
			@@ -994,6 +995,7 @@
			and position(ogd.technology_number in #{technologyNumber})
			GROUP BY order_id, order_number
			) as ogdc on ogdc.order_id=ogd.order_id and ogdc.order_number=ogd.order_number and ogdc.technology_number=ogd.technology_number
			left join patch_log as pl on pl.process_id=fc.process_id and pl.order_sort=fc.order_number and pl.technology_number=fc.technology_number
			where fc.process_id = #{processId} and fc.order_number=#{orderNumber}
			and position(fc.technology_number in #{technologyNumber}) and ogdc.concatenated_glass_child is NOT null
			group by fc.process_id, fc.technology_number
			@@ -1002,7 +1004,7 @@
			<select id="getDetailListRefund">
			select fc.order_number,
			concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
			od.quantity,
			(pl.patch_num) as quantity,
			round(ogd.total_area, 2) as total_area,
			od.perimeter,
			od.bend_radius,
			@@ -1018,6 +1020,7 @@
			fc.technology_number = ogd.technology_number
			left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
			left join sd.product_detail as pd on pd.prod_id=od.product_id and pd.glass_sort=ogd.technology_number
			left join patch_log as pl on pl.process_id=fc.process_id and pl.order_sort=fc.order_number and pl.technology_number=fc.technology_number
			where fc.process_id = #{processId}
			and fc.order_number = #{orderNumber}
			and position(fc.technology_number in #{technologyNumber})
			@@ -1034,7 +1037,7 @@
			od.product_name,
			o.processing_note,
			fc.process_id,
			SUM(od.quantity) as quantity,
			pl.patch_num as quantity,
			round(SUM(ogd.total_area), 2) as gross_area,
			sum(od.weight) as weight,
			#{technologyNumber} as technologyNumber,
			@@ -1058,6 +1061,7 @@
			and position(ogd.technology_number in #{technologyNumber})
			GROUP BY order_id, order_number
			) as ogdc on ogdc.order_id=ogd.order_id and ogdc.order_number=ogd.order_number and ogdc.technology_number=ogd.technology_number
			left join patch_log as pl on pl.process_id=fc.process_id and pl.order_sort=fc.order_number and pl.technology_number=fc.technology_number
			where fc.process_id = #{processId}
			and fc.order_number = #{orderNumber}
			and fc.technology_number = #{technologyNumber}
			@@ -1067,7 +1071,7 @@
			<select id="getDetailListLikeRefund">
			select fc.order_number,
			concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
			od.quantity,
			pl.patch_num as quantity,
			round(ogd.total_area, 2) as total_area,
			od.perimeter,
			od.bend_radius,
			@@ -1083,6 +1087,140 @@
			fc.technology_number = ogd.technology_number
			left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
			left join sd.product_detail as pd on pd.prod_id=od.product_id and pd.glass_sort=ogd.technology_number
			left join patch_log as pl on pl.process_id=fc.process_id and pl.order_sort=fc.order_number and pl.technology_number=fc.technology_number
			where fc.process_id = #{processId}
			and fc.order_number = #{orderNumber}
			and position(fc.technology_number in #{technologyNumber})
			group by fc.process_id, fc.order_number,fc.technology_number
			order by IF(sort != NULL \|\| sort != '', sort, fc.order_number)
			</select>

			<select id="getPrimaryListRework">
			select o.customer_name,
			o.project,
			ogd.process,
			od.edging_type,
			ogd.glass_child,
			od.product_name,
			o.processing_note,
			fc.process_id,
			pl.rework_num as quantity,
			round(SUM(ogd.total_area), 2) 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
			fc.technology_number = ogd.technology_number
			left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
			left join sd.`order` as o on o.order_id = fc.order_id
			left join sd.product as p on p.id=od.product_id
			left join (
			select ogd.order_id,
			ogd.order_number,
			ogd.technology_number,
			ogd.glass_child,
			GROUP_CONCAT(glass_child SEPARATOR ' ') AS concatenated_glass_child
			from sd.order_glass_detail as ogd
			where ogd.order_id = left(#{processId},10)
			and ogd.order_number = #{orderNumber}
			and position(ogd.technology_number in #{technologyNumber})
			GROUP BY order_id, order_number
			) as ogdc on ogdc.order_id=ogd.order_id and ogdc.order_number=ogd.order_number and ogdc.technology_number=ogd.technology_number
			left join rework as pl on pl.process_id=fc.process_id and pl.order_sort=fc.order_number and pl.technology_number=fc.technology_number
			where fc.process_id = #{processId}
			and fc.order_number = #{orderNumber}
			and fc.technology_number = #{technologyNumber}
			group by fc.process_id, fc.technology_number
			</select>

			<select id="getDetailListRework">
			select fc.order_number,
			concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
			(pl.rework_num) as quantity,
			round(ogd.total_area, 2) as total_area,
			od.perimeter,
			od.bend_radius,
			concat(od.processing_note,od.remarks) as remarks,
			od.other_columns,
			round(ogd.child_width) as width,
			round(ogd.child_height) as height,
			pd.separation,
			fc.technology_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
			fc.technology_number = ogd.technology_number
			left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
			left join sd.product_detail as pd on pd.prod_id=od.product_id and pd.glass_sort=ogd.technology_number
			left join rework as pl on pl.process_id=fc.process_id and pl.order_sort=fc.order_number and pl.technology_number=fc.technology_number
			where fc.process_id = #{processId}
			and fc.order_number = #{orderNumber}
			and position(fc.technology_number in #{technologyNumber})
			group by fc.process_id, fc.order_number,fc.technology_number
			order by IF(sort != NULL \|\| sort != '', sort, fc.order_number)
			</select>

			<select id="getPrimaryListMergeRework">
			select o.customer_name,
			o.project,
			ogd.process,
			od.edging_type,
			ogdc.concatenated_glass_child as glass_child,
			od.product_name,
			o.processing_note,
			fc.process_id,
			pl.rework_num as quantity,
			round(SUM(ogd.total_area), 2) 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
			fc.technology_number = ogd.technology_number
			left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
			left join sd.`order` as o on o.order_id = fc.order_id
			left join sd.product as p on p.id=od.product_id
			left join (
			select ogd.order_id,
			ogd.order_number,
			ogd.technology_number,
			ogd.glass_child,
			GROUP_CONCAT(glass_child SEPARATOR ' ') AS concatenated_glass_child
			from sd.order_glass_detail as ogd
			where ogd.order_id = left(#{processId},10)
			and ogd.order_number=#{orderNumber}
			and position(ogd.technology_number in #{technologyNumber})
			GROUP BY order_id, order_number
			) as ogdc on ogdc.order_id=ogd.order_id and ogdc.order_number=ogd.order_number and ogdc.technology_number=ogd.technology_number
			left join rework as pl on pl.process_id=fc.process_id and pl.order_sort=fc.order_number and pl.technology_number=fc.technology_number
			where fc.process_id = #{processId} and fc.order_number=#{orderNumber}
			and position(fc.technology_number in #{technologyNumber}) and ogdc.concatenated_glass_child is NOT null
			group by fc.process_id, fc.technology_number
			</select>

			<select id="getDetailListLikeRework">
			select fc.order_number,
			concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
			pl.rework_num as quantity,
			round(ogd.total_area, 2) as total_area,
			od.perimeter,
			od.bend_radius,
			concat(od.processing_note,od.remarks) as remarks,
			od.other_columns,
			round(ogd.child_width) as width,
			round(ogd.child_height) as height,
			pd.separation,
			fc.technology_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
			fc.technology_number = ogd.technology_number
			left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
			left join sd.product_detail as pd on pd.prod_id=od.product_id and pd.glass_sort=ogd.technology_number
			left join rework as pl on pl.process_id=fc.process_id and pl.order_sort=fc.order_number and pl.technology_number=fc.technology_number
			where fc.process_id = #{processId}
			and fc.order_number = #{orderNumber}
			and position(fc.technology_number in #{technologyNumber})