From a09ff1d01aeebae9037118035f10e06c570b092e Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 19 一月 2022 08:46:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_SourceController.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
index 4433f25..f72e812 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
@@ -34,11 +34,11 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_SourceList where 绂佺敤鏍囪='' ", "h_v_IF_SourceList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_SourceList where 1=1 ", "h_v_IF_SourceList");
}
else
{
- string sql1 = "select * from h_v_IF_SourceList where 绂佺敤鏍囪='' ";
+ string sql1 = "select * from h_v_IF_SourceList where 1=1 ";
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_IF_SourceList");
}
@@ -131,7 +131,7 @@
}
//鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
- ds = oCN.RunProcReturn("select * from Gy_Source where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_Unit");
+ ds = oCN.RunProcReturn("select * from Gy_Source where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_Source");
if (oItem.HNumber.Trim() == "")
{
objJsonResult.code = "0";
@@ -287,7 +287,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -306,7 +306,7 @@
return objJsonResult;
}
oCN.BeginTran();//寮�濮嬩簨鍔�
- ds = oCN.RunProcReturn("select * from Gy_Source where HItemID=" + HItemID, "Gy_Unit");
+ ds = oCN.RunProcReturn("select * from Gy_Source where HItemID=" + HItemID, "Gy_Source");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
--
Gitblit v1.9.1