From 2dab4a42f79397e64d62afc4a141f8de7899e2a2 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 08 十二月 2023 13:21:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 92 insertions(+), 12 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..b3b35d6 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.*;
@@ -42,6 +43,14 @@
private MatService matService;
@Autowired
private ManLocDetlService manLocDetlService;
+ @RequestMapping(value = "/locDetl/list/barcode")
+ public R getBarcodeList(@RequestParam String barcode) {
+ List<ManLocDetl> manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("zpallet", barcode));
+ if (Cools.isEmpty(manLocDetls)){
+ return R.error("鎵樼洏鐮佹暟鎹负绌�");
+ }
+ return R.ok(manLocDetls);
+ }
@RequestMapping(value = "/locDetl/update")
public R update1() {
@@ -112,11 +121,19 @@
// }
excludeTrash(param);
String locNo = convert(param, wrapper);
+ String zpallet = String.valueOf( param.get("zpallet"));
+ String matnr = String.valueOf( param.get("matnr"));
+ if (!Cools.isEmpty(zpallet) && zpallet.equals("null")) {
+ zpallet = null;
+ }
+ if (!Cools.isEmpty(matnr) && matnr.equals("null")) {
+ matnr = null;
+ }
allLike(LocDetl.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
if (Cools.isEmpty(locDetlPage) || locDetlPage.getTotal()==0){
- List<LocDetl> locDetls = locDetlService.queryStockViewMerge(locNo);
+ List<LocDetl> locDetls = locDetlService.queryStockViewMerge(locNo,zpallet,matnr);
return R.ok(locDetlPage.setRecords(locDetls));
}else {
return R.ok(locDetlPage);
@@ -242,11 +259,44 @@
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);
+ }
+ @RequestMapping(value = "/locDetl/ownerStatis/auth")
+ @ManagerAuth
+ public R statis2(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param) {
+
+ Object owner = param.get("owner");
+ if (!Cools.isEmpty(owner)){
+ LocOwner owner1 = locOwnerService.selectOne(new EntityWrapper<LocOwner>().like("owner", owner.toString()));
+
+ param.put("owner",owner1.getId());
+ }else {
+ param.remove("owner");
+ }
+
+ Page<LocDetlAll> stockStatis = locDetlService.getOwnerStatisAll(toPage(curr, limit, param, LocDetlAll.class));
+ for (LocDetlAll locDetlAll : stockStatis.getRecords()) {
+ Mat mat = matService.selectByMatnr(locDetlAll.getMatnr());
+ if (mat != null) {
+ locDetlAll.sync(mat);
}
}
return R.ok().add(stockStatis);
@@ -281,7 +331,7 @@
*/
@RequestMapping("/locDetl/count")
public R getAllCount(){
- Integer sum = locDetlService.sum();
+ Double sum = locDetlService.sumAll();
return R.ok(sum);
}
@@ -321,20 +371,29 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
+ Integer owner = null;
+ Integer payment = null;
if (param.get("owner$") != null && param.get("owner$") != ""){
- LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().like("owner", (String) param.get("owner$")));
if(locOwner == null){
return R.error("鍙傛暟鏈夎锛�");
}
param.remove("owner$");
- param.put("owner",locOwner.getId());
+ owner = locOwner.getId();
+ }
+ if (param.get("payment$") != null && param.get("payment$") != ""){
+ if ( param.get("payment$").equals("浠撳偍") ){
+ payment = 1;
+ } else if (param.get("payment$").equals("浠ｉ噰")) {
+ payment = 0;
+ }
+ param.remove("payment$");
}
LocDetlDTO locDetlDTO = new LocDetlDTO();
locDetlDTO.setPageSize(limit);
locDetlDTO.setPageNumber(curr);
String locNo = String.valueOf(param.get("locNo"));
- String owner = String.valueOf(param.get("owner"));
String matnr = String.valueOf(param.get("matnr"));
if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
locDetlDTO.setLocNo(locNo);
@@ -344,6 +403,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);
@@ -360,20 +422,20 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
+ Integer owner = null;
if (param.get("owner$") != null && param.get("owner$") != ""){
- LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().like("owner", (String) param.get("owner$")));
if(locOwner == null){
return R.error("鍙傛暟鏈夎锛�");
}
param.remove("owner$");
- param.put("owner",locOwner.getId());
+ owner = locOwner.getId();
}
LocDetlDTO locDetlDTO = new LocDetlDTO();
locDetlDTO.setPageSize(limit);
locDetlDTO.setPageNumber(curr);
String locNo = String.valueOf(param.get("locNo"));
- String owner = String.valueOf(param.get("owner"));
String matnr = String.valueOf(param.get("matnr"));
if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
locDetlDTO.setLocNo(locNo);
@@ -389,8 +451,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