From a3e47b54c53c9ac2afa0423cda5577e9b768d643 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 18 九月 2024 10:05:04 +0800
Subject: [PATCH] bug调整
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 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 ff7f8a8..4df3e6c 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -1,15 +1,17 @@
package com.zy.asrs.service.impl;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.StockStatisDTO;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.utils.MatCompareUtils;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -84,15 +86,31 @@
return this.baseMapper.countLocNoNum(locNo);
}
+// @Override
+// public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
+// return this.baseMapper.queryStock(null, matnr, batch, orderNo, locNos);
+// }
+
@Override
- public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
- return this.baseMapper.queryStock(null, matnr, batch, orderNo, locNos);
+ public List<LocDetl> queryStock(OrderDetl orderDetl) {
+ List<LocDetl> data = new ArrayList<>();
+ List<LocDetl> locDetls = this.baseMapper.queryStock(null, orderDetl.getMatnr(), null, null, null);
+ if (locDetls == null) {
+ return null;
+ }
+ for (LocDetl locDetl : locDetls) {
+ if (MatCompareUtils.compare(locDetl, orderDetl)) {
+ data.add(locDetl);
+ }
+ }
+ return data;
}
@Override
- public List<LocDetl> queryStock(String spgNo) {
- return this.baseMapper.queryStock(spgNo, null, null, null, null);
+ public List<LocDetl> queryStockByModel(String model) {
+ return this.baseMapper.queryStock(null, model, null, null, null);
}
+
@Override
public Double queryStockAnfme(String matnr, String batch) {
@@ -127,6 +145,11 @@
}
@Override
+ public LocDetl selectItem2(String locNo, String matnr) {
+ return this.baseMapper.selectItem2(locNo, matnr);
+ }
+
+ @Override
public Double getLocDetlSumQty(String locNo) {
return this.baseMapper.selectLocDetlSumQty(locNo);
}
--
Gitblit v1.9.1