From 695d9c4cda618bae357d6f70a068b604dac4fdd3 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 23 十一月 2022 10:17:45 +0800
Subject: [PATCH] 合并
---
WebAPI/Controllers/基础资料/基础资料/Gy_SOPBillController.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillController.cs"
index c9a5385..e6769f8 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillController.cs"
@@ -40,7 +40,7 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
- string sql1 = string.Format(@"select * from h_v_Sc_WorkOrderList where HMainID='" + sWhere + "'");
+ string sql1 = string.Format(@"select * from h_v_Sc_WorkOrderList where 寮�宸ユ爣璁� = 1 and HMainID='" + sWhere + "'");
ds = oCN.RunProcReturn(sql1, "h_v_Sc_WorkOrderList");
@@ -68,7 +68,7 @@
/// </summary>
[Route("Sc_ICMOBillStatus_Tmp/Filelist")]
[HttpGet]
- public object Filelist()
+ public object Filelist(int sWhere)
{
try
{
@@ -81,9 +81,9 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
- string sql1 = string.Format(@"select HSno 搴忓彿,HFileName 鏂囦欢鍚嶇О from Gy_SOPBillSub2");
+ string sql1 = string.Format(@"select * from h_v_Sc_GetFileList where 鏂囦欢ID = " + sWhere);
- ds = oCN.RunProcReturn(sql1, "Gy_SOPBillSub2");
+ ds = oCN.RunProcReturn(sql1, "h_v_Sc_GetFileList");
objJsonResult.code = "1";
--
Gitblit v1.9.1