From 8367eaeda2f9fb15d56726218466ed9f14b5c9e8 Mon Sep 17 00:00:00 2001
From: black-goat-me <226547893@qq.com>
Date: 星期三, 17 五月 2023 17:10:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/ShengWei
---
WorkM/WorkM.csproj | 6 +
DBUtility/DBUtility.csproj | 2
BLL/BLL.csproj | 35 -----
BLL/Form5.resx | 157 ++++++++++++++++++++++++++
APS.sln | 32 ++--
BLL/Form5.cs | 19 +++
BLL/Form5.Designer.cs | 105 +++++++++++++++++
7 files changed, 304 insertions(+), 52 deletions(-)
diff --git a/APS.sln b/APS.sln
index c0f88c9..39116d2 100644
--- a/APS.sln
+++ b/APS.sln
@@ -97,64 +97,64 @@
{DA885755-32A9-493A-AD54-5B7C1D3B54D8}.Release|Any CPU.Build.0 = Release|Any CPU
{DA885755-32A9-493A-AD54-5B7C1D3B54D8}.Release|x86.ActiveCfg = Release|x86
{DA885755-32A9-493A-AD54-5B7C1D3B54D8}.Release|x86.Build.0 = Release|x86
- {B7BA9BE5-0A75-4CEF-BFFB-76FBCD76073B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B7BA9BE5-0A75-4CEF-BFFB-76FBCD76073B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B7BA9BE5-0A75-4CEF-BFFB-76FBCD76073B}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {B7BA9BE5-0A75-4CEF-BFFB-76FBCD76073B}.Debug|Any CPU.Build.0 = Debug|x86
{B7BA9BE5-0A75-4CEF-BFFB-76FBCD76073B}.Debug|x86.ActiveCfg = Debug|x86
{B7BA9BE5-0A75-4CEF-BFFB-76FBCD76073B}.Debug|x86.Build.0 = Debug|x86
{B7BA9BE5-0A75-4CEF-BFFB-76FBCD76073B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B7BA9BE5-0A75-4CEF-BFFB-76FBCD76073B}.Release|Any CPU.Build.0 = Release|Any CPU
{B7BA9BE5-0A75-4CEF-BFFB-76FBCD76073B}.Release|x86.ActiveCfg = Release|x86
{B7BA9BE5-0A75-4CEF-BFFB-76FBCD76073B}.Release|x86.Build.0 = Release|x86
- {609A6A42-C190-4FA1-ADC4-15325F8AA06C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {609A6A42-C190-4FA1-ADC4-15325F8AA06C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {609A6A42-C190-4FA1-ADC4-15325F8AA06C}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {609A6A42-C190-4FA1-ADC4-15325F8AA06C}.Debug|Any CPU.Build.0 = Debug|x86
{609A6A42-C190-4FA1-ADC4-15325F8AA06C}.Debug|x86.ActiveCfg = Debug|x86
{609A6A42-C190-4FA1-ADC4-15325F8AA06C}.Debug|x86.Build.0 = Debug|x86
{609A6A42-C190-4FA1-ADC4-15325F8AA06C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{609A6A42-C190-4FA1-ADC4-15325F8AA06C}.Release|Any CPU.Build.0 = Release|Any CPU
{609A6A42-C190-4FA1-ADC4-15325F8AA06C}.Release|x86.ActiveCfg = Release|x86
{609A6A42-C190-4FA1-ADC4-15325F8AA06C}.Release|x86.Build.0 = Release|x86
- {0BF3D95A-4A7B-45FB-92FB-9A5BB374B750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0BF3D95A-4A7B-45FB-92FB-9A5BB374B750}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0BF3D95A-4A7B-45FB-92FB-9A5BB374B750}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {0BF3D95A-4A7B-45FB-92FB-9A5BB374B750}.Debug|Any CPU.Build.0 = Debug|x86
{0BF3D95A-4A7B-45FB-92FB-9A5BB374B750}.Debug|x86.ActiveCfg = Debug|x86
{0BF3D95A-4A7B-45FB-92FB-9A5BB374B750}.Debug|x86.Build.0 = Debug|x86
{0BF3D95A-4A7B-45FB-92FB-9A5BB374B750}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0BF3D95A-4A7B-45FB-92FB-9A5BB374B750}.Release|Any CPU.Build.0 = Release|Any CPU
{0BF3D95A-4A7B-45FB-92FB-9A5BB374B750}.Release|x86.ActiveCfg = Release|x86
{0BF3D95A-4A7B-45FB-92FB-9A5BB374B750}.Release|x86.Build.0 = Release|x86
- {0A4EF483-D8D3-49A5-8378-974EF7993365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0A4EF483-D8D3-49A5-8378-974EF7993365}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0A4EF483-D8D3-49A5-8378-974EF7993365}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {0A4EF483-D8D3-49A5-8378-974EF7993365}.Debug|Any CPU.Build.0 = Debug|x86
{0A4EF483-D8D3-49A5-8378-974EF7993365}.Debug|x86.ActiveCfg = Debug|x86
{0A4EF483-D8D3-49A5-8378-974EF7993365}.Debug|x86.Build.0 = Debug|x86
{0A4EF483-D8D3-49A5-8378-974EF7993365}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0A4EF483-D8D3-49A5-8378-974EF7993365}.Release|Any CPU.Build.0 = Release|Any CPU
{0A4EF483-D8D3-49A5-8378-974EF7993365}.Release|x86.ActiveCfg = Release|x86
{0A4EF483-D8D3-49A5-8378-974EF7993365}.Release|x86.Build.0 = Release|x86
- {F7838319-779C-4AD9-A59F-5DCB5757F335}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F7838319-779C-4AD9-A59F-5DCB5757F335}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F7838319-779C-4AD9-A59F-5DCB5757F335}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {F7838319-779C-4AD9-A59F-5DCB5757F335}.Debug|Any CPU.Build.0 = Debug|x86
{F7838319-779C-4AD9-A59F-5DCB5757F335}.Debug|x86.ActiveCfg = Debug|x86
{F7838319-779C-4AD9-A59F-5DCB5757F335}.Debug|x86.Build.0 = Debug|x86
{F7838319-779C-4AD9-A59F-5DCB5757F335}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F7838319-779C-4AD9-A59F-5DCB5757F335}.Release|Any CPU.Build.0 = Release|Any CPU
{F7838319-779C-4AD9-A59F-5DCB5757F335}.Release|x86.ActiveCfg = Release|x86
{F7838319-779C-4AD9-A59F-5DCB5757F335}.Release|x86.Build.0 = Release|x86
- {0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Debug|Any CPU.Build.0 = Debug|x86
{0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Debug|x86.ActiveCfg = Debug|x86
{0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Debug|x86.Build.0 = Debug|x86
{0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Release|Any CPU.Build.0 = Release|Any CPU
{0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Release|x86.ActiveCfg = Release|x86
{0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Release|x86.Build.0 = Release|x86
- {F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug|Any CPU.Build.0 = Debug|x86
{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug|x86.ActiveCfg = Debug|x86
{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug|x86.Build.0 = Debug|x86
{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release|Any CPU.Build.0 = Release|Any CPU
{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release|x86.ActiveCfg = Release|x86
{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release|x86.Build.0 = Release|x86
- {081CCAAA-FF0F-4659-B4BE-36BEE053DF0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {081CCAAA-FF0F-4659-B4BE-36BEE053DF0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {081CCAAA-FF0F-4659-B4BE-36BEE053DF0C}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {081CCAAA-FF0F-4659-B4BE-36BEE053DF0C}.Debug|Any CPU.Build.0 = Debug|x86
{081CCAAA-FF0F-4659-B4BE-36BEE053DF0C}.Debug|x86.ActiveCfg = Debug|x86
{081CCAAA-FF0F-4659-B4BE-36BEE053DF0C}.Debug|x86.Build.0 = Debug|x86
{081CCAAA-FF0F-4659-B4BE-36BEE053DF0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/BLL/BLL.csproj b/BLL/BLL.csproj
index 1572780..8088beb 100644
--- a/BLL/BLL.csproj
+++ b/BLL/BLL.csproj
@@ -49,14 +49,6 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="AxInterop.VSFlex7, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>obj\x86\Debug\AxInterop.VSFlex7.dll</HintPath>
- </Reference>
- <Reference Include="Interop.VSFlex7, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>obj\x86\Debug\Interop.VSFlex7.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
<Reference Include="System.Data" />
@@ -71,12 +63,6 @@
<ItemGroup>
<Compile Include="ClsBaseDownSelect.cs" />
<Compile Include="ClsBaseSelect_CLD.cs" />
- <Compile Include="Form4.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Form4.Designer.cs">
- <DependentUpon>Form4.cs</DependentUpon>
- </Compile>
<Compile Include="鍩虹璧勬枡鏂板\Gy_Material_Add.cs">
<SubType>Form</SubType>
</Compile>
@@ -148,7 +134,6 @@
<Compile Include="绯荤粺鍏敤CLS\Class1.cs" />
<Compile Include="绯荤粺鍏敤CLS\ClsBaseSelect_InterFace.cs" />
<Compile Include="绯荤粺鍏敤CLS\ClsDateToNongli.cs" />
- <Compile Include="绯荤粺鍏敤CLS\ClsGridSum.cs" />
<Compile Include="绯荤粺鍏敤CLS\ClsGy_UserGroup_Model.cs" />
<Compile Include="绯荤粺鍏敤CLS\ClsGy_UserGroup_View.cs" />
<Compile Include="绯荤粺鍏敤CLS\ClsK3Pub_BLL.cs" />
@@ -314,10 +299,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="Form4.resx">
- <SubType>Designer</SubType>
- <DependentUpon>Form4.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="鍩虹璧勬枡鏂板\Gy_Material_Add.resx">
<SubType>Designer</SubType>
<DependentUpon>Gy_Material_Add.cs</DependentUpon>
@@ -452,14 +433,6 @@
<WrapperTool>aximp</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
- <COMReference Include="AxVSFlex7">
- <Guid>{D76D7128-4A96-11D3-BD95-D296DC2DD072}</Guid>
- <VersionMajor>1</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>
@@ -490,14 +463,6 @@
<VersionMinor>0</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="VSFlex7">
- <Guid>{D76D7128-4A96-11D3-BD95-D296DC2DD072}</Guid>
- <VersionMajor>1</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
</ItemGroup>
diff --git a/BLL/Form5.Designer.cs b/BLL/Form5.Designer.cs
new file mode 100644
index 0000000..af901ca
--- /dev/null
+++ b/BLL/Form5.Designer.cs
@@ -0,0 +1,105 @@
+锘�
+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()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form5));
+ this.axGRDisplayViewer1 = new Axgregn6Lib.AxGRDisplayViewer();
+ this.axGRDesigner1 = new Axgrdes6Lib.AxGRDesigner();
+ this.axGRDesigner2 = new Axgrdes6Lib.AxGRDesigner();
+ this.axGRPrintViewer1 = new Axgregn6Lib.AxGRPrintViewer();
+ ((System.ComponentModel.ISupportInitialize)(this.axGRDisplayViewer1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.axGRDesigner1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.axGRDesigner2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.axGRPrintViewer1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // axGRDisplayViewer1
+ //
+ this.axGRDisplayViewer1.Enabled = true;
+ this.axGRDisplayViewer1.Location = new System.Drawing.Point(67, 106);
+ this.axGRDisplayViewer1.Name = "axGRDisplayViewer1";
+ this.axGRDisplayViewer1.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("axGRDisplayViewer1.OcxState")));
+ this.axGRDisplayViewer1.Size = new System.Drawing.Size(192, 192);
+ this.axGRDisplayViewer1.TabIndex = 0;
+ //
+ // axGRDesigner1
+ //
+ this.axGRDesigner1.Enabled = true;
+ this.axGRDesigner1.Location = new System.Drawing.Point(332, 116);
+ this.axGRDesigner1.Name = "axGRDesigner1";
+ this.axGRDesigner1.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("axGRDesigner1.OcxState")));
+ this.axGRDesigner1.Size = new System.Drawing.Size(192, 192);
+ this.axGRDesigner1.TabIndex = 1;
+ //
+ // axGRDesigner2
+ //
+ this.axGRDesigner2.Enabled = true;
+ this.axGRDesigner2.Location = new System.Drawing.Point(586, 97);
+ this.axGRDesigner2.Name = "axGRDesigner2";
+ this.axGRDesigner2.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("axGRDesigner2.OcxState")));
+ this.axGRDesigner2.Size = new System.Drawing.Size(98, 155);
+ this.axGRDesigner2.TabIndex = 2;
+ //
+ // axGRPrintViewer1
+ //
+ this.axGRPrintViewer1.Enabled = true;
+ this.axGRPrintViewer1.Location = new System.Drawing.Point(219, 326);
+ this.axGRPrintViewer1.Name = "axGRPrintViewer1";
+ this.axGRPrintViewer1.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("axGRPrintViewer1.OcxState")));
+ this.axGRPrintViewer1.Size = new System.Drawing.Size(219, 60);
+ this.axGRPrintViewer1.TabIndex = 3;
+ //
+ // Form5
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(800, 450);
+ this.Controls.Add(this.axGRPrintViewer1);
+ this.Controls.Add(this.axGRDesigner2);
+ this.Controls.Add(this.axGRDesigner1);
+ this.Controls.Add(this.axGRDisplayViewer1);
+ this.Name = "Form5";
+ this.Text = "Form5";
+ ((System.ComponentModel.ISupportInitialize)(this.axGRDisplayViewer1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.axGRDesigner1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.axGRDesigner2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.axGRPrintViewer1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private Axgregn6Lib.AxGRDisplayViewer axGRDisplayViewer1;
+ private Axgrdes6Lib.AxGRDesigner axGRDesigner1;
+ private Axgrdes6Lib.AxGRDesigner axGRDesigner2;
+ private Axgregn6Lib.AxGRPrintViewer axGRPrintViewer1;
+ }
+}
\ No newline at end of file
diff --git a/BLL/Form5.cs b/BLL/Form5.cs
new file mode 100644
index 0000000..1efb402
--- /dev/null
+++ b/BLL/Form5.cs
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+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..2b8934d
--- /dev/null
+++ b/BLL/Form5.resx
@@ -0,0 +1,157 @@
+锘�<?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>
+ <data name="axGRDisplayViewer1.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0
+ ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAiQAAAAIB
+ AAAAAQAAAAAAAAAAAAAAAHQAAAAACQAAAwABAAAACwABAAsAAQACAAAAAgAAAAIAAAACAAAAAgAAAAsA
+ AAALAAAACwAAAAsAAQALAAAACwAAAAsAAAALAAEACwABAAsAAQATAAUAAIATAA0AAIATAA4AAIALAAAA
+ CwABAAsAAQALAAEAAAAAAAs=
+</value>
+ </data>
+ <data name="axGRDesigner1.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0
+ ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAXQAAAAIB
+ AAAAAQAAAAAAAAAAAAAAAEgAAAAACQAACwAQAAsABAALAAAACwABABMA/////xMA/////wMAAQAAAAsA
+ IAALAAAgAwABAAAAAwAPAAAABQAAAAAAAABZQAAAAAAL
+</value>
+ </data>
+ <data name="axGRDesigner2.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0
+ ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAXQAAAAIB
+ AAAAAQAAAAAAAAAAAAAAAEgAAAAACQAACwAQAAsABAALAAAACwABABMA/////xMA/////wMAAQAAAAsA
+ IAALAAAgAwABAAAAAwAPAAAABQAAAAAAAABZQAAAAAAL
+</value>
+ </data>
+ <data name="axGRPrintViewer1.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0
+ ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAATwAAAAIB
+ AAAAAQAAAAAAAAAAAAAAADoAAAAACQAAAwABAAAAAgADAAIAAgACAGQACwABAAsAAQADAAMAAAADAAEA
+ AAALAAEACwAAAAsAAQAAAAAACw==
+</value>
+ </data>
+</root>
\ No newline at end of file
diff --git a/DBUtility/DBUtility.csproj b/DBUtility/DBUtility.csproj
index b5bea0f..8c60199 100644
--- a/DBUtility/DBUtility.csproj
+++ b/DBUtility/DBUtility.csproj
@@ -51,7 +51,7 @@
<ItemGroup>
<Reference Include="Interop.Excel, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\NetERP\婧愪唬鐮乗HX_MIS\bin\Debug\Interop.Excel.dll</HintPath>
+ <HintPath>..\NETERP\bin\Debug\Interop.Excel.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
diff --git a/WorkM/WorkM.csproj b/WorkM/WorkM.csproj
index f7b55b7..e296906 100644
--- a/WorkM/WorkM.csproj
+++ b/WorkM/WorkM.csproj
@@ -49,6 +49,11 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Interop.Excel, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ <HintPath>bin\x86\Debug\Interop.Excel.dll</HintPath>
+ </Reference>
<Reference Include="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Users\jingh\Desktop\棰滄枃闈橽濉炵撼\NPOI.dll</HintPath>
@@ -504,6 +509,7 @@
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
+ <Private>True</Private>
</COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
--
Gitblit v1.9.1