diff --git a/C2P/DiesGroupMan.aspx b/C2P/DiesGroupMan.aspx index 9515405..deb132e 100644 --- a/C2P/DiesGroupMan.aspx +++ b/C2P/DiesGroupMan.aspx @@ -2,8 +2,6 @@ <%@ Register Src="~/WebUserControls/mod_DiesGroupMan.ascx" TagPrefix="uc1" TagName="mod_DiesGroupMan" %> - - diff --git a/C2P/TranspCostMan.aspx b/C2P/TranspCostMan.aspx index 415a707..672b250 100644 --- a/C2P/TranspCostMan.aspx +++ b/C2P/TranspCostMan.aspx @@ -1 +1,17 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="TranspCostMan.aspx.cs" Inherits="C2P.TranspCostMan" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.Master" AutoEventWireup="true" CodeBehind="TranspCostMan.aspx.cs" Inherits="C2P.TranspCostMan" %> + +<%@ Register Src="~/WebUserControls/mod_TranspCostMan.ascx" TagPrefix="uc1" TagName="mod_TranspCostMan" %> + + + + + + +
+
+
+ +
+
+
+ diff --git a/C2P/TranspCostMan.aspx.designer.cs b/C2P/TranspCostMan.aspx.designer.cs index 904e4fd..55bcd67 100644 --- a/C2P/TranspCostMan.aspx.designer.cs +++ b/C2P/TranspCostMan.aspx.designer.cs @@ -3,15 +3,22 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace C2P -{ - - - public partial class TranspCostMan - { +namespace C2P { + + + public partial class TranspCostMan { + + /// + /// mod_TranspCostMan control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::C2P.WebUserControls.mod_TranspCostMan mod_TranspCostMan; } } diff --git a/C2P/WebUserControls/mod_TranspCostMan.ascx b/C2P/WebUserControls/mod_TranspCostMan.ascx new file mode 100644 index 0000000..9fdc876 --- /dev/null +++ b/C2P/WebUserControls/mod_TranspCostMan.ascx @@ -0,0 +1,64 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_TranspCostMan.ascx.cs" Inherits="C2P.WebUserControls.mod_TranspCostMan" %> + +<%@ Register Src="~/WebUserControls/mod_fileUploader.ascx" TagName="mod_fileUploader" TagPrefix="uc1" %> + +
+
+
+
+
+

<%: traduci("HTranspCostManTitle") %>

+
+ <%: traduci("HTranspCostManRepBody") %> +
+
+
+
+
+
+
+
+
+

<%: traduci("StepA") %>

+
+
+

<%: traduci("HTranspCostManStepA") %>

+
+
+
+ + + +
+ <%: traduci("TranspCostFile") %> +
+ +
+
+
+
+
+
+
+

<%: traduci("StepB") %>

+
+
+

<%: traduci("HTranspCostManStepB") %>

+
+
+
+ + <%: traduci("WaitingForFile") %> +
+
+ +
+
+
+
+
+
+
+
+
+
diff --git a/C2P/WebUserControls/mod_TranspCostMan.ascx.cs b/C2P/WebUserControls/mod_TranspCostMan.ascx.cs new file mode 100644 index 0000000..1f4ee60 --- /dev/null +++ b/C2P/WebUserControls/mod_TranspCostMan.ascx.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; +using C2P_Data; + +namespace C2P.WebUserControls +{ + public partial class mod_TranspCostMan : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + mod_fileUploader1.eh_uploadDone += mod_fileUploader1_eh_uploadDone; + } + + /// + /// file caricato + /// + /// + /// + void mod_fileUploader1_eh_uploadDone(object sender, EventArgs e) + { + // caricato file su server, PROVA ad eseguire import tabella + string fileName = "TranspCostRaw"; + string uplDir = memLayer.ML.confReadString("uplDir"); + string FIELDTERMINATOR = memLayer.ML.confReadString("FIELDTERMINATOR"); + string ROWTERMINATOR = memLayer.ML.confReadString("ROWTERMINATOR"); + string FIRSTROW = memLayer.ML.confReadString("FIRSTROW"); + string CODEPAGE = memLayer.ML.confReadString("CODEPAGE"); + bool flgUpdate = memLayer.ML.confReadBool("flgUpdate"); + int numTicket = 0; // Convert.ToInt32(DateTime.Now.ToString("yyMMddHHmm")); + try + { + DtProxy.man.taTCD.import(fileName, uplDir, "TranspCostRaw.csv", FIELDTERMINATOR, ROWTERMINATOR, FIRSTROW, CODEPAGE, "errorTranspCost.log", numTicket); + } + catch + { } + try + { + DtProxy.man.taTCD.convert(fileName, numTicket); + } + catch + { } + try + { + DtProxy.man.taTCD.merge(fileName, numTicket, flgUpdate); + } + catch + { } + lblUploadDone.Text = string.Format("Upload and Import done for {0}", fileName); + logger.lg.scriviLog(lblUploadDone.Text, tipoLog.INFO); + } + + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + } +} \ No newline at end of file diff --git a/C2P/WebUserControls/mod_TranspCostMan.ascx.designer.cs b/C2P/WebUserControls/mod_TranspCostMan.ascx.designer.cs new file mode 100644 index 0000000..bbb6ca6 --- /dev/null +++ b/C2P/WebUserControls/mod_TranspCostMan.ascx.designer.cs @@ -0,0 +1,78 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace C2P.WebUserControls { + + + public partial class mod_TranspCostMan { + + /// + /// divHelp control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHelp; + + /// + /// divAnalisys control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divAnalisys; + + /// + /// HyperLink2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink HyperLink2; + + /// + /// div1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl div1; + + /// + /// mod_fileUploader1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::C2P.WebUserControls.mod_fileUploader mod_fileUploader1; + + /// + /// lblOut control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblOut; + + /// + /// lblUploadDone control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblUploadDone; + } +} diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 9d4821d..6015871 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index f106359..b0b4d79 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P_CronJob/bin/Release/C2P_CronJob.application b/C2P_CronJob/bin/Release/C2P_CronJob.application index 8af4e45..3f52b6b 100644 --- a/C2P_CronJob/bin/Release/C2P_CronJob.application +++ b/C2P_CronJob/bin/Release/C2P_CronJob.application @@ -11,7 +11,7 @@ - scdH882AFFsw9qODgLh5duMYeOY= + O5FovlmJ/n2mXM2o3WHZb2hnIfk= diff --git a/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest b/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest index 48c9ff2..29fcd78 100644 --- a/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest +++ b/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest @@ -84,19 +84,19 @@ - 9Co0gwc4OUj8X4I1+YFJDq4o77A= + axoa00lLoJ5Y8SyJpyJCceGbdFc= - + - H0p40cT6cWtx9w3KeH6cGReWot4= + ha2Yz7MQoahBf632pg6rITGlGSU= diff --git a/C2P_CronJob/bin/Release/C2P_Data.dll b/C2P_CronJob/bin/Release/C2P_Data.dll index f106359..b0b4d79 100644 Binary files a/C2P_CronJob/bin/Release/C2P_Data.dll and b/C2P_CronJob/bin/Release/C2P_Data.dll differ diff --git a/C2P_Data/DS_Utility.Designer.cs b/C2P_Data/DS_Utility.Designer.cs index 617021c..383cb4c 100644 --- a/C2P_Data/DS_Utility.Designer.cs +++ b/C2P_Data/DS_Utility.Designer.cs @@ -15293,11 +15293,40 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT TranspZone, TranspCost FROM dbo.TranspCostDet"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = "tmp.stp_convertTranspCostRaw"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fileType", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumTicket", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = "tmp.stp_importTranspCostRaw"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fileType", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@filePath", global::System.Data.SqlDbType.NVarChar, 4000, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@FileName", global::System.Data.SqlDbType.NVarChar, 400, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@FIELDTERMINATOR", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ROWTERMINATOR", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@FIRSTROW", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CODEPAGE", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ERRORFILE", global::System.Data.SqlDbType.NVarChar, 4000, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumTicket", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[3].Connection = this.Connection; + this._commandCollection[3].CommandText = "ext.stp_mergeTranspCostDet"; + this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@source", global::System.Data.SqlDbType.NVarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumTicket", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@flgUpdate", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -15451,6 +15480,156 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone public virtual int Update(decimal TranspCost, string Original_TranspZone, decimal Original_TranspCost) { return this.Update(Original_TranspZone, TranspCost, Original_TranspZone, Original_TranspCost); } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int convert(string fileType, global::System.Nullable NumTicket) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((fileType == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(fileType)); + } + if ((NumTicket.HasValue == true)) { + command.Parameters[2].Value = ((int)(NumTicket.Value)); + } + else { + command.Parameters[2].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int import(string fileType, string filePath, string FileName, string FIELDTERMINATOR, string ROWTERMINATOR, string FIRSTROW, string CODEPAGE, string ERRORFILE, global::System.Nullable NumTicket) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + if ((fileType == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(fileType)); + } + if ((filePath == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(filePath)); + } + if ((FileName == null)) { + command.Parameters[3].Value = global::System.DBNull.Value; + } + else { + command.Parameters[3].Value = ((string)(FileName)); + } + if ((FIELDTERMINATOR == null)) { + command.Parameters[4].Value = global::System.DBNull.Value; + } + else { + command.Parameters[4].Value = ((string)(FIELDTERMINATOR)); + } + if ((ROWTERMINATOR == null)) { + command.Parameters[5].Value = global::System.DBNull.Value; + } + else { + command.Parameters[5].Value = ((string)(ROWTERMINATOR)); + } + if ((FIRSTROW == null)) { + command.Parameters[6].Value = global::System.DBNull.Value; + } + else { + command.Parameters[6].Value = ((string)(FIRSTROW)); + } + if ((CODEPAGE == null)) { + command.Parameters[7].Value = global::System.DBNull.Value; + } + else { + command.Parameters[7].Value = ((string)(CODEPAGE)); + } + if ((ERRORFILE == null)) { + command.Parameters[8].Value = global::System.DBNull.Value; + } + else { + command.Parameters[8].Value = ((string)(ERRORFILE)); + } + if ((NumTicket.HasValue == true)) { + command.Parameters[9].Value = ((int)(NumTicket.Value)); + } + else { + command.Parameters[9].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int merge(string source, global::System.Nullable NumTicket, global::System.Nullable flgUpdate) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; + if ((source == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(source)); + } + if ((NumTicket.HasValue == true)) { + command.Parameters[2].Value = ((int)(NumTicket.Value)); + } + else { + command.Parameters[2].Value = global::System.DBNull.Value; + } + if ((flgUpdate.HasValue == true)) { + command.Parameters[3].Value = ((bool)(flgUpdate.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } } /// diff --git a/C2P_Data/DS_Utility.xsd b/C2P_Data/DS_Utility.xsd index 784d6cd..a747800 100644 --- a/C2P_Data/DS_Utility.xsd +++ b/C2P_Data/DS_Utility.xsd @@ -838,7 +838,7 @@ SELECT CodDiesGroup, Price, QtyTot, QtyEOL, ExpLife, EOLLife FROM DiesGroupDet W - + tmp.stp_convertDiesGroupRaw @@ -850,7 +850,7 @@ SELECT CodDiesGroup, Price, QtyTot, QtyEOL, ExpLife, EOLLife FROM DiesGroupDet W - + tmp.stp_importDiesGroupRaw @@ -930,7 +930,52 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + + + + + tmp.stp_convertTranspCostRaw + + + + + + + + + + + + tmp.stp_importTranspCostRaw + + + + + + + + + + + + + + + + + + + ext.stp_mergeTranspCostDet + + + + + + + + + + @@ -940,7 +985,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -960,7 +1005,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -980,7 +1025,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -1000,7 +1045,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -1020,7 +1065,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -1040,7 +1085,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -1070,7 +1115,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -1091,7 +1136,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -1111,7 +1156,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -1131,7 +1176,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -1151,7 +1196,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -1163,14 +1208,14 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + - + @@ -1182,7 +1227,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -1196,14 +1241,14 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + - + @@ -1238,7 +1283,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -1258,7 +1303,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -1291,7 +1336,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -1322,7 +1367,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -1342,7 +1387,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + @@ -1360,7 +1405,7 @@ SELECT TranspZone, TranspCost FROM TranspCostDet WHERE (TranspZone = @TranspZone - + diff --git a/C2P_Data/DS_Utility.xss b/C2P_Data/DS_Utility.xss index a5f1eca..3db8e19 100644 --- a/C2P_Data/DS_Utility.xss +++ b/C2P_Data/DS_Utility.xss @@ -17,7 +17,7 @@ - + @@ -27,7 +27,7 @@ - + \ No newline at end of file diff --git a/C2P_Data/bin/Release/C2P_Data.dll b/C2P_Data/bin/Release/C2P_Data.dll index f106359..b0b4d79 100644 Binary files a/C2P_Data/bin/Release/C2P_Data.dll and b/C2P_Data/bin/Release/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index f106359..b0b4d79 100644 Binary files a/C2P_Report/bin/C2P_Data.dll and b/C2P_Report/bin/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index cbe467c..dc30576 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ