11

Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs

@@ -101,6 +101,8 @@ namespace Pilot.Report.Exploitation.SBUYingShouBiao
             ReportHeader header = new ReportHeader();
             header.AddChild("SBU", new LocaleValue("SBU", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar);
             //header.AddChild("本年度发货及验收额", new LocaleValue("已到期应收账款（含子公司）", this.Context.UserLocale.LCID), SqlStorageType.SqlMoney);
+            header.AddChild("仪表发货金额", new LocaleValue("仪表发货金额", this.Context.UserLocale.LCID), SqlStorageType.SqlMoney);
+            header.AddChild("系统验收金额", new LocaleValue("系统验收金额", this.Context.UserLocale.LCID), SqlStorageType.SqlMoney);
             header.AddChild("已到期应收账款", new LocaleValue("已到期应收账款(含子公司)", this.Context.UserLocale.LCID), SqlStorageType.SqlMoney);
             //一级表头
             var header1 = header.AddChild("应收账款账龄", new LocaleValue("应收账款账龄"));
@@ -193,12 +195,13 @@ FROM T_SAL_ORDERFIN aa
      ON    ACL.名称=L.FNAME  AND ISNULL(ACL.明细区域,'') != '' 
 	 WHERE  ACL.区域=a.SBU  
      AND bb.fid = (SELECT MAX(fid) FROM MBBA_t_Cust100002 aaa  WHERE aaa.FDOCUMENTSTATUS='C' AND YEAR(aaa.F_VRYF_DATE_83G)=YEAR( '{begin}' ) )) ccc),0)
+,[仪表发货金额]=sum([仪表发货金额])
+,[系统验收金额]=sum([系统验收金额])
  FROM ZRP_YingShouMingXi_yuyubo a
  {Filter}
  GROUP BY a.SBU) a
-
-
 ");
+            
             //执行SQL并动态创建报表
             DBUtils.ExecuteDynamicObject(this.Context, sql);
         }

Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Pilot.Report.Exploitation.Common;
+using Kingdee.BOS.Log;
 
 namespace Pilot.Report.Exploitation.SpecialDetails
 {
@@ -220,7 +221,7 @@ WHERE
       AND B.F_YKQC_CHECKBOX_QTR != '1'
       AND A.FDOCUMENTSTATUS = 'C'
       AND A.FBUSINESSTYPE = 'NORMAL'
-      AND a.FCloseStatus='A' AND b.FMrpCloseStatus='A'
+     
       AND B.FQTY >= 0
       AND A.FMANUALCLOSE = '0'    
       AND A.FMANUALCLOSE <> '1'
@@ -264,7 +265,7 @@ WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C', 'S','CS','CW' )
       AND B.FQTY >= 0
       AND A.FDOCUMENTSTATUS = 'C'
       AND A.FBUSINESSTYPE = 'NORMAL'
-  	  AND a.FCloseStatus='A' AND b.FMrpCloseStatus='A'
+  	  
       AND A.FMANUALCLOSE = '0'    
       AND A.F_CONTRACTNUMBER NOT LIKE 'Z%'
       AND A.FMANUALCLOSE <> '1'
@@ -318,7 +319,7 @@ WHERE
       AND B.F_YKQC_CHECKBOX_QTR != '1'
       AND A.FDOCUMENTSTATUS = 'C'
       AND A.FBUSINESSTYPE = 'NORMAL'
-  	  AND a.FCloseStatus='A' AND b.FMrpCloseStatus='A'
+ 
       AND B.FQTY >= 0
       AND A.FMANUALCLOSE = '0'     
       AND A.FMANUALCLOSE <> '1'
@@ -377,7 +378,7 @@ WHERE
 	 AND (A.F_SpecialContracts = '是'  OR a.F_GROSSMARGIN1='<35%')
       AND A.FDOCUMENTSTATUS = 'C'
       AND A.FBUSINESSTYPE = 'NORMAL'
-  	  AND a.FCloseStatus='A' AND b.FMrpCloseStatus='A'
+  	 
       AND B.FQTY >= 0
       AND A.FMANUALCLOSE = '0'     
       AND A.FMANUALCLOSE <> '1'
@@ -853,7 +854,7 @@ FROM #PLChongDianZhuangHeTong ;");
             0 Sort
             FROM #tempDaBiao t1) t1
             order by Sort desc,fid desc ,FIDENTITYID ", tableName);
-            Loghelp.Log(sql);
+            //Logger.Error("特价明细报表", sql, new Exception());
             DBUtils.Execute(this.Context, sql);
         }