From f8eaad3fa2ffcae47ff149cd7a826c8983a69b00 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 31 十二月 2020 17:33:55 +0800
Subject: [PATCH] color 更改

---
 src/BLL/Demo.Report/PRD/prd_ExtractionPlanDetail.cs |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/BLL/Demo.Report/PRD/prd_ExtractionPlanDetail.cs b/src/BLL/Demo.Report/PRD/prd_ExtractionPlanDetail.cs
index c22efe3..c0f1621 100644
--- a/src/BLL/Demo.Report/PRD/prd_ExtractionPlanDetail.cs
+++ b/src/BLL/Demo.Report/PRD/prd_ExtractionPlanDetail.cs
@@ -23,6 +23,7 @@
     /// </summary>
     public class prd_ExtractionPlanDetail : SysReportBaseService
     {
+        string date = "";
         //鍒濆鍖�
         public override void Initialize()
         {
@@ -108,17 +109,27 @@
         public override ReportHeader GetReportHeaders(IRptParams filter)
         {
             ReportHeader header = new ReportHeader();
-            ReportHeader headerch = new ReportHeader();
             header.AddChild("FRogNUMBER", new LocaleValue("渚涘簲鍟嗕俊鎭�&閲囪喘缁勭粐", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar);
             header.AddChild("FNAME", new LocaleValue("渚涘簲鍟嗕俊鎭�&渚涘簲鍟�", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar);
-            header.AddChild("FNUMBER", new LocaleValue("渚涘簲鍟嗕俊鎭�&鐗╂枡", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar);
-            DataSet ds = DBServiceHelper.ExecuteDataSet(Context, "/*dialect*/select distinct convert(nvarchar(50),FHDATE,111) FHDATE from Cg_PODemandPlanBillMain ");
+
+            header.AddChild("FNUMBER", new LocaleValue("鐗╂枡淇℃伅&鐗╂枡", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar);
+            header.AddChild("FMATERIALNAME", new LocaleValue("鐗╂枡淇℃伅&鐗╂枡鍚嶇О", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar);
+            header.AddChild("FSPECIFICATION", new LocaleValue("鐗╂枡淇℃伅&鐗╂枡瑙勬牸", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar);
+            header.AddChild("FBASEUNIT", new LocaleValue("鐗╂枡淇℃伅&鍗曚綅", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar);
+            header.AddChild("FPROUNIT", new LocaleValue("鐗╂枡淇℃伅&璁¢噺鍗曚綅", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar);
+            header.AddChild("FQTY", new LocaleValue("鐗╂枡淇℃伅&搴撳瓨鏁伴噺", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar);
+            header.AddChild("FTRANSITQTY", new LocaleValue("鐗╂枡淇℃伅&鍦ㄩ�旀暟閲�", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar);
+
+            //header.AddChild("FNUMBER", new LocaleValue("鎷栨湡鏄庣粏&鎷栨湡鏁伴噺", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar);
+
+            //header.AddChild("FNUMBER", new LocaleValue("璁″垝鏄庣粏&鍚堣", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar);
+            DataSet ds = DBServiceHelper.ExecuteDataSet(Context, "/*dialect*/select distinct convert(nvarchar(50),FHDATE,111) FHDATE from Cg_PODemandPlanBillMain");
             DataTable dt = ds.Tables[0];
             if (dt.Rows.Count > 0)
             {
                 foreach (DataRow dr in dt.Rows)
                 {
-                    header.AddChild(dr[0].ToString(), new LocaleValue("鏃ユ湡&" + dr[0].ToString() + "", this.Context.UserLocale.LCID), SqlStorageType.SqlDecimal);
+                    header.AddChild(dr[0].ToString(), new LocaleValue("璁″垝鏄庣粏&" + dr[0].ToString() + "", this.Context.UserLocale.LCID), SqlStorageType.SqlDecimal);
                 }
             }
             return header;
@@ -149,6 +160,7 @@
             string startValue = (customFilter["FBeginConveyDate"] == null) ? string.Empty : Convert.ToDateTime(customFilter["FBeginConveyDate"]).ToString("yyyy/MM/d");
             string endValue = (customFilter["FEndConveyDate"] == null) ? string.Empty : Convert.ToDateTime(customFilter["FEndConveyDate"]).ToString("yyyy/MM/d");
             strwhere.AppendLine(string.Format(" AND FHDate>=''{0}'' and FHDate<=''{1}'' ", startValue, endValue));
+            date = string.Format("  FHDate>=''{0}'' and FHDate<=''{1}'' ", startValue, endValue);
             //鐗╂枡
             var baseDataNameValue = customFilter["FMATERIALID"];
             string MaterailName = baseDataNameValue == null
@@ -161,7 +173,7 @@
             //渚涘簲鍟�
             var baseSuppName = customFilter["FSUPPLIERID"];
             string SuppName = baseSuppName == null
-                ? " " : string.Format(" AND a.FSUPPLIERID IN ({0}) ", (customFilter["FSUPPLIERID"] as DynamicObject)["Id"].ToString());  
+                ? " " : string.Format(" AND a.FSUPPLIERID IN ({0}) ", (customFilter["FSUPPLIERID"] as DynamicObject)["Id"].ToString());
             strwhere.AppendLine(SuppName);
             string text2 = string.IsNullOrWhiteSpace(filter.FilterParameter.FilterString) ? " " : " AND " + filter.FilterParameter.FilterString.Replace("{ts", "").Replace("}", "");
             strwhere.AppendLine(text2);

--
Gitblit v1.9.1