Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dati mancanti su CartDetailIRK

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-26 21:04:43 +02:00
parent cbc617b9bf
commit 516baaa1a8
6 changed files with 92 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppData/DS_App.Designer.cs
Generated
+56 -5
View File
@@ -15463,6 +15463,8 @@ namespace AppData {
private global::System.Data.DataColumn columnCartID;
private global::System.Data.DataColumn columnBatchName;
private global::System.Data.DataColumn columnCartIndex;
private global::System.Data.DataColumn columnCartDtmx;
@@ -15524,6 +15526,14 @@ namespace AppData {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn BatchNameColumn {
get {
return this.columnBatchName;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn CartIndexColumn {
@@ -15609,11 +15619,12 @@ namespace AppData {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public Pack2CartRow AddPack2CartRow(int PackListID, int CartID, int CartIndex, string CartDtmx, string OrderExtCode, string FamilyCode, int Started, int Completed) {
public Pack2CartRow AddPack2CartRow(int PackListID, int CartID, string BatchName, int CartIndex, string CartDtmx, string OrderExtCode, string FamilyCode, int Started, int Completed) {
Pack2CartRow rowPack2CartRow = ((Pack2CartRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
PackListID,
CartID,
BatchName,
CartIndex,
CartDtmx,
OrderExtCode,
@@ -15652,6 +15663,7 @@ namespace AppData {
internal void InitVars() {
this.columnPackListID = base.Columns["PackListID"];
this.columnCartID = base.Columns["CartID"];
this.columnBatchName = base.Columns["BatchName"];
this.columnCartIndex = base.Columns["CartIndex"];
this.columnCartDtmx = base.Columns["CartDtmx"];
this.columnOrderExtCode = base.Columns["OrderExtCode"];
@@ -15667,6 +15679,8 @@ namespace AppData {
base.Columns.Add(this.columnPackListID);
this.columnCartID = new global::System.Data.DataColumn("CartID", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCartID);
this.columnBatchName = new global::System.Data.DataColumn("BatchName", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnBatchName);
this.columnCartIndex = new global::System.Data.DataColumn("CartIndex", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCartIndex);
this.columnCartDtmx = new global::System.Data.DataColumn("CartDtmx", typeof(string), null, global::System.Data.MappingType.Element);
@@ -15684,6 +15698,8 @@ namespace AppData {
this.columnPackListID}, true));
this.columnPackListID.AllowDBNull = false;
this.columnCartID.AllowDBNull = false;
this.columnBatchName.AllowDBNull = false;
this.columnBatchName.MaxLength = 50;
this.columnCartIndex.AllowDBNull = false;
this.columnCartDtmx.ReadOnly = true;
this.columnCartDtmx.MaxLength = 10;
@@ -23163,6 +23179,17 @@ namespace AppData {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string BatchName {
get {
return ((string)(this[this.tablePack2Cart.BatchNameColumn]));
}
set {
this[this.tablePack2Cart.BatchNameColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int CartIndex {
@@ -37330,6 +37357,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W
tableMapping.DataSetTable = "Pack2Cart";
tableMapping.ColumnMappings.Add("PackListID", "PackListID");
tableMapping.ColumnMappings.Add("CartID", "CartID");
tableMapping.ColumnMappings.Add("BatchName", "BatchName");
tableMapping.ColumnMappings.Add("CartIndex", "CartIndex");
tableMapping.ColumnMappings.Add("CartDtmx", "CartDtmx");
tableMapping.ColumnMappings.Add("OrderExtCode", "OrderExtCode");
@@ -37349,17 +37377,23 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W
[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[2];
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_Pack2Cart";
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 = "dbo.stp_P2C_getByPackListId";
this._commandCollection[1].CommandText = "dbo.stp_P2C_getByCartId";
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("@PackListID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CartID", 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 = "dbo.stp_P2C_getByPackListId";
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("@PackListID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -37390,8 +37424,25 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W
[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.Pack2CartDataTable getByPackListId(global::System.Nullable<int> PackListID) {
public virtual DS_App.Pack2CartDataTable getByCartId(global::System.Nullable<int> CartID) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((CartID.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(CartID.Value));
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
DS_App.Pack2CartDataTable dataTable = new DS_App.Pack2CartDataTable();
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.Pack2CartDataTable getByPackListId(global::System.Nullable<int> PackListID) {
this.Adapter.SelectCommand = this.CommandCollection[2];
if ((PackListID.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(PackListID.Value));
}
AppData/DS_App.xsd
+19
View File
@@ -3089,6 +3089,7 @@ FROM v_Pack2Cart</CommandText>
<Mappings>
<Mapping SourceColumn="PackListID" DataSetColumn="PackListID" />
<Mapping SourceColumn="CartID" DataSetColumn="CartID" />
<Mapping SourceColumn="BatchName" DataSetColumn="BatchName" />
<Mapping SourceColumn="CartIndex" DataSetColumn="CartIndex" />
<Mapping SourceColumn="CartDtmx" DataSetColumn="CartDtmx" />
<Mapping SourceColumn="OrderExtCode" DataSetColumn="OrderExtCode" />
@@ -3097,6 +3098,17 @@ FROM v_Pack2Cart</CommandText>
<Mapping SourceColumn="Completed" DataSetColumn="Completed" />
</Mappings>
<Sources>
<DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_P2C_getByCartId" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByCartId" GetMethodModifier="Public" GetMethodName="getByCartId" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByCartId" UserSourceName="getByCartId">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_P2C_getByCartId</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CartID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_P2C_getByPackListId" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByPackListId" GetMethodModifier="Public" GetMethodName="getByPackListId" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByPackListId" UserSourceName="getByPackListId">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
@@ -4401,6 +4413,13 @@ FROM v_Pack2Cart</CommandText>
<xs:sequence>
<xs:element name="PackListID" msprop:Generator_ColumnVarNameInTable="columnPackListID" msprop:Generator_ColumnPropNameInRow="PackListID" msprop:Generator_ColumnPropNameInTable="PackListIDColumn" msprop:Generator_UserColumnName="PackListID" type="xs:int" />
<xs:element name="CartID" msprop:Generator_ColumnVarNameInTable="columnCartID" msprop:Generator_ColumnPropNameInRow="CartID" msprop:Generator_ColumnPropNameInTable="CartIDColumn" msprop:Generator_UserColumnName="CartID" type="xs:int" />
<xs:element name="BatchName" msprop:Generator_ColumnVarNameInTable="columnBatchName" msprop:Generator_ColumnPropNameInRow="BatchName" msprop:Generator_ColumnPropNameInTable="BatchNameColumn" msprop:Generator_UserColumnName="BatchName">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="CartIndex" msprop:Generator_ColumnVarNameInTable="columnCartIndex" msprop:Generator_ColumnPropNameInRow="CartIndex" msprop:Generator_ColumnPropNameInTable="CartIndexColumn" msprop:Generator_UserColumnName="CartIndex" type="xs:int" />
<xs:element name="CartDtmx" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnCartDtmx" msprop:Generator_ColumnPropNameInRow="CartDtmx" msprop:Generator_ColumnPropNameInTable="CartDtmxColumn" msprop:Generator_UserColumnName="CartDtmx" minOccurs="0">
<xs:simpleType>
AppData/DS_App.xss
+2 -2
View File
@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="149" ViewPortY="1028" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="149" ViewPortY="1057" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:BatchList" ZOrder="15" X="291" Y="375" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:StackList" ZOrder="14" X="584" Y="890" Height="381" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
@@ -40,7 +40,7 @@
<Shape ID="DesignTable:OKIB_Sum" ZOrder="8" X="50" Y="1823" Height="362" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:OKOI" ZOrder="5" X="342" Y="1417" Height="324" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:OKOI_sum" ZOrder="4" X="338" Y="1822" Height="362" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Pack2Cart" ZOrder="7" X="919" Y="1805" Height="248" Width="203" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:Pack2Cart" ZOrder="7" X="919" Y="1805" Height="286" Width="203" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:CartIRK" ZOrder="1" X="648" Y="1996" Height="286" Width="188" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
</Shapes>
<Connectors>
NKC_WF/WebUserControls/cmp_cartDetIRK.ascx
+13 -6
View File
@@ -7,19 +7,26 @@
<asp:TemplateField SortExpression="OrderExtCode" ShowHeader="false">
<ItemTemplate>
<div class="row text-center ">
<div class="col-12 col-md-6 ">
order:
<asp:Label ID="OrderExtCodeLabel" runat="server" Text='<%# Eval("OrderExtCode") %>' CssClass="h3" />
<div class="col-12 col-md-3">
req date:
<asp:Label ID="BatchNameLabel" runat="server" Text='<%# Eval("BatchName") %>' CssClass="h4" />
</div>
<div class="col-12 col-md-6">
<asp:Label ID="CartDtmxLabel" runat="server" Text='' CssClass="h4"><b><%# Eval("CartIndex","C{0}") %></b> <%# Eval("CartDtmx") %></asp:Label>
<div class="col-12 col-md-3">
model:<asp:Label ID="FamilyCodeLabel" runat="server" Text='<%# Eval("FamilyCode") %>' CssClass="h4" />
</div>
<div class="col-12 col-md-3">
order:
<asp:Label ID="OrderExtCodeLabel" runat="server" Text='<%# Eval("OrderExtCode") %>' CssClass="h4" />
</div>
<div class="col-12 col-md-3">
cart: <asp:Label ID="CartDtmxLabel" runat="server" Text='' CssClass="h4"><b><%# Eval("CartIndex","C{0}") %></b> <%# Eval("CartDtmx") %></asp:Label>
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
</Fields>
</asp:DetailsView>
<asp:ObjectDataSource ID="odsCart" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="AppData.DS_AppTableAdapters.CartIRKTableAdapter">
<asp:ObjectDataSource ID="odsCart" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByCartId" TypeName="AppData.DS_AppTableAdapters.Pack2CartTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfCartID" DefaultValue="0" Name="CartID" PropertyName="Value" Type="Int32" />
</SelectParameters>
NKC_WF/WebUserControls/cmp_kitReqRunning.ascx
+1 -1
View File
@@ -39,7 +39,7 @@
<ItemStyle Width="5em"></ItemStyle>
</asp:TemplateField>
<%--<asp:BoundField DataField="PackListID" HeaderText="#" ReadOnly="True" SortExpression="PackListID" />--%>
<asp:BoundField DataField="BatchName" HeaderText="Name" SortExpression="Name" />
<asp:BoundField DataField="BatchName" HeaderText="Req Date" SortExpression="Name" />
<asp:BoundField DataField="StatusDesc" HeaderText="Status" ReadOnly="True" SortExpression="StatusDesc" />
<%--<asp:BoundField DataField="ImportDate" HeaderText="Import Date" SortExpression="ImportDate" />--%>
<asp:BoundField DataField="NumCart" HeaderText="Cart #" SortExpression="NumCart" />
NKC_WF/WebUserControls/cmp_kitReqSched.ascx
+1 -2
View File
@@ -47,9 +47,8 @@
<ItemStyle Width="8em"></ItemStyle>
</asp:TemplateField>
<asp:BoundField DataField="BatchName" HeaderText="Name" SortExpression="Name" />
<asp:BoundField DataField="BatchName" HeaderText="Req Date" SortExpression="Name" />
<asp:BoundField DataField="StatusDesc" HeaderText="Status" ReadOnly="True" SortExpression="StatusDesc" />
<%--<asp:BoundField DataField="ImportDate" HeaderText="Import Date" SortExpression="ImportDate" />--%>
<asp:BoundField DataField="NumCart" HeaderText="Cart #" SortExpression="NumCart" />
<asp:TemplateField SortExpression="NumKit">
<HeaderTemplate>