diff --git a/Project/EETGW.csproj b/Project/EETGW.csproj index e603372..2e09c9e 100644 --- a/Project/EETGW.csproj +++ b/Project/EETGW.csproj @@ -167,8 +167,30 @@ ..\packages\Microsoft.Owin.Hosting.4.1.1\lib\net45\Microsoft.Owin.Hosting.dll - - + + ..\packages\Microsoft.ReportViewer.11.0.3366.16\lib\Microsoft.ReportViewer.Common.dll + + + ..\packages\Microsoft.ReportViewer.11.0.3366.16\lib\Microsoft.ReportViewer.DataVisualization.DLL + + + ..\packages\Microsoft.ReportViewer.11.0.3366.16\lib\Microsoft.ReportViewer.Design.DLL + + + ..\packages\Microsoft.ReportViewer.11.0.3366.16\lib\Microsoft.ReportViewer.ProcessingObjectModel.DLL + + + ..\packages\Microsoft.ReportViewer.11.0.3366.16\lib\Microsoft.ReportViewer.WebDesign.DLL + + + ..\packages\Microsoft.ReportViewer.11.0.3366.16\lib\Microsoft.ReportViewer.WebForms.DLL + + + ..\packages\Microsoft.ReportViewer.11.0.3366.16\lib\Microsoft.ReportViewer.WinForms.DLL + + + ..\packages\Microsoft.SqlServer.Types.11.0.1\lib\net20\Microsoft.SqlServer.Types.dll + ..\packages\Owin.1.0\lib\net40\Owin.dll @@ -319,6 +341,7 @@ + AdoNetEFMain.tt @@ -514,6 +537,22 @@ + + SqlServerTypes\x64\msvcr100.dll + Always + + + SqlServerTypes\x64\SqlServerSpatial110.dll + Always + + + SqlServerTypes\x86\msvcr100.dll + Always + + + SqlServerTypes\x86\SqlServerSpatial110.dll + Always + TextTemplatingFileGenerator AdoNetEFMain.edmx @@ -529,6 +568,7 @@ PreserveNewest + diff --git a/Project/Program.cs b/Project/Program.cs index e9ea626..e086bca 100644 --- a/Project/Program.cs +++ b/Project/Program.cs @@ -15,8 +15,9 @@ namespace Project { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - // Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException); - // AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); + SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory); + // Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException); + // AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); Application.Run(new fMain()); } diff --git a/Project/SqlServerTypes/Loader.cs b/Project/SqlServerTypes/Loader.cs new file mode 100644 index 0000000..8911029 --- /dev/null +++ b/Project/SqlServerTypes/Loader.cs @@ -0,0 +1,45 @@ +using System; +using System.IO; +using System.Runtime.InteropServices; + +namespace SqlServerTypes +{ + /// + /// Utility methods related to CLR Types for SQL Server + /// + internal class Utilities + { + [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] + private static extern IntPtr LoadLibrary(string libname); + + /// + /// Loads the required native assemblies for the current architecture (x86 or x64) + /// + /// + /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications + /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. + /// + public static void LoadNativeAssemblies(string rootApplicationPath) + { + var nativeBinaryPath = IntPtr.Size > 4 + ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") + : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); + + LoadNativeAssembly(nativeBinaryPath, "msvcr100.dll"); + LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial110.dll"); + } + + private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) + { + var path = Path.Combine(nativeBinaryPath, assemblyName); + var ptr = LoadLibrary(path); + if (ptr == IntPtr.Zero) + { + throw new Exception(string.Format( + "Error loading {0} (ErrorCode: {1})", + assemblyName, + Marshal.GetLastWin32Error())); + } + } + } +} \ No newline at end of file diff --git a/Project/SqlServerTypes/readme.htm b/Project/SqlServerTypes/readme.htm new file mode 100644 index 0000000..1f4b224 --- /dev/null +++ b/Project/SqlServerTypes/readme.htm @@ -0,0 +1,39 @@ + + + + Microsoft.SqlServer.Types + + + +
+

Action required to load native assemblies

+

+ To deploy an application that uses spatial data types to a machine that does not have 'System CLR Types for SQL Server' installed you also need to deploy the native assembly SqlServerSpatial110.dll. Both x86 (32 bit) and x64 (64 bit) versions of this assembly have been added to your project under the SqlServerTypes\x86 and SqlServerTypes\x64 subdirectories. The native assembly msvcr100.dll is also included in case the C++ runtime is not installed. +

+

+ You need to add code to load the correct one of these assemblies at runtime (depending on the current architecture). +

+

ASP.NET applications

+

+ For ASP.NET applications, add the following line of code to the Application_Start method in Global.asax.cs: +

    SqlServerTypes.Utilities.LoadNativeAssemblies(Server.MapPath("~/bin"));
+

+

Desktop applications

+

+ For desktop applications, add the following line of code to run before any spatial operations are performed: +

    SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);
+

+
+ + \ No newline at end of file diff --git a/Project/packages.config b/Project/packages.config index d8488cb..baad00f 100644 --- a/Project/packages.config +++ b/Project/packages.config @@ -11,5 +11,7 @@ + + \ No newline at end of file diff --git a/SubProject/FCM0000/fCode.Designer.cs b/SubProject/FCM0000/fCode.Designer.cs index c8d96be..57f591a 100644 --- a/SubProject/FCM0000/fCode.Designer.cs +++ b/SubProject/FCM0000/fCode.Designer.cs @@ -59,6 +59,7 @@ this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ta = new FCM0000.dsMSSQLTableAdapters.CommonTableAdapter(); this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager(); + this.title가져오기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); @@ -75,7 +76,7 @@ this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel1.Name = "panel1"; this.panel1.Padding = new System.Windows.Forms.Padding(5); - this.panel1.Size = new System.Drawing.Size(685, 48); + this.panel1.Size = new System.Drawing.Size(706, 48); this.panel1.TabIndex = 0; // // cmbList @@ -87,7 +88,7 @@ this.cmbList.Location = new System.Drawing.Point(5, 5); this.cmbList.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cmbList.Name = "cmbList"; - this.cmbList.Size = new System.Drawing.Size(675, 37); + this.cmbList.Size = new System.Drawing.Size(696, 37); this.cmbList.TabIndex = 0; this.cmbList.SelectedIndexChanged += new System.EventHandler(this.cmbList_SelectedIndexChanged); // @@ -114,14 +115,14 @@ this.commonBindingNavigatorSaveItem, this.toolStripSeparator1, this.toolStripButton1}); - this.bn.Location = new System.Drawing.Point(0, 576); + this.bn.Location = new System.Drawing.Point(0, 522); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(685, 25); + this.bn.Size = new System.Drawing.Size(706, 25); this.bn.TabIndex = 1; this.bn.Text = "bindingNavigator1"; // @@ -192,6 +193,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -241,7 +243,8 @@ // toolStripButton1 // this.toolStripButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.코드일괄생성ToolStripMenuItem}); + this.코드일괄생성ToolStripMenuItem, + this.title가져오기ToolStripMenuItem}); this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; @@ -274,7 +277,7 @@ this.commonDataGridView.Location = new System.Drawing.Point(0, 48); this.commonDataGridView.Name = "commonDataGridView"; this.commonDataGridView.RowTemplate.Height = 23; - this.commonDataGridView.Size = new System.Drawing.Size(685, 528); + this.commonDataGridView.Size = new System.Drawing.Size(706, 474); this.commonDataGridView.TabIndex = 3; // // dataGridViewTextBoxColumn3 @@ -331,11 +334,18 @@ this.tam.StaffTableAdapter = null; this.tam.UpdateOrder = FCM0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // + // title가져오기ToolStripMenuItem + // + this.title가져오기ToolStripMenuItem.Name = "title가져오기ToolStripMenuItem"; + this.title가져오기ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.title가져오기ToolStripMenuItem.Text = "Title 가져오기"; + this.title가져오기ToolStripMenuItem.Click += new System.EventHandler(this.title가져오기ToolStripMenuItem_Click); + // // fCode // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(685, 601); + this.ClientSize = new System.Drawing.Size(706, 547); this.Controls.Add(this.commonDataGridView); this.Controls.Add(this.bn); this.Controls.Add(this.panel1); @@ -390,5 +400,6 @@ private System.Windows.Forms.ToolStripDropDownButton toolStripButton1; private System.Windows.Forms.ToolStripMenuItem 코드일괄생성ToolStripMenuItem; private System.Windows.Forms.ToolStripLabel toolStripLabel6; + private System.Windows.Forms.ToolStripMenuItem title가져오기ToolStripMenuItem; } } \ No newline at end of file diff --git a/SubProject/FCM0000/fCode.cs b/SubProject/FCM0000/fCode.cs index a97b6ae..369c093 100644 --- a/SubProject/FCM0000/fCode.cs +++ b/SubProject/FCM0000/fCode.cs @@ -24,7 +24,7 @@ namespace FCM0000 e.Row["wuid"] = FCOMMON.info.Login.no; e.Row["wdate"] = DateTime.Now; string grp = "99"; - if (this.cmbList.SelectedIndex > 0 ) + if (this.cmbList.SelectedIndex > 0) { var title = cmbList.Text.Split(']'); grp = title[0].Substring(1); @@ -36,8 +36,10 @@ namespace FCM0000 { this.Show(); Application.DoEvents(); - // this.TopMost=true; - // this.Activate(); + + toolStripButton1.Visible = FCOMMON.info.Login.no == "dev"; + // this.TopMost=true; + // this.Activate(); cmbList_SelectedIndexChanged(null, null); } void RefreshCodeList() @@ -61,7 +63,7 @@ namespace FCM0000 } try { - this.ta.Fill(this.dsMSSQL.Common, grp,FCOMMON.info.Login.gcode ); + this.ta.Fill(this.dsMSSQL.Common, grp, FCOMMON.info.Login.gcode); this.dsMSSQL.Common.AcceptChanges(); } catch (Exception ex) @@ -85,7 +87,7 @@ namespace FCM0000 private void cmbList_SelectedIndexChanged(object sender, EventArgs e) { - if(this.dsMSSQL.HasChanges()) + if (this.dsMSSQL.HasChanges()) { var dlg = FCOMMON.Util.MsgQ( "변경된 자료가 손실됩니다.\n\n" + @@ -96,18 +98,47 @@ namespace FCM0000 { RefreshCodeList(); RefreshCodeData(); - } - else if(cmbList.SelectedIndex > 0) + } + else if (cmbList.SelectedIndex > 0) RefreshCodeData(); } private void 코드일괄생성ToolStripMenuItem_Click(object sender, EventArgs e) { - var drows = this.dsMSSQL.Common.Select(this.bs.Filter,"memo"); - for (int i = 1; i<= drows.Length;i++) + var drows = this.dsMSSQL.Common.Select(this.bs.Filter, "memo"); + for (int i = 1; i <= drows.Length; i++) { drows[i - 1]["code"] = i.ToString("000"); } } + + private void title가져오기ToolStripMenuItem_Click(object sender, EventArgs e) + { + var f = new FCOMMON.fInputTextBox(); + if (f.ShowDialog() == DialogResult.OK) + { + var data = f.textBox1.Text.Trim(); + data = data.Replace("\r", ""); + var lines = data.Split(new string[] { "\n" }, StringSplitOptions.RemoveEmptyEntries); + + var dlg = FCOMMON.Util.MsgQ(lines.Count().ToString() + "건의 자료가 있습니다. 입력할까요?"); + if (dlg == DialogResult.Yes) + { + foreach (var item in lines) + { + if (item.Trim().Equals("")) continue; + + if(this.dsMSSQL.Common.Where(t=>t.memo == item.Trim()).Any()==false) + { + var newdr = this.dsMSSQL.Common.NewCommonRow(); + newdr.memo = item; + this.dsMSSQL.Common.AddCommonRow(newdr); + } + } + } + + + } + } } } diff --git a/SubProject/FCOMMON/FCOMMON.csproj b/SubProject/FCOMMON/FCOMMON.csproj index cecc2d9..4cdff26 100644 --- a/SubProject/FCOMMON/FCOMMON.csproj +++ b/SubProject/FCOMMON/FCOMMON.csproj @@ -90,6 +90,12 @@ fFTPExplorer.cs + + Form + + + fInputTextBox.cs + Form @@ -135,6 +141,9 @@ fFTPExplorer.cs + + fInputTextBox.cs + fLovDateList.cs diff --git a/SubProject/FCOMMON/fInputTextBox.Designer.cs b/SubProject/FCOMMON/fInputTextBox.Designer.cs new file mode 100644 index 0000000..300b2e4 --- /dev/null +++ b/SubProject/FCOMMON/fInputTextBox.Designer.cs @@ -0,0 +1,75 @@ + +namespace FCOMMON +{ + partial class fInputTextBox + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.textBox1 = new System.Windows.Forms.TextBox(); + this.button1 = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // textBox1 + // + this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.textBox1.Location = new System.Drawing.Point(0, 0); + this.textBox1.Multiline = true; + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(636, 526); + this.textBox1.TabIndex = 0; + // + // button1 + // + this.button1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.button1.Location = new System.Drawing.Point(0, 526); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(636, 72); + this.button1.TabIndex = 1; + this.button1.Text = "button1"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // fInputTextBox + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(636, 598); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.button1); + this.Name = "fInputTextBox"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "fInputTextBox"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private System.Windows.Forms.Button button1; + public System.Windows.Forms.TextBox textBox1; + } +} \ No newline at end of file diff --git a/SubProject/FCOMMON/fInputTextBox.cs b/SubProject/FCOMMON/fInputTextBox.cs new file mode 100644 index 0000000..9ad4b63 --- /dev/null +++ b/SubProject/FCOMMON/fInputTextBox.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace FCOMMON +{ + public partial class fInputTextBox : Form + { + public fInputTextBox() + { + InitializeComponent(); + } + + private void button1_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.OK; + } + } +} diff --git a/SubProject/FCOMMON/fInputTextBox.resx b/SubProject/FCOMMON/fInputTextBox.resx new file mode 100644 index 0000000..29dcb1b --- /dev/null +++ b/SubProject/FCOMMON/fInputTextBox.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SubProject/FEQ0000/Equipment/rpt_equipmentB.cs b/SubProject/FEQ0000/Equipment/rpt_equipmentB.cs index 2bc3174..a421f1e 100644 --- a/SubProject/FEQ0000/Equipment/rpt_equipmentB.cs +++ b/SubProject/FEQ0000/Equipment/rpt_equipmentB.cs @@ -1,59 +1,60 @@ -using 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 FEQ0000 -{ - public partial class rpt_equipmentB : Form - { - fEquipment.eTabletype imptype = fEquipment.eTabletype.MOLD; - string pdate = string.Empty; - public rpt_equipmentB(fEquipment.eTabletype type_, string dateStr) - { - InitializeComponent(); - pdate = dateStr; - imptype = type_; - } - - private void rpt_equipment_Load(object sender, EventArgs e) - { - this.Text = string.Format("Data Report({0})",this.imptype); - this.Show(); - Application.DoEvents(); - - this.rpv1.PageCountMode = Microsoft.Reporting.WinForms.PageCountMode.Actual; - this.rpv1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth; - - //Set DataSource - Microsoft.Reporting.WinForms.ReportDataSource DsEQ = new Microsoft.Reporting.WinForms.ReportDataSource(); - DsEQ.Name = "DataSet1"; - - switch (imptype) - { - case fEquipment.eTabletype.FOL: - this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportF.rdlc"; - taF.Fill(this.dsEQ.vEquStockF, this.pdate); - DsEQ.Value = this.dsEQ.vEquStockF; - break; - case fEquipment.eTabletype.BUMP: - this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportB.rdlc"; - taB.Fill(this.dsEQ.vEquStockB, this.pdate); - DsEQ.Value = this.dsEQ.vEquStockB; - break; - case fEquipment.eTabletype.MOLD: - this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportE.rdlc"; - taE.Fill(this.dsEQ.vEquStockME, this.pdate); - DsEQ.Value = this.dsEQ.vEquStockME; - break; - } - - this.rpv1.LocalReport.DataSources.Add(DsEQ); - this.rpv1.RefreshReport(); - } - } -} +using 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 FEQ0000 +{ + public partial class rpt_equipmentB : Form + { + fEquipment.eTabletype imptype = fEquipment.eTabletype.MOLD; + string pdate = string.Empty; + public rpt_equipmentB(fEquipment.eTabletype type_, string dateStr) + { + //SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory); + InitializeComponent(); + pdate = dateStr; + imptype = type_; + } + + private void rpt_equipment_Load(object sender, EventArgs e) + { + this.Text = string.Format("Data Report({0})",this.imptype); + this.Show(); + Application.DoEvents(); + + this.rpv1.PageCountMode = Microsoft.Reporting.WinForms.PageCountMode.Actual; + this.rpv1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth; + + //Set DataSource + Microsoft.Reporting.WinForms.ReportDataSource DsEQ = new Microsoft.Reporting.WinForms.ReportDataSource(); + DsEQ.Name = "DataSet1"; + + switch (imptype) + { + case fEquipment.eTabletype.FOL: + this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportF.rdlc"; + taF.Fill(this.dsEQ.vEquStockF, this.pdate); + DsEQ.Value = this.dsEQ.vEquStockF; + break; + case fEquipment.eTabletype.BUMP: + this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportB.rdlc"; + taB.Fill(this.dsEQ.vEquStockB, this.pdate); + DsEQ.Value = this.dsEQ.vEquStockB; + break; + case fEquipment.eTabletype.MOLD: + this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportE.rdlc"; + taE.Fill(this.dsEQ.vEquStockME, this.pdate); + DsEQ.Value = this.dsEQ.vEquStockME; + break; + } + + this.rpv1.LocalReport.DataSources.Add(DsEQ); + this.rpv1.RefreshReport(); + } + } +} diff --git a/SubProject/FEQ0000/FEQ0000.csproj b/SubProject/FEQ0000/FEQ0000.csproj index 049aaa1..fdc1c4f 100644 --- a/SubProject/FEQ0000/FEQ0000.csproj +++ b/SubProject/FEQ0000/FEQ0000.csproj @@ -56,8 +56,30 @@ True - - + + ..\..\packages\Microsoft.ReportViewer.11.0.3366.16\lib\Microsoft.ReportViewer.Common.dll + + + ..\..\packages\Microsoft.ReportViewer.11.0.3366.16\lib\Microsoft.ReportViewer.DataVisualization.DLL + + + ..\..\packages\Microsoft.ReportViewer.11.0.3366.16\lib\Microsoft.ReportViewer.Design.DLL + + + ..\..\packages\Microsoft.ReportViewer.11.0.3366.16\lib\Microsoft.ReportViewer.ProcessingObjectModel.DLL + + + ..\..\packages\Microsoft.ReportViewer.11.0.3366.16\lib\Microsoft.ReportViewer.WebDesign.DLL + + + ..\..\packages\Microsoft.ReportViewer.11.0.3366.16\lib\Microsoft.ReportViewer.WebForms.DLL + + + ..\..\packages\Microsoft.ReportViewer.11.0.3366.16\lib\Microsoft.ReportViewer.WinForms.DLL + + + ..\..\packages\Microsoft.SqlServer.Types.11.0.1\lib\net20\Microsoft.SqlServer.Types.dll + ..\..\packages\NetOfficeFw.Core.1.7.4.5\lib\net40\NetOffice.dll @@ -221,6 +243,7 @@ rPurchase.cs + EQFilterApply.cs @@ -356,6 +379,25 @@
+ + + SqlServerTypes\x64\msvcr100.dll + Always + + + SqlServerTypes\x64\SqlServerSpatial110.dll + Always + + + SqlServerTypes\x86\msvcr100.dll + Always + + + SqlServerTypes\x86\SqlServerSpatial110.dll + Always + + +