From 45d602719964509214d06ec5173f23e5307d5dfe Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 16 四月 2024 12:24:10 +0800
Subject: [PATCH] 无空库位时，不做空板入库操作
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 101 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index 4ed072d..5b05f15 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -2,13 +2,18 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.plugins.Page;
+import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
+import com.core.common.R;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.service.LocDetlService;
import com.zy.common.web.BaseController;
-import com.core.annotations.ManagerAuth;
-import com.core.common.R;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
@@ -25,6 +30,8 @@
public class ReportQueryController extends BaseController {
@Autowired
+ private LocDetlService locDetlService;
+ @Autowired
private ReportQueryMapper reportQueryMapper;
//------------------搴撲綅浣跨敤缁熻--------------------------------------
@@ -32,11 +39,29 @@
public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
+
ViewStockUseBean bean = new ViewStockUseBean();
bean.setPageSize(limit);
bean.setPageNumber(curr);
- List<ViewStockUseBean> list= reportQueryMapper.queryViewStockUseList(bean);
- int count = reportQueryMapper.getViewStockUseCount(bean);
+
+ List<ViewStockUseBean> list = new ArrayList<>();
+ int count = 0;
+
+ if(Cools.isEmpty(param.get("locType"))){
+ param.put("locType","asr_loc");
+ }
+
+ if("agv_loc_1".equals(param.get("locType").toString())){
+ list = reportQueryMapper.queryViewStockUse1List(bean);
+ count = reportQueryMapper.getViewStockUse1Count(bean);
+ }else if("agv_loc_3".equals(param.get("locType").toString())){
+ list = reportQueryMapper.queryViewStockUse3List(bean);
+ count = reportQueryMapper.getViewStockUse3Count(bean);
+ }else {
+ list = reportQueryMapper.queryViewStockUseList(bean);
+ count = reportQueryMapper.getViewStockUseCount(bean);
+ }
+
Page<ViewStockUseBean> page = new Page<>();
page.setRecords(list);
page.setTotal(count);
@@ -60,8 +85,14 @@
ViewStayTimeBean bean = new ViewStayTimeBean();
bean.setPageSize(limit);
bean.setPageNumber(curr);
- List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
- int count = reportQueryMapper.getViewStayTimeCount(bean);
+ String locNo = String.valueOf(param.get("loc_no"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ bean.setLoc_no(locNo);
+ }
+// List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
+// int count = reportQueryMapper.getViewStayTimeCount(bean);
+ List<ViewStayTimeBean> list = reportQueryMapper.queryAllViewStayTimeList(bean);
+ int count = reportQueryMapper.getAllViewStayTimeCount(bean);
Page<ViewStayTimeBean> page = new Page<>();
page.setRecords(list);
page.setTotal(count);
@@ -145,12 +176,70 @@
return R.ok(page);
}
+ /**
+ * 鏃ュ叆搴撴眹鎬绘煡璇�
+ * @return
+ */
+ @RequestMapping("/viewWorkCountInList.action")
+ public R viewWorkCountInList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param){
+ String startTime = "1970.1.2";
+ String endTime = "2099.1.2";
+ if (!Cools.isEmpty(param.get("query_date"))) {
+ String queryDate = (String) param.get("query_date");
+ String[] split = queryDate.split(" - ");
+ startTime= split[0].split(" ")[0].replace("-",".");
+ endTime = split[1].split(" ")[0].replace("-",".");
+ }
+ List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountIn(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime,endTime);
+ Integer total = reportQueryMapper.selectWorkCountInTotal((String) param.get("matnr"), startTime,endTime);
+ Page<ViewWorkCountInView> page = new Page<>();
+ page.setRecords(allCountIn);
+ page.setTotal(total);
+ Integer sum = reportQueryMapper.selectWorkCountInSum((String) param.get("matnr"), startTime,endTime);
+ HashMap<String, Object> result = new HashMap<>();
+ result.put("page",page);
+ result.put("sum",sum);
+ return R.ok(result);
+ }
+
+ /**
+ * 鏃ュ嚭搴撴眹鎬�
+ */
+ @RequestMapping("/viewWorkCountOutList.action")
+ public R viewWorkCountOutList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param){
+ String startTime = "1970.1.2";
+ String endTime = "2099.1.2";
+ if (!Cools.isEmpty(param.get("query_date"))) {
+ String queryDate = (String) param.get("query_date");
+ String[] split = queryDate.split(" - ");
+ startTime= split[0].split(" ")[0].replace("-",".");
+ endTime = split[1].split(" ")[0].replace("-",".");
+ }
+ List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountOut(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime,endTime);
+ Integer total = reportQueryMapper.selectWorkCountOutTotal((String) param.get("matnr"), startTime,endTime);
+ Page<ViewWorkCountInView> page = new Page<>();
+ page.setRecords(allCountIn);
+ page.setTotal(total);
+ Integer sum = reportQueryMapper.selectWorkCountOutSum((String) param.get("matnr"), startTime,endTime);
+ HashMap<String, Object> result = new HashMap<>();
+ result.put("page",page);
+ result.put("sum",sum);
+ return R.ok(result);
+ }
+
//excel瀵煎嚭
@RequestMapping("/viewWorkInExport.action")
@ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
public R viewWorkInExport(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(new ViewWorkInBean());
+ @SuppressWarnings("unchecked")
+ ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
+ bean.setQuery_date(bean.getQuery_date());
+ List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(bean);
return R.ok(exportSupport(list, fields));
}
@@ -170,7 +259,10 @@
@ManagerAuth(memo = "鏃ュ嚭搴撴槑缁嗙粺璁″鍑�")
public R viewWorkOutExport(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(new ViewWorkInBean());
+ @SuppressWarnings("unchecked")
+ ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
+ bean.setQuery_date(bean.getQuery_date());
+ List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(bean);
return R.ok(exportSupport(list, fields));
}
--
Gitblit v1.9.1