111

yxj

2022-02-19 9c6aef7ace10b8afacf79c272598d26fb9882362

111

 AccPayM/AccPayM.csproj

@@ -14,7 +14,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -51,9 +51,23 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="AxInterop.grdes6Lib">
      <HintPath>..\DLL\AxInterop.grdes6Lib.dll</HintPath>
    </Reference>
    <Reference Include="AxInterop.gregn6Lib">
      <HintPath>..\DLL\AxInterop.gregn6Lib.dll</HintPath>
    </Reference>
    <Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\DLL\DBUtility.dll</HintPath>
    </Reference>
    <Reference Include="Interop.grdes6Lib">
      <HintPath>..\DLL\Interop.grdes6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Interop.gregn6Lib">
      <HintPath>..\DLL\Interop.gregn6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Pub_Class, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -200,38 +214,6 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <COMReference Include="Axgrdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="Axgregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="grdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="gregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="stdole">
      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
      <VersionMajor>2</VersionMajor>

 AccRecM/AccRecM.csproj

@@ -14,7 +14,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -51,9 +51,23 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="AxInterop.grdes6Lib">
      <HintPath>..\DLL\AxInterop.grdes6Lib.dll</HintPath>
    </Reference>
    <Reference Include="AxInterop.gregn6Lib">
      <HintPath>..\DLL\AxInterop.gregn6Lib.dll</HintPath>
    </Reference>
    <Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\DLL\DBUtility.dll</HintPath>
    </Reference>
    <Reference Include="Interop.grdes6Lib">
      <HintPath>..\DLL\Interop.grdes6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Interop.gregn6Lib">
      <HintPath>..\DLL\Interop.gregn6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Pub_Class, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -220,38 +234,6 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <COMReference Include="Axgrdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="Axgregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="grdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="gregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="stdole">
      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
      <VersionMajor>2</VersionMajor>

 BLL/BLL.csproj

@@ -14,7 +14,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -51,9 +51,23 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="AxInterop.grdes6Lib">
      <HintPath>..\DLL\AxInterop.grdes6Lib.dll</HintPath>
    </Reference>
    <Reference Include="AxInterop.gregn6Lib">
      <HintPath>..\DLL\AxInterop.gregn6Lib.dll</HintPath>
    </Reference>
    <Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\DLL\DBUtility.dll</HintPath>
    </Reference>
    <Reference Include="Interop.grdes6Lib">
      <HintPath>..\DLL\Interop.grdes6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Interop.gregn6Lib">
      <HintPath>..\DLL\Interop.gregn6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Pub_Class, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -72,9 +86,8 @@
    <Reference Include="System.Drawing" />
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
    <Reference Include="TeeChart, Version=3.2.2697.18419, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\NETERP\bin\Debug\TeeChart.dll</HintPath>
    <Reference Include="TeeChart">
      <HintPath>..\DLL\TeeChart.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
@@ -84,6 +97,12 @@
    </Compile>
    <Compile Include="Form4.Designer.cs">
      <DependentUpon>Form4.cs</DependentUpon>
    </Compile>
    <Compile Include="Form5.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="Form5.Designer.cs">
      <DependentUpon>Form5.cs</DependentUpon>
    </Compile>
    <Compile Include="公用模块\Frm_SQLInfo.cs">
      <SubType>Form</SubType>
@@ -301,6 +320,9 @@
      <SubType>Designer</SubType>
      <DependentUpon>Form4.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Form5.resx">
      <DependentUpon>Form5.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="公用模块\Frm_SQLInfo.resx">
      <SubType>Designer</SubType>
      <DependentUpon>Frm_SQLInfo.cs</DependentUpon>
@@ -415,38 +437,6 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <COMReference Include="Axgrdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="Axgregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="grdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="gregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="stdole">
      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
      <VersionMajor>2</VersionMajor>

 BLL/Form4.Designer.cs

@@ -43,7 +43,7 @@
            this.axGRDisplayViewer1.Location = new System.Drawing.Point(60, 87);
            this.axGRDisplayViewer1.Name = "axGRDisplayViewer1";
            this.axGRDisplayViewer1.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("axGRDisplayViewer1.OcxState")));
            this.axGRDisplayViewer1.Size = new System.Drawing.Size(90, 59);
            this.axGRDisplayViewer1.Size = new System.Drawing.Size(192, 192);
            this.axGRDisplayViewer1.TabIndex = 0;
            // 
            // axGRDesigner1
@@ -52,7 +52,7 @@
            this.axGRDesigner1.Location = new System.Drawing.Point(143, 162);
            this.axGRDesigner1.Name = "axGRDesigner1";
            this.axGRDesigner1.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("axGRDesigner1.OcxState")));
            this.axGRDesigner1.Size = new System.Drawing.Size(57, 34);
            this.axGRDesigner1.Size = new System.Drawing.Size(192, 192);
            this.axGRDesigner1.TabIndex = 1;
            // 
            // axGRPrintViewer1
@@ -61,14 +61,14 @@
            this.axGRPrintViewer1.Location = new System.Drawing.Point(161, 21);
            this.axGRPrintViewer1.Name = "axGRPrintViewer1";
            this.axGRPrintViewer1.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("axGRPrintViewer1.OcxState")));
            this.axGRPrintViewer1.Size = new System.Drawing.Size(72, 66);
            this.axGRPrintViewer1.Size = new System.Drawing.Size(192, 192);
            this.axGRPrintViewer1.TabIndex = 2;
            // 
            // Form4
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(284, 262);
            this.ClientSize = new System.Drawing.Size(572, 323);
            this.Controls.Add(this.axGRPrintViewer1);
            this.Controls.Add(this.axGRDesigner1);
            this.Controls.Add(this.axGRDisplayViewer1);

 BLL/Form5.Designer.cs

New file
@@ -0,0 +1,40 @@

namespace BLL
{
    partial class Form5
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(800, 450);
            this.Text = "Form5";
        }

        #endregion
    }
}

 BLL/Form5.cs

New file
@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Text;
using System.Windows.Forms;

namespace BLL
{
    public partial class Form5 : Form
    {
        public Form5()
        {
            InitializeComponent();
        }
    }
}

 BLL/Form5.resx

New file
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!-- 
    Microsoft ResX Schema 
    
    Version 2.0
    
    The primary goals of this format is to allow a simple XML format 
    that is mostly human readable. The generation and parsing of the 
    various data types are done through the TypeConverter classes 
    associated with the data types.
    
    Example:
    
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
                
    There are any number of "resheader" rows that contain simple 
    name/value pairs.
    
    Each data row contains a name, and value. The row also contains a 
    type or mimetype. Type corresponds to a .NET class that support 
    text/value conversion through the TypeConverter architecture. 
    Classes that don't support this are serialized and stored with the 
    mimetype set.
    
    The mimetype is used for serialized objects, and tells the 
    ResXResourceReader how to depersist the object. This is currently not 
    extensible. For a given mimetype the value must be set accordingly:
    
    Note - application/x-microsoft.net.object.binary.base64 is the format 
    that the ResXResourceWriter will generate, however the reader can 
    read any of the formats listed below.
    
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.

    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array 
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>

 BaseSet/BaseSet.csproj

@@ -14,7 +14,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -51,9 +51,23 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="AxInterop.grdes6Lib">
      <HintPath>..\DLL\AxInterop.grdes6Lib.dll</HintPath>
    </Reference>
    <Reference Include="AxInterop.gregn6Lib">
      <HintPath>..\DLL\AxInterop.gregn6Lib.dll</HintPath>
    </Reference>
    <Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\DLL\DBUtility.dll</HintPath>
    </Reference>
    <Reference Include="Interop.grdes6Lib">
      <HintPath>..\DLL\Interop.grdes6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Interop.gregn6Lib">
      <HintPath>..\DLL\Interop.gregn6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Pub_Class, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -962,38 +976,6 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <COMReference Include="Axgrdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="Axgregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="grdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="gregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="stdole">
      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
      <VersionMajor>2</VersionMajor>

 DAL/DAL.csproj

@@ -14,7 +14,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

 DLL/AxInterop.grdes6Lib.dll

Binary files differ

 DLL/AxInterop.gregn6Lib.dll

Binary files differ

 DLL/Interop.Excel.dll

Binary files differ

 DLL/Interop.grdes6Lib.dll

Binary files differ

 DLL/Interop.gregn6Lib.dll

Binary files differ

 DLL/NPOI.OOXML.dll

Binary files differ

 DLL/NPOI.OpenXml4Net.dll

Binary files differ

 DLL/NPOI.OpenXmlFormats.dll

Binary files differ

 DLL/NPOI.dll

Binary files differ

 DLL/Newtonsoft.Json.dll

Binary files differ

 DLL/OAM.dll

Binary files differ

 DLL/PlanM.dll

Binary files differ

 DLL/TeeChart.dll

Binary files differ

 Model/Model.csproj

@@ -14,7 +14,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

 NETERP/NETERP.csproj

@@ -15,7 +15,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -52,16 +52,34 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="AxInterop.grdes6Lib">
      <HintPath>..\DLL\AxInterop.grdes6Lib.dll</HintPath>
    </Reference>
    <Reference Include="AxInterop.gregn6Lib">
      <HintPath>..\DLL\AxInterop.gregn6Lib.dll</HintPath>
    </Reference>
    <Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\DLL\DBUtility.dll</HintPath>
    </Reference>
    <Reference Include="Interop.Excel, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>bin\Debug\Interop.Excel.dll</HintPath>
    <Reference Include="Interop.Excel">
      <HintPath>..\DLL\Interop.Excel.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="OAM, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
    <Reference Include="PlanM, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
    <Reference Include="Interop.grdes6Lib">
      <HintPath>..\DLL\Interop.grdes6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Interop.gregn6Lib">
      <HintPath>..\DLL\Interop.gregn6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="OAM">
      <HintPath>..\DLL\OAM.dll</HintPath>
    </Reference>
    <Reference Include="PlanM">
      <HintPath>..\DLL\PlanM.dll</HintPath>
    </Reference>
    <Reference Include="Pub_Class, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\DLL\Pub_Class.dll</HintPath>
@@ -80,7 +98,9 @@
    <Reference Include="System.Drawing" />
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
    <Reference Include="WorkM, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
    <Reference Include="TeeChart">
      <HintPath>..\DLL\TeeChart.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="公用\OA_MessageBox.cs">
@@ -200,38 +220,6 @@
    <Content Include="总控台.ico" />
  </ItemGroup>
  <ItemGroup>
    <COMReference Include="Axgrdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="Axgregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="grdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="gregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="stdole">
      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
      <VersionMajor>2</VersionMajor>

 NETERP/app.config

@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

 NETERP/¹«ÓÃ/ClsShowMod.cs

@@ -2304,9 +2304,9 @@
                        break;
                   
                    case "gy_datain_routingbill":
                        Gy_DataIn_RoutingBill oGy_DataIn_RoutingBill = new Gy_DataIn_RoutingBill();
                        oGy_DataIn_RoutingBill.MdiParent = oMain;
                        oGy_DataIn_RoutingBill.Show();
                        //Gy_DataIn_RoutingBill oGy_DataIn_RoutingBill = new Gy_DataIn_RoutingBill();
                        //oGy_DataIn_RoutingBill.MdiParent = oMain;
                        //oGy_DataIn_RoutingBill.Show();
                        break;
                    case "gy_datain_processprice":
                        Gy_DataIn_ProcessPrice oGy_DataIn_ProcessPrice = new Gy_DataIn_ProcessPrice();

 ProM/ProM.csproj

@@ -14,7 +14,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -51,9 +51,23 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="AxInterop.grdes6Lib">
      <HintPath>..\DLL\AxInterop.grdes6Lib.dll</HintPath>
    </Reference>
    <Reference Include="AxInterop.gregn6Lib">
      <HintPath>..\DLL\AxInterop.gregn6Lib.dll</HintPath>
    </Reference>
    <Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\DLL\DBUtility.dll</HintPath>
    </Reference>
    <Reference Include="Interop.grdes6Lib">
      <HintPath>..\DLL\Interop.grdes6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Interop.gregn6Lib">
      <HintPath>..\DLL\Interop.gregn6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Pub_Class, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -430,38 +444,6 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <COMReference Include="Axgrdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="Axgregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="grdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="gregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="stdole">
      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
      <VersionMajor>2</VersionMajor>

 SelM/SelM.csproj

@@ -14,7 +14,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -51,9 +51,23 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="AxInterop.grdes6Lib">
      <HintPath>..\DLL\AxInterop.grdes6Lib.dll</HintPath>
    </Reference>
    <Reference Include="AxInterop.gregn6Lib">
      <HintPath>..\DLL\AxInterop.gregn6Lib.dll</HintPath>
    </Reference>
    <Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\DLL\DBUtility.dll</HintPath>
    </Reference>
    <Reference Include="Interop.grdes6Lib">
      <HintPath>..\DLL\Interop.grdes6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Interop.gregn6Lib">
      <HintPath>..\DLL\Interop.gregn6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Pub_Class, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -72,10 +86,6 @@
    <Reference Include="System.Drawing" />
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
    <Reference Include="TeeChart, Version=3.2.2697.18419, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\NETERP\bin\Debug\TeeChart.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Class1.cs" />
@@ -327,38 +337,6 @@
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <COMReference Include="Axgrdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="Axgregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="grdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="gregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="stdole">
      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
      <VersionMajor>2</VersionMajor>

 WarM/Form3.Designer.cs

New file
@@ -0,0 +1,40 @@

namespace WarM
{
    partial class Form3
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(800, 450);
            this.Text = "Form3";
        }

        #endregion
    }
}

 WarM/Form3.cs

New file
@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Text;
using System.Windows.Forms;

namespace WarM
{
    public partial class Form3 : Form
    {
        public Form3()
        {
            InitializeComponent();
        }
    }
}

 WarM/WarM.csproj

@@ -14,7 +14,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -51,13 +51,27 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="AxInterop.grdes6Lib">
      <HintPath>..\DLL\AxInterop.grdes6Lib.dll</HintPath>
    </Reference>
    <Reference Include="AxInterop.gregn6Lib">
      <HintPath>..\DLL\AxInterop.gregn6Lib.dll</HintPath>
    </Reference>
    <Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\DLL\DBUtility.dll</HintPath>
    </Reference>
    <Reference Include="Interop.Excel, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\NETERP\bin\Debug\Interop.Excel.dll</HintPath>
    <Reference Include="Interop.Excel">
      <HintPath>..\DLL\Interop.Excel.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Interop.grdes6Lib">
      <HintPath>..\DLL\Interop.grdes6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Interop.gregn6Lib">
      <HintPath>..\DLL\Interop.gregn6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Pub_Class, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -84,6 +98,12 @@
    </Compile>
    <Compile Include="Form2.Designer.cs">
      <DependentUpon>Form2.cs</DependentUpon>
    </Compile>
    <Compile Include="Form3.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="Form3.Designer.cs">
      <DependentUpon>Form3.cs</DependentUpon>
    </Compile>
    <Compile Include="FrmPassWord.cs">
      <SubType>Form</SubType>
@@ -651,38 +671,6 @@
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <COMReference Include="Axgrdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="Axgregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="grdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="gregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="stdole">
      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
      <VersionMajor>2</VersionMajor>