From 497807c8f2bf240703c8e899327d78a66fcc1f4d Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期日, 02 一月 2022 19:16:43 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 100 +++++++++++++++++++++++++++-----------------------
1 files changed, 54 insertions(+), 46 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 738a9a5..b153a67 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -880,8 +880,16 @@
{
try
{
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Kf_OtherOutBillList where 1=1 order by 鏃ユ湡 desc", "h_v_Kf_OtherOutBillList");
+ }
+ else
+ {
+ string sql = "select * from h_v_Kf_OtherOutBillList where 1 = 1 " + sWhere+ " order by 鏃ユ湡 desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Kf_OtherOutBillList");
+ }
- ds = Sc_GetOtherOutBillList(sWhere);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objJsonResult.code = "0";
@@ -908,15 +916,6 @@
return objJsonResult;
}
}
-
- #region sql璇彞
-
-
- public static DataSet Sc_GetOtherOutBillList(string sWhere)
- {
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Kf_OtherOutBillList order by 鏃ユ湡 desc", "h_v_Kf_OtherOutBillList");
- }
- #endregion
/// <summary>
@@ -1029,7 +1028,15 @@
try
{
- ds = Sc_GetProductInBill(sWhere);
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_ProductInBillList where 1=1 order by 鏃ユ湡 desc", "h_v_IF_ProductInBillList");
+ }
+ else
+ {
+ string sql = "select * from h_v_IF_ProductInBillList where 1 = 1 " + sWhere + " order by 鏃ユ湡 desc";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_ProductInBillList");
+ }
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objJsonResult.code = "0";
@@ -1056,6 +1063,7 @@
return objJsonResult;
}
}
+
/// <summary>
///浜у搧鍏ュ簱鍗曞垹闄ゅ姛鑳�
/// </summary>
@@ -1086,14 +1094,7 @@
return objJsonResult;
}
}
- #region sql璇彞
-
-
- public static DataSet Sc_GetProductInBill(string sWhere)
- {
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProductInBillList order by 鏃ユ湡 desc", "h_v_IF_ProductInBillList");
- }
- #endregion
+
/// <summary>
@@ -1107,7 +1108,15 @@
try
{
- ds = Sc_GetOtherInBill(sWhere);
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Kf_OtherInBillList where 1=1 order by 鏃ユ湡 desc", "h_v_Kf_OtherInBillList");
+ }
+ else
+ {
+ string sql = "select * from h_v_Kf_OtherInBillList where 1 = 1 " + sWhere+ " order by 鏃ユ湡 desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Kf_OtherInBillList");
+ }
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objJsonResult.code = "0";
@@ -1135,16 +1144,6 @@
}
}
- #region sql璇彞
-
-
- public static DataSet Sc_GetOtherInBill(string sWhere)
- {
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Kf_OtherInBillList order by 鏃ユ湡 desc ", "h_v_Kf_OtherInBillList");
- }
- #endregion
-
-
/// <summary>
/// 濮斿鍏ュ簱鍗曞垪琛�
/// </summary>
@@ -1155,12 +1154,31 @@
{
try
{
- ds = Sc_GetEntrustInBill(sWhere);
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Kf_EntrustInBillList where 1=1", "h_v_Kf_EntrustInBillList");
+ }
+ else
+ {
+ string sql = "select * from h_v_Kf_EntrustInBillList where 1 = 1 " + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Kf_EntrustInBillList");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
}
catch (Exception ex)
{
@@ -1171,16 +1189,6 @@
return objJsonResult;
}
}
-
- #region sql璇彞
-
-
- public static DataSet Sc_GetEntrustInBill(string sWhere)
- {
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Kf_EntrustInBillList ", "h_v_Kf_EntrustInBillList");
- }
- #endregion
-
//娴嬭瘯涓撶敤鎺ュ彛
[Route("LookingFor/Test")]
--
Gitblit v1.9.1