From f10169ec96e281abd2d68064ca855e48e9dc9e6a Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期一, 20 六月 2022 15:54:59 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 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 85cca1f..1107108 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -1,14 +1,15 @@
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.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.List;
+import java.util.Set;
@Service("locDetlService")
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
@@ -21,14 +22,14 @@
}
@Override
- public boolean updateAnfme(Double anfme, String locNo, String matnr) {
+ 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) {
@@ -69,12 +70,38 @@
}
@Override
- public List<LocDetl> queryStock(String matnr, String batch, String orderNo) {
- return this.baseMapper.queryStock(matnr, batch, orderNo);
+ public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
+ return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
}
@Override
public Double queryStockAnfme(String matnr, String batch) {
return this.baseMapper.queryStockAnfme(matnr, batch);
}
+
+ @Override
+ public List<StockVo> queryStockTotal() {
+ return this.baseMapper.queryStockTotal();
+ }
+
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @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);
+ }
}
--
Gitblit v1.9.1