From 0401f1e6323ebb34f13f446713cb35082b14a0cd Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期一, 29 七月 2024 12:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

---
 src/main/resources/mapper/ViewWorkInMapper.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index 0f5d0cd..6340944 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -48,6 +48,12 @@
 		<if test="specs != null and specs != ''">
 			and specs like concat('%',#{specs},'%')
 		</if>
+	<if test="outOrderNo != null and outOrderNo != ''">
+		and out_order_no like concat('%',#{outOrderNo},'%')
+	</if>
+	<if test="sPgNO != null and sPgNO != ''">
+		and pg_no like concat('%',#{sPgNO},'%')
+	</if>
 </sql>
 
 <sql id="viewWorkOutConditionSql">

--
Gitblit v1.9.1