ERP_override.git

			@@ -25,6 +25,8 @@
			<result column="salesman" property="salesman"/>
			<result column="processing_note" property="processingNote"/>
			<result column="delivery_address" property="deliveryAddress"/>
			<result column="create_time" property="createTime"/>
			<result column="update_time" property="updateTime"/>
			</association>
			<association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
			<result column="product_id" property="productId"/>
			@@ -69,7 +71,9 @@
			layout_status as layout_status,
			a.merge,
			a.rack,
			b.batch
			b.batch,
			b.create_time,
			b.update_time
			from (select id,order_id,process_id,order_number, quantity,founder,max(layout_status) as layout_status,create_time,max(merge) as merge,rack from flow_card
			group by process_Id,order_number) as a
			left join sd.`order` as b on a.order_Id=b.order_id
			@@ -323,7 +327,7 @@
			ods.S03,
			ods.S04,
			ods.S05,
			od.building_number
			od.building_number as 'buildingNumber'
			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
			@@ -559,7 +563,8 @@
			</select>

			<select id="selectPrintFlowCard">
			select op.project_no,glass_total,glass_total_area,labelPrintNum,processPrintNum,glass_type,glass_thickness
			select op.project_no,glass_total,glass_total_area,labelPrintNum,processPrintNum,glass_type,glass_thickness,
			GROUP_CONCAT(DISTINCT o.order_id SEPARATOR '~') as order_id
			from pp.optimize_project as op
			left join pp.flow_card as fc on op.project_no=fc.project_no
			left join sd.`order` as o on o.order_id=fc.order_id
			@@ -811,7 +816,7 @@
			fcs.technology_number = fc.technology_number
			and fcs.process = #{process}
			where fc.process_id = #{processId}
			and position(fc.technology_number in #{technologyNumber})
			and FIND_IN_SET(fc.technology_number , #{technologyNumber})
			group by fc.process_id, fc.order_number
			<choose>
			<!-- 当 landingSequence != 1 且 flashback != 1 时，按 landing_sequence 倒序 -->
			@@ -1479,7 +1484,7 @@
			from sd.order_detail as od
			left join flow_card as fc on od.order_id = fc.order_id and od.order_number = fc.order_number
			where fc.process_id = #{processId}
			and POSITION(fc.technology_number in #{technologyNumber})
			and FIND_IN_SET(fc.technology_number , #{technologyNumber})
			GROUP BY other_columns
			order by IF(fc.sort != NULL or fc.sort != '', fc.sort, fc.order_number)
			</select>
			@@ -1629,7 +1634,7 @@
			fcs.technology_number = fc.technology_number
			and fcs.process = #{process}
			where fc.process_id = #{processId}
			and position(fc.technology_number in #{technologyNumber})
			and FIND_IN_SET(fc.technology_number , #{technologyNumber})
			group by fc.process_id, fc.order_number, fc.technology_number
			<choose>
			<when test="landingSequence != 1 and flashback != 1">
			@@ -2818,6 +2823,7 @@
			left join sd.order_glass_detail as ogd
			on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
			ogd.technology_number = fc.technology_number

			where fc.process_id = #{processId}
			and fc.order_number = #{orderNumber}
			group by fc.process_id,od.order_number, width, height
			@@ -3005,25 +3011,25 @@
			contacts,
			delivery_address as deliveryAddress,
			od.processing_note as processingNote,
			od.width,
			od.height,
			opt.width,
			opt.height,
			opl.glass_count as flowQuantity,
			CONCAT(
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.width AS CHAR))),
			opt.width,
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.height AS CHAR))),
			opt.height,
			' = ',opl.glass_count ) as size,
			CONCAT(
			od.order_number,') ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.width AS CHAR))),
			opt.width,
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.height AS CHAR))),
			opt.height,
			' = ',opl.glass_count ) as numberSize,
			CONCAT(
			od.order_number,')',' ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.width AS CHAR))),
			opt.width,
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.height AS CHAR)))) as numberSizeQuantity,
			opt.height) as numberSizeQuantity,
			od.order_number as orderNumber,
			fc.technology_number as technologyNumber,
			od.building_number as buildingNumber,
			@@ -3052,7 +3058,8 @@
			'文本' as custom3,
			'文本' as custom4,
			'文本' as custom5,
			od.quantity
			od.quantity,
			CONCAT(opt.stock_id,"/",opt.polys_id) as stockPolysId
			from optimize_detail as opt
			left join optimize_layout as opl on opl.project_no=opt.project_no and opl.stock_id=opt.stock_id
			left join flow_card as fc on opt.project_no=fc.project_no and opt.process_id=fc.process_id and opt.layer=fc.technology_number and opt.order_sort=fc.order_number
			@@ -3533,7 +3540,8 @@
			fcs.technology_number = fc.technology_number
			and fcs.process = #{process}
			where fc.process_id = #{processId}
			and position(fc.technology_number in #{compound})
			and
			FIND_IN_SET(fc.technology_number , #{compound})
			group by fc.process_id, fc.order_number
			<choose>
			<when test="landingSequence != 1 and flashback != 1">
			@@ -3589,7 +3597,7 @@
			fcs.technology_number = fc.technology_number
			and fcs.process = #{process}
			where fc.process_id = #{processId}
			and position(fc.technology_number in #{compound})
			and FIND_IN_SET(fc.technology_number , #{compound})
			group by fc.process_id, fc.order_number
			<choose>
			<when test="landingSequence != 1 and flashback != 1">