From f42daa4afb23949f718bcbc3c78ae0ec4079adb0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 12 六月 2023 16:59:34 +0800
Subject: [PATCH] #货物转换状态、货主修改完成
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 78 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index d06d3d5..b914ab1 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -13,6 +13,8 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.result.LocDetlAll;
+import com.zy.asrs.entity.result.LocDetlDTO;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocOwnerService;
@@ -38,6 +40,8 @@
private LocDetlMapper locDetlMapper;
@Autowired
private MatService matService;
+ @Autowired
+ private ManLocDetlService manLocDetlService;
@RequestMapping(value = "/locDetl/update")
public R update1() {
@@ -318,18 +322,74 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
if (param.get("owner$") != null && param.get("owner$") != ""){
- LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
- param.remove("owner$");
- param.put("owner",locOwner.getId());
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
+ if(locOwner == null){
+ return R.error("鍙傛暟鏈夎锛�");
+ }
+ param.remove("owner$");
+ param.put("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);
+ }
+ if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
+ locDetlDTO.setMatnr(matnr);
+ }
+ if (!Cools.isEmpty(owner) && !owner.equals("null")) {
+ locDetlDTO.setOwner(owner);
+ }
+ List<LocDetlAll> list = locDetlService.selectAllPyment(locDetlDTO);
+ int count = locDetlService.selectAllPymentcount(locDetlDTO);
+ Page<LocDetlAll> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
- EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
- wrapper.eq("payment",0);
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ @RequestMapping(value = "/locDetl/selectOwner/list/auth")
+ @ManagerAuth
+ public R selectOwnerlist(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ if (param.get("owner$") != null && param.get("owner$") != ""){
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
+ if(locOwner == null){
+ return R.error("鍙傛暟鏈夎锛�");
+ }
+ param.remove("owner$");
+ param.put("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);
+ }
+ if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
+ locDetlDTO.setMatnr(matnr);
+ }
+ if (!Cools.isEmpty(owner) && !owner.equals("null")) {
+ locDetlDTO.setOwner(owner);
+ }
+ List<LocDetlAll> list = locDetlService.selectAllOwner(locDetlDTO);
+ int count = locDetlService.selectAllCount(locDetlDTO);
+ Page<LocDetlAll> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
}
--
Gitblit v1.9.1