From e531fbb59d4d3e79a59af5b10efe7294d703d1d8 Mon Sep 17 00:00:00 2001 From: Comair <1464848666@qq.com> Date: Fri, 2 Aug 2024 17:25:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=85=A5=E5=BA=93=E6=97=B6?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=88=86=E9=85=8D=E8=B4=A7=E4=BD=8D=E6=97=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=B7=E9=81=93=2020=E7=A7=92=E4=B8=8B?= =?UTF-8?q?=E6=8C=8240=E7=A7=92=E5=87=BA=E5=BA=93=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shkj/common/constant/RedisConstant.java | 9 ++- .../com/shkj/wms/bo/AssingEmptyLocBo.java | 1 + .../com/shkj/wms/bo/BusinTaskQueryBo.java | 3 + .../shkj/wms/mapper/BaseLocationMapper.java | 2 + .../java/com/shkj/wms/plc/PlcEventTask.java | 8 +- .../shkj/wms/scheduled/ScheduledTasks.java | 66 +++++++++++++-- .../wms/service/IBaseLocationService.java | 2 +- .../service/impl/BaseLocationServiceImpl.java | 80 ++++++++++++------- .../IBusinContainerUpkeepServiceImpl.java | 2 +- .../impl/IBusinEnptyContainerServiceImpl.java | 2 +- .../impl/PutInOutStorageServiceImpl.java | 2 +- .../wms/service/impl/StackServiceImpl.java | 2 +- .../mapper/wms/BaseLocationMapper.xml | 24 ++++++ .../mapper/wms/BusinDataTaskMapper.xml | 9 ++- 14 files changed, 166 insertions(+), 46 deletions(-) diff --git a/shkj-common/src/main/java/com/shkj/common/constant/RedisConstant.java b/shkj-common/src/main/java/com/shkj/common/constant/RedisConstant.java index cc16dd4..44a9baf 100644 --- a/shkj-common/src/main/java/com/shkj/common/constant/RedisConstant.java +++ b/shkj-common/src/main/java/com/shkj/common/constant/RedisConstant.java @@ -91,7 +91,7 @@ public class RedisConstant { public final static String redisStkStatus="redisStkStatus"; /** - * AGV实时数据 + * AGV实时数据p */ public static String redisAgvRealInfo="redisAgvRealInfo:"; @@ -101,5 +101,12 @@ public class RedisConstant { public static String redisInVehicheModel="InVehicheModel:"; + /** + * 剩余待下发空治具数 + */ + + public static String redisSurplusWaitIssueEmpFixTaskNum="surplusWaitIssueEmpFixTaskNum:"; + + } diff --git a/shkj-wms/src/main/java/com/shkj/wms/bo/AssingEmptyLocBo.java b/shkj-wms/src/main/java/com/shkj/wms/bo/AssingEmptyLocBo.java index 77f1a6c..d147b5c 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/bo/AssingEmptyLocBo.java +++ b/shkj-wms/src/main/java/com/shkj/wms/bo/AssingEmptyLocBo.java @@ -24,6 +24,7 @@ public class AssingEmptyLocBo implements Serializable { private String batch; private String tunnel; + private String taskId; private List businDataTaskGoodsVos; diff --git a/shkj-wms/src/main/java/com/shkj/wms/bo/BusinTaskQueryBo.java b/shkj-wms/src/main/java/com/shkj/wms/bo/BusinTaskQueryBo.java index 35b5b84..2aa1f9e 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/bo/BusinTaskQueryBo.java +++ b/shkj-wms/src/main/java/com/shkj/wms/bo/BusinTaskQueryBo.java @@ -46,4 +46,7 @@ public class BusinTaskQueryBo implements Serializable { /** 查询关键字*/ private String keywords; + /** 限制条数，传入按照传入的查询*/ + private Integer limit; + } diff --git a/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseLocationMapper.java b/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseLocationMapper.java index 2cc0c0f..98b2a0e 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseLocationMapper.java +++ b/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseLocationMapper.java @@ -80,6 +80,8 @@ public interface BaseLocationMapper extends BaseMapper { List getLocationByAreaId( Long areaId); + List getLocationByAreaIdTunel( BaseLocationQueryBo bo); + /** * 获取 异常、冲孔出库货位数据 * @author Comair diff --git a/shkj-wms/src/main/java/com/shkj/wms/plc/PlcEventTask.java b/shkj-wms/src/main/java/com/shkj/wms/plc/PlcEventTask.java index c99523b..73377ad 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/plc/PlcEventTask.java +++ b/shkj-wms/src/main/java/com/shkj/wms/plc/PlcEventTask.java @@ -143,7 +143,7 @@ public class PlcEventTask { private ScheduledExecutorService executorService = Executors.newScheduledThreadPool(8); - // @Scheduled(fixedRate = 200) + @Scheduled(fixedRate = 200) public void init() { //查询需要连接的PLC,初始化连接对象 List plcList = iWcsPlcConnectService.selectWcsPlcConnectList(new WcsPlcConnect().setIsActive("1")); @@ -226,7 +226,7 @@ public class PlcEventTask { } } - // @Scheduled(fixedRate = 200) + @Scheduled(fixedRate = 200) public void init1() { //查询需要连接的PLC,初始化连接对象 List plcList = iWcsPlcConnectService.selectWcsPlcConnectList(new WcsPlcConnect().setIsActive("1")); @@ -244,7 +244,7 @@ public class PlcEventTask { } } - // @Scheduled(fixedRate = 200) + @Scheduled(fixedRate = 200) public void init2() { //查询需要连接的PLC,初始化连接对象 List plcList = iWcsPlcConnectService.selectWcsPlcConnectList(new WcsPlcConnect().setIsActive("1")); @@ -262,7 +262,7 @@ public class PlcEventTask { } } - // @Scheduled(fixedDelay = 6000) + @Scheduled(fixedDelay = 6000) public void writePlcheartbeat() { //根据连接的plcId获取属性 PlcOperate plcOperate = plcInit.getPlcOperate_41(); diff --git a/shkj-wms/src/main/java/com/shkj/wms/scheduled/ScheduledTasks.java b/shkj-wms/src/main/java/com/shkj/wms/scheduled/ScheduledTasks.java index 3ea8193..7faf743 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/scheduled/ScheduledTasks.java +++ b/shkj-wms/src/main/java/com/shkj/wms/scheduled/ScheduledTasks.java @@ -180,9 +180,18 @@ public class ScheduledTasks { } - // @Scheduled(fixedRate = 200) + @Scheduled(fixedRate = 200) public void task() { + // log.info("开始获取需要执行的任务"); + //获取下发车型 + String inVehicheModel = ""; + Object objVehicheModel = redisTemplate.opsForValue().get(RedisConstant.redisInVehicheModel); + if (objVehicheModel == null) { + inVehicheModel = ""; + } + + //获取待下发任务数据 BusinTaskQueryBo taskQueryBo = new BusinTaskQueryBo(); List businDataTaskVos = new ArrayList<>(); @@ -217,9 +226,12 @@ public class ScheduledTasks { taskQueryBo.setTaskType("12"); List businDataTaskVo12 = iBusinDataTaskService.selectBusinDataTask1(taskQueryBo); businDataTaskVos.addAll(businDataTaskVo12); - taskQueryBo.setTaskType("15"); - List businDataTaskVo15 = iBusinDataTaskService.selectOutBusinDataTask(taskQueryBo); - businDataTaskVos.addAll(businDataTaskVo15); + + if (!inVehicheModel.equals("3LN") && !inVehicheModel.equals("3UE")) {//如果车型非3LN车型，空托任务正常执行，否则根据出库任务交替执行 + taskQueryBo.setTaskType("15"); + List businDataTaskVo15 = iBusinDataTaskService.selectOutBusinDataTask(taskQueryBo); + businDataTaskVos.addAll(businDataTaskVo15); + } taskQueryBo.setTaskType("17"); List businDataTaskVo17 = iBusinDataTaskService.selectBusinDataTask1(taskQueryBo); businDataTaskVos.addAll(businDataTaskVo17); @@ -246,20 +258,45 @@ public class ScheduledTasks { List businDataTaskVo23 = iBusinDataTaskService.selectBusinDataTask1(taskQueryBo); businDataTaskVos.addAll(businDataTaskVo23); + Integer[] waitIssueEmpTaskNum = {0}; + //按照优先级降序排序，优先级高的优先执行 businDataTaskVos = businDataTaskVos.stream().sorted(Comparator.comparing(BusinDataTaskVo::getIsTop, Comparator.reverseOrder()).thenComparing(BusinDataTaskVo::getCreateTime)).collect(Collectors.toList()); for (BusinDataTaskVo businDataTaskVo : businDataTaskVos) { - doTask(businDataTaskVos,businDataTaskVo); + // doTask(businDataTaskVos,businDataTaskVo); + doTask(inVehicheModel, waitIssueEmpTaskNum, businDataTaskVo,businDataTaskVos); } //查询下挂任务目前的车型：入库：3LN（20秒） 出库：3UG（40秒） 空托和保险杠交替进行 4和15 //从redis中写入 + //从redis中写入 + if (inVehicheModel.equals("3LN") || inVehicheModel.equals("3UE")) {//下发车型为3LN的时候，根据出库任务数量执行空托任务 + //获取出库任务下发成功数 + if (redisTemplate.hasKey(RedisConstant.redisSurplusWaitIssueEmpFixTaskNum)) { + Integer lastSurpTaskNum = (Integer) redisTemplate.opsForValue().get(RedisConstant.redisSurplusWaitIssueEmpFixTaskNum); + log.error("上次剩余待下发空治具任务数：" + lastSurpTaskNum); + waitIssueEmpTaskNum[0] = waitIssueEmpTaskNum[0] + lastSurpTaskNum; + } + log.error("总待下发空治具任务数：" + waitIssueEmpTaskNum[0]); + if (waitIssueEmpTaskNum[0] > 0) {//上次空治具未下发成功的是否计入本次任务，如果计入，本次任务+上次未下发成功任务是否会超出查询限制条数 + taskQueryBo.setTaskType("15"); + taskQueryBo.setLimit(waitIssueEmpTaskNum[0]); + List businDataTaskVo15 = iBusinDataTaskService.selectOutBusinDataTask(taskQueryBo); + for (BusinDataTaskVo businDataTaskVo : businDataTaskVo15) { + doTask(inVehicheModel, waitIssueEmpTaskNum, businDataTaskVo,businDataTaskVos); + } + if (waitIssueEmpTaskNum[0] > 0) { + log.error("本次剩余待下发空治具任务数：" + waitIssueEmpTaskNum[0]); + redisTemplate.opsForValue().set(RedisConstant.redisSurplusWaitIssueEmpFixTaskNum, waitIssueEmpTaskNum[0]); + } + } + } } @Transactional(rollbackFor = Exception.class) - void doTask(List businDataTaskVos,BusinDataTaskVo businDataTaskVo) { + void doTask(String inVehicheModel, Integer[] waitIssueEmpTaskNum,BusinDataTaskVo businDataTaskVo,List businDataTaskVos) { //如果当前任务是非紧急任务，则查询是否有紧急任务待执行，如果有，优先处理紧急的 if (businDataTaskVo.getIsTop().equals("0")){ BusinDataTaskVo businDataTaskVoIstop= businDataTaskVos.stream().filter(item -> item.getIsTop().equals("1")).sorted(Comparator.comparing(BusinDataTaskVo::getCreateTime)).findFirst().orElse(null); @@ -390,7 +427,7 @@ public class ScheduledTasks { emptyLocBo.setVehicheModel(vehicheModel); emptyLocBo.setGoodsNo(goodsNo); emptyLocBo.setBusinDataTaskGoodsVos(businDataTaskGoodsVos); - locationVoResult = iBaseLocationService.assignEmptyLocationAll(emptyLocBo); + locationVoResult = iBaseLocationService.assignEmptyLocationAll(emptyLocBo,null); } if (ObjectUtils.isNotEmpty(locationVoResult) && locationVoResult.getCode() == HttpStatus.SUCCESS.getCode()) { @@ -1128,6 +1165,14 @@ public class ScheduledTasks { iSysStockDetailService.updateBatchById(sysStockDetailList); Result taskResult = outTask(businDataTask); if (taskResult.getCode() == HttpStatus.SUCCESS.getCode()) { + + //成功后计算出库成功数量并写入redis + if (inVehicheModel.equals("3LN") || inVehicheModel.equals("3UE")) { + waitIssueEmpTaskNum[0]++; + log.info("3LN出库成功任务数：" + waitIssueEmpTaskNum[0]); + + } + businDataTask.setTaskStatus(TaskStatusEnum.wait_callback.getValue()); businDataTask.setExceptionMsg(""); businDataTask.setUpdateTime(DateUtils.getNowDate()); @@ -1217,6 +1262,11 @@ public class ScheduledTasks { if (ObjectUtils.isNotEmpty(businDataTask)) { Result taskResult = outTask(businDataTask); if (Result.isOk(taskResult)) { + if (inVehicheModel.equals("3LN") || inVehicheModel.equals("3UE")) { + waitIssueEmpTaskNum[0]--; + log.info("3LN待出库空治具任务数：" + waitIssueEmpTaskNum); + } + //完成后更新库位状态为空闲 BaseLocation location = iBaseLocationService.getById(businDataTask.getLocationId()); location.setLocationStatus("0"); @@ -2100,7 +2150,7 @@ public class ScheduledTasks { emptyLocBo.setVehicheModel(vehicheModel); emptyLocBo.setGoodsNo(goodsNo); emptyLocBo.setBusinDataTaskGoodsVos(businDataTaskGoodsVos); - locationVoResult = iBaseLocationService.assignEmptyLocationAll(emptyLocBo); + locationVoResult = iBaseLocationService.assignEmptyLocationAll(emptyLocBo,null); } diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/IBaseLocationService.java b/shkj-wms/src/main/java/com/shkj/wms/service/IBaseLocationService.java index 8181385..1547c59 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/IBaseLocationService.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/IBaseLocationService.java @@ -157,7 +157,7 @@ public interface IBaseLocationService extends IService { Result assignEmptyLocationByStock( String goodsNo,String vehicheModel, String batch,List businDataTaskGoodsVos); - Result assignEmptyLocationAll(AssingEmptyLocBo assingEmptyLocBo); + Result assignEmptyLocationAll(AssingEmptyLocBo assingEmptyLocBo,String tunnel); /** * 冲孔杠分配货位 diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseLocationServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseLocationServiceImpl.java index 8a9be5b..999410c 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseLocationServiceImpl.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseLocationServiceImpl.java @@ -815,13 +815,16 @@ public class BaseLocationServiceImpl extends ServiceImpl assignEmptyLocationAll(AssingEmptyLocBo assingEmptyLocBo) { + public synchronized Result assignEmptyLocationAll(AssingEmptyLocBo assingEmptyLocBo,String lcoatinTunnel) { BaseLocationVo locationVo = null; //bo等于空时，是空治具分配货位，否则是保险杠分配货位 if (assingEmptyLocBo == null) { //获取立库区的空治具存放区域编号 Long emptyconArea = Long.valueOf(sysParameterService.selectConfigByKey(SecurityUtils.getCurrentBranchId(), ParameterConstants.ParameterSystem.emptycon_area)); - List baseLocationVos = baseLocationMapper.getLocationByAreaId(emptyconArea); + BaseLocationQueryBo locationQueryBo = new BaseLocationQueryBo(); + locationQueryBo.setAreaId(emptyconArea); + locationQueryBo.setTunnel(lcoatinTunnel); + List baseLocationVos = baseLocationMapper.getLocationByAreaIdTunel(locationQueryBo); if (baseLocationVos.size() > 0) { locationVo = baseLocationVos.get(0); } else { @@ -909,19 +912,21 @@ public class BaseLocationServiceImpl extends ServiceImpl baseLocationVos = this.baseMapper.queryBaseLocationListByGoods(bo); - if (baseLocationVos.size() == 0) { - //查看缓冲区是否还有货位 - Long bufferArea = Long.valueOf(sysParameterService.selectConfigByKey(ParameterConstants.ParameterSystem.buffer_area)); - List baseLocationVoList = baseLocationMapper.getLocationByAreaId(bufferArea); - log.info("保险杠缓冲区分配到的货位信息：" + baseLocationVoList.size()); - if (baseLocationVoList.size() < 0) { - log.info("车型及缓冲区都未查询到空货位"); - return Result.err().msg("保险杠分配货位暂无空货位可用"); + if (StringUtils.isEmpty(assingEmptyLocBo.getTunnel())){ + if (baseLocationVos.size() == 0) { + //查看缓冲区是否还有货位 + Long bufferArea = Long.valueOf(sysParameterService.selectConfigByKey(ParameterConstants.ParameterSystem.buffer_area)); + List baseLocationVoList = baseLocationMapper.getLocationByAreaId(bufferArea); + log.info("保险杠缓冲区分配到的货位信息：" + baseLocationVoList.size()); + if (baseLocationVoList.size() < 0) { + log.info("车型及缓冲区都未查询到空货位"); + return Result.err().msg("保险杠分配货位暂无空货位可用"); + } + baseLocationVos = baseLocationVoList; } - //baseLocationVos.addAll(baseLocationVoList); - baseLocationVos = baseLocationVoList; } + //拿到所有可用货位,根据巷道号对双深位的巷道进行处理 //空货位所在巷道列表,同时过滤掉已有入库任务的巷道 List tunnelList = baseLocationVos.stream().map(e -> e.getTunnel()).distinct().collect(Collectors.toList()); @@ -1300,7 +1305,11 @@ public class BaseLocationServiceImpl extends ServiceImpl businDataTaskGoodsVos = businDataTaskGoodsService.selectBusinTaskGoodsByTaskCode(businDataTask.getId()); + String tunnel = baseLocation.getTunnel(); + String locationStatus = baseLocation.getLocationStatus(); if ("01".equals(tunnel) || "06".equals(tunnel)) { //如果是单深位，验证下双深位的是否有库存，如果有在判断车型颜色是否一致 String locationRow = baseLocation.getLocationRow(); @@ -1320,10 +1329,7 @@ public class BaseLocationServiceImpl extends ServiceImpl sysStockDetailVoList = iSysStockDetailService.queryByLocation(doubleLocation.getId()); - //查询目前任务的信息的保险杠信息： - List businDataTaskGoodsVos = businDataTaskGoodsService.selectBusinTaskGoodsByTaskCode(businDataTask.getId()); //空托盘入库时，此对象无数据 - //双深位无库存 if (sysStockDetailVoList != null && sysStockDetailVoList.size() == 0) { baseLocation = doubleLocation; @@ -1342,7 +1348,7 @@ public class BaseLocationServiceImpl extends ServiceImpl locationVoResult = this.assignEmptyLocationAll(assingEmptyLocBo); + Result locationVoResult = this.assignEmptyLocationAll(assingEmptyLocBo,null); if (Result.isOk(locationVoResult)) { BaseLocationVo baseLocationVo = locationVoResult.getData(); baseLocation = BeanUtil.toBean(baseLocationVo, BaseLocation.class); @@ -1353,7 +1359,7 @@ public class BaseLocationServiceImpl extends ServiceImpl locationVoResult = this.assignEmptyLocationAll(assingEmptyLocBo); + Result locationVoResult = this.assignEmptyLocationAll(assingEmptyLocBo,businDataTask.getTunnel()); if (Result.isOk(locationVoResult)) { BaseLocationVo baseLocationVo = locationVoResult.getData(); baseLocation = BeanUtil.toBean(baseLocationVo, BaseLocation.class); @@ -1361,19 +1367,39 @@ public class BaseLocationServiceImpl extends ServiceImpl0) { + String goodsNo = businDataTaskGoodsVos.get(0).getGoodsNo(); + BaseGoodsData baseGoodsData = iBaseGoodsDataService.getBaseGoodsByBarcodes(goodsNo); + assingEmptyLocBo = new AssingEmptyLocBo(); + assingEmptyLocBo.setBusinDataTaskGoodsVos(businDataTaskGoodsVos); + assingEmptyLocBo.setBatch(DateUtils.getDate()); + assingEmptyLocBo.setGoodsNo(goodsNo); + assingEmptyLocBo.setVehicheModel(baseGoodsData.getVehicheModel()); + assingEmptyLocBo.setTunnel(baseLocation.getTunnel()); + } + Result locationVoResult = this.assignEmptyLocationAll(assingEmptyLocBo,businDataTask.getTunnel()); + if (Result.isOk(locationVoResult)) { + BaseLocationVo baseLocationVo = locationVoResult.getData(); + baseLocation = BeanUtil.toBean(baseLocationVo, BaseLocation.class); + } } } + + if (!businDataTask.getLocationId().equals(baseLocation.getId())) { + baseLocation.setLocationStatus("4"); + this.updateById(baseLocation); + businDataTask.setToLayer(baseLocation.getLayer()); + businDataTask.setToColumn(baseLocation.getLocationColumn()); + businDataTask.setToRow(baseLocation.getLocationRow()); + businDataTask.setLocationId(baseLocation.getId()); + log.info("双深位重新分配货位：" + JsonUtil.toJSONString(baseLocation)); + iBusinDataTaskService.updateById(businDataTask); + } } else { - String locationStatus = baseLocation.getLocationStatus(); if ("1".equals(locationStatus) || "2".equals(locationStatus) || "5".equals(locationStatus)) { log.info("给堆垛机下发任务：" + businDataTask.getId() + " 原货位:" + JsonUtil.toJSONString(baseLocation)); BaseLocationVo baseLocationVo = this.queryLocationByTunnel(tunnel); diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/impl/IBusinContainerUpkeepServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wms/service/impl/IBusinContainerUpkeepServiceImpl.java index 234ff61..cf7d3b2 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/impl/IBusinContainerUpkeepServiceImpl.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/impl/IBusinContainerUpkeepServiceImpl.java @@ -144,7 +144,7 @@ public class IBusinContainerUpkeepServiceImpl extends ServiceImpl locationVoResult=iBaseLocationService.assignEmptyLocationAll(emptyLocBo); + Result locationVoResult=iBaseLocationService.assignEmptyLocationAll(emptyLocBo,null); if (!Result.isOk(locationVoResult)){ return Result.err().msg("暂无空治具存放区域"); diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/impl/IBusinEnptyContainerServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wms/service/impl/IBusinEnptyContainerServiceImpl.java index e6eef43..4c3501e 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/impl/IBusinEnptyContainerServiceImpl.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/impl/IBusinEnptyContainerServiceImpl.java @@ -158,7 +158,7 @@ public class IBusinEnptyContainerServiceImpl extends ServiceImpl locationVoResult=iBaseLocationService.assignEmptyLocationAll(emptyLocBo); + Result locationVoResult=iBaseLocationService.assignEmptyLocationAll(emptyLocBo,null); if (!Result.isOk(locationVoResult)){ return Result.err().msg("暂无空治具存放区域"); diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/impl/PutInOutStorageServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wms/service/impl/PutInOutStorageServiceImpl.java index 7f84751..410915d 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/impl/PutInOutStorageServiceImpl.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/impl/PutInOutStorageServiceImpl.java @@ -472,7 +472,7 @@ public class PutInOutStorageServiceImpl extends ServiceImpl locationVoResult=iBaseLocationService.assignEmptyLocationAll(emptyLocBo); + Result locationVoResult=iBaseLocationService.assignEmptyLocationAll(emptyLocBo,null); if (!Result.isOk(locationVoResult)){ return Result.err().msg("暂无空治具存放区域"); diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/impl/StackServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wms/service/impl/StackServiceImpl.java index 0f2365d..d62d6fe 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/impl/StackServiceImpl.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/impl/StackServiceImpl.java @@ -308,7 +308,7 @@ public class StackServiceImpl implements IStackService { emptyLocBo.setVehicheModel(vehicheModel); emptyLocBo.setGoodsNo(goodsNo); emptyLocBo.setBusinDataTaskGoodsVos(businDataTaskGoodsVos); - Result locationVoResult=iBaseLocationService.assignEmptyLocationAll(emptyLocBo); + Result locationVoResult=iBaseLocationService.assignEmptyLocationAll(emptyLocBo,null); BaseLocationVo locationVo = locationVoResult.getData(); String tunnel = locationVo.getTunnel(); diff --git a/shkj-wms/src/main/resources/mapper/wms/BaseLocationMapper.xml b/shkj-wms/src/main/resources/mapper/wms/BaseLocationMapper.xml index e0f7c4c..a0577f5 100644 --- a/shkj-wms/src/main/resources/mapper/wms/BaseLocationMapper.xml +++ b/shkj-wms/src/main/resources/mapper/wms/BaseLocationMapper.xml @@ -422,6 +422,30 @@ bl.route ASC,bl.is_deep desc + + + +