YiWuProject.git

			@@ -3,6 +3,7 @@
			import com.baomidou.dynamic.datasource.annotation.DS;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.github.yulichang.base.MPJBaseServiceImpl;
			import com.github.yulichang.query.MPJQueryWrapper;
			import com.mes.engineering.entity.Engineering;
			@@ -40,7 +41,7 @@
			public List<UpPattenUsage> prioritylist() {
			//获取正在上片的任务id
			Engineering engineering= engineeringService.selectInitiate(1);
			log.info("将参数传入到查询类里{}",engineering);
			//log.info("将参数传入到查询类里{}",engineering);
			if(engineering!=null){
			LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
			wrapper.eq(UpPattenUsage::getEngineeringId,engineering.getEngineerId());
			@@ -52,13 +53,20 @@
			}

			@Override
			public List<UpPattenUsage> selectUpPattenUsage(UpPattenUsage upPattenUsage) {
			LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
			wrapper.eq(UpPattenUsage::getEngineeringId,upPattenUsage.getEngineeringId());
			return this.list(wrapper);
			}

			@Override
			@DS("pp")
			public List<UpPattenUsage> selectSaveUpPattenUsage(String engineeringId) {

			List<OptimizeUpPattenUsage> upPattenUsageList = null;
			if (engineeringId != null) {
			upPattenUsageList = optimizeProjectMapper.selectJoinList(OptimizeUpPattenUsage.class, new MPJQueryWrapper<OptimizeProject>()
			.select("t.project_no,t.glass_type,b.realwidth as width,b.realheight as height ,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.stock_id")
			.select("t.project_no,t.glass_type,b.o_width as width,b.o_height as height ,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.stock_id")
			.leftJoin("optimize_layout b on t.project_no=b.project_no")
			.eq("b.project_no", engineeringId));
			}
			@@ -117,5 +125,23 @@
			return this.getOne(wrapper);
			}

			@Override
			//获取最后一块玻璃
			public UpPattenUsage selectSequence(UpPattenUsage upPattenUsage) {
			QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>();
			wrapper.eq("engineering_id",upPattenUsage.getEngineeringId())
			.orderByDesc("layout_sequence")
			.last("limit 1");
			return this.getOne(wrapper);
			}

			@Override
			public Boolean updateGlassState(UpPattenUsage upPattenUsage) {
			UpdateWrapper<UpPattenUsage> updateWrapper = new UpdateWrapper<>();
			updateWrapper.eq("id",upPattenUsage.getId())
			.set("state",upPattenUsage.getState());
			return this.update(updateWrapper);
			}


			}