YiWuProject.git

			@@ -4,10 +4,8 @@
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.mes.common.config.Const;
			import com.mes.damage.entity.Damage;
			import com.mes.damage.service.DamageService;
			import com.mes.hollow.entity.HollowGlassOutRelationInfo;
			import com.mes.hollow.service.HollowGlassOutRelationInfoService;
			import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
			import com.mes.hollowqueue.mapper.HollowGlassQueueInfoMapper;
			@@ -16,8 +14,9 @@
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.time.LocalDate;
			import java.time.LocalDateTime;
			import java.util.List;
			import java.util.Optional;

			/**
			* (HollowGlassQueueInfo)表服务实现类
			@@ -46,6 +45,7 @@

			@Override
			public List<HollowGlassQueueInfo> queryHollowGlassQueueInfoByLine(int cell) {
			LocalDateTime twoDaysAgo = LocalDate.now().atStartOfDay().minusDays(1);
			List<String> relationIds = this.listObjs(
			new LambdaQueryWrapper<HollowGlassQueueInfo>()
			.lt(HollowGlassQueueInfo::getState, 1)
			@@ -59,7 +59,8 @@
			.in("relation_id", relationIds)
			.eq("cell", cell)
			.eq("is_pair", 1)
			.select("width","height","flow_card_id","relation_id", "hollow_sequence", "cell", "MAX(state) as state", "MAX(layer) as layer")
			.ge("create_time", twoDaysAgo)
			.select("width", "height", "flow_card_id", "relation_id", "hollow_sequence", "cell", "MAX(state) as state", "MAX(layer) as layer")
			.groupBy("relation_id", "hollow_sequence")
			.orderByAsc("relation_id", "hollow_sequence")
			);
			@@ -104,5 +105,10 @@

			}
			}

			@Override
			public List<String> queryNeedInCarGlass() {
			return baseMapper.queryNeedInCarGlass();
			}
			}