From 9bc4d0cab5dbe6eff70a5efa1ccee619b6bfe9f0 Mon Sep 17 00:00:00 2001
From: black-goat-me <226547893@qq.com>
Date: 星期六, 20 五月 2023 02:08:36 +0800
Subject: [PATCH] 白坯发布汇总报表：任意字段过滤
---
WebAPI/Controllers/MateOutController.cs | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index 68911ff..5d2c1f7 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -1320,7 +1320,7 @@
- //#region 鐧藉澂鍙戝竷姹囨�绘姤琛�
+ #region 鐧藉澂鍙戝竷姹囨�绘姤琛�
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
//private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -1334,10 +1334,10 @@
public string HBillNo;
public string HProductName;
public string HProductModel;
- //public string RandomSearch;
+ public string RandomSearch;
}
- //鐧藉澂鍙戝竷姹囨�绘姤琛�
+ #region 鐧藉澂鍙戝竷姹囨�绘姤琛�
[Route("MaterOutSumReport/MaterOutSumReport_Cloth")]
[HttpGet]
public object MaterOutSumReport_Cloth(string sWhere)
@@ -1347,8 +1347,22 @@
//鍙嶅簭鍒楀寲浼犻�掔殑鍊�
MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());
- ds = oCN.RunProcReturn($"exec h_p_Kf_MaterOutSumReport_Cloth '{com.HBeginDate}','{com.HEndDate}'" +
- $",'{com.HMaterNumber}','{com.HBillNo}','{com.HProductName}','{com.HProductModel}'", "h_p_Kf_MaterOutSumReport_Cloth");
+ string sql = "" +
+ "( (鏃ユ湡 between ''" + com.HBeginDate + "'' and ''" + com.HEndDate + "'') or (''" + com.HBeginDate + "'' = '''' and ''" + com.HEndDate + "''='''') ) " +
+ "and (浜у搧浠ｇ爜=''" + com.HMaterNumber + "'' or ''" + com.HMaterNumber + "''='''') " +
+ "and (鍗曟嵁鍙�=''" + com.HBillNo + "'' or ''"+ com.HBillNo + "''='''') " +
+ "and (浜у搧鍚嶇О=''" + com.HProductName + "'' or ''" + com.HBillNo + "''='''') " +
+ "and (瑙勬牸鍨嬪彿=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch;
+
+ ds = oCN.RunProcReturn($"exec h_p_Kf_MaterOutSumReport_Cloth_New '{sql}','1' , ''" , "h_p_Kf_MaterOutSumReport_Cloth_New");
+
+
+
+
+ //ds = oCN.RunProcReturn($"exec h_p_Kf_MaterOutSumReport_Cloth '{com.HBeginDate}','{com.HEndDate}'" +
+ // $",'{com.HMaterNumber}','{com.HBillNo}','{com.HProductName}','{com.HProductModel}'", "h_p_Kf_MaterOutSumReport_Cloth");
+
+ DataTable dt = ds.Tables[0];
//鑾峰彇鍒楀悕
List<object> columnNameList = new List<object>();
@@ -1364,7 +1378,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.list = columnNameList;
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = dt;
return objJsonResult;
}
catch (Exception e)
@@ -1376,9 +1390,9 @@
return objJsonResult;
}
}
+ #endregion
-
- //鐧藉澂鍙戝竷鏄庣粏鎶ヨ〃
+ #region 鐧藉澂鍙戝竷鏄庣粏鎶ヨ〃
[Route("MaterOutEntryReport/MaterOutEntryReport_Cloth")]
[HttpGet]
public object MaterOutEntryReport_Cloth(string sWhere)
@@ -1418,9 +1432,10 @@
return objJsonResult;
}
}
+ #endregion
- //#endregion
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1