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
			@@ -853,19 +855,20 @@
			o.project,
			od.building_number,
			od.processing_note,
			ogd.child_width as width,
			ogd.child_height as height,
			opd.o_width as width,
			opd.o_height as height,
			ogd.glass_child,
			ogd.process,
			e.type_name,
			opd.stock_id,
			opd.polys_id,
			od.quantity,
			IFNULL(od.quantity,1) as quantity,
			od.other_columns,
			od.bend_radius,
			od.order_number as heat_layout_id,
			a.id as heat_layout_sort,
			od.product_name
			ifnull(od.order_number,0) as heat_layout_id,
			ifnull(a.id,0) as heat_layout_sort,
			od.product_name,
			opd.process_id
			from pp.optimize_detail opd
			left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
			left join sd.order_detail od
			@@ -901,7 +904,8 @@
			od.bend_radius,
			opd.heat_layout_id,
			opd.heat_layout_sort,
			od.product_name
			od.product_name,
			opd.process_id
			from pp.optimize_detail opd
			left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
			left join sd.order_detail od
			@@ -912,7 +916,7 @@
			left join sd.product p on od.product_id = p.id
			left join sd.basic_glass_type e on e.type_id = p.type_id
			left join sd.customer c on c.id = o.customer_id
			where opd.project_no = #{projectNo}
			where opd.project_no = #{projectNo} and o.order_id is not null
			order by opd.heat_layout_id, opd.heat_layout_sort desc
			</select>

			@@ -2192,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}
			@@ -2231,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
			@@ -2453,7 +2459,7 @@
			ogd.technology_number = fc.technology_number
			where fc.process_id = #{processId}
			and fc.order_number = #{orderNumber}
			group by od.order_number, width, height
			group by fc.process_id,od.order_number, width, height
			order by fc.process_id
			</select>

			@@ -2790,7 +2796,7 @@
			left join
			(select (@row_number := @row_number + 1) as id,process_id as process_id from (select process_id from pp.optimize_detail tt where project_no =#{projectNo} group by process_id) tt,(select @row_number := 0) as t) a
			on a.process_id=opd.process_id
			where opd.project_no = #{projectNo}
			where opd.project_no = #{projectNo} and o.order_id is not null
			group by order_id,od.order_number
			order by ogd.child_width desc,ogd.child_height desc
			</select>
			@@ -2847,7 +2853,7 @@
			left join sd.order_detail as od on od.order_id = SUBSTRING(fc.process_id,1,10) and od.order_number = fc.order_sort
			left join sd.`order` as o on o.order_id = SUBSTRING(fc.process_id,1,10)
			left join pp.`flow_card` as fcd on fcd.process_id=fc.process_id and fcd.technology_number=ogd.technology_number and fcd.order_number=od.order_number
			where fc.project_no = #{printProject}
			where fc.project_no = #{printProject} and fc.process_id is not null and fc.process_id!=""
			GROUP BY fc.process_id, ogd.technology_number
			order by fc.process_id, ogd.technology_number
			</select>
			@@ -3061,4 +3067,21 @@
			<select id="getOrderIdByProcessId">
			select order_id from pp.flow_card where process_id = #{processId} limit 1;
			</select>

			<select id="flowCardDetailMergeMp">
			select merge from pp.flow_card where process_id = #{processId} group by id ORDER BY merge desc LIMIT 1
			</select>

			<update id="updateFlowCardIsMerge">
			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>