From 606628d4d1c06b14b9d7a882a92df0250efe4d2d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 14 九月 2023 14:11:13 +0800
Subject: [PATCH] #订单出库有小数时，优先出小数
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index b914ab1..c5fab80 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -242,11 +242,20 @@
public R statis(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param) {
- Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
- for (LocDetl locDetl : stockStatis.getRecords()) {
- Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+// Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
+// for (LocDetl locDetl : stockStatis.getRecords()) {
+// Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+// if (mat != null) {
+// locDetl.sync(mat);
+// }
+// }
+// return R.ok().add(stockStatis);
+
+ Page<LocDetlAll> stockStatis = locDetlService.getStockStatisAll(toPage(curr, limit, param, LocDetlAll.class));
+ for (LocDetlAll locDetlAll : stockStatis.getRecords()) {
+ Mat mat = matService.selectByMatnr(locDetlAll.getMatnr());
if (mat != null) {
- locDetl.sync(mat);
+ locDetlAll.sync(mat);
}
}
return R.ok().add(stockStatis);
@@ -281,7 +290,7 @@
*/
@RequestMapping("/locDetl/count")
public R getAllCount(){
- Integer sum = locDetlService.sum();
+ Double sum = locDetlService.sumAll();
return R.ok(sum);
}
@@ -336,6 +345,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);
}
@@ -344,6 +354,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);
@@ -389,8 +402,26 @@
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);
}
+ @RequestMapping(value = "/locDetl/selectLocF")
+ @ManagerAuth
+ public R selectLocF(@RequestParam String locNo){
+ String s = locDetlService.selectLocNoF(locNo);
+ if (s.equals("F")){
+ return R.error("褰撳墠搴撲綅涓嶆槸绌哄簱浣�");
+ }
+ return R.ok("褰撳墠搴撲綅鏄┖搴撲綅");
+ }
+
}
--
Gitblit v1.9.1