From 2e36f3e6ccd951fd85a15eff4fae54f938dbe503 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 12 四月 2025 11:06:48 +0800
Subject: [PATCH] 订单出库界面翻译为俄语
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 90 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 86 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index 92f5114..dca90f8 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -67,7 +67,10 @@
ViewStayTimeBean bean = new ViewStayTimeBean();
bean.setPageSize(limit);
bean.setPageNumber(curr);
- bean.setLoc_no(String.valueOf(param.get("loc_no")));
+ 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);
Page<ViewStayTimeBean> page = new Page<>();
@@ -76,12 +79,36 @@
return R.ok(page);
}
- // 瀵煎嚭
+// // 瀵煎嚭
+// @RequestMapping(value = "/viewStayTimeExport.action")
+// @ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
+// public R viewStayTimeExport(@RequestBody JSONObject param){
+// List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+// List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
+// return R.ok(exportSupport(list, fields));
+// }
+// 瀵煎嚭
@RequestMapping(value = "/viewStayTimeExport.action")
@ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
- public R viewStayTimeExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ public R viewStayTimeExport(){
+ // List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ // List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
+ // return R.ok(exportSupport(list, fields));
+
+ // 浠庢暟鎹簱鑾峰彇鎵�鏈� ViewStayTimeBean 鍒楄〃
List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
+
+ // 鑾峰彇闇�瑕佸鍑虹殑瀛楁锛堜緥濡傦紝鍙互纭紪鐮佹垨浠庡叾浠栨潵婧愬畾涔夛級
+ List<String> fields = new ArrayList<>(); // 鏍规嵁瀹為檯瀛楁璁剧疆
+ fields.add("Begin_date");
+ fields.add("Stay_time");
+ fields.add("Loc_no");
+ fields.add("anfme");
+ fields.add("matnr");
+ fields.add("maktx");
+ fields.add("specs");
+
+ // 璋冪敤瀵煎嚭鏀寔鏂规硶
return R.ok(exportSupport(list, fields));
}
@@ -153,6 +180,61 @@
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 = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
--
Gitblit v1.9.1