From a9a8af3cd6e452cbcb8f8a046890cd5b36a61b17 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 21 八月 2024 10:34:39 +0800
Subject: [PATCH] 档查询出来有多条数据时，加上数量条件，进行匹配，如果数量也匹配不上，就默认返回第一个
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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 130ed88..db27d05 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -52,14 +52,13 @@
}
@Override
- public List<String> getSameDetlToday(String matnr,String batch, Integer start, Integer end) {
- return this.baseMapper.selectSameDetlTodayBatch(matnr,batch, start, end);
+ public List<String> getSameDetlToday(String matnr, String batch, Integer start, Integer end) {
+ return this.baseMapper.selectSameDetlTodayBatch(matnr, batch, start, end);
}
@Override
public Page<StockStatisDTO> getStockStatis(Page<StockStatisDTO> page) {
- System.out.println(JSONObject.toJSON(page));
page.setRecords(baseMapper.asrsAndErpList(page.getCondition()));
page.setTotal(baseMapper.asrsAndErpCount(page.getCondition()));
return page;
@@ -87,8 +86,19 @@
@Override
public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
- return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
+ return this.baseMapper.queryStock(null, matnr, batch, orderNo, locNos);
}
+
+ @Override
+ public List<LocDetl> queryStock(String spgNo) {
+ return this.baseMapper.queryStock(spgNo, null, null, null, null);
+ }
+
+ @Override
+ public List<LocDetl> queryStockByModel(String model) {
+ return this.baseMapper.queryStock(null, model, null, null, null);
+ }
+
@Override
public Double queryStockAnfme(String matnr, String batch) {
@@ -102,6 +112,7 @@
/**
* 鑾峰彇搴撳瓨鎬绘暟
+ *
* @return
*/
@Override
@@ -127,23 +138,23 @@
}
@Override
- public void updateMatTurn(String matnrOld,String matnr){
- this.baseMapper.updateMatTurn(matnrOld,matnr);
+ public void updateMatTurn(String matnrOld, String matnr) {
+ this.baseMapper.updateMatTurn(matnrOld, matnr);
}
@Override
public List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMap(Integer crnNo) {
- if (crnNo==1){
+ if (crnNo == 1) {
return this.baseMapper.selectLocDetlUnilateralMoveShuttleMapY(crnNo);
}
return this.baseMapper.selectLocDetlUnilateralMoveShuttleMapN(crnNo);
}
@Override
- public List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr,String batch,String grade,Integer crnNo) {
- if (crnNo==1){
- return this.baseMapper.selectLocDetlUnilateralMoveShuttleY(matnr,batch,grade);
+ public List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr, String batch, String grade, Integer crnNo) {
+ if (crnNo == 1) {
+ return this.baseMapper.selectLocDetlUnilateralMoveShuttleY(matnr, batch, grade);
}
- return this.baseMapper.selectLocDetlUnilateralMoveShuttleN(matnr,batch,grade);
+ return this.baseMapper.selectLocDetlUnilateralMoveShuttleN(matnr, batch, grade);
}
}
--
Gitblit v1.9.1