ERP_override.git

			@@ -95,7 +95,8 @@
			o.area = od.c,
			o.perimeter= od.aa,
			o.other_money = ifnull(c.money,0),
			o.other_remarks = (select group_concat( distinct edging_type) from order_detail where order_id = #{orderId} and edging_type is not null)
			o.other_remarks = (select GROUP_CONCAT(DISTINCT edging_type)
			from order_detail where order_id = #{orderId} and edging_type is not null)
			where
			o.order_id = #{orderId}

			@@ -110,7 +111,7 @@
			sd.`order` as o
			left join mm.finished_goods_inventory as fgi
			on o.order_id = fgi.order_id
			where date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
			where date(o.create_time) between #{startDate} and #{endDate}

			<if test="orderType!= null and orderType != ''">
			and o.create_order = #{orderType}
			@@ -397,7 +398,10 @@
			concat(a.width," * " , a.height) as size,
			b.area,
			b.glass_child as glassChild,
			d.product_name as productName
			d.product_name as productName,
			d.building_number as buildingNumber,
			d.remarks as remarks,
			d.processing_note as processingNote
			from pp.optimize_heat_detail as a
			left join sd.order_glass_detail as b
			on b.order_number = a.order_sort
			@@ -412,4 +416,38 @@
			and a.layout_id = #{layoutId}
			and a.sort = #{sort}
			</select>


			<insert id="saveOrderFile">
			insert into sd.order_file (order_id,order_number,file_name,file_data,file_json,create_time) values(#{orderId},#{orderNumber},#{fileName},#{dxfData},#{fileJson},now())
			</insert>

			<select id="selectOrderFile">
			select * from sd.order_file
			where order_id = #{orderId} and order_number = #{orderNumber}

			</select>

			<select id="selectOrderFileList">
			select * from sd.order_file
			where order_id = #{orderId}

			</select>

			<update id="updateOrderFile">
			update sd.order_file set file_name=#{fileName},file_data=#{dxfData},file_json=#{fileJson},create_time=now() where order_id=#{orderId} and order_number=#{orderNumber}
			</update>


			<select id="selectProcessAttributeConfigOne">
			select * from sd.process_attribute_config
			where level=1

			</select>

			<select id="selectProcessAttributeConfigTow">
			select * from sd.process_attribute_config
			where level=2 and belong=#{belong}

			</select>
			</mapper>