From 0ff66508469ce993b771fe63085f7039a430999c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 27 一月 2026 16:33:42 +0800
Subject: [PATCH] 1.捡货单打印里面显示备注和发货时间 2.拣货单界面,仓库管理员角色拣货单发货时间超过当天16:00则当天不显示
---
src/main/java/com/zy/asrs/controller/ManPakOutController.java | 6 ++++--
1 files changed, 4 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 7717d74..66fed6e 100644
--- a/src/main/java/com/zy/asrs/controller/ManPakOutController.java
+++ b/src/main/java/com/zy/asrs/controller/ManPakOutController.java
@@ -102,7 +102,9 @@
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);
+ // 浠撳簱绠＄悊鍛� 鍙戣揣鏃堕棿瓒呰繃褰撳ぉ16.00鍒欏綋澶╀笉鏄剧ず
+ // getUser().getRoleId() = 24
+ List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit,userId,custName,getUser().getRoleId());
for (PakOutDTO pakOutDTO:pakOutDTOS){
List<ManPakOut> manPakOuts = manPakOutService.selectList(new EntityWrapper<ManPakOut>().eq("doc_num", pakOutDTO.getDoc_num()));
for (ManPakOut manPakOut:manPakOuts){
@@ -117,7 +119,7 @@
}
- int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit,userId,custName);
+ int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit,userId,custName,getUser().getRoleId());
Page<PakOutDTO> page = new Page<>();
// 鏈�鍚庢寜鐘舵�佹湭鍑哄簱->宸插嚭搴撴帓搴�
// page.setRecords(pakOutDTOS.stream().sorted(Comparator.comparingInt(PakOutDTO::getStatus)).collect(Collectors.toList()));
--
Gitblit v1.9.1