YiWuProject.git

			@@ -7,6 +7,7 @@
			import com.github.yulichang.base.MPJBaseServiceImpl;
			import com.github.yulichang.query.MPJQueryWrapper;
			import com.mes.engineering.entity.Engineering;
			import com.mes.engineering.mapper.EngineeringMapper;
			import com.mes.engineering.service.EngineeringService;
			import com.mes.pp.entity.OptimizeProject;
			import com.mes.pp.mapper.OptimizeProjectMapper;
			@@ -44,10 +45,10 @@
			//log.info("将参数传入到查询类里{}",engineering);
			if(engineering!=null){
			LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
			wrapper.eq(UpPattenUsage::getEngineeringId,engineering.getEngineerId());
			wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
			return this.list(wrapper);
			}else {
			return null;
			} else {
			return null;
			}

			}
			@@ -66,7 +67,7 @@
			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.count as stockId")
			.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")
			.leftJoin("optimize_layout b on t.project_no=b.project_no")
			.eq("b.project_no", engineeringId));
			}
			@@ -138,10 +139,15 @@
			@Override
			public Boolean updateGlassState(UpPattenUsage upPattenUsage) {
			UpdateWrapper<UpPattenUsage> updateWrapper = new UpdateWrapper<>();
			updateWrapper.eq("id",upPattenUsage.getId())
			.set("state",upPattenUsage.getState());
			updateWrapper.eq("id", upPattenUsage.getId())
			.set("state", upPattenUsage.getState());
			return this.update(updateWrapper);
			}

			@Override
			public Object Engineering(Engineering request) {
			return null;
			}


			}