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;
			@@ -11,13 +12,14 @@
			import com.mes.pp.mapper.OptimizeProjectMapper;
			import com.mes.uppattenusage.entity.OptimizeUpPattenUsage;
			import com.mes.uppattenusage.entity.UpPattenUsage;
			import com.mes.uppattenusage.service.UpPattenUsageService;
			import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
			import com.mes.uppattenusage.service.UpPattenUsageService;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.*;
			import java.util.ArrayList;
			import java.util.List;

			/**
			* <p>
			@@ -51,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.width,b.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));
			}
			@@ -126,5 +135,13 @@
			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);
			}


			}