ERP_override.git

			@@ -728,7 +728,9 @@
			concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
			concat('对应我司单号', o.batch) AS otherRemarks,
			'' as qrcode,
			ifnull(rack,"") as rack
			ifnull(rack,"") as rack,
			o.quantity as orderQuantity,
			o.area as orderArea
			from flow_card as fc
			left join sd.order_glass_detail as ogd
			on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
			@@ -2171,6 +2173,15 @@
			order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
			</select>

			<select id="getgetPrintCustomDataSemiSp">
			select * from pp.optimize_detail opd
			where opd.process_id= #{processId} and opd.order_sort = #{orderNumber}
			<if test="technologyNumber != null and technologyNumber != ''">
			and opd.layer = #{technologyNumber}
			</if>

			</select>

			<select id="selectPrintNotMp">
			select fc.id,
			fc.order_id,
			@@ -2649,7 +2660,9 @@
			concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
			concat('对应我司单号', o.batch) AS otherRemarks,
			fc.technology_number as qrcode,
			o.other_remarks
			o.other_remarks,
			o.quantity as orderQuantity,
			o.area as orderArea
			from flow_card as fc
			left join sd.order_glass_detail as ogd
			on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
			@@ -2996,6 +3009,16 @@
			ORDER BY opd.stock_id
			</select>

			<select id="getPrintProjectDetailsMpSp">
			SELECT opd.project_no,opd.stock_id,opd.polys_id,o_width,o_height,p_width,p_height
			FROM optimize_detail as opd left join optimize_layout as opl on opl.project_no=opd.project_no and opl.stock_id=opd.stock_id
			where opd.project_no=#{projectNo} and opd.stock_id in
			<foreach item="item" index="index" collection="stockId" open="(" separator="," close=")">
			#{item}
			</foreach>
			order BY opd.stock_id
			</select>

			<select id="getPrintCustomDataProjectDetail">
			select
			opt.glass_id as heat_layout_sort ,
			@@ -3075,6 +3098,9 @@
			left join sd.product_detail as pd on pd.prod_id = p.id and pd.sort_num = od.order_number and
			pd.glass_sort = fc.technology_number
			where opt.project_no=#{projectNo} and opt.stock_id=#{stockId}
			<if test="polysId != null">
			and opt.polys_id=#{polysId}
			</if>
			order by opt.stock_id,opt.polys_id
			</select>