From b802f67f272e5d14b8d3b9205b55e75e31fb5524 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期四, 25 七月 2024 20:47:20 +0800
Subject: [PATCH] 前端添加查询条件
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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 506b3cb..130ed88 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,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.StockStatisDTO;
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.Map;
import java.util.Set;
@Service("locDetlService")
@@ -55,9 +58,10 @@
@Override
- public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
- page.setRecords(baseMapper.getStockStatis(page.getCondition()));
- page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
+ 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;
}
@@ -126,4 +130,20 @@
public void updateMatTurn(String matnrOld,String matnr){
this.baseMapper.updateMatTurn(matnrOld,matnr);
}
+
+ @Override
+ public List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMap(Integer crnNo) {
+ 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);
+ }
+ return this.baseMapper.selectLocDetlUnilateralMoveShuttleN(matnr,batch,grade);
+ }
}
--
Gitblit v1.9.1