From a3776853fa6ff1c4a9805615a79852d54f700e3f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 20 七月 2024 09:21:04 +0800
Subject: [PATCH] 增加库位明细导出功能，曾加物料、单据、库存全局搜索功能
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
index 15518e9..7a69542 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
@@ -321,10 +321,9 @@
LambdaQueryWrapper<LocMast> wrapper1 = new LambdaQueryWrapper<LocMast>()
.eq(LocMast::getLocSts, "O")
.eq(LocMast::getHostId, hostId)
- .eq(LocMast::getWhsType, WHS_TYPE)
.in(LocMast::getRow1, curRow)
- .orderByAsc(LocMast::getBay1)
- .orderByAsc(LocMast::getLev1);
+ .orderByAsc(LocMast::getLev1)
+ .orderByAsc(LocMast::getBay1);
//搴撲綅鎼滅储鑼冨洿
@@ -341,7 +340,7 @@
for (LocMast mast : locMasts) {
LocMast innerLoc = null;
for (String loc : Utils.getGroupLoc(mast.getLocNo(), hostId)) {
- LocMast one = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, loc).eq(LocMast::getHostId, hostId).eq(LocMast::getWhsType, WHS_TYPE));
+ LocMast one = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, loc).eq(LocMast::getHostId, hostId));
if (!one.getLocSts().equals("O")) {
innerLoc = null;
continue;
--
Gitblit v1.9.1