From 1cea8144b4ddd9ed19f8e2542b5374ca13c030f4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 22 十二月 2023 15:42:44 +0800
Subject: [PATCH] Merge branch 'hzjzwms' of http://47.97.1.152:5880/r/zy-asrs into tzhnewms
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 3e3a6bf..e13669c 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocDetlWarningDTO;
import com.zy.asrs.entity.result.LocDetlAll;
import com.zy.asrs.entity.result.LocDetlDTO;
import com.zy.asrs.entity.result.StockVo;
@@ -69,6 +70,25 @@
}
@Override
+ public Page<LocDetlAll> getStockStatisAll(Page<LocDetlAll> page) {
+ page.setRecords(baseMapper.getStockStatisAll(page.getCondition()));
+ page.setTotal(baseMapper.getStockStatisCountAll(page.getCondition()));
+ return page;
+ }
+
+ @Override
+ public Page<LocDetlAll> getWarningNumPage(Page<LocDetlAll> page) {
+ page.setRecords(baseMapper.getWarningNumList(page.getCondition()));
+ page.setTotal(baseMapper.getWarningNumListCount(page.getCondition()));
+ return page;
+ }
+
+ @Override
+ public Double sumAll() {
+ return this.baseMapper.sumAll();
+ }
+
+ @Override
public Double getSumAnfme(String matnr) {
return this.baseMapper.selectSumAnfmeByMatnr(matnr);
}
@@ -94,8 +114,8 @@
}
@Override
- public List<LocDetl> queryStock2(String matnr, String batch, int owner) {
- return this.baseMapper.queryStock2(matnr, batch, owner);
+ public List<LocDetl> queryStock2(String matnr, String batch) {
+ return this.baseMapper.queryStock2(matnr, batch);
}
@Override
@@ -171,4 +191,14 @@
public int selectAllPymentcount(LocDetlDTO locDetlDTO) {
return this.baseMapper.selectAllPymentcount(locDetlDTO);
}
+
+ @Override
+ public List<LocDetlWarningDTO> selectAllWarning(LocDetlWarningDTO locDetlWarningDTO) {
+ return this.baseMapper.selectAllWarning(locDetlWarningDTO);
+ }
+
+ @Override
+ public int getAllWarningCount(LocDetlWarningDTO locDetlWarningDTO) {
+ return this.baseMapper.getAllWarningCount(locDetlWarningDTO);
+ }
}
--
Gitblit v1.9.1