From 370ef9917136dc8f53113a4bcb83a1f14976e50a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 18 六月 2025 15:16:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 59 +++++++++++++++++++++++------------------------------------
1 files changed, 23 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 5cb0385..0769dab 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -82,41 +82,11 @@
param.remove("modi_time");
}
}
- param.remove("curr");
- param.remove("limit");
- EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
- if (!Cools.isEmpty(param.get("crnNo"))) {
- switch ((String) param.get("crnNo")) {
- case "1": wrapper.le("SUBSTRING(loc_no, 1, 2)",4);
- break;
- case "2":wrapper.ge("SUBSTRING(loc_no, 1, 2)",5).le("SUBSTRING(loc_no, 1, 2)",8);
- break;
- case "3":wrapper.ge("SUBSTRING(loc_no, 1, 2)",9).le("SUBSTRING(loc_no, 1, 2)",12);
- break;
- case "4":wrapper.ge("SUBSTRING(loc_no, 1, 2)",13).le("SUBSTRING(loc_no, 1, 2)",16);
- break;
- case "5":
- break;
- case "6":
- break;
- case "7":wrapper.ge("SUBSTRING(loc_no, 1, 2)",17).le("SUBSTRING(loc_no, 1, 2)",37);
- break;
- case "8":wrapper.ge("SUBSTRING(loc_no, 1, 2)",38).le("SUBSTRING(loc_no, 1, 2)",45);
- break;
- case "9":wrapper.ge("SUBSTRING(loc_no, 1, 2)",46).le("SUBSTRING(loc_no, 1, 2)",53);
- break;
- default:
- }
- param.remove("crnNo");
+ Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
+ if (stockOut.getRecords().size()==0){
+ stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
}
- convert(param, wrapper);
- // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByLocNo(getUserId(),wrapper);
- Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
- if (locDetlPage.getRecords().size()==0){
- locDetlPage = locDetlService.selectPage(new Page<>(1, limit), wrapper);
- }
- return R.ok(locDetlPage);
+ return R.ok(stockOut);
}
@RequestMapping(value = "/stock/out/crn/list/auth")
@@ -328,8 +298,25 @@
* @return
*/
@RequestMapping("/locDetl/count")
- public R getAllCount(){
- Integer sum = locDetlService.sum();
+ public R getAllCount() {
+ Double sum = locDetlService.sum();
+ return R.ok(sum);
+ }
+
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @return
+ */
+ @RequestMapping("/locDetl/matnr/count")
+ public R getCount(@RequestBody Map<String, String> param){
+ String matnr = param.get("matnr");
+ Double sum = 0.0;
+ if (Cools.isEmpty(matnr)){
+ sum = locDetlService.sum();
+ }else {
+ sum = locDetlService.getSumAnfme(matnr);
+ }
+
return R.ok(sum);
}
--
Gitblit v1.9.1