ERP_override.git

			@@ -1413,7 +1413,7 @@
			thickness
			) VALUES (
			#{processId},
			1,
			#{stockId},
			#{detail.width},
			#{detail.height},
			#{detail.x},
			@@ -1523,6 +1523,7 @@
			<update id="updateNormalDetails">
			UPDATE pp.optimize_detail
			SET
			glass_point = #{detail.glassPoint},
			x_axis = #{detail.x},
			y_axis = #{detail.y}
			WHERE
			@@ -1790,7 +1791,9 @@
			opd.process_id as flowCardId,
			od.order_id as orderNumber,
			opd.order_sort as productSortNumber,
			IF(LOCATE('中空', ogd.process ) > 0, JSON_UNQUOTE(JSON_EXTRACT(pd.separation, "$.lowE")), 0) as hollowCombineDirection,
			IF(LOCATE('中空', ogd.process ) > 0 and LOCATE('#', pd.separation ),
			REPLACE(JSON_UNQUOTE(JSON_EXTRACT(pd.separation, "$.lowE")),'#',''),
			0) as hollowCombineDirection,
			opd.o_width as width,
			opd.o_height as height,
			op.glass_thickness as thickness,
			@@ -1920,11 +1923,11 @@
			od.rack_no AS rackNo
			FROM
			pp.optimize_detail od
			LEFT JOIN pp.flow_card fc on od.process_id = fc.process_id
			LEFT JOIN sd.order_glass_detail ogd ON fc.order_id = ogd.order_id
			LEFT JOIN pp.flow_card fc on (od.process_id = fc.process_id and od.layer = fc.technology_number and od.order_sort = fc.order_number )
			LEFT JOIN sd.order_glass_detail ogd ON (fc.order_id = ogd.order_id and od.order_sort = ogd.order_number)
			LEFT JOIN sd.ORDER o ON o.order_id = fc.order_id
			LEFT JOIN sd.order_detail ord ON fc.order_id = ord.order_id
			LEFT JOIN pp.optimize_heat_detail h ON h.process_id = fc.process_id
			LEFT JOIN sd.order_detail ord ON (fc.order_id = ord.order_id and od.order_sort = ord.order_number)
			LEFT JOIN pp.optimize_heat_detail h ON (h.process_id = fc.process_id and od.order_sort = h.sort)
			WHERE
			od.project_no = #{projectId}
			</select>