YiWuProject.git

File was renamed from hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
			@@ -11,13 +11,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>
			@@ -39,7 +40,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());
			@@ -57,7 +58,7 @@
			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.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));
			}
			@@ -116,5 +117,15 @@
			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);
			}


			}