From 486065f75babd0e67b9101faa974ba634c00e72a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 08 九月 2023 16:03:53 +0800
Subject: [PATCH] #库存冻结
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index fc615fd..d10ed26 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -43,6 +43,30 @@
@Autowired
private ManLocDetlService manLocDetlService;
+ @RequestMapping(value = "/locDetl/selectAllWarning/auth")
+ @ManagerAuth(memo = "搴撳瓨棰勮")
+ public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param){
+ LocDetlWarningDTO locDetlWarningDTO = new LocDetlWarningDTO();
+ locDetlWarningDTO.setPageSize(limit);
+ locDetlWarningDTO.setPageNumber(curr);
+ String locNo = String.valueOf(param.get("locNo"));
+ String matnr = String.valueOf(param.get("matnr"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ locDetlWarningDTO.setLocNo(locNo);
+ }
+ if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
+ locDetlWarningDTO.setMatnr(matnr);
+ }
+ List<LocDetlWarningDTO> list = locDetlService.selectAllWarning(locDetlWarningDTO);
+ int count = locDetlService.getAllWarningCount(locDetlWarningDTO);
+ Page<LocDetlWarningDTO> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
+
@RequestMapping(value = "/locDetl/update")
public R update1() {
if (!locDetlService.updateLocNo("0402805", "0402804")) {
@@ -345,6 +369,7 @@
String locNo = String.valueOf(param.get("locNo"));
String owner = String.valueOf(param.get("owner"));
String matnr = String.valueOf(param.get("matnr"));
+ String payment = String.valueOf(param.get("payment"));
if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
locDetlDTO.setLocNo(locNo);
}
@@ -353,6 +378,9 @@
}
if (!Cools.isEmpty(owner) && !owner.equals("null")) {
locDetlDTO.setOwner(owner);
+ }
+ if (!Cools.isEmpty(payment) && !payment.equals("null")) {
+ locDetlDTO.setPayment(payment);
}
List<LocDetlAll> list = locDetlService.selectAllPyment(locDetlDTO);
int count = locDetlService.selectAllPymentcount(locDetlDTO);
@@ -398,6 +426,14 @@
Page<LocDetlAll> page = new Page<>();
page.setRecords(list);
page.setTotal(count);
+ if (list.size()==0){
+ locDetlDTO.setPageNumber(1);
+ list = locDetlService.selectAllOwner(locDetlDTO);
+ count = locDetlService.selectAllCount(locDetlDTO);
+ page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ }
return R.ok(page);
}
--
Gitblit v1.9.1