From d78791713edbe8e80fb06f08e3474ac0491ebc9b Mon Sep 17 00:00:00 2001
From: 15815213711 <a13118667520@163.com>
Date: 星期三, 30 七月 2025 10:41:27 +0800
Subject: [PATCH] 修改ID，修改加密方式
---
service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml | 3 ++-
ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue | 3 +++
pom.xml | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index eec6d51..d02d130 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<properties>
<!--鍚姩椤圭洰鐨勫寘鍚�-->
- <project.admin.package.name>rybase-admin-master</project.admin.package.name>
+ <project.admin.package.name>cwgl-admin-master</project.admin.package.name>
<ruoyi.version>${project.version}</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml b/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml
index 7375dec..e07ec65 100644
--- a/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml
@@ -66,7 +66,8 @@
<if test="isDeleted != null "> and thisTab.is_deleted = #{isDeleted}</if>
</sql>
<sql id="whereCondition2">
- <if test="dispatchNo != null and dispatchNo != ''"> and ts.DISPATCH_NO = #{dispatchNo}</if>
+ <if test="dispatchNo != null and dispatchNo != ''"> and ts.DISPATCH_NO like concat('%', #{dispatchNo}, '%')</if>
+ <if test="customerName != null and customerName != ''"> and customer.`NAME` like concat('%', #{customerName}, '%')</if>
<if test="transportMode != null and transportMode != ''"> and ts.TRANSPORT_MODE = #{transportMode}</if>
<if test="productName != null and productName != ''"> and ts.PRODUCT_ID like concat('%', #{productName}, '%')</if>
<if test="carrierName != null and carrierName != ''"> and bp.NAME like concat('%', #{carrierName}, '%')</if>
diff --git a/ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue b/ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue
index 6810e0b..6c5eec8 100644
--- a/ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue
@@ -121,6 +121,9 @@
productName: {
label: '鏈嶅姟浜у搧鍚嶇О', width: 120, showOverflowTooltip: true
},
+ customerName: {
+ label: '瀹㈡埛鍚嶇О', search: true, width: 200, showOverflowTooltip: true
+ },
carrierName: {
label: '鎵胯繍鍟�', search: true, width: 200, showOverflowTooltip: true
},
--
Gitblit v1.8.0