ERP_override.git

			@@ -246,11 +246,31 @@
			od.compute_gross_area as 'computeGrossArea',
			p.total_thickness AS 'totalThickness',
			p.thickness,
			od.weight
			od.weight,
			od.weight,
			ods.S01,
			ods.S02,
			ods.S03,
			ods.S04,
			ods.S05
			from sd.order_detail as od
			left join sd.order_glass_detail as ogd
			on od.order_id = ogd.order_id and od.order_number = ogd.order_number
			left join sd.product as p on od.product_name = p.product_name
			left join (
			SELECT
			order_id,
			order_number,
			JSON_UNQUOTE( JSON_EXTRACT( other_columns, '$.S01' )) AS S01,
			JSON_UNQUOTE( JSON_EXTRACT( other_columns, '$.S02' )) AS S02,
			JSON_UNQUOTE( JSON_EXTRACT( other_columns, '$.S03' )) AS S03,
			JSON_UNQUOTE( JSON_EXTRACT( other_columns, '$.S04' )) AS S04,
			JSON_UNQUOTE( JSON_EXTRACT( other_columns, '$.S05' )) AS S05
			FROM
			sd.order_detail
			WHERE
			order_id = #{orderId}
			) as ods on ods.order_id=od.order_id and ods.order_number=od.order_number
			where od.order_id = #{orderId}
			and ogd.production_id = #{productionId}
			and ogd.splitting_status = 0
			@@ -563,18 +583,19 @@

			<select id="getPrintLabel">
			select o.order_id,
			o.customer_name,
			c.customer_abbreviation as customer_name,
			o.project,
			od.building_number,
			od.processing_note,
			od.width,
			od.height,
			ogd.child_width as width,
			ogd.child_height as height,
			ogd.glass_child,
			ogd.process,
			e.type_name,
			opd.stock_id,
			od.quantity,
			od.other_columns
			od.other_columns,
			od.bend_radius
			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
			@@ -583,6 +604,7 @@
			on SUBSTR(opd.process_id, 1, 10) = ogd.order_id and opd.order_sort = ogd.order_number and opd.layer=ogd.technology_number
			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}
			order by opd.stock_id
			</select>
			@@ -591,8 +613,8 @@
			select o.order_id ,
			o.project,
			o.customer_id ,
			od.width,
			od.height,
			ogd.child_width as width,
			ogd.child_height as height,
			od.quantity,
			od.order_number as orderNumber,
			fc.technology_number as technologyNumber,
			@@ -602,7 +624,8 @@
			ifnull(od.processing_note,'') as processing_note,
			bgt.type_name,
			od.other_columns,
			od.building_number
			od.building_number,
			od.bend_radius
			from sd.order as o
			left join sd.order_detail as od on o.order_id = od.order_id
			left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
			@@ -875,4 +898,8 @@
			and position(fc.technology_number in #{technologyNumber}) and ogdc.concatenated_glass_child is NOT null
			group by fc.process_id, fc.technology_number
			</select>

			<select id="selectorderOtherMoney">
			select * from sd.basic_other_money where (id=21 or id>31)
			</select>
			</mapper>