From 08b1aba0872aad97b07d59b326f9976036d938b9 Mon Sep 17 00:00:00 2001 From: black-goat-me <226547893@qq.com> Date: 星期六, 20 五月 2023 02:44:02 +0800 Subject: [PATCH] 白坯发布明细报表:任意字段过滤 --- WebAPI/Controllers/MateOutController.cs | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs index 5d2c1f7..7c9a49e 100644 --- a/WebAPI/Controllers/MateOutController.cs +++ b/WebAPI/Controllers/MateOutController.cs @@ -1357,11 +1357,6 @@ 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]; //鑾峰彇鍒楀悕 @@ -1397,14 +1392,21 @@ [HttpGet] public object MaterOutEntryReport_Cloth(string sWhere) { - int i = 0; try { //鍙嶅簭鍒楀寲浼犻�掔殑鍊� MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString()); - ds = oCN.RunProcReturn($"exec h_p_Kf_MaterOutEntryReport_Cloth '{com.HBeginDate}','{com.HEndDate}'" + - $",'{com.HMaterNumber}','{com.HBillNo}','{com.HProductName}','{com.HProductModel}'", "h_p_Kf_MaterOutEntryReport_Cloth"); + string sql = "" + + "( (鏃ユ湡 between ''" + com.HBeginDate + "'' and ''" + com.HEndDate + "'') or (''" + com.HBeginDate + "'' = '''' and ''" + com.HEndDate + "''='''') ) " + + "and (浜у搧浠g爜=''" + 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_MaterOutEntryReport_Cloth_New '{sql}','1' , ''", "h_p_Kf_MaterOutEntryReport_Cloth_New"); + + DataTable dt = ds.Tables[0]; //鑾峰彇鍒楀悕 List<object> columnNameList = new List<object>(); @@ -1420,7 +1422,7 @@ objJsonResult.count = 1; objJsonResult.Message = "Sucess锛�"; objJsonResult.list = columnNameList; - objJsonResult.data = ds.Tables[0]; + objJsonResult.data = dt; return objJsonResult; } catch (Exception e) -- Gitblit v1.9.1