From e235d483194ab95bf62d1cfd343a172ff12781e8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 14:58:24 +0800
Subject: [PATCH] 聚乳酸库存明细 1.批号与包号排序需同步，增加水分，挥发段，分解段搜索，按照最大最小范围，包装类型跟托盘类型增加删选功能。 2.已经出库的物料，在明细表里面隐藏掉，但是数据保留。 3.增加二个跟聚乳酸一样的明细表，分改性树脂，纯树脂库存明细表，所有功能跟总的聚乳酸库存明细表一样 4.明细表整体框架调整一下，相对压缩一下，搜索功能框看看能否弄成二行 5.表里面的包装类型与托盘类型这些不主要的信息放到指标后面 6.关于分包再处理，举例原有系统里面销售选定的10包物料，再二次重新弄后，车间打印新标签，使用新的包号，在明细表里面体现原有所有指标信息及批号，包号，牌号跟新的关联 7.出库时候时间可选历史，不要就只能出现4天 8.提取库存里面需要有最大包号跟最小包号选择
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 181 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 171 insertions(+), 10 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 ddb1d0a..e13669c 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -1,34 +1,55 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
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;
@Service("locDetlService")
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 boolean updateAnfme(Double anfme, String locNo, String matnr) {
+ 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;
+ }
+
+ @Override
+ public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch) {
if (anfme <= 0) {
- return delete(new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr", matnr));
+ return this.baseMapper.deleteItem(locNo, matnr, batch) > 0;
} else {
- int res = baseMapper.updateAnfme(anfme, locNo, matnr);
- return res > 0;
+ return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0;
}
}
+
@Override
public boolean updateLocNo(String newLocNo, String oldLocNo) {
@@ -36,8 +57,148 @@
}
@Override
- public List<String> getSameDetlToday(String matnr) {
- return this.baseMapper.selectSameDetlToday(matnr);
+ public List<String> getSameDetlToday(String matnr, Integer start, Integer end) {
+ return this.baseMapper.selectSameDetlToday(matnr, start, end);
}
+
+ @Override
+ public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
+ 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
+ public Double getSumAnfme(String matnr) {
+ return this.baseMapper.selectSumAnfmeByMatnr(matnr);
+ }
+
+ @Override
+ public List<LocDetl> selectPakoutByRule(String matnr) {
+ return this.baseMapper.selectPakoutByRule(matnr);
+ }
+
+ @Override
+ public List<LocDetl> getAsrsLocDetl(String matnr) {
+ return this.baseMapper.getAsrsLocDetl(matnr);
+ }
+
+ @Override
+ public Integer countLocNoNum(String locNo) {
+ return this.baseMapper.countLocNoNum(locNo);
+ }
+
+ @Override
+ 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
+ public Double queryStockAnfme(String matnr, String batch) {
+ return this.baseMapper.queryStockAnfme(matnr, batch);
+ }
+
+ @Override
+ public List<StockVo> queryStockTotal(StockVo stockVo) {
+ String matnr=stockVo.getMatnr();
+ String batch=stockVo.getBatch();
+ return this.baseMapper.queryStockTotal(matnr,batch);
+ }
+
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @return
+ */
+ @Override
+ public Integer sum() {
+
+ return this.baseMapper.sum();
+ }
+
+ @Override
+ public List<LocDetl> unreason() {
+ return this.baseMapper.unreason();
+ }
+
+
+ @Override
+ 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