YiWuProject.git

			@@ -191,7 +191,7 @@
			List<LoadGlassInfo> glassInfos = null;
			glassInfos = glassInfoMapper.selectJoinList(LoadGlassInfo.class, new MPJQueryWrapper<GlassInfo>()
			.select("IFNULL(b.state, 0) AS state,engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,t.glass_id,t.flow_card_id")
			.leftJoin("(SELECT glass_id, MAX(type) AS state FROM damage GROUP BY glass_id) b\n" +
			.leftJoin("(SELECT glass_id, type as state FROM damage where type in (8, 9) and status = 1) b\n" +
			"ON t.glass_id = b.glass_id")
			.eq("engineer_id", glassInfo.getEngineerId())
			.eq("tempering_layout_id", glassInfo.getTemperingLayoutId()));

			@@ -69,7 +69,7 @@
			else 0 end as state
			from glass_temp t
			left join edg_storage_cage_details t1 on t.glass_id = t1.glass_id
			left join damage t2 on t.glass_id = t2.glass_id and t2.type in (8,9)
			left join damage t2 on t.glass_id = t2.glass_id and t2.type in (8,9) AND t2.STATUS = 1
			)select * from cut_drawing_temp where 1=1
			<if test="isAll == 1">
			and state = 0
			@@ -129,7 +129,8 @@
			2) as oneUncompletedArea,
			round(sum(CASE WHEN e.station_cell = 6 and escd.device_id is null THEN 1 ELSE 0 END),
			2) as twoUncompletedQuantity,
			round(sum( CASE WHEN e.station_cell = 6 and escd.device_id is null THEN gi.width*gi.height/1000000 ELSE 0 END ),2) as twoUncompletedArea
			round(sum( CASE WHEN e.station_cell = 6 and escd.device_id is null THEN gi.width*gi.height/1000000 ELSE 0 END
			),2) as twoUncompletedArea
			FROM
			glass_info gi
			left join edg_storage_cage_details escd ON gi.glass_id = escd.glass_id

	hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageDetailsMapper.xml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史