YiWuProject.git

			@@ -25,14 +25,16 @@
			@Override
			public List<EngineerScheduling> listByState() {
			QueryWrapper<EngineerScheduling> wrapper = new QueryWrapper<>();
			wrapper.lt("type", 3);
			wrapper.lt("type", 3)
			.eq("state", 100);
			return baseMapper.selectList(wrapper);
			}

			@Override
			public List<EngineerScheduling> queryByType(Integer type) {
			QueryWrapper<EngineerScheduling> queryWrapper = new QueryWrapper<>();
			queryWrapper.eq("type", type);
			queryWrapper.eq("type", type)
			.orderByAsc("id");
			return baseMapper.selectList(queryWrapper);
			}

			@@ -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());

	hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/service/impl/EngineerSchedulingServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史