From b7ac023f64d569d4223a3b628ded6f5cd1a37978 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 18 十一月 2025 09:17:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/MateOutController.cs |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index b219b35..cfbae7f 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -1314,6 +1314,10 @@
 
                 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                 List<object> columnNameList = new List<object>();
+                if(sWhere!=null)
+                {
+                    sWhere = sWhere.Replace("'", "''");
+                }
                 DataSet ds = oCN.RunProcReturn("exec h_p_KF_WorkShopICStockBillList '" + HBillType + "','" + HCarBarCode + "','" + HProcExBillNo + "','" + HMaterNumber + "'," + HWHID + "," + HSPID + ",'" + sWhere + "'", "h_p_KF_WorkShopICStockBillList");
                 //娣诲姞鍒楀悕
                 foreach (DataColumn col in ds.Tables[0].Columns)

--
Gitblit v1.9.1