From 3356c2fa8ec59e47d29361a97b4eecc7875d66d0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Tue, 3 Sep 2024 08:59:53 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=B8=80=E9=94=AE=E7=A7=BB=E5=BA=93?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/sch/report/service/dao/mapper/ReportMapper.xml    | 5 +++--
 .../nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java | 2 ++
 .../wms/sch/workorder/service/impl/WorkorderServiceImpl.java | 2 ++
 lms/nladmin-ui/src/views/wms/sch/movestor/index.vue          | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml
index 5a986d5..ba6fce2 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml
@@ -170,11 +170,12 @@
         AND P.vehicle_code2 NOT LIKE '%YBHC%'
         AND (p.ing_task_code IS NULL or  p.ing_task_code = '')
         AND p.region_code IN ( 'YLHC' )) a
+        WHERE 1=1
         <if test="query.point_code  != null">
-            and a.point_code like  CONCAT('%', #{query.point_code}, '%')
+            and a.pointCode = #{query.point_code}
         </if>
         <if test="query.status  != null">
-            and a.status =  #{query.point_code}
+            and a.status =  #{query.status}
         </if>
         ORDER BY a.pointCode ASC
     </select>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
index 4b5a061..7901bc0 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
@@ -290,6 +290,8 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
                 .eq(SchBasePoint::getIs_used, true)
                 .eq(SchBasePoint::getRegion_code, "YLHC")
                 .notLike(SchBasePoint::getVehicle_code2, "YBHC")
+                .isNotNull(SchBasePoint::getVehicle_code2)
+                .ne(SchBasePoint::getVehicle_code2, "")
                 .and(slam -> slam.isNull(SchBasePoint::getIng_task_code)
                         .or()
                         .eq(SchBasePoint::getIng_task_code, "")
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java
index c9f53cd..87e50ee 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java
@@ -155,6 +155,8 @@ public class WorkorderServiceImpl extends ServiceImpl<WorkorderMapper, Workorder
                         .eq(SchBasePoint::getIs_used, true)
                         .eq(SchBasePoint::getRegion_code, "YLHC")
                         .eq(SchBasePoint::getPoint_code, pointCode)
+                        .isNotNull(SchBasePoint::getVehicle_code2)
+                        .ne(SchBasePoint::getVehicle_code2, "")
                         .notLike(SchBasePoint::getVehicle_code2, "YBHC")
                         .and(slam -> slam.isNull(SchBasePoint::getIng_task_code)
                                 .or()
diff --git a/lms/nladmin-ui/src/views/wms/sch/movestor/index.vue b/lms/nladmin-ui/src/views/wms/sch/movestor/index.vue
index 1f10e70..28bcaa7 100644
--- a/lms/nladmin-ui/src/views/wms/sch/movestor/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/movestor/index.vue
@@ -115,7 +115,7 @@ export default {
         download: false,
         reset: false
       },
-      query: {}
+      query: {status:'0'}
     })
   },
   data() {