仓租明细报表过滤条件日期为一天

Code/LQKJ.K3.CZXT.Pluglus/Warehouserent_MXBB.cs

@@ -99,12 +99,12 @@ namespace LQKJ.K3.CZXT.Pluglus
             //仓库
             string org = this.GetBaseDataNameValue(customFilter["F_LQKJ_Stocks"] as DynamicObjectCollection);
             string ywzzb = string.IsNullOrWhiteSpace(org)
-                ? " " : string.Format(" AND ZZ.FNAME IN ({0}) ", org);
+                ? " " : string.Format(" AND CKBM.FNUMBER IN ({0}) ", org);
             strwhere.AppendLine(ywzzb);
             //物料
             string baseSuppName = this.GetBaseDataNameValue(customFilter["F_LQKJ_Materials"] as DynamicObjectCollection);
             string SuppName = string.IsNullOrWhiteSpace(baseSuppName)
-                ? " " : string.Format(" AND GYSL.FNAME IN ({0}) ", baseSuppName);
+                ? " " : string.Format(" AND W.FNUMBER IN ({0}) ", baseSuppName);
             strwhere.AppendLine(SuppName);
 
             string text2 = string.IsNullOrWhiteSpace(filter.FilterParameter.FilterString) ? " " : " AND " + filter.FilterParameter.FilterString.Replace("{ts", "").Replace("}", "");
@@ -117,10 +117,6 @@ namespace LQKJ.K3.CZXT.Pluglus
             string Filter = GetFilterWhere(filter);
             // 创建组织信息列表
             List<string> errorMessagest = new List<string>();
-            // 创建仓库信息列表
-            List<string> Stockrepositories = new List<string>();
-            // 创建物料信息列表
-            List<string> Materialrepositories = new List<string>();
             // 创建一个 StringBuilder 来构建 SQL 语句中的 WHERE 子句
             StringBuilder strwhere = new StringBuilder();
             // 获取用户自定义的过滤参数（例如：开始日期、结束日期）
@@ -158,25 +154,6 @@ namespace LQKJ.K3.CZXT.Pluglus
                 F_LQKJ_StartDate = (customFilter["F_LQKJ_StartDate"] == null) ? string.Empty : Convert.ToDateTime(customFilter["F_LQKJ_StartDate"]).ToString("yyyy-MM-dd");//起始日期
                 //F_LQKJ_EndDate = (customFilter["F_LQKJ_EndDate"] == null) ? string.Empty : Convert.ToDateTime(customFilter["F_LQKJ_EndDate"]).ToString("yyyy-MM-dd");//截止日期
             }
-
-            //获取单个或者多个仓库内码
-            DynamicObjectCollection F_LQKJ_Stocks = customFilter["F_LQKJ_Stocks"] as DynamicObjectCollection;
-            if (F_LQKJ_Stocks.Count > 0)
-            {
-                foreach (var item in F_LQKJ_Stocks)
-                {
-                    Stockrepositories.Add(Convert.ToString(item["F_LQKJ_Stocks_Id"]));
-                }
-            }
-            //获取单个或者多个物料内码
-            DynamicObjectCollection F_LQKJ_Materials = customFilter["F_LQKJ_Materials"] as DynamicObjectCollection;
-            if (F_LQKJ_Materials.Count > 0)
-            {
-                foreach (var item in F_LQKJ_Materials)
-                {
-                    Materialrepositories.Add(Convert.ToString(item["F_LQKJ_Materials_Id"]));
-                }
-            }
             string tmpRpt1 = "";
             //搜索物料收发明细表的默认方案查询语句
             //string sqlBB = string.Format(@"/*dialect*/SELECT FSCHEMEID FROM T_BAS_FILTERSCHEME where FFORMID='STK_StockDetailRpt' and FSCHEMENAME='Default Scheme'");
@@ -188,7 +165,7 @@ namespace LQKJ.K3.CZXT.Pluglus
                 throw new Exception("物料收发明细表没有专用过滤方案！");
             }
 
-            IMoveReport moveReport = GetReportData(Context, "STK_StockDetailRpt", "STK_StockDetailFilter", schemeId, F_LQKJ_OrgId, F_LQKJ_StartDate, F_LQKJ_EndDate, 0);
+            IMoveReport moveReport = GetReportData(Context, "STK_StockDetailRpt", "STK_StockDetailFilter", schemeId, F_LQKJ_OrgId, F_LQKJ_StartDate, 0);
             if (moveReport.DataSource != null)
             {
 
@@ -286,7 +263,8 @@ LEFT JOIN T_BD_MATERIAL W ON T1.FMATERIALID=W.FMATERIALID
 LEFT JOIN T_BD_MATERIAL_L WL ON T1.FMATERIALID=WL.FMATERIALID AND WL.FLOCALEID = 2052 --物料多语言表
 LEFT JOIN T_BD_UNIT_L DW ON T1.FSTOCKUNITID=DW.FUNITID AND DW.FLOCALEID=2052 --计量单位多语言表
 LEFT JOIN T_LQKJ_CZexpenses SS ON COALESCE(T1.FDate, CAST(GETDATE() AS DATE)) = SS.F_LQKJ_FDATE AND ZZ.FNAME=SS.F_LQKJ_ORGID AND CK.FNAME=SS.F_LQKJ_WAREHOUSE AND W.FNUMBER=SS.F_LQKJ_FMATERIALID--仓租手输费用表
-WHERE T1.FSTOCKID IN ('" + string.Join("','", Stockrepositories) + "') AND T1.FMATERIALID IN ('" + string.Join("','", Materialrepositories) + "')");
+LEFT JOIN T_BD_STOCK CKBM ON T1.FSTOCKID=CKBM.FSTOCKID
+WHERE 1=1 {0}", Filter);
                 // 执行动态SQL查询并获取查询结果
                 DynamicObjectCollection dynamics = DBUtils.ExecuteDynamicObject(Context, sql);
 
@@ -496,7 +474,7 @@ WHERE T1.FSTOCKID IN ('" + string.Join("','", Stockrepositories) + "') AND T1.FM
         /// <param name="schemeId">过滤方案内码</param>
         /// <param name="currentPosition">分页账表当前位置</param>
         /// <returns></returns>
-        private IMoveReport GetReportData(Context ctx, string rptFormId, string rptFilterFormId, string schemeId, string F_LQKJ_OrgId,string F_LQKJ_StartDate,string F_LQKJ_EndDate, int currentPosition)
+        private IMoveReport GetReportData(Context ctx, string rptFormId, string rptFilterFormId, string schemeId, string F_LQKJ_OrgId,string F_LQKJ_StartDate, int currentPosition)
         {
             //删除物料收发明细表临时表
             //DBServiceHelper.DropTable(Context, new HashSet<string>() { tmpTableName });
@@ -524,10 +502,7 @@ WHERE T1.FSTOCKID IN ('" + string.Join("','", Stockrepositories) + "') AND T1.FM
             if(!string.IsNullOrEmpty(F_LQKJ_StartDate) && F_LQKJ_StartDate != "")
             {
                 filterObj["BeginDate"] = Convert.ToDateTime(F_LQKJ_StartDate);
-            }
-            if(!string.IsNullOrEmpty(F_LQKJ_EndDate) && F_LQKJ_EndDate != "")
-            {
-                filterObj["EndDate"] = Convert.ToDateTime(F_LQKJ_EndDate);
+                filterObj["EndDate"] = Convert.ToDateTime(F_LQKJ_StartDate);
             }
             IRptParams rptParam = new RptParams();
             rptParam.FormId = reportFilterMetadata.BusinessInfo.GetForm().Id;