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/SCGL/Sc_ProductionReturnBillController.cs | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs b/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs
index 0c10e5a..07dab3b 100644
--- a/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs
@@ -27,8 +27,15 @@
{
try
{
-
- ds = Sc_GetProductInBill(sWhere);
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_ProductionReturnList where 1=1 order by 鏃ユ湡 desc", "h_v_IF_ProductionReturnList");
+ }
+ else
+ {
+ string sql = "select * from h_v_IF_ProductionReturnList where 1 = 1 " + sWhere + " order by 鏃ユ湡 desc";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_ProductionReturnList");
+ }
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objJsonResult.code = "0";
@@ -55,14 +62,5 @@
return objJsonResult;
}
}
-
- #region sql璇彞
-
-
- public static DataSet Sc_GetProductInBill(string sWhere)
- {
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProductionReturnList order by 鏃ユ湡 desc", "h_v_IF_ProductionReturnList");
- }
- #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1