From bb3941c91f4d400ec13044f5ada027b9bc3c07d3 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 17 一月 2024 16:21:51 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocMastServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocMastServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocMastServiceImpl.java
index e56e26b..d1608ec 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocMastServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocMastServiceImpl.java
@@ -1,6 +1,8 @@
package com.zy.asrs.common.wms.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.common.domain.dto.LocRangeDto;
+import com.zy.asrs.common.utils.Utils;
import com.zy.asrs.common.wms.mapper.LocMastMapper;
import com.zy.asrs.common.wms.entity.LocMast;
import com.zy.asrs.common.wms.service.LocMastService;
@@ -27,4 +29,45 @@
return this.baseMapper.queryGroupEmptyStock(hostId);
}
+ @Override
+ public List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd, Long hostId) {
+ return this.baseMapper.queryFreeLocMast2(locType1, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd, hostId);
+ }
+
+ @Override
+ public Boolean checkEmptyCount(LocMast locMast, int quaOfBlank, Long hostId) {
+ if (locMast == null) {
+ return false;
+ }
+ int count = this.baseMapper.selectCount(new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getLocSts, 'O')
+// .eq(LocMast::getLocType3, locMast.getLocType3())
+ .eq(LocMast::getLev1, locMast.getLev1())
+ .eq(LocMast::getHostId, hostId));
+ return count > quaOfBlank;
+ }
+
+ @Override
+ public LocMast findNearloc(String locNo, Long hostId, LocRangeDto locRangeDto) {
+ LocMast locMast = null;
+ List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo, hostId);
+ if (!Cools.isEmpty(groupOuterLoc)) {
+ LambdaQueryWrapper<LocMast> wrapper = new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getLocSts, 'O')
+ .in(LocMast::getLocNo, groupOuterLoc)
+ .eq(LocMast::getHostId, hostId)
+ .orderByAsc(LocMast::getRow1);
+ //搴撲綅鎼滅储鑼冨洿
+ if (locRangeDto != null) {
+ wrapper.ge(LocMast::getRow1, locRangeDto.getStartRow());
+ wrapper.le(LocMast::getRow1, locRangeDto.getTargetRow());
+ wrapper.ge(LocMast::getBay1, locRangeDto.getStartBay());
+ wrapper.le(LocMast::getBay1, locRangeDto.getTargetBay());
+ wrapper.ge(LocMast::getLev1, locRangeDto.getStartLev());
+ wrapper.le(LocMast::getLev1, locRangeDto.getTargetLev());
+ }
+ locMast = this.getOne(wrapper, false);
+ }
+ return locMast;
+ }
}
--
Gitblit v1.9.1