diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs
index 9d34a2d..e510077 100644
--- a/AppData/ComLib.cs
+++ b/AppData/ComLib.cs
@@ -1219,14 +1219,99 @@ namespace AppData
/// - dal batch prende i BUNK attivi sulla macchina (posizione 3)
/// - filtra i fogli già lavorati
///
- ///
+ ///
///
- public static SheetWorkList prodGetSheetWorkList(string machineName)
+ public static SheetWorkList prodGetSheetWorkList(string codPost)
{
+ // init out
SheetWorkList answ = null;
+ // recupero batch corrente
+ DS_App.BatchListDataTable currBatch = DataLayer.man.taBL.getCurrentByMachine(codPost);
+ try
+ {
+ if (currBatch != null)
+ {
+ // coem batch DOVREI averne solo 1 in corso...
+ DS_App.BatchListRow batchRow = currBatch[0];
+ // recupero i vari SHEETS del batch...
+ DS_App.SheetListDataTable sheetList = DataLayer.man.taSHL.getByBatch(batchRow.BatchID);
+ answ = convertSheetWorkList(sheetList);
+ }
+ }
+ catch (Exception exc)
+ { }
return answ;
}
+
+ ///
+ /// Rranscodifica dati da format DB a formato PROD
+ ///
+ ///
+ ///
+ private static SheetWorkList convertSheetWorkList(DS_App.SheetListDataTable sheetList)
+ {
+ SheetWorkList answ;
+ List elSheet = new List();
+ string nestBasePath = memLayer.ML.CRS("nestBasePath").ToLower();
+ string servBasePath = memLayer.ML.CRS("servBasePath").ToLower();
+ string prodBasePath = memLayer.ML.CRS("prodBasePath").ToLower();
+ DateTime dataStart = DateTime.Now;
+ ProdSheetExt currPanel;
+ // ciclo elenco fogli x escludere lavorati...
+ foreach (var item in sheetList)
+ {
+ // converto i workData con check null sul campo data
+ WorkData wdPrint = new WorkData()
+ {
+ DtStart = item.IsPrntStartNull() ? null : (DateTime?)item.PrntStart,
+ DtEnd = item.IsPrntEndNull() ? null : (DateTime?)item.PrntEnd,
+ ProgramPath = item.PrintFilePath.ToLower().Replace(nestBasePath, prodBasePath).Replace(servBasePath, prodBasePath)
+ };
+ WorkData wdMachining = new WorkData()
+ {
+ DtStart = item.IsWrkStartNull() ? null : (DateTime?)item.WrkStart,
+ DtEnd = item.IsWrkEndNull() ? null : (DateTime?)item.WrkEnd,
+ ProgramPath = item.CncFilePath.ToLower().Replace(nestBasePath, prodBasePath).Replace(servBasePath, prodBasePath)
+ };
+ WorkData wdUnload = new WorkData()
+ {
+ DtStart = item.IsUnlStartNull() ? null : (DateTime?)item.UnlStart,
+ DtEnd = item.IsUnlEndNull() ? null : (DateTime?)item.UnlEnd
+ };
+ MaterialData material = new MaterialData()
+ {
+ MaterialId = item.MatID,
+ MaterialDescription = item.MatDesc,
+ MaterialPN = item.MatExtCode.ToString()
+ };
+ PStatus currPnlStatus = PStatus.Programmed;
+ Enum.TryParse(item.ShStatus.ToString(), out currPnlStatus);
+ currPanel = new ProdSheetExt()
+ {
+ BunkId = item.StackID,
+ Printing = wdPrint,
+ Machining = wdMachining,
+ Unloading = wdUnload,
+ Material = material,
+ SheetId = item.SheetID,
+ Status = currPnlStatus
+ };
+ elSheet.Add(currPanel);
+ if (!item.IsPrntStartNull())
+ {
+ dataStart = item.PrntStart < dataStart ? item.PrntStart : dataStart;
+ }
+ }
+ // compongo il bunk...
+ answ = new SheetWorkList()
+ {
+ SheetList = elSheet
+ };
+ return answ;
+ }
+
+
///
/// Restituisce il BUNK che è il primo della lista:
/// - posizione = 3 (ho letto da webApp il BUNK e preso in carico)
@@ -1286,7 +1371,6 @@ namespace AppData
}
return answ;
}
-
///
/// Restituisce il PROSSIMO bunk secondo criterio:
/// - posizione = 5 (ho letto da webApp il BUNK e preso in carico)
@@ -1412,7 +1496,6 @@ namespace AppData
};
return answ;
}
-
///
/// Recupera e transcodifica DA DB i dati di UN SINGOLO bunk
///
@@ -1498,7 +1581,6 @@ namespace AppData
}
return answ;
}
-
///
/// Valore dello Stack correntemente in processing per ML (MachineLoad)
///
diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs
index 0f5d5e4..736fe55 100644
--- a/AppData/DS_App.Designer.cs
+++ b/AppData/DS_App.Designer.cs
@@ -16162,7 +16162,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
private void InitCommandCollection() {
- this._commandCollection = new global::System.Data.SqlClient.SqlCommand[15];
+ this._commandCollection = new global::System.Data.SqlClient.SqlCommand[16];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT * FROM v_BatchList";
@@ -16215,47 +16215,53 @@ namespace AppData.DS_AppTableAdapters {
this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PartValid", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[8].Connection = this.Connection;
- this._commandCollection[8].CommandText = "dbo.stp_Batch_getLastByTakt";
+ this._commandCollection[8].CommandText = "dbo.stp_Batch_getCurrentByMachine";
this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[8].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[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodPosition", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[9].Connection = this.Connection;
- this._commandCollection[9].CommandText = "dbo.stp_Batch_getNextAvailable";
+ this._commandCollection[9].CommandText = "dbo.stp_Batch_getLastByTakt";
this._commandCollection[9].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[9].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[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[10] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[10].Connection = this.Connection;
- this._commandCollection[10].CommandText = "dbo.stp_Batch_redoPartValid";
+ this._commandCollection[10].CommandText = "dbo.stp_Batch_getNextAvailable";
this._commandCollection[10].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[10].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[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[11] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[11].Connection = this.Connection;
- this._commandCollection[11].CommandText = "dbo.stp_Batch_resetAllNesting";
+ this._commandCollection[11].CommandText = "dbo.stp_Batch_redoPartValid";
this._commandCollection[11].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[11].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[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[12] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[12].Connection = this.Connection;
- this._commandCollection[12].CommandText = "dbo.stp_Batch_resetPartUnValid";
+ this._commandCollection[12].CommandText = "dbo.stp_Batch_resetAllNesting";
this._commandCollection[12].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[12].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[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[13] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[13].Connection = this.Connection;
- this._commandCollection[13].CommandText = "dbo.stp_Batch_resetTree";
+ this._commandCollection[13].CommandText = "dbo.stp_Batch_resetPartUnValid";
this._commandCollection[13].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[13].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[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[14] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[14].Connection = this.Connection;
- this._commandCollection[14].CommandText = "dbo.stp_Batch_updateStatus";
+ this._commandCollection[14].CommandText = "dbo.stp_Batch_resetTree";
this._commandCollection[14].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[14].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[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EnvNum", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalTime", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[15] = new global::System.Data.SqlClient.SqlCommand();
+ this._commandCollection[15].Connection = this.Connection;
+ this._commandCollection[15].CommandText = "dbo.stp_Batch_updateStatus";
+ this._commandCollection[15].CommandType = global::System.Data.CommandType.StoredProcedure;
+ this._commandCollection[15].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[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EnvNum", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalTime", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -16349,8 +16355,25 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
- public virtual DS_App.BatchListDataTable getLastByTakt(string Takt) {
+ public virtual DS_App.BatchListDataTable getCurrentByMachine(string CodPosition) {
this.Adapter.SelectCommand = this.CommandCollection[8];
+ if ((CodPosition == null)) {
+ this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodPosition));
+ }
+ DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable();
+ this.Adapter.Fill(dataTable);
+ return dataTable;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+ public virtual DS_App.BatchListDataTable getLastByTakt(string Takt) {
+ this.Adapter.SelectCommand = this.CommandCollection[9];
if ((Takt == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
@@ -16367,7 +16390,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_App.BatchListDataTable getNextAvailable() {
- this.Adapter.SelectCommand = this.CommandCollection[9];
+ this.Adapter.SelectCommand = this.CommandCollection[10];
DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
@@ -16501,7 +16524,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int redoPartValid(string Takt) {
- global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[10];
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[11];
if ((Takt == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
}
@@ -16529,7 +16552,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int resetNesting(global::System.Nullable BatchID) {
- global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[11];
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[12];
if ((BatchID.HasValue == true)) {
command.Parameters[1].Value = ((int)(BatchID.Value));
}
@@ -16557,7 +16580,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int resetPartUnValid() {
- global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[12];
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[13];
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -16579,7 +16602,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int resetTree(global::System.Nullable Original_BatchID) {
- global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[13];
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[14];
if ((Original_BatchID.HasValue == true)) {
command.Parameters[1].Value = ((int)(Original_BatchID.Value));
}
@@ -16607,7 +16630,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int updateStatus(global::System.Nullable BatchID, global::System.Nullable Status, string EnvNum, global::System.Nullable TotalTime) {
- global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[14];
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[15];
if ((BatchID.HasValue == true)) {
command.Parameters[1].Value = ((int)(BatchID.Value));
}
diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd
index 1648273..88fea26 100644
--- a/AppData/DS_App.xsd
+++ b/AppData/DS_App.xsd
@@ -120,6 +120,17 @@
+
+
+
+ dbo.stp_Batch_getCurrentByMachine
+
+
+
+
+
+
+
@@ -2305,7 +2316,7 @@ FROM v_CartKitDetail
-
+
@@ -2353,7 +2364,7 @@ FROM v_CartKitDetail
-
+
@@ -2375,7 +2386,7 @@ FROM v_CartKitDetail
-
+
@@ -2430,7 +2441,7 @@ FROM v_CartKitDetail
-
+
@@ -2503,7 +2514,7 @@ FROM v_CartKitDetail
-
+
@@ -2511,7 +2522,7 @@ FROM v_CartKitDetail
-
+
@@ -2580,7 +2591,7 @@ FROM v_CartKitDetail
-
+
@@ -2613,7 +2624,7 @@ FROM v_CartKitDetail
-
+
@@ -2654,7 +2665,7 @@ FROM v_CartKitDetail
-
+
@@ -2673,7 +2684,7 @@ FROM v_CartKitDetail
-
+
@@ -2697,7 +2708,7 @@ FROM v_CartKitDetail
-
+
@@ -2705,7 +2716,7 @@ FROM v_CartKitDetail
-
+
@@ -2722,7 +2733,7 @@ FROM v_CartKitDetail
-
+
@@ -2731,7 +2742,7 @@ FROM v_CartKitDetail
-
+
@@ -2762,7 +2773,7 @@ FROM v_CartKitDetail
-
+
@@ -2770,7 +2781,7 @@ FROM v_CartKitDetail
-
+
@@ -2786,7 +2797,7 @@ FROM v_CartKitDetail
-
+
@@ -2794,7 +2805,7 @@ FROM v_CartKitDetail
-
+
@@ -2822,7 +2833,7 @@ FROM v_CartKitDetail
-
+
@@ -2858,7 +2869,7 @@ FROM v_CartKitDetail
-
+
@@ -2874,7 +2885,7 @@ FROM v_CartKitDetail
-
+
@@ -2884,7 +2895,7 @@ FROM v_CartKitDetail
-
+
@@ -2901,7 +2912,7 @@ FROM v_CartKitDetail
-
+
@@ -2914,7 +2925,7 @@ FROM v_CartKitDetail
-
+
@@ -2964,7 +2975,7 @@ FROM v_CartKitDetail
-
+
@@ -2990,7 +3001,7 @@ FROM v_CartKitDetail
-
+
@@ -3136,18 +3147,18 @@ FROM v_CartKitDetail
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss
index 189f968..34d3d98 100644
--- a/AppData/DS_App.xss
+++ b/AppData/DS_App.xss
@@ -4,18 +4,18 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
-
+
-
+
-
-
-
+
+
+
@@ -25,13 +25,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+