src/main/java/com/zy/asrs/service/BasSteService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/BasSteServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/BasSteService.java
@@ -5,8 +5,6 @@ public interface BasSteService extends IService<BasSte> { BasSte findByCrnNo(Integer crnNo); Boolean updatePos(Integer steNo, Integer row, Integer bay, Integer lev); Boolean updatePakMk(Integer steNo, String pakMk); src/main/java/com/zy/asrs/service/impl/BasSteServiceImpl.java
@@ -1,31 +1,15 @@ package com.zy.asrs.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.zy.asrs.mapper.BasSteMapper; import com.zy.asrs.entity.BasSte; import com.zy.asrs.service.BasSteService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.zy.asrs.entity.BasSte; import com.zy.asrs.mapper.BasSteMapper; import com.zy.asrs.service.BasSteService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.List; @Slf4j @Service("basSteService") public class BasSteServiceImpl extends ServiceImpl<BasSteMapper, BasSte> implements BasSteService { @Override public BasSte findByCrnNo(Integer crnNo) { List<BasSte> basStes = this.selectList(new EntityWrapper<BasSte>().eq("crn_no", crnNo)); if (Cools.isEmpty(basStes)) { return null; } if (basStes.size() > 1) { log.warn("目前有{}台穿梭车归属于{}号堆垛机!!!", basStes.size(), crnNo); } return basStes.get(0); } @Override public Boolean updatePos(Integer steNo, Integer row, Integer bay, Integer lev) { src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.annotations.ManagerAuth; import com.core.common.Cools; import com.core.exception.CoolException; import com.zy.asrs.entity.*; @@ -1290,17 +1291,32 @@ * 查找当前库位最适合的穿梭车来作业 */ public SteThread queryIdleCar(WrkMast wrkMast) { Integer crnNo = wrkMast.getCrnNo(); BasSte basSte = basSteService.findByCrnNo(crnNo); List<BasSte> basStes = basSteService.selectList(new EntityWrapper<>()); int val = 0; SteThread result = null; for (BasSte basSte : basStes) { // 获取穿梭车信息 SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, basSte.getSteNo()); SteProtocol steProtocol = steThread.getSteProtocol(); if (steProtocol != null) { if (steProtocol.isIdle()) { return steThread; if (steProtocol == null) { continue; } if (!steProtocol.isIdle()) { continue; } String locNo = wrkMast.getWrkSts() < 10 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo(); LocMast locMast = locMastService.selectById(locNo); int lev = locMast.getLev1(); int bay = locMast.getBay1(); int levAbs = Math.abs(lev - steProtocol.getLev()); int bayAbs = Math.abs(bay - steProtocol.getBay()); if (val == 0) { val = levAbs + bayAbs; result = steThread; } else { if ((levAbs + bayAbs) < val) { val = levAbs + bayAbs; result = steThread; } } return null; } return result; } /**