From 7b87ac9846e8bfdd5a7a64e4c9623408220845b8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 01 三月 2024 09:29:07 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/target/classes/mapper/pp/FolwCard.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
index 86b29c8..9d82870 100644
--- a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
@@ -101,7 +101,7 @@
where o.production_order=2 and ogd.splitting_status=0 and o.create_time between #{selectTime1} and #{selectTime2}
<if test="flowCard.order.orderId != null and flowCard.order.orderId != ''">
- and o.order_id, regexp #{flowCard.order.orderId}
+ and o.order_id regexp #{flowCard.order.orderId}
</if>
<if test="flowCard.order.customerName != null and flowCard.order.customerName != ''">
and o.customer_name regexp #{flowCard.order.customerName}
--
Gitblit v1.8.0