ERP_override.git

			@@ -484,7 +484,7 @@
			</select>

			<select id="selectPrintFlowCard">
			select project_no,glass_total,glass_total_area
			select project_no,glass_total,glass_total_area,labelPrintNum,processPrintNum
			from pp.optimize_project
			where date(create_time)>=#{selectTime1} and date(create_time) <= #{selectTime2}
			and state >= 20
			@@ -492,7 +492,7 @@
			</select>

			<select id="selectPrintMp">
			select *
			SELECT result.,fcc.print_status from ( select
			from ((select fc.id,
			fc.order_id,
			fc.process_id,
			@@ -507,7 +507,6 @@
			ogdss.concatenated_glass_child as glass_child,
			fc.founder,
			date(fc.splitFrame_time) as splitFrame_time,
			fc.print_status,
			processed_part as process

			from flow_card as fc
			@@ -549,7 +548,6 @@
			ogdss.concatenated_glass_child as glass_child,
			fc.founder,
			date(fc.splitFrame_time) as splitFrame_time,
			fc.print_status,
			processed_part as process

			from flow_card as fc
			@@ -587,7 +585,6 @@
			ogdss.concatenated_glass_child as glass_child,
			fc.founder,
			date(fc.splitFrame_time) as splitFrame_time,
			fc.print_status,
			processed_part as process

			from flow_card as fc
			@@ -618,7 +615,9 @@
			where process is not null
			and process != ""
			GROUP BY order_id, process_id, technology_number, process
			order by order_id, process_id, length(technology_number)
			order by order_id, process_id, length(technology_number)) as result
			LEFT JOIN (SELECT * from flow_card GROUP BY process_id,technology_number) as fcc
			on result.process_id = fcc.process_id and result.technology_number = fcc.technology_number
			</select>

			<select id="getPrimaryList">
			@@ -701,7 +700,7 @@

			<select id="getDetailList">
			select fc.order_number,
			concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
			concat(IF(ROUND(ogd.child_width, 1) = FLOOR(ogd.child_width), FLOOR(ogd.child_width), ROUND(ogd.child_width, 1)), "*", IF(ROUND(child_height, 1) = FLOOR(child_height), FLOOR(child_height), ROUND(child_height, 1))) as child_width,
			fc.quantity,
			round(ogd.total_area, 2) as total_area,
			od.perimeter,
			@@ -1285,7 +1284,7 @@

			<select id="getDetailListLike">
			select fc.order_number,
			concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
			concat(IF(ROUND(ogd.child_width, 1) = FLOOR(ogd.child_width), FLOOR(ogd.child_width), ROUND(ogd.child_width, 1)), "*", IF(ROUND(child_height, 1) = FLOOR(child_height), FLOOR(child_height), ROUND(child_height, 1))) as child_width,
			fc.quantity,
			round(ogd.total_area, 2) as total_area,
			od.perimeter,
			@@ -1318,9 +1317,9 @@
			<select id="getDetailListLikes">
			select fc.order_number,
			concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
			#{quantity} as quantity,
			round(ogd.child_widthogd.child_height#{quantity}/1000000, 2) as total_area,
			round((ogd.child_width+ogd.child_height)2#{quantity}/1000, 2) as perimeter,
			count(*) as quantity,
			round(ogd.child_widthogd.child_heightcount(*)/1000000, 2) as total_area,
			round((ogd.child_width+ogd.child_height)2count(*)/1000, 2) as perimeter,
			if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),od.bend_radius) as bend_radius,
			concat(IFNULL(od.processing_note, ''), IFNULL(od.remarks, '')) as remarks,
			od.other_columns,
			@@ -1330,20 +1329,20 @@
			fc.technology_number,
			IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
			od.building_number
			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
			fc.technology_number = ogd.technology_number
			left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
			left join sd.product_detail as pd
			on pd.prod_id = od.product_id and pd.glass_sort = ogd.technology_number
			left join flow_card_sort as fcs
			on fcs.process_id = fc.process_id and fcs.order_number = fc.order_number and
			fcs.technology_number = fc.technology_number
			and fcs.process = #{process}
			where fc.process_id = #{processId}
			from optimize_detail opt left join flow_card as fc on opt.process_id = fc.process_id and opt.order_sort = fc.order_number and
			opt.layer = fc.technology_number
			left join sd.order_glass_detail as ogd
			on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
			fc.technology_number = ogd.technology_number
			left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
			left join sd.product_detail as pd
			on pd.prod_id = od.product_id and pd.glass_sort = ogd.technology_number
			left join flow_card_sort as fcs
			on fcs.process_id = fc.process_id and fcs.order_number = fc.order_number and
			fcs.technology_number = fc.technology_number
			and fcs.process = #{process}
			where opt.process_id = #{processId} and opt.project_no=#{printProject}
			and position(fc.technology_number in #{technologyNumber})
			and fc.order_number=#{orderNumber}
			group by fc.process_id, fc.order_number, fc.technology_number
			order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
			</select>
			@@ -2211,6 +2210,13 @@
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
			' = ',#{printQuantity} ) as size,

			CONCAT(
			od.order_number,') ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
			' = ',#{printQuantity} ) as numberSize,
			od.order_number as orderNumber,
			fc.technology_number as technologyNumber,
			od.building_number as buildingNumber,
			@@ -2640,4 +2646,22 @@
			GROUP BY fc.process_id, ogd.technology_number
			order by fc.process_id, ogd.technology_number
			</select>

			<update id="updateProjectLabelPrintCount">
			update optimize_project set labelPrintNum=labelPrintNum+1 where project_no=#{projectNo}
			</update>

			<select id="selectProjectLabelPrintCount">
			select labelPrintNum from optimize_project where project_no=#{projectNo}
			</select>

			<update id="updateProjectProcessPrintCount">
			update optimize_project set processPrintNum=processPrintNum+1 where project_no=#{projectNo}
			</update>

			<select id="selectProjectProcessPrintCount">
			select processPrintNum from optimize_project where project_no=#{projectNo}
			</select>


			</mapper>