ERP_override.git

			@@ -473,7 +473,7 @@
			<!--库存信息-->
			<select id="materialStoreMp">
			SELECT
			i.id AS id,
			i.material_code AS id,
			i.producer AS producer,
			i.available_quantity-i.plan_quantity AS available_quantity,
			null as processingQuantity,
			@@ -570,7 +570,7 @@


			<select id="materialStoreOptimizeUse">
			select ms.id AS id,
			select ou.raw_stock_code AS id,
			ou.use_count AS processingQuantity,
			ou.width,
			ou.height,
			@@ -1711,7 +1711,10 @@
			p.creater = a.Id
			)))
			WHERE
			( p.state = 1 ) and p.tempering_state=0 and optimize_state=0 and p.project_no = #{projectNo}
			( p.state = 1 ) and
			# p.tempering_state=0 and
			# optimize_state=0 and
			p.project_no = #{projectNo}
			ORDER BY
			p.create_time DESC,
			p.project_no
			@@ -1881,27 +1884,40 @@
			</select>
			<select id="getOptimizeDetailsInfo" resultType="java.util.Map">
			SELECT
			0 As isRemain,
			width AS realWidth,
			height AS realHeight,
			p_width AS width,
			p_height AS height,
			process_id AS processId,
			layer,
			total_layer AS totalLayer,
			order_sort As orderSort,
			stock_id AS layoutId,
			stock_number AS glassSort,
			x_axis AS x,
			y_axis AS y,
			mark_icon AS markIcon,
			isRotate,
			glass_point AS glassPoint,
			rack_no As rackNo
			0 AS isRemain,
			od.width AS realWidth,
			od.height AS realHeight,
			od.p_width AS width,
			od.p_height AS height,
			od.process_id AS processId,
			od.layer,
			od.total_layer AS totalLayer,
			od.order_sort AS orderSort,
			od.stock_id AS layoutId,
			od.stock_number AS glassSort,
			od.x_axis AS x,
			od.y_axis AS y,
			od.mark_icon AS markIcon,
			od.isRotate,
			od.glass_point AS glassPoint,
			fc.order_id AS orderNo,
			ogd.process,
			o.customer_name AS customerName,
			o.processing_note AS processingNote,
			o.project AS projectName,
			ord.product_name AS productName,
			ord.building_number AS buildingNumber,
			COALESCE(h.layout_id, 0) as heatLayoutId,
			od.rack_no AS rackNo
			FROM
			pp.optimize_detail
			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 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
			WHERE
			project_no = #{projectId}
			od.project_no = #{projectId}
			</select>
			<select id="getOptimizeOffsetsInfo" resultType="java.util.Map">
			SELECT