JiuMuMES.git - Gitblit

			@@ -238,6 +238,7 @@
			.eq(Tasking::getScanId,scan_id)
			.eq(Tasking::getGlassState,"正常")
			.eq(Tasking::getState,"线上")
			.ne(Tasking::getWorkState,"完工")
			.le(LineConfiguration::getProcessSequence,machineLineConfiguration.get(0).getProcessSequence())
			.orderByAsc(Tasking::getTaskSequence));
			if(!list.isEmpty()){
			@@ -325,11 +326,12 @@
			@Override
			public int finishMachineTask(Machine machine) {
			List<Tasking> list=this.findMachineWorkStateTask(machine,"正在工作");
			//当前设备的线路配置
			//查询当前设备线路配置
			List<LineConfiguration> machineLineConfiguration=lineConfigurationMapper.selectJoinList(LineConfiguration.class,new MPJLambdaWrapper<LineConfiguration>()
			.selectAll(LineConfiguration.class)
			.eq(LineConfiguration::getMachineId,machine.getId()));
			if(!machineLineConfiguration.isEmpty()){
			//当前设备存在线路配置，查询当前设备在线路配置表中的下一设备
			List<LineConfiguration> listLineConfiguration=lineConfigurationMapper.selectJoinList(LineConfiguration.class,new MPJLambdaWrapper<LineConfiguration>()
			.selectAll(LineConfiguration.class)
			.eq(LineConfiguration::getLineId,machineLineConfiguration.get(0).getLineId())
			@@ -338,12 +340,16 @@
			.orderByAsc(LineConfiguration::getProcessSequence)
			.orderByAsc(LineConfiguration::getPrioritySequence)
			);

			if(!list.isEmpty()){
			//标记任务状态
			Tasking tasking=list.get(0);
			LineConfiguration thisLineConfiguration=lineConfigurationMapper.selectById(tasking.getLineConfigurationId());
			tasking.setOperationRecord(thisLineConfiguration.getRemark()+thisLineConfiguration.getLineId());
			tasking.setOperationRecordTime(new Date());
			tasking.setOperationMode("结束");
			//listLineConfiguration不是空,表示当前设备配置关系中有下一设备
			// 否则表示无下一工序，即当前工序为最后一工序标记状态完工
			if (!listLineConfiguration.isEmpty()){
			tasking.setLineConfigurationId(listLineConfiguration.get(0).getId());
			tasking.setWorkState("等待");
			@@ -352,7 +358,6 @@
			else{
			tasking.setWorkState("完工");
			return baseMapper.updateById(tasking);
			//return this.stopTasking(tasking);
			}

			}