From 9c6aef7ace10b8afacf79c272598d26fb9882362 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期六, 19 二月 2022 20:13:54 +0800
Subject: [PATCH] 111
---
WarM/Form3.Designer.cs | 40 +++
DLL/TeeChart.dll | 0
DLL/NPOI.OpenXml4Net.dll | 0
NETERP/NETERP.csproj | 66 ++---
BLL/Form5.resx | 120 ++++++++++
DLL/NPOI.OOXML.dll | 0
Model/Model.csproj | 2
ProM/ProM.csproj | 48 +--
DLL/Interop.grdes6Lib.dll | 0
BLL/Form5.cs | 18 +
DLL/AxInterop.gregn6Lib.dll | 0
DLL/NPOI.OpenXmlFormats.dll | 0
NETERP/app.config | 2
SelM/SelM.csproj | 52 +---
NETERP/公用/ClsShowMod.cs | 6
AccPayM/AccPayM.csproj | 48 +--
DLL/NPOI.dll | 0
BLL/BLL.csproj | 62 ++---
DLL/Newtonsoft.Json.dll | 0
WarM/WarM.csproj | 60 ++---
DLL/PlanM.dll | 0
BaseSet/BaseSet.csproj | 48 +--
DLL/AxInterop.grdes6Lib.dll | 0
WarM/Form3.cs | 18 +
DLL/OAM.dll | 0
BLL/Form4.Designer.cs | 8
BLL/Form5.Designer.cs | 40 +++
DLL/Interop.Excel.dll | 0
AccRecM/AccRecM.csproj | 48 +--
DLL/Interop.gregn6Lib.dll | 0
DAL/DAL.csproj | 2
31 files changed, 398 insertions(+), 290 deletions(-)
diff --git a/AccPayM/AccPayM.csproj b/AccPayM/AccPayM.csproj
index 0a78de0..6738ec2 100644
--- a/AccPayM/AccPayM.csproj
+++ b/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>
diff --git a/AccRecM/AccRecM.csproj b/AccRecM/AccRecM.csproj
index cd1daa0..fdf07a3 100644
--- a/AccRecM/AccRecM.csproj
+++ b/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>
diff --git a/BLL/BLL.csproj b/BLL/BLL.csproj
index e881474..41ec9dd 100644
--- a/BLL/BLL.csproj
+++ b/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>
diff --git a/BLL/Form4.Designer.cs b/BLL/Form4.Designer.cs
index a3ce734..d0d232a 100644
--- a/BLL/Form4.Designer.cs
+++ b/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);
diff --git a/BLL/Form5.Designer.cs b/BLL/Form5.Designer.cs
new file mode 100644
index 0000000..ea1362a
--- /dev/null
+++ b/BLL/Form5.Designer.cs
@@ -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
+ }
+}
\ No newline at end of file
diff --git a/BLL/Form5.cs b/BLL/Form5.cs
new file mode 100644
index 0000000..6cad4b7
--- /dev/null
+++ b/BLL/Form5.cs
@@ -0,0 +1,18 @@
+锘縰sing 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();
+ }
+ }
+}
diff --git a/BLL/Form5.resx b/BLL/Form5.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/BLL/Form5.resx
@@ -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>
\ No newline at end of file
diff --git a/BaseSet/BaseSet.csproj b/BaseSet/BaseSet.csproj
index 62f2df1..f1180c6 100644
--- a/BaseSet/BaseSet.csproj
+++ b/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>
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index b4fc46d..92a3bf0 100644
--- a/DAL/DAL.csproj
+++ b/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' ">
diff --git a/DLL/AxInterop.grdes6Lib.dll b/DLL/AxInterop.grdes6Lib.dll
new file mode 100644
index 0000000..1a9504a
--- /dev/null
+++ b/DLL/AxInterop.grdes6Lib.dll
Binary files differ
diff --git a/DLL/AxInterop.gregn6Lib.dll b/DLL/AxInterop.gregn6Lib.dll
new file mode 100644
index 0000000..4ff22df
--- /dev/null
+++ b/DLL/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/DLL/Interop.Excel.dll b/DLL/Interop.Excel.dll
new file mode 100644
index 0000000..0e7f72e
--- /dev/null
+++ b/DLL/Interop.Excel.dll
Binary files differ
diff --git a/DLL/Interop.grdes6Lib.dll b/DLL/Interop.grdes6Lib.dll
new file mode 100644
index 0000000..1a5ea73
--- /dev/null
+++ b/DLL/Interop.grdes6Lib.dll
Binary files differ
diff --git a/DLL/Interop.gregn6Lib.dll b/DLL/Interop.gregn6Lib.dll
new file mode 100644
index 0000000..d756550
--- /dev/null
+++ b/DLL/Interop.gregn6Lib.dll
Binary files differ
diff --git a/DLL/NPOI.OOXML.dll b/DLL/NPOI.OOXML.dll
new file mode 100644
index 0000000..a200471
--- /dev/null
+++ b/DLL/NPOI.OOXML.dll
Binary files differ
diff --git a/DLL/NPOI.OpenXml4Net.dll b/DLL/NPOI.OpenXml4Net.dll
new file mode 100644
index 0000000..5034194
--- /dev/null
+++ b/DLL/NPOI.OpenXml4Net.dll
Binary files differ
diff --git a/DLL/NPOI.OpenXmlFormats.dll b/DLL/NPOI.OpenXmlFormats.dll
new file mode 100644
index 0000000..df8708d
--- /dev/null
+++ b/DLL/NPOI.OpenXmlFormats.dll
Binary files differ
diff --git a/DLL/NPOI.dll b/DLL/NPOI.dll
new file mode 100644
index 0000000..907cfb1
--- /dev/null
+++ b/DLL/NPOI.dll
Binary files differ
diff --git a/DLL/Newtonsoft.Json.dll b/DLL/Newtonsoft.Json.dll
new file mode 100644
index 0000000..416bd37
--- /dev/null
+++ b/DLL/Newtonsoft.Json.dll
Binary files differ
diff --git a/DLL/OAM.dll b/DLL/OAM.dll
new file mode 100644
index 0000000..c80dfba
--- /dev/null
+++ b/DLL/OAM.dll
Binary files differ
diff --git a/DLL/PlanM.dll b/DLL/PlanM.dll
new file mode 100644
index 0000000..31eae0f
--- /dev/null
+++ b/DLL/PlanM.dll
Binary files differ
diff --git a/DLL/TeeChart.dll b/DLL/TeeChart.dll
new file mode 100644
index 0000000..f81678b
--- /dev/null
+++ b/DLL/TeeChart.dll
Binary files differ
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 2e2042b..13c3aee 100644
--- a/Model/Model.csproj
+++ b/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' ">
diff --git a/NETERP/NETERP.csproj b/NETERP/NETERP.csproj
index 6c6d733..f1aacd9 100644
--- a/NETERP/NETERP.csproj
+++ b/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>
diff --git a/NETERP/app.config b/NETERP/app.config
index 2fa6e95..fcd0c93 100644
--- a/NETERP/app.config
+++ b/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>
diff --git "a/NETERP/\345\205\254\347\224\250/ClsShowMod.cs" "b/NETERP/\345\205\254\347\224\250/ClsShowMod.cs"
index 80573d5..3d21f9d 100644
--- "a/NETERP/\345\205\254\347\224\250/ClsShowMod.cs"
+++ "b/NETERP/\345\205\254\347\224\250/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();
diff --git a/ProM/ProM.csproj b/ProM/ProM.csproj
index 45027e2..05ffacd 100644
--- a/ProM/ProM.csproj
+++ b/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>
diff --git a/SelM/SelM.csproj b/SelM/SelM.csproj
index a7cba5e..a9af5c9 100644
--- a/SelM/SelM.csproj
+++ b/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>
diff --git a/WarM/Form3.Designer.cs b/WarM/Form3.Designer.cs
new file mode 100644
index 0000000..297401c
--- /dev/null
+++ b/WarM/Form3.Designer.cs
@@ -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
+ }
+}
\ No newline at end of file
diff --git a/WarM/Form3.cs b/WarM/Form3.cs
new file mode 100644
index 0000000..aaa257c
--- /dev/null
+++ b/WarM/Form3.cs
@@ -0,0 +1,18 @@
+锘縰sing 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();
+ }
+ }
+}
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 09a7207..fccab05 100644
--- a/WarM/WarM.csproj
+++ b/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>
--
Gitblit v1.9.1