ERP_override.git

			@@ -730,7 +730,8 @@
			'' as qrcode,
			ifnull(rack,"") as rack,
			o.quantity as orderQuantity,
			o.area as orderArea
			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
			@@ -770,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
			@@ -808,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
			@@ -1770,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
			@@ -1816,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
			@@ -1857,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
			@@ -2662,7 +2668,8 @@
			fc.technology_number as qrcode,
			o.other_remarks,
			o.quantity as orderQuantity,
			o.area as orderArea
			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
			@@ -3558,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
			@@ -3911,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>