From 2dcef9a259de99429f42086d274584e2e280b128 Mon Sep 17 00:00:00 2001
From: baoge <751575283@qq.com>
Date: Sat, 11 May 2024 10:23:14 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E6=96=B0=E5=A2=9E=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/nl/wms/database/eas/dao/EasOutInBill.java   | 2 +-
 .../database/eas/service/impl/EasOutInBillServiceImpl.java    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/EasOutInBill.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/EasOutInBill.java
index 968cf88..db6fa4b 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/EasOutInBill.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/EasOutInBill.java
@@ -77,7 +77,7 @@ public class EasOutInBill extends Model<EasOutInBill> {
     /**
      * 仓库编码
      */
-    private String ckbm;
+        private String ckbm;
 
 
     /**
diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java
index 0787aeb..92b09b8 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java
@@ -1,5 +1,6 @@
 package org.nl.wms.database.eas.service.impl;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSON;
@@ -96,10 +97,13 @@ public class EasOutInBillServiceImpl extends ServiceImpl<EasOutInBillMapper, Eas
      * @param params 查询条件
      */
     @Override
+    @SaIgnore
     public CommonPage<EasOutInBill> page(EasOutInBillQuery params) {
+        params.setFuzzy("");
         Page<EasOutInBill> easOutInBills = easOutInBillMapper.selectPage(new Page<>(params.getPage(), params.getSize()), new QueryWrapper<EasOutInBill>()
                 .lambda()
                 .eq(ObjectUtil.isNotEmpty(params.getDjlx()), EasOutInBill::getDjlx, params.getDjlx())
+                .eq(ObjectUtil.isNotEmpty(params.getCkbm()), EasOutInBill::getCkbm, params.getCkbm())
                 .eq(ObjectUtil.isNotEmpty(params.getDjzt()), EasOutInBill::getDjzt, "1".equals(params.getDjzt()) ? "提交" : "审核")
                 .nested(ObjectUtil.isNotEmpty(params.getFuzzy()),
                         i -> i.like(EasOutInBill::getDjid, params.getFuzzy())