From 34f71b13b15fb5002f61569aa8940c7b6d26bbb5 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期二, 28 十一月 2023 16:16:46 +0800 Subject: [PATCH] 生产日记报表里, 增加 业务员 列, 和增加 业务员过滤(根据名称模糊过滤即可) 功能以及 自定义过滤功能; --- WebAPI/Controllers/MateOutController.cs | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 38 insertions(+), 12 deletions(-) diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs index 3cb7c26..858190a 100644 --- a/WebAPI/Controllers/MateOutController.cs +++ b/WebAPI/Controllers/MateOutController.cs @@ -1341,6 +1341,7 @@ public string HProductName; public string HProductModel; public string RandomSearch; + public string OtherSearch; } #region 鐧藉澂鍙戝竷姹囨�绘姤琛� @@ -1356,9 +1357,17 @@ 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.HBillNo + "'' or ''" + com.HBillNo + "''='''') " + "and (浜у搧鍚嶇О=''" + com.HProductName + "'' or ''" + com.HProductName + "''='''') " + - "and (瑙勬牸鍨嬪彿=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch; + "and (瑙勬牸鍨嬪彿=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch + + " " + com.OtherSearch; + + //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.HProductName + "''='''') " + + // "and (瑙勬牸鍨嬪彿=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch; ds = oCN.RunProcReturn($"exec h_p_Kf_MaterOutSumReport_Cloth_New '{sql}'" , "h_p_Kf_MaterOutSumReport_Cloth_New"); @@ -1480,7 +1489,15 @@ "and (浜у搧浠g爜=''" + com.HMaterNumber + "'' or ''" + com.HMaterNumber + "''='''') " + "and (鐢熶骇璁㈠崟鍙�=''" + com.HBillNo + "'' or ''" + com.HBillNo + "''='''') " + "and (浜у搧鍚嶇О=''" + com.HProductName + "'' or ''" + com.HProductName + "''='''') " + - "and (瑙勬牸鍨嬪彿=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch; + "and (瑙勬牸鍨嬪彿=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch + + " " + com.OtherSearch; + + //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.HProductName + "''='''') " + + // "and (瑙勬牸鍨嬪彿=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch; ds = oCN.RunProcReturn($"exec h_p_Kf_ProdProcessSumReport_DyeColor '{sql}'", "h_p_Kf_ProdProcessSumReport_DyeColor"); @@ -2051,12 +2068,15 @@ #endregion #region 鐢熶骇鏃ヨ鎶ヨ〃 - public class DayRkReport { - public string HBeginDate { get; set; } - public string HEndDate { get; set; } - public string HMaterNumber { get; set; } - public string HCustomerName { get; set; } - public string HProductName { get; set; } + public class DayRkReport { + public string HBeginDate { get; set; } + public string HEndDate { get; set; } + public string HMaterNumber { get; set; } + public string HCustomerName { get; set; } + public string HProductName { get; set; } + public string HOtherSearch { get; set; } + public string HEmpName { get; set; } + public string sWheres { get; set; } } [Route("MaterOutEntryReport/SC_DayRkReport")] [HttpGet] @@ -2065,9 +2085,12 @@ try { DayRkReport DayRkReportList = JsonConvert.DeserializeObject<DayRkReport>(sWhere); - + string sql = $"exec h_p_Gy_DayRkReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" + - $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}'"; + $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}','{DayRkReportList.HOtherSearch}','{DayRkReportList.HEmpName}','{DayRkReportList.sWheres}'"; + //string sql = $"exec h_p_Gy_DayRkReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" + + // $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}'"; + ds = oCN.RunProcReturn(sql, "h_p_Gy_DayRkReport"); DataTable dt = null; @@ -2129,6 +2152,7 @@ public string HMaterNumber { get; set; } public string HCustomerName { get; set; } public string HProductName { get; set; } + public string HOtherSearch { get; set; } } [Route("MaterOutEntryReport/SemiFinishedProductsReportList")] [HttpGet] @@ -2139,7 +2163,9 @@ SemiFinishedProductsReport DayRkReportList = JsonConvert.DeserializeObject<SemiFinishedProductsReport>(sWhere); string sql = $"exec h_p_sc_SemiFinishedProductsReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" + - $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}'"; + $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}','{DayRkReportList.HOtherSearch}'"; + //string sql = $"exec h_p_sc_SemiFinishedProductsReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" + + // $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}'"; ds = oCN.RunProcReturn(sql, "h_p_Gy_DayRkReport"); DataTable dt = null; -- Gitblit v1.9.1