package com.mes.edgstoragecage.service.impl;
|
|
import cn.hutool.core.lang.Assert;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
import com.github.yulichang.base.MPJBaseServiceImpl;
|
import com.github.yulichang.query.MPJLambdaQueryWrapper;
|
import com.github.yulichang.toolkit.JoinWrappers;
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
import com.mes.damage.entity.Damage;
|
import com.mes.damage.mapper.DamageMapper;
|
import com.mes.damage.service.DamageService;
|
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
|
import com.mes.edgglasstask.entity.request.IdentWornRequest;
|
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
|
import com.mes.edgstoragecage.entity.EdgStorageCage;
|
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
|
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
|
import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
|
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
|
import com.mes.engineering.entity.Engineering;
|
import com.mes.engineering.mapper.EngineeringMapper;
|
import com.mes.glassinfo.entity.GlassInfo;
|
import com.mes.glassinfo.mapper.GlassInfoMapper;
|
import com.mes.pp.entity.*;
|
import com.mes.pp.mapper.OptimizeDetailMapper;
|
import com.mes.pp.mapper.OptimizeHeatDetailMapper;
|
import com.mes.taskcache.entity.TaskCache;
|
import com.mes.taskcache.service.TaskCacheService;
|
import com.mes.uppattenusage.entity.UpPattenUsage;
|
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
|
import lombok.extern.slf4j.Slf4j;
|
import org.apache.commons.lang.StringUtils;
|
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.stereotype.Service;
|
|
import javax.annotation.Resource;
|
import java.util.ArrayList;
|
import java.util.HashMap;
|
import java.util.List;
|
import java.util.Map;
|
import java.util.stream.Collectors;
|
|
/**
|
* <p>
|
* 服务实现类
|
* </p>
|
*
|
* @author zhoush
|
* @since 2024-04-07
|
*/
|
@Service
|
@Slf4j
|
public class EdgStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
|
|
@Resource
|
UpPattenUsageMapper upPattenUsageMapper;
|
|
@Resource
|
EngineeringMapper engineeringMapper;
|
|
@Resource
|
OptimizeDetailMapper optimizeDetailMapper;
|
|
@Resource
|
OptimizeHeatDetailMapper optimizeHeatDetailMapper;
|
|
@Resource
|
EdgStorageCageMapper edgStorageCageMapper;
|
|
@Resource
|
GlassInfoMapper glassInfoMapper;
|
|
@Autowired
|
TaskCacheService taskCacheService;
|
|
@Resource
|
DamageMapper damageMapper;
|
|
@Autowired
|
DamageService damageService;
|
|
@Autowired
|
EdgGlassTaskInfoService edgGlassTaskInfoService;
|
//
|
// @Override
|
// public boolean identWorn(Map<String, Object> arguments) {
|
// String glassId=arguments.get("glassId").toString();
|
// int state=arguments.get("state").toString().isEmpty()?0:Integer.parseInt(arguments.get("state").toString());
|
// int line=arguments.get("line").toString().isEmpty()?0:Integer.parseInt(arguments.get("line").toString());
|
// String workingProcedure=arguments.get("workingProcedure").toString();
|
// if(state==0||line==0||workingProcedure==null||glassId==null||glassId.isEmpty()){
|
// log.info("前端传递数据不全:{}",arguments);
|
// return false;
|
// }
|
// List<GlassInfo> GlassInfos = glassInfoMapper.selectList(new MPJLambdaQueryWrapper<GlassInfo>()
|
// .selectAll(GlassInfo.class)
|
// .eq(GlassInfo::getGlassId, glassId));
|
// if (GlassInfos.size() == 1) {
|
// Damage damage =new Damage();
|
// damage.setGlassId(glassId);
|
// damage.setLine(line);
|
// damage.setWorkingProcedure(workingProcedure);
|
// damage.setRemark("");
|
// damage.setStatus(state);//8破损，9拿走
|
// damageService.insertDamage(damage);
|
// }else{
|
// return false;
|
// }
|
// List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
|
// .selectAll(EdgStorageCageDetails.class)
|
// .eq(EdgStorageCageDetails::getGlassId, glassId));
|
// if (edgStorageCageDetails.size() == 1) {
|
// EdgStorageCageDetails item = edgStorageCageDetails.get(0);
|
// item.setState(state);
|
// baseMapper.update(item, new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));
|
// }
|
// return true;
|
// }
|
|
/**
|
* 获取 切割当前版图
|
*
|
* @return
|
*/
|
@Override
|
public List<Map<String, Object>> selectCutTerritory() {
|
//查询EdgStorageCageDetails最后一张玻璃所属版图
|
List<UpPattenUsage> upPattenUsage = upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
|
.selectAll(UpPattenUsage.class)
|
.distinct()
|
.innerJoin(Engineering.class, on -> on
|
.eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
|
.innerJoin(GlassInfo.class, on -> on
|
.eq(GlassInfo::getEngineerId, UpPattenUsage::getEngineeringId)
|
.eq(GlassInfo::getPatternSequence, UpPattenUsage::getLayoutSequence))
|
.leftJoin(EdgStorageCageDetails.class, on -> on
|
.eq(EdgStorageCageDetails::getEngineerId, UpPattenUsage::getEngineeringId)
|
.eq(EdgStorageCageDetails::getGlassId, GlassInfo::getGlassId))
|
.leftJoin(Damage.class, on -> on
|
.eq(Damage::getEngineerId, UpPattenUsage::getEngineeringId)
|
.eq(Damage::getGlassId, GlassInfo::getGlassId))
|
.eq(Engineering::getState, 1)
|
.and(wrapper -> wrapper.isNotNull(EdgStorageCageDetails::getId).or().isNotNull(Damage::getId))
|
.orderByDesc(UpPattenUsage::getLayoutSequence)
|
.orderByDesc(GlassInfo::getId)
|
);
|
if (!upPattenUsage.isEmpty()) {
|
//当前版
|
UpPattenUsage upPattenUsage1 = upPattenUsage.get(0);
|
//查看当前版是否存在未进笼子或破损的玻璃
|
List<UpPattenUsage> upPattenUsage2 = upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
|
.selectAll(UpPattenUsage.class)
|
.distinct()
|
.innerJoin(GlassInfo.class, on -> on
|
.eq(GlassInfo::getEngineerId, UpPattenUsage::getEngineeringId)
|
.eq(GlassInfo::getPatternSequence, UpPattenUsage::getLayoutSequence))
|
.leftJoin(EdgStorageCageDetails.class, on -> on
|
.eq(EdgStorageCageDetails::getEngineerId, UpPattenUsage::getEngineeringId)
|
.eq(EdgStorageCageDetails::getGlassId, GlassInfo::getGlassId))
|
.leftJoin(Damage.class, on -> on
|
.eq(Damage::getEngineerId, UpPattenUsage::getEngineeringId)
|
.eq(Damage::getGlassId, GlassInfo::getGlassId))
|
.eq(UpPattenUsage::getEngineeringId, upPattenUsage.get(0).getEngineeringId())
|
.eq(UpPattenUsage::getLayoutSequence, upPattenUsage.get(0).getLayoutSequence())
|
.and(wrapper -> wrapper.isNull(EdgStorageCageDetails::getId).or().isNull(Damage::getId))
|
.orderByDesc(UpPattenUsage::getLayoutSequence)
|
.orderByDesc(GlassInfo::getId)
|
);
|
//显示下一版 否则显示当前版图
|
if (upPattenUsage2.isEmpty()) {
|
//剩余版图
|
List<UpPattenUsage> upPattenUsage3 = upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
|
.selectAll(UpPattenUsage.class)
|
.distinct()
|
.innerJoin(Engineering.class, on -> on
|
.eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
|
.eq(Engineering::getState, 1)
|
.gt(UpPattenUsage::getLayoutSequence, upPattenUsage1.getLayoutSequence())
|
.orderByAsc(UpPattenUsage::getLayoutSequence)
|
);
|
if (!upPattenUsage3.isEmpty()) {
|
//切换成下一版图
|
upPattenUsage1 = upPattenUsage3.get(0);
|
}
|
}
|
|
List<Map<String, Object>> cutTerritorys = optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
|
.selectAll(OptimizeDetail.class)
|
.selectAs(OptimizeLayout::getWidth, "olWidth")
|
.selectAs(OptimizeLayout::getHeight, "olHeight")
|
.leftJoin(OptimizeLayout.class, on -> on
|
.eq(OptimizeLayout::getProjectNo, OptimizeDetail::getProjectNo)
|
.eq(OptimizeLayout::getStockId, OptimizeDetail::getStockId))
|
.eq(OptimizeDetail::getProjectNo, upPattenUsage1.getEngineeringId())
|
.eq(OptimizeDetail::getStockId, upPattenUsage1.getLayoutSequence())
|
);
|
Map<String, EdgStorageCageDetails> edgMaps = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
|
.selectAll(EdgStorageCageDetails.class)
|
.eq(EdgStorageCageDetails::getEngineerId, upPattenUsage1.getEngineeringId())
|
).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId, EdgStorageCageDetails -> EdgStorageCageDetails));
|
|
Map<String, Damage> damageMaps = damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
|
.selectAll(Damage.class)
|
.eq(Damage::getEngineerId, upPattenUsage1.getEngineeringId())
|
.and(wrapper -> wrapper.eq(Damage::getType, 8)
|
.or()
|
.eq(Damage::getType, 9))
|
).stream().collect(Collectors.toMap(Damage::getGlassId, Damage -> Damage, (V1, V2) -> V2));
|
|
List<Map<String, Object>> resultCutTerritory = new ArrayList<>();
|
for (Map<String, Object> cutTerritory : cutTerritorys) {
|
// log.info("内容：{}-------{}",cutTerritory,edgStorageCageDetails);
|
if (cutTerritory.get("glass_id") == null || "".equals(cutTerritory.get("glass_id"))) {
|
log.info("优化数据中glassId存在空值-----内容：{}", cutTerritorys);
|
return new ArrayList<>();
|
} else if (damageMaps.get(cutTerritory.get("glass_id")) != null) {
|
//log.info("玻璃已破损/拿走-----内容：{}",damageMaps.get(item.get("glass_id")));
|
cutTerritory.put("glass_state", damageMaps.get(cutTerritory.get("glass_id")).getType());
|
} else if (edgMaps.get(cutTerritory.get("glass_id")) != null) {
|
cutTerritory.put("glass_state", edgMaps.get(cutTerritory.get("glass_id")).getState());
|
} else {
|
cutTerritory.put("glass_state", 0);
|
}
|
resultCutTerritory.add(cutTerritory);
|
}
|
return resultCutTerritory;
|
}
|
return null;
|
}
|
|
/**
|
* 获取 工程下的当前版图
|
*
|
* @param current
|
* @return
|
*/
|
@Override
|
public List<List<Map<String, Object>>> selectCurrentCutTerritory(String current) {
|
|
List<Engineering> engineering = engineeringMapper.selectJoinList(Engineering.class, new MPJLambdaWrapper<Engineering>()
|
.selectAll(Engineering.class)
|
.eq(Engineering::getEngineerId, current)
|
);
|
if (engineering.size() == 0) {
|
log.info("当前工程号未领取过:{}", current);
|
return new ArrayList<>();
|
}
|
//结果
|
List<Map<String, Object>> resultCutTerritory = new ArrayList<>();
|
//此工程的所有优化数据
|
List<Map<String, Object>> cutTerritory = optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
|
.selectAll(OptimizeDetail.class)
|
.selectAs(OptimizeLayout::getWidth, "olWidth")
|
.selectAs(OptimizeLayout::getHeight, "olHeight")
|
.leftJoin(OptimizeLayout.class, on -> on
|
.eq(OptimizeLayout::getProjectNo, OptimizeDetail::getProjectNo)
|
.eq(OptimizeLayout::getStockId, OptimizeDetail::getStockId))
|
.eq(OptimizeDetail::getProjectNo, current)
|
);
|
|
Map<String, EdgStorageCageDetails> edgMaps = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
|
.selectAll(EdgStorageCageDetails.class)
|
.eq(EdgStorageCageDetails::getEngineerId, current)
|
).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId, EdgStorageCageDetails -> EdgStorageCageDetails, (V1, V2) -> V2));
|
|
Map<String, Damage> damageMaps = damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
|
.selectAll(Damage.class)
|
.eq(Damage::getEngineerId, current)
|
.and(wrapper -> wrapper.eq(Damage::getType, 8)
|
.or()
|
.eq(Damage::getType, 9))
|
).stream().collect(Collectors.toMap(Damage::getGlassId, Damage -> Damage, (V1, V2) -> V2));
|
|
for (Map<String, Object> item : cutTerritory) {
|
// log.info("内容：{}-------{}",cutTerritory,edgStorageCageDetails);
|
if (item.get("glass_id") == null || "".equals(item.get("glass_id"))) {
|
log.info("优化数据中glassId存在空值-----内容：{}", cutTerritory);
|
return new ArrayList<>();
|
}
|
if (damageMaps.get(item.get("glass_id")) != null) {
|
//log.info("玻璃已破损/拿走-----内容：{}",damageMaps.get(item.get("glass_id")));
|
item.put("glass_state", damageMaps.get(item.get("glass_id")).getType());
|
} else if (edgMaps.get(item.get("glass_id")) != null) {
|
item.put("glass_state", edgMaps.get(item.get("glass_id")).getState());
|
} else {
|
item.put("glass_state", 0);
|
}
|
resultCutTerritory.add(item);
|
}
|
Map<String, List<Map<String, Object>>> groupBy = resultCutTerritory.stream().collect(Collectors.groupingBy(item -> item.get("stock_id").toString()));
|
// List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());
|
int count = 1;
|
List<List<Map<String, Object>>> result = new ArrayList<>();
|
for (String item : groupBy.keySet()) {
|
String key = count + "";
|
if (key != null) {
|
result.add(groupBy.get(key));
|
}
|
count++;
|
}
|
return result;
|
}
|
|
/**
|
* 获取 工程下的钢化版图
|
*
|
* @param current
|
* @return
|
*/
|
@Override
|
public List<Map<String, Object>> selectTemperingTerritory(String current) {
|
//此工程的所有优化数据
|
List<Map<String, Object>> resultCutTerritory = optimizeHeatDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeHeatDetail.class)
|
.selectAll(OptimizeHeatDetail.class)
|
.selectAs(OptimizeProject::getLoadWidth, "olWidth")
|
.selectAs(OptimizeProject::getLoadLength, "olHeight")
|
.selectAs(OptimizeHeatLayout::getLayoutRate, "olLayoutRate")
|
.leftJoin(OptimizeHeatLayout.class, on -> on
|
.eq(OptimizeHeatLayout::getProjectNo, OptimizeHeatDetail::getProjectNo)
|
.eq(OptimizeHeatLayout::getLayoutId, OptimizeHeatDetail::getLayoutId))
|
.leftJoin(OptimizeProject.class, on -> on
|
.eq(OptimizeProject::getProjectNo, OptimizeHeatLayout::getProjectNo))
|
.eq(OptimizeHeatDetail::getProjectNo, current)
|
.gt(OptimizeHeatDetail::getLayoutId, 0)
|
);
|
//这里就是 按版图号分组 [{layout_id:"1",width:200,height:300...},{layout_id:"2",width:300,height:300...}]
|
Map<String, List<Map<String, Object>>> groupBy = resultCutTerritory.stream().collect(Collectors.groupingBy(item -> item.get("layout_id").toString()));
|
//按版图号排序
|
|
List<Map<String, Object>> result = new ArrayList<>();//返回结果
|
for (int i = 1; i <= groupBy.keySet().size(); i++) {
|
String key = i + "";
|
if (key != null) {
|
List<Map<String, Object>> galssInfo = groupBy.get(key);//当前钢化版图内玻璃小片集合
|
if (!galssInfo.isEmpty()) {
|
Map<String, Object> item = new HashMap<>();//新格式编排
|
//以下为同层 {key:"groupBy.get(key)",olLayoutRate:"小片集合"}
|
// {key:"groupBy.get(key)",olLayoutRate:[{},{},{},{}]}
|
|
|
item.put("listGlass", groupBy.get(key));
|
item.put("LayoutId", key);
|
item.put("olWidth", galssInfo.get(0).get("olWidth").toString());
|
item.put("olHeight", galssInfo.get(0).get("olHeight").toString());
|
item.put("olLayoutRate", galssInfo.get(0).get("olLayoutRate").toString());
|
result.add(item);
|
} else {
|
log.info("当前钢化版图不存在小片数据请检查，版图号:{}" + key);
|
return null;
|
}
|
}
|
}
|
// List<List<Map<String, Object>>> result = new ArrayList<>();//返回结果
|
//
|
// for (int i = 1; i <= groupBy.keySet().size(); i++) {
|
// String key = i + "";
|
// if (key != null) {
|
// result.add(groupBy.get(key));
|
// }
|
// }
|
return result;
|
}
|
|
/**
|
* 查询笼内版图差值范围内的 此尺寸玻璃 如无则按照 钢化版图序号 以及玻璃序号
|
*
|
* @param glassId
|
* @param threshold
|
* @return
|
*/
|
@Override
|
public EdgStorageCageDetails selectConformGlass(String glassId, int threshold) {
|
//1.去笼内查询此尺寸的玻璃 目前版图差值内的玻璃 是否有同尺寸的
|
//1.1 有同尺寸的 则生成同尺寸的任务
|
//1.2 无同尺寸的 则生成版图顺序最小的出片
|
EdgStorageCageDetails edgStorageCageDetails = baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
|
.selectAll(EdgStorageCageDetails.class)
|
.eq(EdgStorageCageDetails::getGlassId, glassId)
|
);
|
List<EdgStorageCageDetails> listEdgStorageCageDetails = baseMapper.selectList(new LambdaQueryWrapper<EdgStorageCageDetails>()
|
.lt(EdgStorageCageDetails::getState, 200)
|
.orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
|
);
|
EdgStorageCageDetails minTemperingLayoutId = new EdgStorageCageDetails();
|
if (!listEdgStorageCageDetails.isEmpty()) {
|
minTemperingLayoutId = listEdgStorageCageDetails.get(0);
|
}
|
EdgStorageCageDetails result = new EdgStorageCageDetails();
|
if (edgStorageCageDetails != null && minTemperingLayoutId != null) {
|
result = edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class, new MPJLambdaWrapper<EdgStorageCage>()
|
.selectAll(EdgStorageCageDetails.class)
|
.leftJoin(EdgStorageCageDetails.class, on -> on
|
.eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
|
.eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot))
|
.isNotNull(EdgStorageCageDetails::getSlot)
|
.eq(EdgStorageCageDetails::getWidth, edgStorageCageDetails.getWidth())
|
.eq(EdgStorageCageDetails::getHeight, edgStorageCageDetails.getHeight())
|
.ge(EdgStorageCageDetails::getTemperingLayoutId, minTemperingLayoutId.getTemperingLayoutId())
|
.le(EdgStorageCageDetails::getTemperingLayoutId, minTemperingLayoutId.getTemperingLayoutId() + threshold)
|
.orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
|
);
|
}
|
|
if (result == null) {
|
result = edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class, new MPJLambdaWrapper<EdgStorageCage>()
|
.selectAll(EdgStorageCageDetails.class)
|
.leftJoin(EdgStorageCageDetails.class, on -> on
|
.eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
|
.eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot))
|
.isNotNull(EdgStorageCageDetails::getSlot)
|
.orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
|
);
|
}
|
return result;
|
}
|
|
/**
|
* 查询笼内版图差值范围内的 此尺寸玻璃 如无则按照 钢化版图序号 以及玻璃序号
|
*
|
* @param glassId
|
* @param threshold
|
* @return
|
*/
|
@Override
|
public EdgStorageCageDetails selectOutGlass(String glassId, int threshold) {
|
EdgStorageCageDetails oldEdgStorageCageDetails = null;
|
if (StringUtils.isNotEmpty(glassId)) {
|
oldEdgStorageCageDetails = baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
|
.selectAll(EdgStorageCageDetails.class)
|
.eq(EdgStorageCageDetails::getGlassId, glassId));
|
}
|
log.info("按照玻璃id：{}获取玻璃信息{}", glassId, oldEdgStorageCageDetails);
|
|
LambdaQueryWrapper<TaskCache> wrapper = new LambdaQueryWrapper<TaskCache>().select(TaskCache::getGlassId).eq(TaskCache::getTaskType, "2");
|
List<TaskCache> taskCacheList = taskCacheService.list(wrapper);
|
List<String> glassIds = taskCacheList.stream().map(TaskCache::getGlassId).collect(Collectors.toList());
|
log.info("获取笼内所有已出片的玻璃id信息:{}", glassIds);
|
|
//获取笼内最小版图id及版序为最小的玻璃信息（玻璃id不在任务表中的出片记录中）
|
EdgStorageCageDetails minTemperingLayoutId = baseMapper.selectOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
|
.eq(EdgStorageCageDetails::getState, 100)
|
.notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)
|
.orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
|
.last("limit 1"));
|
Assert.isTrue(minTemperingLayoutId != null, "笼内无符合要求的玻璃");
|
log.info("获取笼内最小版图id{}及版序为{}的玻璃信息{}", minTemperingLayoutId.getTemperingLayoutId(),
|
minTemperingLayoutId.getTemperingFeedSequence(), minTemperingLayoutId);
|
|
EdgStorageCageDetails outEdgStorageCageDetails = null;
|
|
// if (queryMaxMinDiff(threshold))
|
//todo:逻辑1：获取两条线已出最后一块玻璃在笼内相同尺寸所剩数量，优先走数量少的线
|
//todo:需要在卧式理片笼详情表中新增状态，用来表示玻璃进出理片笼情况
|
if (oldEdgStorageCageDetails != null && minTemperingLayoutId != null) {
|
log.info("按照上一片已出玻璃宽度{}，高度{}，及版图id区间{}到{}获取出片任务玻璃信息", oldEdgStorageCageDetails.getWidth()
|
, oldEdgStorageCageDetails.getHeight(), minTemperingLayoutId.getTemperingLayoutId(), minTemperingLayoutId.getTemperingLayoutId() + threshold);
|
outEdgStorageCageDetails = this.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
|
.notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)
|
.eq(EdgStorageCageDetails::getWidth, oldEdgStorageCageDetails.getWidth())
|
.eq(EdgStorageCageDetails::getHeight, oldEdgStorageCageDetails.getHeight())
|
.orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
|
.last("limit 1"));
|
log.info("出片任务的玻璃信息：{}", outEdgStorageCageDetails);
|
}
|
if (outEdgStorageCageDetails == null) {
|
outEdgStorageCageDetails = minTemperingLayoutId;
|
}
|
return outEdgStorageCageDetails;
|
}
|
|
@Override
|
public String identControls(IdentWornRequest request) {
|
//将识别破损的玻璃直接加入破损表
|
Damage damage = new Damage();
|
BeanUtils.copyProperties(request, damage);
|
damage.setType(request.getState());
|
damage.setRemark("");
|
damage.setStatus(0);
|
damageService.insertDamage(damage);
|
return "success";
|
}
|
|
@Override
|
public String edgReportStatus(IdentWornRequest request) {
|
//将磨边队列破损的玻璃直接加入破损表
|
Damage damage = new Damage();
|
BeanUtils.copyProperties(request, damage);
|
damage.setType(request.getState());
|
damage.setRemark("");
|
damage.setStatus(0);
|
damageService.insertDamage(damage);
|
//修改磨边队列数据状态
|
edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
|
.set(EdgGlassTaskInfo::getStatus, request.getState()).eq(EdgGlassTaskInfo::getGlassId, request.getGlassId()));
|
return "success";
|
}
|
|
/**
|
* 进片 扫码ID验证重复
|
*
|
* @param glassId
|
* @return
|
*/
|
@Override
|
public boolean inToVerify(String glassId) {
|
List<EdgStorageCageDetails> listEdgStorageCageDetails = baseMapper.selectList(new LambdaQueryWrapper<EdgStorageCageDetails>()
|
.eq(EdgStorageCageDetails::getGlassId, glassId)
|
);
|
if (listEdgStorageCageDetails.isEmpty()) {
|
//说明此玻璃没有进过理片
|
return true;
|
} else {
|
List<Damage> damage = damageMapper.selectList(new LambdaQueryWrapper<Damage>()
|
.eq(Damage::getGlassId, glassId)
|
.and(wrapper -> wrapper.eq(Damage::getType, 8).or().eq(Damage::getType, 9))
|
);
|
if (!damage.isEmpty()) {
|
return true;
|
}
|
}
|
return false;
|
}
|
|
@Override
|
public EdgStorageCageDetails queryEdgStorageDetailsBySize(int deviceId, int currentSlot, double width, double height) {
|
return baseMapper.queryEdgStorageDetailsBySize(deviceId, currentSlot, width, height);
|
}
|
}
|
