From 6f7f9e6fe40ffb1fc2cf26db39c4546bbb844d08 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 30 五月 2024 09:47:59 +0800
Subject: [PATCH] #orderDetlService.selectItem+hostid
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocMastServiceImpl.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 d1608ec..1a1194a 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
@@ -5,15 +5,20 @@
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.LocDirectionService;
import com.zy.asrs.common.wms.service.LocMastService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.framework.common.Cools;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("locMastService")
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
+
+ @Autowired
+ private LocDirectionService locDirectionService;
@Override
public List<String> queryGroupEmptyStock(String sourceLocNo, Long hostId) {
@@ -50,13 +55,19 @@
@Override
public LocMast findNearloc(String locNo, Long hostId, LocRangeDto locRangeDto) {
LocMast locMast = null;
- List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo, hostId);
- if (!Cools.isEmpty(groupOuterLoc)) {
+ List<String> groupLoc = Utils.getGroupLoc(locNo, hostId);
+ boolean asc = locDirectionService.isAsc(Utils.getRow(locNo), "inner", hostId);
+ if (!Cools.isEmpty(groupLoc)) {
LambdaQueryWrapper<LocMast> wrapper = new LambdaQueryWrapper<LocMast>()
.eq(LocMast::getLocSts, 'O')
- .in(LocMast::getLocNo, groupOuterLoc)
- .eq(LocMast::getHostId, hostId)
- .orderByAsc(LocMast::getRow1);
+ .in(LocMast::getLocNo, groupLoc)
+ .eq(LocMast::getHostId, hostId);
+ if (asc) {
+ wrapper.orderByAsc(LocMast::getRow1);
+ }else {
+ wrapper.orderByDesc(LocMast::getRow1);
+ }
+
//搴撲綅鎼滅储鑼冨洿
if (locRangeDto != null) {
wrapper.ge(LocMast::getRow1, locRangeDto.getStartRow());
--
Gitblit v1.9.1