YiWuProject.git

			@@ -4,6 +4,8 @@
			import com.mes.damage.entity.Damage;
			import com.mes.damage.entity.request.DamageRequest;
			import com.mes.damage.service.DamageService;
			import com.mes.engineerScheduling.entity.EngineerScheduling;
			import com.mes.engineerScheduling.service.EngineerSchedulingService;
			import com.mes.engineering.entity.Engineering;
			import com.mes.engineering.service.EngineeringService;
			import com.mes.glassinfo.entity.GlassInfo;
			@@ -43,6 +45,9 @@
			private OptimizeProjectService optimizeProjectService;
			@Autowired
			DamageService damageService;
			@Autowired
			EngineerSchedulingService engineerSchedulingService;



			@ApiOperation("开始/暂停任务/传递工程号和状态,开始是1 暂停是0")
			@@ -76,6 +81,11 @@
			@ResponseBody
			public synchronized Result<Boolean> changeTask(@RequestBody Engineering engineering) {
			try {
			//获取排产顺序，不是当前正在上片的工程号直接返回失败暂时注释，等待排产功能正式上线
			// List<EngineerScheduling> engineerScheduling = engineerSchedulingService.queryByType(1);
			// if (!engineerScheduling.get(0).getProjectNo().equals(engineering.getEngineerId())) {
			// return Result.build(100, "请根据当前排产顺序选择工程号，排产首位为：" + engineerScheduling.get(0).getProjectNo(), false);
			// }
			log.info("engineeringId:{}", engineering);
			UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
			Engineering engineerings = engineeringService.selectUpInitiate(engineering.getEngineerId());
			@@ -95,10 +105,10 @@
			log.info("从PP表查询engineering的数据并保存到表里");
			List<Engineering> listEngineering = engineeringService.selectEngineering(engineering.getEngineerId());
			engineeringService.saveEngineering(listEngineering);
			log.info("更改pp表状态为已领取");
			//将engineering表状态为正在上片
			boolean work = engineeringService.changeTasks(engineering);
			optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
			log.info("更改pp表状态为已领取");
			if (work) {
			return Result.build(200, "保存成功" + engineering.getEngineerId(), true);
			} else {