YiWuProject.git

			@@ -33,6 +33,7 @@
			import java.util.Calendar;
			import java.util.Date;
			import java.util.List;
			import java.util.concurrent.atomic.AtomicInteger;

			/**
			* <p>
			@@ -61,9 +62,9 @@
			@Override
			public List<UpPattenUsage> prioritylist() {
			//获取正在上片的任务id
			Engineering engineering= engineeringService.selectInitiate(1);
			Engineering engineering = engineeringService.selectInitiate(1);
			//log.info("将参数传入到查询类里{}",engineering);
			if(engineering!=null){
			if (engineering != null) {
			LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
			wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
			return this.list(wrapper);
			@@ -78,7 +79,7 @@
			//获取正在上片的任务id
			Engineering engineering = engineeringService.selectInitiates(1, cell.getStationCell());
			//log.info("将参数传入到查询类里{}",engineering);
			if(engineering!=null){
			if (engineering != null) {
			LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
			wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
			if (cell.getState() != null) {
			@@ -121,28 +122,28 @@
			UpPattenUsage optimizeProject = new UpPattenUsage();
			// 将 Map 中的每个键值对映射到 OptimizeProject 对象的相应字段上
			optimizeProject.setEngineeringId(map.getProjectNo());
			optimizeProject.setFilmsId( map.getGlassType());
			optimizeProject.setFilmsId(map.getGlassType());
			optimizeProject.setWidth(map.getWidth());
			optimizeProject.setHeight( map.getHeight());
			optimizeProject.setHeight(map.getHeight());
			optimizeProject.setThickness(map.getGlassThickness());
			optimizeProject.setLayoutSequence( map.getStockId());
			optimizeProject.setLayoutSequence(map.getStockId());
			optimizeProject.setState(0);
			// 将映射后的对象添加到结果列表中
			resultList.add(optimizeProject);
			}
			}
			log.info("查询出上片顺序集合保存到实体类{}",resultList);
			log.info("查询出上片顺序集合保存到实体类{}", resultList);
			return resultList;
			}

			@Override
			public void saveUpPattenUsage(List<UpPattenUsage> upPattenUsage) {
			if (CollectionUtil.isEmpty(upPattenUsage)){
			if (CollectionUtil.isEmpty(upPattenUsage)) {
			return;
			}
			String engineerId = upPattenUsage.get(0).getEngineeringId();
			int count = this.count(new LambdaQueryWrapper<UpPattenUsage>().eq(UpPattenUsage::getEngineeringId, engineerId));
			if (count <=0){
			if (count <= 0) {
			//保存原片使用详情表
			this.saveBatch(upPattenUsage);
			}
			@@ -176,7 +177,7 @@
			@Override
			public void deleteTask(String engineerId) {
			QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
			wrapper.eq("engineering_id",engineerId);
			wrapper.eq("engineering_id", engineerId);
			this.remove(wrapper);
			}

			@@ -184,9 +185,9 @@

			@Override
			public UpPattenUsage selectOverTask() {
			QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>();
			wrapper.gt("state",0)
			.lt("state",99)
			QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
			wrapper.gt("state", 0)
			.lt("state", 99)
			.last("limit 1");
			return this.getOne(wrapper);
			}
			@@ -194,8 +195,8 @@
			@Override
			//获取最后一块玻璃
			public UpPattenUsage selectSequence(UpPattenUsage upPattenUsage) {
			QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>();
			wrapper.eq("engineering_id",upPattenUsage.getEngineeringId())
			QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
			wrapper.eq("engineering_id", upPattenUsage.getEngineeringId())
			.orderByDesc("layout_sequence")
			.last("limit 1");
			return this.getOne(wrapper);

	hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -30,9 +30,9 @@
			@Autowired
			private UpPattenUsageService upPattenUsageService;
			@Autowired
			private GlassInfoService glassInfoService;
			private GlassInfoService glassInfoService;
			@Autowired
			private EngineeringService engineeringService;
			private EngineeringService engineeringService;
			@Autowired
			private OptimizeProjectService optimizeProjectService;

			@@ -66,7 +66,7 @@
			return Result.build(100, "失败", upPattenUsages);
			}

			}
			}

			@ApiOperation("切换原片上片状态")
			@PostMapping("/updateGlassState") //查询现在上片机的玻璃信息