//package com.mes.job.opccallback;
|
//
|
//import cn.hutool.core.lang.Assert;
|
//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
//import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
//import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
//import com.github.yulichang.toolkit.JoinWrappers;
|
//import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
//import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
|
//import com.mes.base.entity.BigStorageCageBaseInfo;
|
//import com.mes.bigstorage.entity.BigStorageCage;
|
//import com.mes.bigstorage.entity.BigStorageCageDetails;
|
//import com.mes.bigstorage.entity.dto.BigStorageDTO;
|
//import com.mes.bigstorage.entity.dto.SlotSequenceDTO;
|
//import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
|
//import com.mes.bigstorage.service.BigStorageCageDetailsService;
|
//import com.mes.bigstorage.service.BigStorageCageService;
|
//import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
|
//import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
|
//import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
|
//import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
|
//import com.mes.common.S7object;
|
//import com.mes.common.config.Const;
|
//import com.mes.damage.entity.Damage;
|
//import com.mes.damage.service.DamageService;
|
//import com.mes.device.PlcParameterObject;
|
//import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
|
//import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
|
//import com.mes.glassinfo.entity.GlassInfo;
|
//import com.mes.glassinfo.service.GlassInfoService;
|
//import com.mes.temperingglass.entity.TemperingGlassInfo;
|
//import com.mes.temperingglass.service.TemperingGlassInfoService;
|
//import com.mes.tools.S7control;
|
//import com.mes.utils.RedisUtil;
|
//import lombok.extern.slf4j.Slf4j;
|
//import org.apache.commons.lang.StringUtils;
|
//import org.springframework.beans.BeanUtils;
|
//import org.springframework.beans.factory.annotation.Value;
|
//import org.springframework.stereotype.Service;
|
//
|
//import javax.annotation.Resource;
|
//import java.util.ArrayList;
|
//import java.util.Date;
|
//import java.util.List;
|
//import java.util.Map;
|
//import java.util.stream.Collectors;
|
//
|
///**
|
// * @Author : zhoush
|
// * @Date: 2024/10/28 21:22
|
// * @Description:
|
// */
|
//@Service
|
//@Slf4j
|
//public class BigStorageStartCallback implements SubscriptionCallback {
|
//
|
//
|
// @Resource
|
// private BigStorageCageService bigStorageCageService;
|
// @Resource
|
// private BigStorageCageDetailsService bigStorageCageDetailsService;
|
// @Resource
|
// private GlassInfoService glassInfoService;
|
// @Resource
|
// private BigStorageCageFeedTaskService bigStorageCageFeedTaskService;
|
// @Resource
|
// private BigStorageCageOutTaskService bigStorageCageOutTaskService;
|
// @Resource
|
// private EdgGlassTaskInfoService edgGlassTaskInfoService;
|
// @Resource
|
// private TemperingGlassInfoService temperingGlassInfoService;
|
// @Resource
|
// private DamageService damageService;
|
//
|
// @Resource
|
// private RedisUtil redisUtil;
|
//
|
// private static final String REQUEST_WORD = "1";
|
//
|
// @Value("${mes.sequence.order}")
|
// private boolean sequenceOrder;
|
//
|
// @Value("${mes.carWidth}")
|
// private Integer carWidth;
|
//
|
// @Value("${mes.slotWidth}")
|
// private Integer slotWidth;
|
//
|
// @Value("${mes.inCarMaxSize}")
|
// private Integer inCarMaxSize;
|
//
|
// @Value("${mes.outCarMaxSize}")
|
// private Integer outCarMaxSize;
|
//
|
// @Value("${mes.glassGap}")
|
// private Integer glassGap;
|
//
|
// @Value("${mes.xMaxSize}")
|
// private Integer xMaxSize;
|
//
|
//
|
// private String d01GlassId = "";
|
// private String d04GlassId = "";
|
//
|
// @Override
|
// public void onSubscribe(String identifier, Object value) {
|
// //todo:获取任务列表
|
// String tableName = "";
|
// //todo:按照表明获取伍信息
|
// List<BigStorageCageFeedTask> tasks = new ArrayList<>();
|
// if (CollectionUtils.isEmpty(tasks)) {
|
// log.info("卧转立上没有玻璃");
|
// //todo 与卧转立交互，将请求字大车请求变为0，确保订阅任务可再次执行
|
// return;
|
// }
|
// List<String> glassIds = tasks.stream().map(BigStorageCageFeedTask::getGlassId).collect(Collectors.toList());
|
// List<GlassInfo> glassInfos = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().in(GlassInfo::getGlassId, glassIds));
|
// computeIsTemperingTargetByLine(glassInfos, tasks);
|
// }
|
//
|
//
|
// // @Scheduled(fixedDelay = 10000)
|
// public void plcToHomeEdgOutTask() {
|
// String mesToPLCAddress = "";
|
// List<BigStorageCageOutTask> outingList = bigStorageCageOutTaskService.list(new LambdaQueryWrapper<BigStorageCageOutTask>()
|
// .eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_NEW));
|
// if (CollectionUtils.isNotEmpty(outingList)) {
|
// log.info("有正在执行出片的任务，结束当前出片线程");
|
// return;
|
// }
|
// if (redisUtil.getCacheObject("temperingSwitch")) {
|
// //是否有正在钢化的玻璃
|
// List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.selectJoinList(TemperingGlassInfo.class, new MPJLambdaWrapper<TemperingGlassInfo>()
|
// .selectAll(TemperingGlassInfo.class)
|
// .leftJoin(BigStorageCageOutTask.class, BigStorageCageOutTask::getGlassId, TemperingGlassInfo::getGlassId)
|
// .eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW)
|
// .isNull(BigStorageCageOutTask::getGlassId)
|
// .orderBy(Boolean.TRUE, sequenceOrder, TemperingGlassInfo::getTemperingFeedSequence));
|
// if (CollectionUtils.isNotEmpty(temperingGlassInfoList)) {
|
// log.info("有正在出片的钢化任务");
|
// computeOutMoreGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
|
// return;
|
// }
|
// //是否有人工下片任务 有直接出
|
//// List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
|
//// .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL).orderByDesc(BigStorageCageDetails::getWidth));
|
// List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
|
// .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL)
|
// .orderByAsc(BigStorageCageDetails::getSlot)
|
// .orderByDesc(BigStorageCageDetails::getId));
|
// if (CollectionUtils.isNotEmpty(artificialList)) {
|
// computeOutMoreGlassInfo(artificialList, Boolean.FALSE, mesToPLCAddress);
|
// return;
|
// }
|
// //钢化优先：获取理片笼 玻璃小片 破损表 数量 判断笼内版图是否到齐
|
// List<TemperingLayoutDTO> temperingLayoutDTOList = bigStorageCageDetailsService.temperingIsAll();
|
// if (CollectionUtils.isNotEmpty(temperingLayoutDTOList)) {
|
// //玻璃到齐包括已出片的
|
// //到齐，将玻璃小片数据存入钢化小片表，逻辑生成出片任务 结束
|
// for (TemperingLayoutDTO item : temperingLayoutDTOList) {
|
// if (redisUtil.getCacheObject("temperingengineerId").equals(item.getEngineerId())) {
|
// List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class)
|
// .selectAll(GlassInfo.class)
|
// .select("-1 as state")
|
// .selectAs(BigStorageCageDetails::getSlot, TemperingGlassInfo::getSlot)
|
// .innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId)
|
// .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
|
// .eq(GlassInfo::getTemperingLayoutId, item.getTemperingLayoutId())
|
// .eq(GlassInfo::getEngineerId, item.getEngineerId())
|
// .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence));
|
// if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
|
// temperingGlassInfoService.saveBatch(temperingGlassInfos);
|
// computeOutMoreGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
|
// return;
|
// }
|
// }
|
// }
|
// }
|
// }
|
// //执行内部调度任务
|
// List<TemperingLayoutDTO> temperingOccupySlotList = bigStorageCageDetailsService.queryTemperingOccupySlot();
|
// if (CollectionUtils.isNotEmpty(temperingOccupySlotList)) {
|
// loop:
|
// for (TemperingLayoutDTO temperingOccupySlot : temperingOccupySlotList) {
|
// List<SlotSequenceDTO> slotSequenceList = bigStorageCageDetailsService.queryGlassMaxAndMin(temperingOccupySlot.getEngineerId(), temperingOccupySlot.getTemperingLayoutId());
|
// for (int i = 0; i < slotSequenceList.size() - 1; i++) {
|
// SlotSequenceDTO first = slotSequenceList.get(i);
|
// SlotSequenceDTO second = slotSequenceList.get(i + 1);
|
// int slotWidth = carWidth - first.getRemainWidth() - glassGap;
|
// if (first.getMinSequence() == second.getMaxSequence() + 1
|
// && second.getRemainWidth() > slotWidth && slotWidth >= 0) {
|
// List<BigStorageCageDetails> list = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
|
// .eq(BigStorageCageDetails::getSlot, first.getSlot()).eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
|
// .orderBy(Boolean.TRUE, sequenceOrder, BigStorageCageDetails::getTemperingFeedSequence));
|
// if (CollectionUtils.isNotEmpty(list)) {
|
// List<BigStorageCageOutTask> outTasks = new ArrayList<>();
|
// int serialNumber = 1;
|
// for (BigStorageCageDetails item : list) {
|
// outTasks.add(new BigStorageCageOutTask(item.getGlassId(), first.getSlot(), second.getSlot(),
|
// item.getWidth() * 10, item.getHeight() * 10, 1, serialNumber++, Const.BIG_STORAGE_OUT_NEW, new Date()));
|
// }
|
// //新增调度任务
|
// bigStorageCageOutTaskService.saveBatch(outTasks);
|
// //更新理片笼详情表调度的后的玻璃位置信息：生成任务后先将玻璃格子位置进行调整，玻璃状态改为调度中，新增调度完成任务，处理调度完成后玻璃状态改为100.
|
// List<String> glassList = list.stream().map(BigStorageCageDetails::getGlassId).collect(Collectors.toList());
|
// bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>().set(BigStorageCageDetails::getState, Const.GLASS_STATE_SCHEDULE_ING)
|
// .set(BigStorageCageBaseInfo::getSlot, second.getSlot()).in(BigStorageCageDetails::getGlassId, glassList));
|
// //两次更新笼子的剩余尺寸：第一次防止有玻璃继续进调度后的笼子，第二次更新：计算格子的实际尺寸
|
// // 仅更新调度后的格子信息：起始格子完成后更新：防止调度出片过程中有新玻璃进入，
|
//// todo:临时解决报错
|
//// updateSlotRemainBySlots(Arrays.asList(second.getSlot()));
|
// break loop;
|
// }
|
// }
|
// }
|
// }
|
//// //向plc写入确认字
|
//// int returnData = 0;
|
//// int count = 1;
|
//// while (returnData == 0) {
|
//// log.info("已向plc第{}次送协议", count);
|
//// S7object.getinstance().plccontrol.writeWord(mesToPLCAddress, 1);
|
//// returnData = S7object.getinstance().plccontrol.readWord(mesToPLCAddress, 1).get(0);
|
//// log.info("已向plc第{}次发送出片任务确认，地址为：{},写入的内容为{}", count++, mesToPLCAddress, returnData);
|
//// }
|
// return;
|
// }
|
// }
|
//
|
//
|
// /**
|
// * 确认字清空
|
// */
|
//// @Scheduled(fixedDelay = 300)
|
// public void confirmClear() {
|
// PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
|
// String d01ToMES = plcParameterObject.getPlcParameter("D01ToMES").getValue();
|
// String d04ToMES = plcParameterObject.getPlcParameter("D04ToMES").getValue();
|
// String mesD01Address = plcParameterObject.getPlcParameter("MESToD01").getAddress();
|
// String mesD04Address = plcParameterObject.getPlcParameter("MESToD04").getAddress();
|
// String d03ToMES = plcParameterObject.getPlcParameter("D03ToMES").getValue();
|
// String d05ToMES = plcParameterObject.getPlcParameter("D05ToMES").getValue();
|
// String mesD03Address = plcParameterObject.getPlcParameter("MESToD03").getAddress();
|
// String mesD05Address = plcParameterObject.getPlcParameter("MESToD05").getAddress();
|
// if (!REQUEST_WORD.equals(d01ToMES)) {
|
// S7object.getinstance().plccontrol.writeWord(mesD01Address, 0);
|
// }
|
// if (!REQUEST_WORD.equals(d04ToMES)) {
|
// S7object.getinstance().plccontrol.writeWord(mesD04Address, 0);
|
// }
|
// if (!REQUEST_WORD.equals(d03ToMES)) {
|
// S7object.getinstance().plccontrol.writeWord(mesD03Address, 0);
|
// }
|
// if (!REQUEST_WORD.equals(d05ToMES)) {
|
// S7object.getinstance().plccontrol.writeWord(mesD05Address, 0);
|
// }
|
// }
|
//
|
// /**
|
// * 进片状态修改
|
// */
|
//// @Scheduled(fixedDelay = 300)
|
// public void feedStatusUpdate() {
|
// PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
|
// List<String> glassIds1 = new ArrayList<>();
|
// List<String> glassIds2 = new ArrayList<>();
|
// for (int i = 1; i <= 6; i++) {
|
// String line1GlassId = plcParameterObject.getPlcParameter("D03ID" + i).getValue();
|
// if (StringUtils.isNotEmpty(line1GlassId)) {
|
// glassIds1.add(line1GlassId);
|
// }
|
// String line2GlassId = plcParameterObject.getPlcParameter("D05ID" + i).getValue();
|
// if (StringUtils.isNotEmpty(line2GlassId)) {
|
// glassIds2.add(line2GlassId);
|
// }
|
// }
|
// List<BigStorageCageFeedTask> bigStorageCageFeedTasks1 = bigStorageCageFeedTaskService.list(
|
// new LambdaQueryWrapper<BigStorageCageFeedTask>()
|
// .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_NEW)
|
// .eq(BigStorageCageFeedTask::getLine, Const.A09_OUT_TARGET_POSITION)
|
// );
|
// List<BigStorageCageFeedTask> bigStorageCageFeedTasks2 = bigStorageCageFeedTaskService.list(
|
// new LambdaQueryWrapper<BigStorageCageFeedTask>()
|
// .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_NEW)
|
// .eq(BigStorageCageFeedTask::getLine, Const.A10_OUT_TARGET_POSITION)
|
// );
|
// if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks1) && CollectionUtils.isNotEmpty(glassIds1)) {
|
// List<String> matchingIds1 = bigStorageCageFeedTasks1.stream()
|
// .map(BigStorageCageFeedTask::getGlassId)
|
// .filter(glassIds1::contains)
|
// .distinct()
|
// .collect(Collectors.toList());
|
// bigStorageCageFeedTaskService.update(
|
// new LambdaUpdateWrapper<BigStorageCageFeedTask>()
|
// .in(BigStorageCageFeedTask::getGlassId, matchingIds1)
|
// .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
|
// .set(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
|
// );
|
// }
|
// if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks2) && CollectionUtils.isNotEmpty(glassIds2)) {
|
// List<String> matchingIds2 = bigStorageCageFeedTasks2.stream()
|
// .map(BigStorageCageFeedTask::getGlassId)
|
// .filter(glassIds2::contains)
|
// .distinct()
|
// .collect(Collectors.toList());
|
// bigStorageCageFeedTaskService.update(
|
// new LambdaUpdateWrapper<BigStorageCageFeedTask>()
|
// .in(BigStorageCageFeedTask::getGlassId, matchingIds2)
|
// .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
|
// .set(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
|
// );
|
// }
|
// if (CollectionUtils.isEmpty(glassIds1)) {
|
// bigStorageCageFeedTaskService.update(
|
// new LambdaUpdateWrapper<BigStorageCageFeedTask>()
|
// .eq(BigStorageCageFeedTask::getLine, Const.A09_OUT_TARGET_POSITION)
|
// .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
|
// .gt(BigStorageCageFeedTask::getTargetSlot, 0)
|
// .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
|
// .set(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_CAR)
|
// );
|
// }
|
// if (CollectionUtils.isEmpty(glassIds2)) {
|
// bigStorageCageFeedTaskService.update(
|
// new LambdaUpdateWrapper<BigStorageCageFeedTask>()
|
// .eq(BigStorageCageFeedTask::getLine, Const.A10_OUT_TARGET_POSITION)
|
// .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
|
// .gt(BigStorageCageFeedTask::getTargetSlot, 0)
|
// .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
|
// .set(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_CAR)
|
// );
|
// }
|
// }
|
//
|
// /**
|
// * 按照玻璃id判断玻璃状态及卧转立是否可直接启动
|
// */
|
// public Boolean judgeGlassTypeStatus(String glassId, Integer line, String mesAddress) {
|
// //判断此玻璃是在笼内或已生成进片任务
|
// BigStorageCageFeedTask bigStorageCageFeedTask = bigStorageCageFeedTaskService.getOne(
|
// new LambdaQueryWrapper<BigStorageCageFeedTask>()
|
// .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
|
// .eq(BigStorageCageFeedTask::getGlassId, glassId)
|
// );
|
// BigStorageCageDetails bigStorageCageDetails = bigStorageCageDetailsService.getOne(
|
// new LambdaQueryWrapper<BigStorageCageDetails>()
|
// .eq(BigStorageCageDetails::getGlassId, glassId)
|
// .ne(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
|
// );
|
// if (bigStorageCageFeedTask != null || bigStorageCageDetails != null) {
|
// log.info("此玻璃存任务或已在笼内");
|
// return Boolean.TRUE;
|
// }
|
// //1、获取任务表中相邻玻璃
|
// List<EdgGlassTaskInfo> edgGlassTaskInfoList;
|
// edgGlassTaskInfoList = edgGlassTaskInfoService.list(new LambdaQueryWrapper<EdgGlassTaskInfo>()
|
// .eq(EdgGlassTaskInfo::getLine, line)
|
// .apply("time >= (select time from edg_glass_task_info where line='" + line + "' and glass_id = '" + glassId + "' and deleted = 0)")
|
// .orderByAsc(EdgGlassTaskInfo::getCreateTime));
|
// if (edgGlassTaskInfoList.size() == 0) {
|
// edgGlassTaskInfoList = edgGlassTaskInfoService.list(new QueryWrapper<EdgGlassTaskInfo>()
|
// .select("Top 1 *")
|
// .eq("glass_id", glassId)
|
// );
|
// log.info("在尺寸表中获取玻璃信息{}", edgGlassTaskInfoList);
|
// if (edgGlassTaskInfoList.size() == 0) {
|
// GlassInfo glassInfo = glassInfoService.getOne(
|
// new LambdaQueryWrapper<GlassInfo>()
|
// .eq(GlassInfo::getGlassId, glassId)
|
// );
|
// EdgGlassTaskInfo edgGlassTaskInfo = new EdgGlassTaskInfo();
|
// BeanUtils.copyProperties(glassInfo, edgGlassTaskInfo);
|
// edgGlassTaskInfo.setWidth((int) glassInfo.getWidth());
|
// edgGlassTaskInfo.setHeight((int) glassInfo.getHeight());
|
// edgGlassTaskInfoList.add(edgGlassTaskInfo);
|
// log.info("在玻璃信息表中获取玻璃信息{}", edgGlassTaskInfoList);
|
// }
|
// }
|
// Assert.isFalse(CollectionUtils.isEmpty(edgGlassTaskInfoList), "识别玻璃信息未出现在尺寸表中,获取相邻两块玻璃失败");
|
// //2、获取卧转立剩余宽度
|
// BigStorageDTO sitToUpRemainWidth = bigStorageCageFeedTaskService.querySitToUpRemainWidth(line);
|
// Integer remainWidth;
|
// Integer glassCount;
|
// if (0 == sitToUpRemainWidth.getGlassCount()) {
|
// remainWidth = carWidth;
|
// glassCount = 0;
|
// } else {
|
// remainWidth = sitToUpRemainWidth.getWidth();
|
// glassCount = sitToUpRemainWidth.getGlassCount();
|
// }
|
//
|
// Boolean flag = Boolean.TRUE;
|
// //2、获取卧转立
|
// Integer widthFirst = Math.max(edgGlassTaskInfoList.get(0).getWidth() / 10, edgGlassTaskInfoList.get(0).getHeight() / 10);
|
// Integer heightFirst = Math.min(edgGlassTaskInfoList.get(0).getWidth() / 10, edgGlassTaskInfoList.get(0).getHeight() / 10);
|
// if (edgGlassTaskInfoList.size() == 1) {
|
// if (remainWidth >= widthFirst) {
|
// if (glassCount < inCarMaxSize) {
|
// addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst, heightFirst);
|
// } else {
|
// if (glassCount < inCarMaxSize + 1) {
|
// addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
|
// } else {
|
// return Boolean.FALSE;
|
// }
|
// }
|
// } else {
|
// flag = Boolean.FALSE;
|
// }
|
// } else {
|
// Integer widthSecond = Math.max(edgGlassTaskInfoList.get(1).getWidth() / 10, edgGlassTaskInfoList.get(1).getHeight() / 10);
|
// Integer heightSecond = Math.min(edgGlassTaskInfoList.get(1).getWidth() / 10, edgGlassTaskInfoList.get(1).getHeight() / 10);
|
// if (remainWidth >= widthFirst) {
|
// if (remainWidth - widthFirst - glassGap >= widthSecond) {
|
// if (glassCount < inCarMaxSize) {
|
// addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst, heightFirst);
|
// } else {
|
// if (glassCount < inCarMaxSize + 1) {
|
// addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
|
// } else {
|
// return Boolean.FALSE;
|
// }
|
// }
|
// } else {
|
// if (glassCount < inCarMaxSize + 1) {
|
// addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
|
// } else {
|
// return Boolean.FALSE;
|
// }
|
// }
|
// } else {
|
// flag = Boolean.FALSE;
|
// }
|
// }
|
// //向plc发送进片确认
|
// if (flag) {
|
// //向plc写入确认字
|
// PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
|
// int returnData = 1;
|
// int count = 1;
|
// while (returnData != 0) {
|
// S7object.getinstance().plccontrol.writeWord(mesAddress, 1);
|
//
|
// if (Const.A10_OUT_TARGET_POSITION.equals(line)) {
|
// returnData = Integer.parseInt(plcParameterObject.getPlcParameter("D04ToMES").getValue());
|
// } else {
|
// returnData = Integer.parseInt(plcParameterObject.getPlcParameter("D01ToMES").getValue());
|
// }
|
//// returnData = S7object.getinstance().plccontrol.readWord(mesAddress, 1).get(0);
|
// log.info("进卧转立第{}次发送确认字完成，地址为：{},写入的内容为{}", count++, mesAddress, 1);
|
// }
|
// }
|
// //记录无法放下玻璃，后续判断启动
|
// return flag;
|
// }
|
//
|
// /**
|
// * 添加任务信息
|
// */
|
// private Boolean addFeedTask(String glassId, Integer line, Integer taskType, Integer width, Integer height) {
|
// BigStorageCageFeedTask bigStorageCageFeedTask = new BigStorageCageFeedTask();
|
// bigStorageCageFeedTask.setGlassId(glassId);
|
// bigStorageCageFeedTask.setTaskState(Const.BIG_STORAGE_IN_NEW);
|
// bigStorageCageFeedTask.setLine(line);
|
// bigStorageCageFeedTask.setTaskType(taskType);
|
// bigStorageCageFeedTask.setWidth(width);
|
// bigStorageCageFeedTask.setHeight(height);
|
// bigStorageCageFeedTask.setCreateTime(new Date());
|
// //删除理片笼表拿走/破损数据数据
|
// damageService.deleteByGlassId(glassId);
|
// Damage damage = new Damage();
|
// damage.setGlassId(glassId);
|
// damage.setWorkingProcedure("磨边");
|
// damage.setLine(line);
|
// damage.setType(1);
|
// damage.setRemark("进大理片");
|
// damageService.insertDamage(damage);
|
// return bigStorageCageFeedTaskService.save(bigStorageCageFeedTask);
|
// }
|
//
|
// /**
|
// * 获取需要启动的线路：两条线都可启动 获取第一片玻璃版图id最小 版序最大的线路
|
// *
|
// * @return 需要启动的线路
|
// */
|
// public Integer getStartLine() {
|
// List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
|
// .inSql(BigStorageCageFeedTask::getId, "select min(id) from big_storage_cage_feed_task where task_state = 2" +
|
// "and (target_slot = 0 or target_slot is null) group by line"));
|
// Assert.isFalse(CollectionUtils.isEmpty(taskList), "卧转立两条线都没有玻璃进片任务");
|
// Map<String, Integer> taskMap = taskList.stream().collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId,
|
// BigStorageCageFeedTask::getLine));
|
// GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
|
// .in(GlassInfo::getGlassId, taskMap.keySet())
|
// .orderByAsc(GlassInfo::getTemperingLayoutId)
|
// .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence)
|
// .last("limit 1"));
|
// return taskMap.get(glassInfo.getGlassId());
|
// }
|
//
|
// /**
|
// * 计算任务表进片线路的目标格子，并启动任务
|
// */
|
// public boolean computeTargetByLine(Integer line) {
|
// //1、获取任务表中的所有玻璃（指定线路且已经进卧转立完成）
|
// List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
|
// .eq(BigStorageCageFeedTask::getLine, line)
|
// .and(e -> e.isNull(BigStorageCageFeedTask::getTargetSlot).or().eq(BigStorageCageFeedTask::getTargetSlot, Const.OUT_TARGET_POSITION_ZERO))
|
// .in(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP_ALL)
|
// .orderByAsc(BigStorageCageFeedTask::getId));
|
// //2、去笼子内查找是否可以继续存放的笼子
|
// List<String> glassIds = taskList.stream().map(BigStorageCageFeedTask::getGlassId).collect(Collectors.toList());
|
// List<GlassInfo> glassInfos = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().in(GlassInfo::getGlassId, glassIds));
|
// return computeIsTemperingTargetByLine(glassInfos, taskList);
|
// }
|
//
|
// /**
|
// * 是否钢化玻璃进笼目标位置
|
// *
|
// * @param glassInfos 当条线卧转立所有玻璃
|
// * @param taskList 当条线卧转立所有任务
|
// */
|
// private boolean computeIsTemperingTargetByLine(List<GlassInfo> glassInfos, List<BigStorageCageFeedTask> taskList) {
|
// //1、将玻璃信息集合转为glassid为key的map
|
// Map<String, GlassInfo> glassInfoMap = glassInfos.stream()
|
// .collect(Collectors.toMap(GlassInfo::getGlassId, p -> p));
|
// for (BigStorageCageFeedTask e : taskList) {
|
// GlassInfo info = glassInfoMap.get(e.getGlassId());
|
// if (info == null) {
|
// continue;
|
// }
|
// BigStorageCageDetails cageDetails = new BigStorageCageDetails();
|
// BeanUtils.copyProperties(info, cageDetails);
|
// //todo:2、获取目标格子信息
|
// BigStorageDTO bigStorageDTO = bigStorageCageDetailsService.queryTargetSlotByTempering(info);
|
// //3、临时更新格子的剩余尺寸：防止相邻玻璃进同一格子造成剩余尺寸不足，玻璃越界的情况，任务完成后再次更新大理片笼表剩余宽度（按照笼内玻璃数量更新大理片笼剩余尺寸）
|
// bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>().set(BigStorageCage::getRemainWidth, bigStorageDTO.getWidth() - Math.max(info.getWidth(), info.getHeight()) - glassGap)
|
// .eq(BigStorageCage::getSlot, bigStorageDTO.getSlot()));
|
// //4、更新进片任务表，目标格子及状态（状态改为2 电气扫到自行处理） 遇到问题：无法批量更新，批量更新无法走指定从库
|
// e.setTargetSlot(bigStorageDTO.getSlot());
|
// bigStorageCageFeedTaskService.updateById(e);
|
//
|
// //5、将进片信息存入大理片笼详情表
|
// cageDetails.setSlot(bigStorageDTO.getSlot());
|
// cageDetails.setState(Const.GLASS_STATE_NEW);
|
// cageDetails.setDeviceId(bigStorageDTO.getDeviceId());
|
// cageDetails.setGap(glassGap);
|
// bigStorageCageDetailsService.save(cageDetails);
|
//
|
// }
|
// return Boolean.TRUE;
|
// }
|
//
|
// private void sendTaskListToPLC(List<BigStorageCageFeedTask> taskList, Integer line) {
|
// log.info("送片任务发送进片玻璃信息");
|
// S7control s7control = S7object.getinstance().plccontrol;
|
// PlcParameterObject plcMesObject = S7object.getinstance().PlcMesObject;
|
// String mesD03Address = plcMesObject.getPlcParameter("MESToD03").getAddress();
|
// String mesD05Address = plcMesObject.getPlcParameter("MESToD05").getAddress();
|
// String outLine = line.equals(Const.A09_OUT_TARGET_POSITION) ? mesD03Address : mesD05Address;
|
// for (int i = 1; i <= taskList.size(); i++) {
|
// s7control.writeWord(plcMesObject.getPlcParameter("StartAddToImport" + i).getAddress(), taskList.get(i - 1).getLine());
|
// s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport" + i).getAddress(), taskList.get(i - 1).getTargetSlot());
|
// log.info("向plc发送第{}片玻璃已完成,起始位置是{}，目标位置是", i, taskList.get(i - 1).getLine(), taskList.get(i - 1).getTargetSlot());
|
// }
|
// int returnData = 1;
|
// int count = 1;
|
// while (returnData != 0) {
|
// s7control.writeWord(outLine, 2);
|
// if (line.equals(Const.A09_OUT_TARGET_POSITION)) {
|
// returnData = Integer.parseInt(plcMesObject.getPlcParameter("D03ToMES").getValue());
|
// } else {
|
// returnData = Integer.parseInt(plcMesObject.getPlcParameter("D05ToMES").getValue());
|
// }
|
//// returnData = s7control.readWord(outLine, 1).get(0);
|
// log.info("已向plc第{}次发送进片任务确认，地址为：{},写入的内容为{}", count++, outLine, 2);
|
// }
|
// }
|
//
|
// /**
|
// * 出片一次仅生成一车玻璃
|
// *
|
// * @param list
|
// * @param isTempering
|
// * @param mesToPLCAddress
|
// * @param <T>
|
// * @return
|
// */
|
// private <T extends BigStorageCageBaseInfo> Boolean computeOutGlassInfo(List<T> list, Boolean isTempering, String mesToPLCAddress) {
|
// //任务数据 获取车子存放玻璃最大数量 玻璃间隔
|
// List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
|
// //打车剩余尺寸
|
// Integer remainWidth = carWidth;
|
// int maxX = 0;
|
// for (T e : list) {
|
// if (bigStorageCageOutTaskList.size() >= outCarMaxSize || Math.max((int) e.getWidth(), (int) e.getHeight()) > remainWidth) {
|
// break;
|
// }
|
// remainWidth = remainWidth - Math.max((int) e.getWidth(), (int) e.getHeight()) - glassGap;
|
// if (isTempering) {
|
// int minLength = Math.min((int) e.getWidth(), (int) e.getHeight());
|
// if (maxX + minLength <= xMaxSize) {
|
// bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
|
// e.getWidth() * 10, e.getHeight() * 10, 0, 0, 1, new Date()));
|
//// maxX = Math.max(maxX, e.getXCoordinate());
|
// } else {
|
// break;
|
// }
|
//
|
// } else {
|
// bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
|
// e.getWidth() * 10, e.getHeight(), 0, 0, 1, new Date()));
|
// }
|
// }
|
// Assert.isFalse(CollectionUtils.isEmpty(bigStorageCageOutTaskList), "未获取出片数据，结束出片任务");
|
// log.info("获取出片任务数据{}条，执行保存", bigStorageCageOutTaskList.size());
|
// bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
|
// List<String> glassIds = bigStorageCageOutTaskList.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList());
|
// log.info("将出片玻璃{}玻璃状态改为已出片", glassIds);
|
// bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>()
|
// .set(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING)
|
// .in(BigStorageCageDetails::getGlassId, glassIds));
|
// int returnData = 0;
|
// int count = 1;
|
// while (returnData == 0) {
|
// S7object.getinstance().plccontrol.writeWord(mesToPLCAddress, 1);
|
// returnData = S7object.getinstance().plccontrol.readWord(mesToPLCAddress, 1).get(0);
|
// log.info("已向plc第{}次发送出片任务确认，地址为：{},写入的内容为{}", count++, mesToPLCAddress, returnData);
|
// }
|
// return Boolean.TRUE;
|
// }
|
//
|
// /**
|
// * 出片一次生成一炉玻璃
|
// *
|
// * @param list
|
// * @param isTempering
|
// * @param mesToPLCAddress
|
// * @param <T>
|
// * @return
|
// */
|
// public <T extends BigStorageCageBaseInfo> Boolean computeOutMoreGlassInfo(List<T> list, Boolean isTempering, String mesToPLCAddress) {
|
// //任务数据 获取车子存放玻璃最大数量 玻璃间隔
|
// List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
|
// //打车剩余尺寸
|
// Integer remainWidth = carWidth;
|
// int trainNumber = 1;
|
// int serialNumber = 1;
|
// int maxX = 0;
|
// for (T e : list) {
|
// int maxLength = Math.max((int) e.getWidth(), (int) e.getHeight());
|
// if (serialNumber > outCarMaxSize || maxLength > remainWidth) {
|
// remainWidth = carWidth;
|
// trainNumber = trainNumber + 1;
|
// serialNumber = 1;
|
// maxX = 0;
|
// }
|
// remainWidth = remainWidth - maxLength - glassGap;
|
// if (isTempering) {
|
// int minLength = Math.min((int) e.getWidth(), (int) e.getHeight());
|
// if (maxX + minLength <= xMaxSize) {
|
// bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
|
// e.getWidth() * 10, e.getHeight() * 10, trainNumber, serialNumber++, 1, new Date()));
|
//// maxX = Math.max(maxX, e.getXCoordinate());
|
// } else {
|
// remainWidth = carWidth - maxLength - glassGap;
|
// trainNumber = trainNumber + 1;
|
// serialNumber = 1;
|
//// maxX = e.getXCoordinate();
|
// bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
|
// e.getWidth() * 10, e.getHeight(), trainNumber, serialNumber++, 1, new Date()));
|
// }
|
// } else {
|
// bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
|
// e.getWidth() * 10, e.getHeight(), trainNumber, serialNumber++, 1, new Date()));
|
// }
|
// }
|
// Assert.isFalse(CollectionUtils.isEmpty(bigStorageCageOutTaskList), "未获取出片数据，结束出片任务");
|
// log.info("获取出片任务数据{}条，执行保存", bigStorageCageOutTaskList.size());
|
// for (BigStorageCageOutTask bigStorageCageOutTask : bigStorageCageOutTaskList
|
// ) {
|
// bigStorageCageOutTaskService.save(bigStorageCageOutTask);
|
// }
|
//// bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
|
// List<String> glassIds = bigStorageCageOutTaskList.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList());
|
// log.info("将出片玻璃{}玻璃状态改为已出片", glassIds);
|
// bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>()
|
// .set(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING)
|
// .in(BigStorageCageDetails::getGlassId, glassIds)
|
// .ne(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT));
|
//
|
// return Boolean.TRUE;
|
// }
|
//
|
// private BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo) {
|
//
|
// MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class)
|
// .selectAll(BigStorageCage.class)
|
// .leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
|
// .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
|
// .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO)
|
// .eq(BigStorageCageDetails::getEngineerId, glassInfo.getEngineerId())
|
// .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
|
// .gt(BigStorageCage::getRemainWidth, Math.max(glassInfo.getWidth(), glassInfo.getHeight()))
|
// .last("limit 1");
|
// if (glassInfo.getTemperingLayoutId() == 0) {
|
// wrapper.eq(BigStorageCageDetails::getFlowCardId, glassInfo.getFlowCardId())
|
// .eq(BigStorageCageDetails::getLayer, glassInfo.getLayer());
|
//// wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight());
|
// } else {
|
// wrapper.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
|
// }
|
// BigStorageCage bigStorageCage = bigStorageCageService.selectJoinOne(BigStorageCage.class, wrapper);
|
// return null;
|
// }
|
//
|
// // @Scheduled(fixedDelay = 300)
|
// public void querySizeByEngineerTask() {
|
// log.info("查询结果：{}", querySizeByEngineer("P24072402", 1, 10, 8));
|
// log.info("查询结果：{}", querySizeByEngineer("P24072402", 1, 5, 8));
|
//
|
// }
|
//
|
// public BigStorageDTO querySizeByEngineer(String engineerId, int temperingLayoutId, int temperingFeedSequence, double thickness) {
|
// BigStorageDTO bigStorageDTO = null;
|
// BigStorageCage bigStorageCage = null;
|
// //获取笼内当前版图每个格子已有玻璃的最小版序 获取笼内当前版图的所有玻璃信息
|
// List<BigStorageCageDetails> cageDetailsList = bigStorageCageDetailsService.list(new QueryWrapper<BigStorageCageDetails>()
|
// .select("slot", "min(tempering_feed_sequence) as tempering_feed_sequence")
|
// .eq("engineer_id", engineerId).eq("tempering_layout_id", temperingLayoutId)
|
// .in("state", Const.GLASS_STATE_IN_ALL_ZERO).groupBy("slot").orderByAsc("min(tempering_feed_sequence)"));
|
// if (CollectionUtils.isNotEmpty(cageDetailsList)) {
|
// Integer minLength = cageDetailsList.stream().filter(e -> e.getTemperingFeedSequence() > temperingFeedSequence)
|
// .mapToInt(BigStorageCageDetails::getTemperingFeedSequence).min().orElse(1000);
|
// List<GlassInfo> infoList = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>()
|
// .notInSql(GlassInfo::getGlassId, "select glass_id from damage where tempering_layout_id = " + temperingLayoutId + " and engineer_id = '" + engineerId + "'")
|
// .eq(GlassInfo::getTemperingLayoutId, temperingLayoutId).eq(GlassInfo::getEngineerId, engineerId).orderByAsc(GlassInfo::getTemperingFeedSequence));
|
// int remainWidth = carWidth;
|
// int trainNumber = 1;
|
// int serialNumber = 0;
|
// int min = 0;
|
// int temp = infoList.get(0).getTemperingFeedSequence();
|
// int slot = 0;
|
// int resultTrainNumber = 0;
|
// for (GlassInfo e : infoList) {
|
// int maxLength = Math.max((int) e.getWidth(), (int) e.getHeight());
|
// if (serialNumber >= outCarMaxSize || maxLength > remainWidth || e.getTemperingFeedSequence() >= minLength) {
|
// if (resultTrainNumber != 0) {
|
// min = temp;
|
// break;
|
// }
|
// temp = e.getTemperingFeedSequence();
|
// remainWidth = carWidth;
|
// trainNumber = trainNumber + 1;
|
// serialNumber = 0;
|
// }
|
// if (temperingFeedSequence == e.getTemperingFeedSequence()) {
|
// resultTrainNumber = trainNumber;
|
// }
|
// remainWidth = remainWidth - maxLength - glassGap > 0 ? remainWidth - maxLength - glassGap : 0;
|
// serialNumber += 1;
|
// log.info("{},{},{}", trainNumber, remainWidth, serialNumber);
|
// if (e.getTemperingFeedSequence().equals(infoList.get(infoList.size() - 1).getTemperingFeedSequence())) {
|
// min = temp;
|
// }
|
// }
|
// for (BigStorageCageDetails item : cageDetailsList) {
|
// if (min <= item.getTemperingFeedSequence() && item.getTemperingFeedSequence() < minLength) {
|
// slot = item.getSlot();
|
// bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
|
// .eq(BigStorageCage::getSlot, slot).eq(BigStorageCage::getEnableState, Const.SLOT_ON));
|
// break;
|
// }
|
// }
|
// }
|
//
|
// if (bigStorageCage != null) {
|
// bigStorageDTO = new BigStorageDTO();
|
// bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
|
// bigStorageDTO.setSlot(bigStorageCage.getSlot());
|
// bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
|
// return bigStorageDTO;
|
// }
|
//
|
// bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
|
// .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
|
// .eq(BigStorageCage::getRemainWidth, slotWidth).orderByAsc(BigStorageCage::getSlot)
|
// .inSql(BigStorageCage::getDeviceId,
|
// "select distinct device_id from big_storage_cage_details where engineer_id = '" + engineerId + "' and tempering_layout_id = " + temperingLayoutId)
|
// .last("limit 1"));
|
// if (null != bigStorageCage) {
|
// log.info("根据版图id找到笼子内的目标格子：{}", bigStorageCage.getSlot());
|
// bigStorageDTO = new BigStorageDTO();
|
// bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
|
// bigStorageDTO.setSlot(bigStorageCage.getSlot());
|
// bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
|
// return bigStorageDTO;
|
//
|
// }
|
//
|
// //获取玻璃的厚度：重新选笼子需要按照笼子可放玻璃厚度进行选择 因为子查询排序对主sql无影响，所以先执行子查询获取顺序，然后一次去查询
|
// List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(thickness);
|
// for (Integer item : deviceUsedList) {
|
// bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
|
// .eq(BigStorageCage::getRemainWidth, slotWidth).orderByAsc(BigStorageCage::getSlot)
|
// .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
|
// .eq(BigStorageCage::getDeviceId, item)
|
// .last("limit 1"));
|
// if (null != bigStorageCage) {
|
// log.info("按照存笼玻璃格子数占用最少方式获取信息格子为：{}", bigStorageCage.getSlot());
|
// bigStorageDTO = new BigStorageDTO();
|
// bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
|
// bigStorageDTO.setSlot(bigStorageCage.getSlot());
|
// bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
|
// return bigStorageDTO;
|
// }
|
// }
|
// Assert.isTrue(null != bigStorageCage, "没有空余的笼子存放玻璃");
|
// return bigStorageDTO;
|
// }
|
//
|
//}
|
