ERP_override.git

			@@ -62,11 +62,11 @@
			c.product_name,
			b.project,
			sum(a.quantity) as quantity,
			sum(c.compute_gross_area) as compute_gross_area,
			sum(a.quantity) * c.area as compute_gross_area,
			a.founder,
			c.processing_note,
			b.customer_name,
			if(a.layout_status=0,'不可排版',if(a.layout_status=1,'可排版','已排版')) as layout_status,
			layout_status as layout_status,
			a.merge,
			a.rack,
			b.batch
			@@ -213,7 +213,7 @@
			ogd.production_id,
			od.product_id,
			od.product_name,
			ROUND(SUM(od.quantity) - IFNULL(SUM(fc.quantity) / fc.layers_number, 0)) AS quantity,
			ROUND(SUM(od.quantity) - IFNULL(SUM(fc.quantity), 0)) AS quantity,
			SUM(od.compute_gross_area) AS compute_gross_area,
			ROUND(SUM(od.perimeter), 2) AS perimeter
			FROM sd.order_detail AS od
			@@ -614,10 +614,11 @@
			GROUP_CONCAT(ogds.technology_number SEPARATOR '') AS technology_number,
			ogds.glass_child,
			GROUP_CONCAT(ogds.glass_child SEPARATOR '+') AS concatenated_glass_child,
			SUBSTRING(process, LOCATE('夹胶', process)) AS processed_part
			SUBSTRING(process, LOCATE(bd.basic_name, process)) AS processed_part
			from sd.order_glass_detail as ogds
			left join sd.basic_data as bd on bd.nickname='stepC'
			where ogds.order_id = #{orderId}
			and LOCATE('夹胶', ogds.process) > 0
			and LOCATE(bd.basic_name, ogds.process) > 0
			GROUP BY order_id, order_number, ogds.group) as ogdss
			on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
			where fc.order_id = #{orderId}
			@@ -652,13 +653,14 @@
			GROUP_CONCAT(pds.glass_sort SEPARATOR '') AS technology_number,
			ogds.glass_child,
			GROUP_CONCAT(ogds.glass_child SEPARATOR '+') AS concatenated_glass_child,
			SUBSTRING(ogds.process, LOCATE('中空', ogds.process)) AS processed_part
			SUBSTRING(ogds.process, LOCATE(bd.basic_name, ogds.process)) AS processed_part
			from sd.order_glass_detail as ogds
			left join sd.order_detail as ods
			on ods.order_id = ogds.order_id and ods.order_number = ogds.order_number
			left join sd.product_detail as pds on pds.prod_id = ods.product_id and
			pds.glass_sort =
			ogds.technology_number
			left join sd.basic_data as bd on bd.nickname='stepD'
			where ogds.order_id = #{orderId}
			GROUP BY order_id, order_number) as ogdss
			on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
			@@ -2194,10 +2196,11 @@
			GROUP_CONCAT(ogds.technology_number SEPARATOR '') AS technology_number,
			ogds.glass_child,
			GROUP_CONCAT(ogds.glass_child SEPARATOR '+') AS concatenated_glass_child,
			SUBSTRING(process, LOCATE('夹胶', process)) AS processed_part
			SUBSTRING(process, LOCATE(bd.basic_name, process)) AS processed_part
			from sd.order_glass_detail as ogds
			left join sd.basic_data as bd on bd.nickname='stepC'
			where ogds.order_id = #{orderId}
			and LOCATE('夹胶', ogds.process) > 0
			and LOCATE(bd.basic_name, ogds.process) > 0
			GROUP BY order_id, order_number, ogds.group) as ogdss
			on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
			where fc.order_id = #{orderId}
			@@ -2233,13 +2236,14 @@
			GROUP_CONCAT(pds.glass_sort SEPARATOR '') AS technology_number,
			ogds.glass_child,
			GROUP_CONCAT(ogds.glass_child SEPARATOR '+') AS concatenated_glass_child,
			SUBSTRING(pds.process, LOCATE('中空', pds.process)) AS processed_part
			SUBSTRING(pds.process, LOCATE(bd.basic_name, pds.process)) AS processed_part
			from sd.order_glass_detail as ogds
			left join sd.order_detail as ods
			on ods.order_id = ogds.order_id and ods.order_number = ogds.order_number
			left join sd.product_detail as pds on pds.prod_id = ods.product_id and
			pds.glass_sort =
			ogds.technology_number
			left join sd.basic_data as bd on bd.nickname='stepD'
			where ogds.order_id = #{orderId}
			GROUP BY order_id, order_number) as ogdss
			on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
			@@ -3072,4 +3076,12 @@
			update pp.flow_card fc set fc.merge=0
			where fc.process_id = #{processId}
			</update>

			<select id="getProcessName">
			select IFNULL(nickname,'') from sd.basic_data where basic_category='process' and basic_name=#{processSub}
			</select>

			<select id="getProcessNameList">
			SELECT id,basic_name,IFNULL(nickname,"") as nickname FROM sd.`basic_data` where basic_category='process'
			</select>
			</mapper>