提交 b08ec542 authored 作者: 刘火's avatar 刘火

修改

上级 7ce2d476
......@@ -71,7 +71,7 @@ namespace LQKJ.K3.NDR.NewReportPlugIn
isnull(sum(研发费用_人工成本_社保费_养老保险费),0)F_LQKJ_YL,isnull(sum(研发费用_人工成本_住房公积金),0)F_LQKJ_ZF,
isnull(sum(研发费用_差旅费),0)F_LQKJ_CL,isnull(sum(研发费用_差旅费_出差补助),0)F_LQKJ_CC,isnull(sum(研发费用_低值易耗品),0)F_LQKJ_DZ,
isnull(sum(研发费用_电信费),0)F_LQKJ_DX,isnull(sum(研发费用_其他服务费_维修服务费),0)F_LQKJ_WX,isnull(sum(研发费用_招待费),0)F_LQKJ_ZD,
isnull(sum(研发费用_邮递费),0)F_LQKJ_YD,isnull(sum(研发费用_研发材料费),0)F_LQKJ_YFCL,ROW_NUMBER()over(order by 部门) as num
isnull(sum(研发费用_邮递费),0)F_LQKJ_YD,isnull(sum(研发费用_研发材料费),0)F_LQKJ_YFCL,ROW_NUMBER()over(order by 部门) as num,isnull(sum(研发费用_人工成本_福利费_公司活动),0)F_LQKJ_GSHD,isnull(sum(研发费用_人工成本_福利费_部门活动),0)F_LQKJ_BMHD
from (
Select f.FNUMBER,d.FNUMBER as 部门编码,d.FDEPTID,e.FNAME 部门,{Month} FPERIOD,{Year} FYEAR,case a.F_LQKJ_KM when 128849 then F_LQKJ_AMOUNT end as 研发费用_租金_房屋租金
,case a.F_LQKJ_KM when 128862 then F_LQKJ_AMOUNT end as 研发费用_租金_宿舍租金,case a.F_LQKJ_KM when 128737 then F_LQKJ_AMOUNT end as 研发费用_水电费
......@@ -85,7 +85,7 @@ namespace LQKJ.K3.NDR.NewReportPlugIn
,case a.F_LQKJ_KM when 128861 then F_LQKJ_AMOUNT end as 研发费用_差旅费_出差补助,case a.F_LQKJ_KM when 128741 then F_LQKJ_AMOUNT end as 研发费用_低值易耗品
,case a.F_LQKJ_KM when 128735 then F_LQKJ_AMOUNT end as 研发费用_电信费,case a.F_LQKJ_KM when 128865 then F_LQKJ_AMOUNT end as 研发费用_其他服务费_维修服务费
,case a.F_LQKJ_KM when 128736 then F_LQKJ_AMOUNT end as 研发费用_招待费,case a.F_LQKJ_KM when 128740 then F_LQKJ_AMOUNT end as 研发费用_邮递费
,case a.F_LQKJ_KM when 128738 then F_LQKJ_AMOUNT end as 研发费用_研发材料费
,case a.F_LQKJ_KM when 128738 then F_LQKJ_AMOUNT end as 研发费用_研发材料费,case a.F_LQKJ_KM when 128870 then F_LQKJ_AMOUNT end as 研发费用_人工成本_福利费_公司活动,case a.F_LQKJ_KM when 272503 then F_LQKJ_AMOUNT end as 研发费用_人工成本_福利费_部门活动
From LQKJ_t_KMYESJ a
left join T_BD_FLEXITEMDETAILV c on a.F_LQKJ_HSWD=c.FID
left join T_BD_DEPARTMENT d on c.FFLEX5=d.FDEPTID
......@@ -357,6 +357,12 @@ namespace LQKJ.K3.NDR.NewReportPlugIn
case "研发材料费":
header.AddChild("F_LQKJ_YFCL", new Kingdee.BOS.LocaleValue("研发费用_研发材料费"), SqlStorageType.SqlDecimal);
break;
case "部门活动":
header.AddChild("F_LQKJ_BMHD", new Kingdee.BOS.LocaleValue("研发费用_人工成本_福利费_部门活动"), SqlStorageType.SqlDecimal);
break;
case "公司活动":
header.AddChild("F_LQKJ_GSHD", new Kingdee.BOS.LocaleValue("研发费用_人工成本_福利费_公司活动"), SqlStorageType.SqlDecimal);
break;
}
}
Type = null;
......
......@@ -32,45 +32,45 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Kingdee.BOS">
<HintPath>D:\纽迪瑞\bin\Kingdee.BOS.dll</HintPath>
<HintPath>..\..\..\WebSite\bin\Kingdee.BOS.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.App">
<HintPath>D:\纽迪瑞\bin\Kingdee.BOS.App.dll</HintPath>
<HintPath>..\..\..\WebSite\bin\Kingdee.BOS.App.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.Contracts, Version=8.1.529.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\纽迪瑞\bin\Kingdee.BOS.Contracts.dll</HintPath>
<HintPath>..\..\..\WebSite\bin\Kingdee.BOS.Contracts.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.Core">
<HintPath>D:\纽迪瑞\bin\Kingdee.BOS.Core.dll</HintPath>
<HintPath>..\..\..\WebSite\bin\Kingdee.BOS.Core.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.DataEntity, Version=8.1.529.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\纽迪瑞\bin\Kingdee.BOS.DataEntity.dll</HintPath>
<HintPath>..\..\..\WebSite\bin\Kingdee.BOS.DataEntity.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.ServiceFacade.KDServiceFx, Version=8.1.529.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\纽迪瑞\bin\Kingdee.BOS.ServiceFacade.KDServiceFx.dll</HintPath>
<HintPath>..\..\..\WebSite\bin\Kingdee.BOS.ServiceFacade.KDServiceFx.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.ServiceHelper, Version=8.1.529.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\纽迪瑞\bin\Kingdee.BOS.ServiceHelper.dll</HintPath>
<HintPath>..\..\..\WebSite\bin\Kingdee.BOS.ServiceHelper.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.WebApi.Client, Version=8.1.529.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\纽迪瑞\bin\Kingdee.BOS.WebApi.Client.dll</HintPath>
<HintPath>..\..\..\WebSite\bin\Kingdee.BOS.WebApi.Client.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.WebApi.ServicesStub, Version=8.1.529.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\纽迪瑞\bin\Kingdee.BOS.WebApi.ServicesStub.dll</HintPath>
<HintPath>..\..\..\WebSite\bin\Kingdee.BOS.WebApi.ServicesStub.dll</HintPath>
</Reference>
<Reference Include="Kingdee.K3.FIN.GL.App.Report, Version=8.1.529.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\纽迪瑞\bin\Kingdee.K3.FIN.GL.App.Report.dll</HintPath>
<HintPath>..\..\..\WebSite\bin\Kingdee.K3.FIN.GL.App.Report.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\纽迪瑞\bin\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\..\..\优博讯客户环境\WebSite\bin\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
......
bafe231da799da3903154c3bdc2c380cf7da38a0
23533381fb47ec7965697c2061cbc265c7702296
......@@ -5,3 +5,8 @@ C:\Users\zcb27\Desktop\LQKJ.K3.NDR.ReportPlugIn\NDR\NDR\LQKJ.K3.NDR.NewReportPlu
C:\Users\zcb27\Desktop\LQKJ.K3.NDR.ReportPlugIn\NDR\NDR\LQKJ.K3.NDR.NewReportPlugIn\obj\Debug\LQKJ.K3.NDR.NewReportPlugIn.dll
C:\Users\zcb27\Desktop\LQKJ.K3.NDR.ReportPlugIn\NDR\NDR\LQKJ.K3.NDR.NewReportPlugIn\obj\Debug\LQKJ.K3.NDR.NewReportPlugIn.pdb
C:\Users\zcb27\Desktop\LQKJ.K3.NDR.ReportPlugIn\NDR\NDR\LQKJ.K3.NDR.NewReportPlugIn\obj\Debug\LQKJ.K3.NDR.NewReportPlugIn.csproj.AssemblyReference.cache
E:\纽迪瑞\第二份代码\NDRReport\LQKJ.K3.NDR.NewReportPlugIn\obj\Debug\LQKJ.K3.NDR.NewReportPlugIn.csproj.AssemblyReference.cache
E:\纽迪瑞\第二份代码\NDRReport\LQKJ.K3.NDR.NewReportPlugIn\obj\Debug\LQKJ.K3.NDR.NewReportPlugIn.csproj.CoreCompileInputs.cache
E:\纽迪瑞\第二份代码\NDRReport\LQKJ.K3.NDR.NewReportPlugIn\obj\Debug\LQKJ.K3.NDR.NewReportPlugIn.csproj.CopyComplete
E:\纽迪瑞\第二份代码\NDRReport\LQKJ.K3.NDR.NewReportPlugIn\obj\Debug\LQKJ.K3.NDR.NewReportPlugIn.dll
E:\纽迪瑞\第二份代码\NDRReport\LQKJ.K3.NDR.NewReportPlugIn\obj\Debug\LQKJ.K3.NDR.NewReportPlugIn.pdb
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论