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 | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 105 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 b2141f1..e13669c 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,17 @@
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.LocDetlWarningDTO;
+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.Set;
@@ -15,9 +20,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;
}
@@ -29,6 +49,7 @@
return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0;
}
}
+
@Override
public boolean updateLocNo(String newLocNo, String oldLocNo) {
@@ -46,6 +67,25 @@
page.setRecords(baseMapper.getStockStatis(page.getCondition()));
page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
return page;
+ }
+
+ @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
@@ -69,8 +109,18 @@
}
@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) {
+ return this.baseMapper.queryStock2(matnr, batch);
+ }
+
+ @Override
+ public List<LocDetl> queryStockViewMerge(String locNo) {
+ return this.baseMapper.queryStockViewMerge(locNo);
}
@Override
@@ -79,8 +129,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);
}
/**
@@ -103,4 +155,50 @@
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);
+ }
+
+ @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 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