ERP_override.git

			@@ -728,7 +728,9 @@
			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
			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 +1816,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
			@@ -2658,7 +2661,9 @@
			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
			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
			@@ -3006,7 +3011,7 @@
			</select>

			<select id="getPrintProjectDetailsMpSp">
			SELECT opd.project_no,opd.stock_id,opd.polys_id,o_width,o_height,p_width,p_height
			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=")">
			@@ -3907,4 +3912,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>