移除水晶报表

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ADR_RecordController.cs

@@ -6,8 +6,6 @@ using System.Web.Mvc;
 using Learun.Application.Base.SystemModule;
 using System.Collections.Generic;
 using System.IO;
-using CrystalDecisions.CrystalReports.Engine;
-using CrystalDecisions.Shared;
 
 namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
 {
@@ -46,13 +44,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         [HttpGet]
         public ActionResult AttendanceReportByWeek()
         {
-            ReportClass rptH = new ReportClass();
-            rptH.FileName = Server.MapPath("~/Areas/LogisticsManagement/Views/ADR_Record/AttendanceReportByWeek.rpt");
-            rptH.Load();
-            var recrodlist = aDR_RecordIBLL.GetList("{}");
-            rptH.SetDataSource(Util.DataBase.DataConvert.ToDataTable(recrodlist));
-            Stream stream = rptH.ExportToStream(ExportFormatType.PortableDocFormat);
-            return File(stream, "application/pdf");
+            return View();
         }
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/ADR_Record.xsc

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--<autogenerated>
-     This code was generated by a tool.
-     Changes to this file may cause incorrect behavior and will be lost if
-     the code is regenerated.
-</autogenerated>-->
-<DataSetUISetting Version="1.00" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-  <TableUISettings />
-</DataSetUISetting>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/ADR_Record.xsd

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema id="ADR_Record" targetNamespace="http://tempuri.org/ADR_Record.xsd" xmlns:mstns="http://tempuri.org/ADR_Record.xsd" xmlns="http://tempuri.org/ADR_Record.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:msprop="urn:schemas-microsoft-com:xml-msprop" attributeFormDefault="qualified" elementFormDefault="qualified">
-  <xs:annotation>
-    <xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
-      <DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-        <Connections />
-        <Tables />
-        <Sources />
-      </DataSource>
-    </xs:appinfo>
-  </xs:annotation>
-  <xs:element name="ADR_Record" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="ADR_Record" msprop:Generator_UserDSName="ADR_Record">
-    <xs:complexType>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="ADR_Record" msprop:Generator_TableClassName="ADR_RecordDataTable" msprop:Generator_TableVarName="tableADR_Record" msprop:Generator_RowChangedName="ADR_RecordRowChanged" msprop:Generator_TablePropName="_ADR_Record" msprop:Generator_RowDeletingName="ADR_RecordRowDeleting" msprop:Generator_RowChangingName="ADR_RecordRowChanging" msprop:Generator_RowEvHandlerName="ADR_RecordRowChangeEventHandler" msprop:Generator_RowDeletedName="ADR_RecordRowDeleted" msprop:Generator_RowClassName="ADR_RecordRow" msprop:Generator_UserTableName="ADR_Record" msprop:Generator_RowEvArgName="ADR_RecordRowChangeEvent">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="ID" msprop:Generator_ColumnVarNameInTable="columnID" msprop:Generator_ColumnPropNameInRow="ID" msprop:Generator_ColumnPropNameInTable="IDColumn" msprop:Generator_UserColumnName="ID" type="xs:string" minOccurs="0" />
-              <xs:element name="UserName" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="UserName" msprop:Generator_ColumnVarNameInTable="columnUserName" msprop:Generator_ColumnPropNameInTable="UserNameColumn" msprop:Generator_UserColumnName="UserName" type="xs:string" minOccurs="0" />
-              <xs:element name="UserNo" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="UserNo" msprop:Generator_ColumnVarNameInTable="columnUserNo" msprop:Generator_ColumnPropNameInTable="UserNoColumn" msprop:Generator_UserColumnName="UserNo" type="xs:string" minOccurs="0" />
-              <xs:element name="Department" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="Department" msprop:Generator_ColumnVarNameInTable="columnDepartment" msprop:Generator_ColumnPropNameInTable="DepartmentColumn" msprop:Generator_UserColumnName="Department" type="xs:string" minOccurs="0" />
-              <xs:element name="ADType" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ADType" msprop:Generator_ColumnVarNameInTable="columnADType" msprop:Generator_ColumnPropNameInTable="ADTypeColumn" msprop:Generator_UserColumnName="ADType" type="xs:string" minOccurs="0" />
-              <xs:element name="ADTime" msprop:Generator_ColumnVarNameInTable="columnADTime" msprop:Generator_ColumnPropNameInRow="ADTime" msprop:Generator_ColumnPropNameInTable="ADTimeColumn" msprop:Generator_UserColumnName="ADTime" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="ClockTime" msprop:Generator_ColumnVarNameInTable="columnClockTime" msprop:Generator_ColumnPropNameInRow="ClockTime" msprop:Generator_ColumnPropNameInTable="ClockTimeColumn" msprop:Generator_UserColumnName="ClockTime" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="ClockStatus" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ClockStatus" msprop:Generator_ColumnVarNameInTable="columnClockStatus" msprop:Generator_ColumnPropNameInTable="ClockStatusColumn" msprop:Generator_UserColumnName="ClockStatus" type="xs:string" minOccurs="0" />
-              <xs:element name="ClockPlace" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ClockPlace" msprop:Generator_ColumnVarNameInTable="columnClockPlace" msprop:Generator_ColumnPropNameInTable="ClockPlaceColumn" msprop:Generator_UserColumnName="ClockPlace" type="xs:string" minOccurs="0" />
-              <xs:element name="ADYear" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ADYear" msprop:Generator_ColumnVarNameInTable="columnADYear" msprop:Generator_ColumnPropNameInTable="ADYearColumn" msprop:Generator_UserColumnName="ADYear" type="xs:string" minOccurs="0" />
-              <xs:element name="ADMonth" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ADMonth" msprop:Generator_ColumnVarNameInTable="columnADMonth" msprop:Generator_ColumnPropNameInTable="ADMonthColumn" msprop:Generator_UserColumnName="ADMonth" type="xs:string" minOccurs="0" />
-              <xs:element name="ADDay" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ADDay" msprop:Generator_ColumnVarNameInTable="columnADDay" msprop:Generator_ColumnPropNameInTable="ADDayColumn" msprop:Generator_UserColumnName="ADDay" type="xs:string" minOccurs="0" />
-              <xs:element name="ADPhoto" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ADPhoto" msprop:Generator_ColumnVarNameInTable="columnADPhoto" msprop:Generator_ColumnPropNameInTable="ADPhotoColumn" msprop:Generator_UserColumnName="ADPhoto" type="xs:string" minOccurs="0" />
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/ADR_Record.xss

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--<autogenerated>
-     This code was generated by a tool to store the dataset designer's layout information.
-     Changes to this file may cause incorrect behavior and will be lost if
-     the code is regenerated.
-</autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
-  <Shapes>
-    <Shape ID="DesignTable:ADR_Record" ZOrder="1" X="555" Y="185" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="24" SplitterPosition="253" />
-  </Shapes>
-  <Connectors />
-</DiagramLayout>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/AttendanceReportByWeek.cs

@@ -1,154 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Learun.Application.Web.Areas.LogisticsManagement.Views.ADR_Record {
-    using System;
-    using System.ComponentModel;
-    using CrystalDecisions.Shared;
-    using CrystalDecisions.ReportSource;
-    using CrystalDecisions.CrystalReports.Engine;
-    
-    
-    public class AttendanceReportByWeek : ReportClass {
-        
-        public AttendanceReportByWeek() {
-        }
-        
-        public override string ResourceName {
-            get {
-                return "AttendanceReportByWeek.rpt";
-            }
-            set {
-                // Do nothing
-            }
-        }
-        
-        public override bool NewGenerator {
-            get {
-                return true;
-            }
-            set {
-                // Do nothing
-            }
-        }
-        
-        public override string FullResourceName {
-            get {
-                return "Learun.Application.Web.Areas.LogisticsManagement.Views.ADR_Record.AttendanceRepor" +
-                    "tByWeek.rpt";
-            }
-            set {
-                // Do nothing
-            }
-        }
-        
-        [Browsable(false)]
-        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
-        public CrystalDecisions.CrystalReports.Engine.Section Section1 {
-            get {
-                return this.ReportDefinition.Sections[0];
-            }
-        }
-        
-        [Browsable(false)]
-        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
-        public CrystalDecisions.CrystalReports.Engine.Section Section2 {
-            get {
-                return this.ReportDefinition.Sections[1];
-            }
-        }
-        
-        [Browsable(false)]
-        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
-        public CrystalDecisions.CrystalReports.Engine.Section Section3 {
-            get {
-                return this.ReportDefinition.Sections[2];
-            }
-        }
-        
-        [Browsable(false)]
-        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
-        public CrystalDecisions.CrystalReports.Engine.Section Section4 {
-            get {
-                return this.ReportDefinition.Sections[3];
-            }
-        }
-        
-        [Browsable(false)]
-        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
-        public CrystalDecisions.CrystalReports.Engine.Section Section5 {
-            get {
-                return this.ReportDefinition.Sections[4];
-            }
-        }
-    }
-    
-    [System.Drawing.ToolboxBitmapAttribute(typeof(CrystalDecisions.Shared.ExportOptions), "report.bmp")]
-    public class CachedAttendanceReportByWeek : Component, ICachedReport {
-        
-        public CachedAttendanceReportByWeek() {
-        }
-        
-        [Browsable(false)]
-        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
-        public virtual bool IsCacheable {
-            get {
-                return true;
-            }
-            set {
-                // 
-            }
-        }
-        
-        [Browsable(false)]
-        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
-        public virtual bool ShareDBLogonInfo {
-            get {
-                return false;
-            }
-            set {
-                // 
-            }
-        }
-        
-        [Browsable(false)]
-        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
-        public virtual System.TimeSpan CacheTimeOut {
-            get {
-                return CachedReportConstants.DEFAULT_TIMEOUT;
-            }
-            set {
-                // 
-            }
-        }
-        
-        public virtual CrystalDecisions.CrystalReports.Engine.ReportDocument CreateReport() {
-            AttendanceReportByWeek rpt = new AttendanceReportByWeek();
-            rpt.Site = this.Site;
-            return rpt;
-        }
-        
-        public virtual string GetCustomizedCacheKey(RequestContext request) {
-            String key = null;
-            // // The following is the code used to generate the default
-            // // cache key for caching report jobs in the ASP.NET Cache.
-            // // Feel free to modify this code to suit your needs.
-            // // Returning key == null causes the default cache key to
-            // // be generated.
-            // 
-            // key = RequestContext.BuildCompleteCacheKey(
-            //     request,
-            //     null,       // sReportFilename
-            //     this.GetType(),
-            //     this.ShareDBLogonInfo );
-            return key;
-        }
-    }
-}

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -57,10 +57,6 @@
     <Reference Include="ClosedXML, Version=0.93.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ClosedXML.0.93.0\lib\net40\ClosedXML.dll</HintPath>
     </Reference>
-    <Reference Include="CrystalDecisions.CrystalReports.Engine, Version=13.0.4000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=MSIL" />
-    <Reference Include="CrystalDecisions.ReportSource, Version=13.0.4000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=MSIL" />
-    <Reference Include="CrystalDecisions.Shared, Version=13.0.4000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=MSIL" />
-    <Reference Include="CrystalDecisions.Web, Version=13.0.4000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=MSIL" />
     <Reference Include="DocumentFormat.OpenXml, Version=2.8.1.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
       <HintPath>..\packages\DocumentFormat.OpenXml.2.8.1\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
     </Reference>
@@ -361,17 +357,6 @@
     <Compile Include="Areas\LogisticsManagement\Controllers\APAppointmentPsychologistController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\CompanyNewsController.cs" />
     <Compile Include="Areas\LogisticsManagement\LogisticsManagementAreaRegistration.cs" />
-    <Compile Include="Areas\LogisticsManagement\Views\ADR_Record\ADR_Record.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>ADR_Record.xsd</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\LogisticsManagement\Views\ADR_Record\AttendanceReportByWeek.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>AttendanceReportByWeek.rpt</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="Areas\LR_AuthorizeModule\Controllers\AuthorizeController.cs" />
     <Compile Include="Areas\LR_AuthorizeModule\Controllers\FilterIPController.cs" />
     <Compile Include="Areas\LR_AuthorizeModule\Controllers\FilterTimeController.cs" />
@@ -6801,17 +6786,6 @@
     <Content Include="Areas\LR_SystemModule\Views\Files\Form.cshtml" />
     <Content Include="Areas\LR_SystemModule\Views\Files\Index.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\AttendanceReportByWeek.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\ADR_Record\ADR_Record.xsc">
-      <DependentUpon>ADR_Record.xsd</DependentUpon>
-    </Content>
-    <None Include="Areas\LogisticsManagement\Views\ADR_Record\ADR_Record.xsd">
-      <SubType>Designer</SubType>
-      <Generator>MSDataSetGenerator</Generator>
-      <LastGenOutput>ADR_Record.Designer.cs</LastGenOutput>
-    </None>
-    <Content Include="Areas\LogisticsManagement\Views\ADR_Record\ADR_Record.xss">
-      <DependentUpon>ADR_Record.xsd</DependentUpon>
-    </Content>
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />
@@ -6879,12 +6853,6 @@
     <Analyzer Include="..\packages\Microsoft.DependencyValidation.Analyzers.0.10.0\analyzers\dotnet\cs\Microsoft.DependencyValidation.Analyzers.resources.dll" />
     <Analyzer Include="..\packages\Microsoft.DependencyValidation.Analyzers.0.10.0\analyzers\dotnet\Microsoft.DependencyValidation.Analyzers.dll" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Areas\LogisticsManagement\Views\ADR_Record\AttendanceReportByWeek.rpt">
-      <Generator>CrystalDecisions.VSDesigner.CodeGen.ReportCodeGenerator</Generator>
-      <LastGenOutput>AttendanceReportByWeek.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
     <Service Include="{C0C07587-41A7-46C8-8FBD-3F9C8EBE2DDC}" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Web.config

@@ -11,15 +11,6 @@
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
     <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
-    <!--水晶报表配置 start-->
-    <sectionGroup name="businessObjects">
-      <sectionGroup name="crystalReports">
-        <section name="rptBuildProvider" type="CrystalDecisions.Shared.RptBuildProviderHandler, CrystalDecisions.Shared, Version=13.0.4000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, Custom=null" />
-        <section name="crystalReportViewer" type="System.Configuration.NameValueSectionHandler" />
-        <section name="printControl" type="System.Configuration.NameValueSectionHandler" />
-      </sectionGroup>
-    </sectionGroup>
-    <!--水晶报表配置 end-->
   </configSections>
   <unity configSource="XmlConfig\ioc.config" />
   <connectionStrings configSource="XmlConfig\database.config">
@@ -39,15 +30,6 @@
     <compilation debug="true" targetFramework="4.6.2">
       <assemblies>
         <add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <!--水晶报表配置 start-->
-        <add assembly="CrystalDecisions.Web, Version=13.0.4000.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304"/>
-        <add assembly="CrystalDecisions.Shared, Version=13.0.4000.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304"/>
-        <!--<add assembly="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304"/>-->
-        <add assembly="CrystalDecisions.ReportSource, Version=13.0.4000.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304"/>
-        <!--<add assembly="CrystalDecisions.ReportAppServer.Controllers, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304"/>
-        <add assembly="CrystalDecisions.ReportAppServer.DataDefModel, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304"/>-->
-        <add assembly="CrystalDecisions.CrystalReports.Engine, Version=13.0.4000.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304"/>
-        <!--水晶报表配置 end-->
       </assemblies>
     </compilation>
     <customErrors mode="Off" defaultRedirect="\Error\ErrorPath404" />
@@ -62,16 +44,6 @@
       </namespaces>
     </pages>
   </system.web>
-  <!--水晶报表配置 start-->
-  <businessObjects>
-    <crystalReports>
-      <rptBuildProvider>
-        <add embedRptInResource="true" />
-        <add extension=".rpt" type="CrystalDecisions.Web.Compilation.RptBuildProvider, CrystalDecisions.Web, Version=13.0.4000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304"/>
-      </rptBuildProvider>
-    </crystalReports>
-  </businessObjects>
-  <!--水晶报表配置 end-->
   <system.webServer>
     <security>
       <requestFiltering allowDoubleEscaping="true" />