From 6d75b9bda39c710153183844ba1e8effbb730de1 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 16 四月 2024 09:53:43 +0800
Subject: [PATCH] 单据、拣货单权限问题
---
src/main/java/com/zy/asrs/controller/ManPakOutController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManPakOutController.java b/src/main/java/com/zy/asrs/controller/ManPakOutController.java
index 7fd3310..051f035 100644
--- a/src/main/java/com/zy/asrs/controller/ManPakOutController.java
+++ b/src/main/java/com/zy/asrs/controller/ManPakOutController.java
@@ -9,7 +9,6 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.param.PakOutDTO;
-import com.zy.asrs.entity.result.LocDetlAll;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
@@ -69,12 +68,20 @@
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;
}
+ Date stime = null;
+ Date etime = null;
+ if(param.get("create_time") != null){
+ String[] dates = param.get("create_time").toString().split(RANGE_TIME_LINK);
+ stime = DateUtils.convert(dates[0]);
+ etime = DateUtils.convert(dates[1]);
+ }
- List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, curr, limit);
+ List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit,getUserId());
for (PakOutDTO pakOutDTO:pakOutDTOS){
List<ManPakOut> manPakOuts = manPakOutService.selectList(new EntityWrapper<ManPakOut>().eq("doc_num", pakOutDTO.getDoc_num()));
for (ManPakOut manPakOut:manPakOuts){
@@ -89,9 +96,10 @@
}
-
- int count = manPakOutService.selectPakOutCount(docnum, curr, limit);
+ int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit,getUserId());
Page<PakOutDTO> page = new Page<>();
+ // 鏈�鍚庢寜鐘舵�佹湭鍑哄簱->宸插嚭搴撴帓搴�
+// page.setRecords(pakOutDTOS.stream().sorted(Comparator.comparingInt(PakOutDTO::getStatus)).collect(Collectors.toList()));
page.setRecords(pakOutDTOS);
page.setTotal(count);
return R.ok(page);
--
Gitblit v1.9.1