From 92596fe28d064ad7b9897a44927498306a3f3c85 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 21 十二月 2023 08:51:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 124 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 119 insertions(+), 5 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 8cc6a1f..1854311 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -2,13 +2,20 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.param.WrkDetlLogAllViewParam;
+import com.zy.asrs.entity.result.LocDetlAll;
+import com.zy.asrs.entity.result.LocDetlDTO;
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.Map;
import java.util.Set;
@Service("locDetlService")
@@ -22,9 +29,17 @@
}
@Override
- public Page<LocDetl> getStockOut(Page<LocDetl> page) {
- page.setRecords(baseMapper.getStockOutPage(page.getCondition()));
- page.setTotal(baseMapper.getStockOutPageCount(page.getCondition()));
+ 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;
}
@@ -57,6 +72,49 @@
}
@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<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParam(Page<WrkDetlLogAllViewParam> page) {
+ page.setRecords(baseMapper.selectAllWrkDetlLogAllViewParam(page.getCondition()));
+ page.setTotal(baseMapper.selectAllWrkDetlLogAllViewParamCount(page.getCondition()));
+ return page;
+ }
+
+ @Override
+ public Page<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamByMatnr(Page<WrkDetlLogAllViewParam> page) {
+ page.setRecords(baseMapper.selectAllWrkDetlLogAllViewParamByMatnr(page.getCondition()));
+ page.setTotal(baseMapper.selectAllWrkDetlLogAllViewParamByMatnrCount(page.getCondition()));
+ return page;
+ }
+
+ @Override
+ public List<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamByMatnrE(Map<String, Object> map) {
+ return baseMapper.selectAllWrkDetlLogAllViewParamByMatnrE(map);
+ }
+
+ @Override
+ public List<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamE(Map<String, Object> map) {
+ return baseMapper.selectAllWrkDetlLogAllViewParamE(map);
+ }
+
+ @Override
+ public Page<LocDetlAll> getOwnerStatisAll(Page<LocDetlAll> page) {
+ page.setRecords(baseMapper.getOwnerStatisAll(page.getCondition()));
+ page.setTotal(baseMapper.getOwnerStatisAllCount(page.getCondition()));
+ return page;
+ }
+
+ @Override
+ public Double sumAll() {
+ return this.baseMapper.sumAll();
+ }
+
+ @Override
public Double getSumAnfme(String matnr) {
return this.baseMapper.selectSumAnfmeByMatnr(matnr);
}
@@ -77,8 +135,23 @@
}
@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> queryStock2(String matnr, String batch, int owner) {
+ return this.baseMapper.queryStock2(matnr, batch, owner);
+ }
+
+ @Override
+ public List<LocDetl> queryStock3(String matnr, String batch, int owner) {
+ return this.baseMapper.queryStock3(matnr, batch, owner);
+ }
+
+ @Override
+ public List<LocDetl> queryStockViewMerge(String locNo,String zpallet,String matnr) {
+ return this.baseMapper.queryStockViewMerge(locNo,zpallet,matnr);
}
@Override
@@ -118,4 +191,45 @@
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);
+ }
+
+ @Override
+ public List<LocDetlAll> selectAllOwner(LocDetlDTO locDetlDTO) {
+ return this.baseMapper.selectAllOwner(locDetlDTO);
+ }
+
+ @Override
+ public List<LocDetlAll> selectAllPyment(LocDetlDTO locDetlDTO) {
+ return this.baseMapper.selectAllPyment(locDetlDTO);
+ }
+
+ @Override
+ public int selectAllCount(LocDetlDTO locDetlDTO) {
+ return this.baseMapper.selectAllCount(locDetlDTO);
+ }
+
+ @Override
+ public int selectAllPymentcount(LocDetlDTO locDetlDTO) {
+ return this.baseMapper.selectAllPymentcount(locDetlDTO);
+ }
+
+ @Override
+ public String selectLocNoF(String locNo) {
+ return this.baseMapper.selectLocNoF(locNo);
+ }
+
+ @Override
+ public List<LocDetlAll> selectOwnerAllAnfme() {
+ return this.baseMapper.selectOwnerAllAnfme();
+ }
}
--
Gitblit v1.9.1