From a23bf319248345801a7f3110f246336d244e8edc Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 17 二月 2025 13:55:10 +0800
Subject: [PATCH] 退货增加退货标识，退货人，退货备注，清空库区和库位值
---
src/main/java/com/zy/asrs/controller/ManPakOutController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManPakOutController.java b/src/main/java/com/zy/asrs/controller/ManPakOutController.java
index 5caf5ed..7717d74 100644
--- a/src/main/java/com/zy/asrs/controller/ManPakOutController.java
+++ b/src/main/java/com/zy/asrs/controller/ManPakOutController.java
@@ -58,6 +58,20 @@
return R.ok(manPakOutService.selectPage(new Page<>(curr, limit), wrapper));
}
+ @RequestMapping(value = "/ManPakOut/list/auth1")
+ @ManagerAuth
+ public R list1(@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){
+ EntityWrapper<ManPakOut> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert1(param, wrapper);
+
+ return R.ok(manPakOutService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
@RequestMapping(value = "/ManPakOut/detailed/auth")
@ManagerAuth
public R detailed(@RequestParam(defaultValue = "1")Integer curr,
@@ -68,6 +82,7 @@
EntityWrapper<ManPakOut> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
+
String docnum = String.valueOf(param.get("doc_num"));
if (Cools.isEmpty(docnum) || docnum.equals("null")) {
docnum = null;
@@ -80,7 +95,14 @@
etime = DateUtils.convert(dates[1]);
}
- List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit);
+ Long userId = getUserId();
+ if(getUser().getRoleId() == 2 || getUser().getRoleId() == 24){
+ userId = null;
+ }
+
+ String custName = Cools.isEmpty(param.get("cust_name")) ? "" : param.get("cust_name").toString();
+
+ List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit,userId,custName);
for (PakOutDTO pakOutDTO:pakOutDTOS){
List<ManPakOut> manPakOuts = manPakOutService.selectList(new EntityWrapper<ManPakOut>().eq("doc_num", pakOutDTO.getDoc_num()));
for (ManPakOut manPakOut:manPakOuts){
@@ -95,7 +117,7 @@
}
- int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit);
+ int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit,userId,custName);
Page<PakOutDTO> page = new Page<>();
// 鏈�鍚庢寜鐘舵�佹湭鍑哄簱->宸插嚭搴撴帓搴�
// page.setRecords(pakOutDTOS.stream().sorted(Comparator.comparingInt(PakOutDTO::getStatus)).collect(Collectors.toList()));
@@ -113,6 +135,19 @@
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ private <T> void convert1(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.eq(entry.getKey(), val);
}
}
}
@@ -461,4 +496,5 @@
response.getOutputStream().close();
return R.ok();
}
+
}
--
Gitblit v1.9.1