From a83eeabe948a953290062e5dcedb0d33f01defef Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 30 五月 2024 16:59:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java
index 001bc8b..4fe5548 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.domain.dto.QueryStockPreDo;
+import com.zy.asrs.common.domain.dto.ReportStockDto;
import com.zy.asrs.common.wms.mapper.LocDetlMapper;
import com.zy.asrs.common.wms.entity.LocDetl;
import com.zy.asrs.common.wms.service.LocDetlService;
@@ -33,13 +34,8 @@
}
@Override
- public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
- List<LocDetl> result = new ArrayList<>();
- List<QueryStockPreDo> preDos = this.baseMapper.queryStockPre(matnr);
- for (QueryStockPreDo preDo : preDos) {
- List<LocDetl> locDetls = this.baseMapper.queryStock(matnr, preDo.getNo(), preDo.getOrderBy(), preDo.getBay());
- result.addAll(locDetls);
- }
+ public List<LocDetl> queryStock(String matnr, String batch, Long hostId) {
+ List<LocDetl> result = this.baseMapper.queryStock(matnr, batch, hostId);
return result;
}
@@ -67,4 +63,14 @@
Page<LocDetl> page = new Page<>(curr, limit);
return this.baseMapper.getStockOutPage(page, param);
}
+
+ @Override
+ public List<ReportStockDto> getReportStockDto(Long hostId) {
+ return this.baseMapper.getReportStockDto(hostId);
+ }
+
+ @Override
+ public List<String> getSameDetl(String matnr, String batch, Long hostId) {
+ return this.baseMapper.selectSameDetl(matnr, batch, hostId);
+ }
}
--
Gitblit v1.9.1