YiWuProject.git

			@@ -9,6 +9,7 @@
			import com.kangaroohy.milo.model.ReadWriteEntity;
			import com.kangaroohy.milo.service.MiloService;
			import com.mes.common.config.Const;
			import com.mes.damage.service.DamageService;
			import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
			import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
			import com.mes.edgstoragecage.entity.EdgStorageCage;
			@@ -72,6 +73,8 @@
			EdgStorageCageService edgStorageCageService;
			@Resource
			EdgStorageDeviceTaskHistoryService edgStorageDeviceTaskHistoryService;
			@Resource
			DamageService damageService;

			@Value("${mes.glassGap}")
			private int glassGap;
			@@ -487,6 +490,10 @@
			.eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)
			.eq(EdgStorageDeviceTaskHistory::getDeviceId, device)
			.orderByDesc(EdgStorageDeviceTaskHistory::getCreateTime).last("limit 1"));
			//如果任务类型为1，3，将切割完成的玻璃自动报工
			if (Const.GLASS_CACHE_TYPE_IN_ALL.contains(taskHistory.getTaskType())) {
			damageService.autoSubmitReport(taskHistory.getGlassIdIn(), taskHistory.getDeviceId(),"切割","进卧理");
			}
			updateCellRemainWidth(cell, device, taskHistory);
			edgStorageDeviceTaskHistoryService.update(new LambdaUpdateWrapper<EdgStorageDeviceTaskHistory>()
			.eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)