ERP_override.git

			@@ -728,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
			@@ -768,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
			@@ -806,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
			@@ -1768,7 +1773,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
			@@ -1814,7 +1820,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
			@@ -1855,7 +1862,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
			@@ -2169,6 +2177,15 @@
			</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">
			@@ -2649,7 +2666,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
			@@ -2996,6 +3016,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 ,
			@@ -3075,6 +3105,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>

			@@ -3532,7 +3565,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
			@@ -3885,4 +3919,16 @@
			<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>