From cb7339c12d6cd3f4d1668d27d34dbb4b515cc6c1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 26 五月 2023 09:50:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 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 1107108..2ea9852 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -2,12 +2,14 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -15,9 +17,24 @@
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
@Override
- public Page<LocDetl> getStockOut(Page<LocDetl> page) {
- page.setRecords(baseMapper.getStockOutPage(page.getCondition()));
- page.setTotal(baseMapper.getStockOutPageCount(page.getCondition()));
+ public Page<LocDetl> getPage(Page<LocDetl> page) {
+ page.setRecords(baseMapper.listByPage(page.getCondition()));
+ page.setTotal(baseMapper.listByPageCount(page.getCondition()));
+ return page;
+ }
+
+ @Override
+ public Page<LocDetl> getStockOut(Page<LocDetl> page,String view) {
+ if (view.equals("1")){
+ page.setRecords(baseMapper.getStockOutPage2(page.getCondition()));
+ page.setTotal(baseMapper.getStockOutPageCount2(page.getCondition()));
+ }else if (view.equals("2")){
+ page.setRecords(baseMapper.getStockOutPage(page.getCondition()));
+ page.setTotal(baseMapper.getStockOutPageCount(page.getCondition()));
+ }else {
+ page.setRecords(baseMapper.getStockOutPage(page.getCondition()));
+ page.setTotal(baseMapper.getStockOutPageCount(page.getCondition()));
+ }
return page;
}
@@ -70,8 +87,13 @@
}
@Override
- public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
- return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
+ public List<LocDetl> queryStock(String matnr, String batch, int owner) {
+ return this.baseMapper.queryStock(matnr, batch, owner);
+ }
+
+ @Override
+ public List<LocDetl> queryStockViewMerge(String locNo) {
+ return this.baseMapper.queryStockViewMerge(locNo);
}
@Override
@@ -80,8 +102,10 @@
}
@Override
- public List<StockVo> queryStockTotal() {
- return this.baseMapper.queryStockTotal();
+ public List<StockVo> queryStockTotal(StockVo stockVo) {
+ String matnr=stockVo.getMatnr();
+ String batch=stockVo.getBatch();
+ return this.baseMapper.queryStockTotal(matnr,batch);
}
/**
@@ -104,4 +128,20 @@
public LocDetl selectItem(String locNo, String matnr, String batch) {
return this.baseMapper.selectItem(locNo, matnr, batch);
}
+
+ @Override
+ public Double getLocDetlSumQty(String locNo) {
+ return this.baseMapper.selectLocDetlSumQty(locNo);
+ }
+
+ @Override
+ public Integer queryStockViewMergeCount(int row,int lev){return this.baseMapper.queryStockViewMergeCount(row,lev);}
+
+ @Override
+ public List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo) {
+ if (Cools.isEmpty(orderNo) && Cools.isEmpty(matnr) && Cools.isEmpty(maktx) && Cools.isEmpty(specs) && Cools.isEmpty(locNo)) {
+ return new ArrayList<LocDetl>();
+ }
+ return this.baseMapper.searchByLike(orderNo, matnr, maktx, specs, locNo);
+ }
}
--
Gitblit v1.9.1