From ed06303a918ac8b1c7492652c24aed477e53fd8a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 09 二月 2026 23:45:47 +0800
Subject: [PATCH] 客户问题优化调整8-修改过磅单

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
index 0d4ecbe..76dcd79 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
@@ -66,6 +66,9 @@
         param.setCompanyId(ContextUtil.getCompanyId());
 
         queryWrapper.eq("company_id", param.getCompanyId());
+        if (StringUtils.isNotBlank(param.getDeptId())) {
+            queryWrapper.eq("dept_id", param.getDeptId());
+        }
         if (StringUtils.isNotBlank(param.getCustomerName())) {
             queryWrapper.like("customer_name", param.getCustomerName());
         }
@@ -76,6 +79,7 @@
             queryWrapper.like("complete_status", param.getCompleteStatus());
         }
 
+        queryWrapper.orderByDesc("id");
         noticeInMapper.selectPage(page, queryWrapper);
     }
 
@@ -261,6 +265,9 @@
         param.setCompanyId(ContextUtil.getCompanyId());
 
         queryWrapper.eq("company_id", param.getCompanyId());
+        if (StringUtils.isNotBlank(param.getDeptId())) {
+            queryWrapper.eq("dept_id", param.getDeptId());
+        }
         if (StringUtils.isNotBlank(param.getCustomerName())) {
             queryWrapper.like("customer_name", param.getCustomerName());
         }
@@ -270,7 +277,7 @@
         if (StringUtils.isNotBlank(param.getCompleteStatus())) {
             queryWrapper.like("complete_status", param.getCompleteStatus());
         }
-
+        queryWrapper.orderByDesc("id");
         noticeOutMapper.selectPage(page, queryWrapper);
     }
 

--
Gitblit v1.9.3