~zhoushihao/YiWuProject.git

			@@ -13,7 +13,7 @@
			import com.mes.damage.mapper.DamageMapper;
			import com.mes.damage.service.DamageService;
			import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
			import com.mes.edgglasstask.entity.request.IdentWornRequest;
			import com.mes.damage.entity.request.DamageRequest;
			import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
			import com.mes.edgstoragecage.entity.EdgStorageCage;
			import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
			@@ -33,7 +33,6 @@
			import com.mes.taskcache.service.TaskCacheService;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.lang.StringUtils;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			@@ -70,9 +69,6 @@

			@Autowired
			TaskCacheService taskCacheService;

			@Resource
			DamageMapper damageMapper;

			@Autowired
			DamageService damageService;
			@@ -291,27 +287,19 @@
			return outEdgStorageCageDetails;
			}


			@Override
			public String identControls(IdentWornRequest request) {
			public String identControls(DamageRequest request) {
			//将识别破损的玻璃直接加入破损表
			Damage damage = new Damage();
			BeanUtils.copyProperties(request, damage);
			damage.setType(request.getState());
			damage.setRemark("");
			damage.setStatus(0);
			damageService.insertDamage(damage);
			damageService.autoSubmitReport(request.getGlassId(), request.getLine(), request.getWorkingProcedure(), "掰片识别", request.getState());
			return "success";
			}

			@Override
			public String edgReportStatus(IdentWornRequest request) {
			public String edgReportStatus(DamageRequest request) {
			//将磨边队列破损的玻璃直接加入破损表
			Damage damage = new Damage();
			BeanUtils.copyProperties(request, damage);
			damage.setType(request.getState());
			damage.setRemark("");
			damage.setStatus(0);
			damageService.insertDamage(damage);
			damageService.autoSubmitReport(request.getGlassId(), request.getLine(), request.getWorkingProcedure(), "磨边清洗", request.getState());

			//修改磨边队列数据状态
			edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
			.set(EdgGlassTaskInfo::getState, request.getState()).eq(EdgGlassTaskInfo::getGlassId, request.getGlassId()));
			@@ -333,7 +321,7 @@
			//说明此玻璃没有进过理片
			return true;
			} else {
			List<Damage> damage = damageMapper.selectList(new LambdaQueryWrapper<Damage>()
			List<Damage> damage = damageService.list(new LambdaQueryWrapper<Damage>()
			.eq(Damage::getGlassId, glassId)
			.and(wrapper -> wrapper.eq(Damage::getType, 8).or().eq(Damage::getType, 9))
			);
			@@ -348,4 +336,12 @@
			public EdgStorageCageDetails queryEdgStorageDetailsBySize(int deviceId, int currentSlot, double width, double height) {
			return baseMapper.queryEdgStorageDetailsBySize(deviceId, currentSlot, width, height);
			}

			@Override
			public String edgDetailsOperate(DamageRequest request) {
			//卧式理片笼爆破损
			damageService.autoSubmitReport(request.getGlassId(), request.getLine(), request.getWorkingProcedure(), "卧式理片笼", request.getState());
			this.remove(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getGlassId,request.getGlassId()));
			return "success";
			}
			}