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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-07-27 16:13:13 +02:00
parent 03f7b865c5 591c653fb6
commit 72c4d9d08d
24 changed files with 473 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppData/DS_App.Designer.cs
Generated
+58 -92
View File
@@ -10022,8 +10022,6 @@ namespace AppData {
private global::System.Data.DataColumn columnCartID;
private global::System.Data.DataColumn columnBatchID;
private global::System.Data.DataColumn columnOrdID;
private global::System.Data.DataColumn columnCartIndex;
@@ -10101,14 +10099,6 @@ namespace AppData {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn BatchIDColumn {
get {
return this.columnBatchID;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn OrdIDColumn {
@@ -10292,7 +10282,6 @@ namespace AppData {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public CartOnKitRow AddCartOnKitRow(
int CartID,
int BatchID,
int OrdID,
int CartIndex,
string CartDtmx,
@@ -10314,7 +10303,6 @@ namespace AppData {
CartOnKitRow rowCartOnKitRow = ((CartOnKitRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
CartID,
BatchID,
OrdID,
CartIndex,
CartDtmx,
@@ -10363,7 +10351,6 @@ namespace AppData {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
internal void InitVars() {
this.columnCartID = base.Columns["CartID"];
this.columnBatchID = base.Columns["BatchID"];
this.columnOrdID = base.Columns["OrdID"];
this.columnCartIndex = base.Columns["CartIndex"];
this.columnCartDtmx = base.Columns["CartDtmx"];
@@ -10389,8 +10376,6 @@ namespace AppData {
private void InitClass() {
this.columnCartID = new global::System.Data.DataColumn("CartID", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCartID);
this.columnBatchID = new global::System.Data.DataColumn("BatchID", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnBatchID);
this.columnOrdID = new global::System.Data.DataColumn("OrdID", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnOrdID);
this.columnCartIndex = new global::System.Data.DataColumn("CartIndex", typeof(int), null, global::System.Data.MappingType.Element);
@@ -10431,7 +10416,6 @@ namespace AppData {
this.columnCartID}, true));
this.columnCartID.AllowDBNull = false;
this.columnCartID.Unique = true;
this.columnBatchID.AllowDBNull = false;
this.columnCartIndex.AllowDBNull = false;
this.columnCartDtmx.ReadOnly = true;
this.columnCartDtmx.MaxLength = 10;
@@ -12842,14 +12826,12 @@ namespace AppData {
[global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
public partial class PackCheckDataTable : global::System.Data.TypedTableBase<PackCheckRow> {
private global::System.Data.DataColumn columnBatchID;
private global::System.Data.DataColumn columnCartID;
private global::System.Data.DataColumn columnBatchName;
private global::System.Data.DataColumn columnOrdID;
private global::System.Data.DataColumn columnCartID;
private global::System.Data.DataColumn columnCartDtmx;
private global::System.Data.DataColumn columnNumTot;
@@ -12895,9 +12877,9 @@ namespace AppData {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn BatchIDColumn {
public global::System.Data.DataColumn CartIDColumn {
get {
return this.columnBatchID;
return this.columnCartID;
}
}
@@ -12917,14 +12899,6 @@ namespace AppData {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn CartIDColumn {
get {
return this.columnCartID;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn CartDtmxColumn {
@@ -13002,13 +12976,12 @@ namespace AppData {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public PackCheckRow AddPackCheckRow(int BatchID, string BatchName, int OrdID, string CartDtmx, int NumTot, int NumProd, int NumKit, int NumPenalty) {
public PackCheckRow AddPackCheckRow(string BatchName, int OrdID, string CartDtmx, int NumTot, int NumProd, int NumKit, int NumPenalty) {
PackCheckRow rowPackCheckRow = ((PackCheckRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
BatchID,
null,
BatchName,
OrdID,
null,
CartDtmx,
NumTot,
NumProd,
@@ -13036,10 +13009,9 @@ namespace AppData {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
internal void InitVars() {
this.columnBatchID = base.Columns["BatchID"];
this.columnCartID = base.Columns["CartID"];
this.columnBatchName = base.Columns["BatchName"];
this.columnOrdID = base.Columns["OrdID"];
this.columnCartID = base.Columns["CartID"];
this.columnCartDtmx = base.Columns["CartDtmx"];
this.columnNumTot = base.Columns["NumTot"];
this.columnNumProd = base.Columns["NumProd"];
@@ -13050,14 +13022,12 @@ namespace AppData {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
private void InitClass() {
this.columnBatchID = new global::System.Data.DataColumn("BatchID", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnBatchID);
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.columnOrdID = new global::System.Data.DataColumn("OrdID", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnOrdID);
this.columnCartID = new global::System.Data.DataColumn("CartID", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCartID);
this.columnCartDtmx = new global::System.Data.DataColumn("CartDtmx", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCartDtmx);
this.columnNumTot = new global::System.Data.DataColumn("NumTot", typeof(int), null, global::System.Data.MappingType.Element);
@@ -13070,13 +13040,13 @@ namespace AppData {
base.Columns.Add(this.columnNumPenalty);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnCartID}, false));
this.columnBatchName.AllowDBNull = false;
this.columnBatchName.MaxLength = 50;
this.columnCartID.AutoIncrement = true;
this.columnCartID.AutoIncrementSeed = -1;
this.columnCartID.AutoIncrementStep = -1;
this.columnCartID.ReadOnly = true;
this.columnCartID.Unique = true;
this.columnBatchName.AllowDBNull = false;
this.columnBatchName.MaxLength = 50;
this.columnCartDtmx.ReadOnly = true;
this.columnCartDtmx.MaxLength = 10;
this.columnNumTot.ReadOnly = true;
@@ -19485,17 +19455,6 @@ namespace AppData {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int BatchID {
get {
return ((int)(this[this.tableCartOnKit.BatchIDColumn]));
}
set {
this[this.tableCartOnKit.BatchIDColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int OrdID {
@@ -20989,17 +20948,17 @@ namespace AppData {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int BatchID {
public int CartID {
get {
try {
return ((int)(this[this.tablePackCheck.BatchIDColumn]));
return ((int)(this[this.tablePackCheck.CartIDColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("Il valore della colonna \'BatchID\' nella tabella \'PackCheck\' è DBNull.", e);
throw new global::System.Data.StrongTypingException("Il valore della colonna \'CartID\' nella tabella \'PackCheck\' è DBNull.", e);
}
}
set {
this[this.tablePackCheck.BatchIDColumn] = value;
this[this.tablePackCheck.CartIDColumn] = value;
}
}
@@ -21030,22 +20989,6 @@ namespace AppData {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int CartID {
get {
try {
return ((int)(this[this.tablePackCheck.CartIDColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("Il valore della colonna \'CartID\' nella tabella \'PackCheck\' è DBNull.", e);
}
}
set {
this[this.tablePackCheck.CartIDColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string CartDtmx {
@@ -21128,14 +21071,14 @@ namespace AppData {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsBatchIDNull() {
return this.IsNull(this.tablePackCheck.BatchIDColumn);
public bool IsCartIDNull() {
return this.IsNull(this.tablePackCheck.CartIDColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetBatchIDNull() {
this[this.tablePackCheck.BatchIDColumn] = global::System.Convert.DBNull;
public void SetCartIDNull() {
this[this.tablePackCheck.CartIDColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -21150,18 +21093,6 @@ namespace AppData {
this[this.tablePackCheck.OrdIDColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsCartIDNull() {
return this.IsNull(this.tablePackCheck.CartIDColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetCartIDNull() {
this[this.tablePackCheck.CartIDColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsCartDtmxNull() {
@@ -30000,7 +29931,7 @@ SELECT KitID, OrdID, BatchID, CartID, KitExtCode FROM KitList WHERE (KitID = @Ki
[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[4];
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT *\r\nFROM KitList";
@@ -30024,6 +29955,12 @@ SELECT KitID, OrdID, BatchID, CartID, KitExtCode FROM KitList WHERE (KitID = @Ki
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("@KitID", 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("@CartID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[4].Connection = this.Connection;
this._commandCollection[4].CommandText = "dbo.stp_KL_updateCartForBin";
this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CartDtmx", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -30245,6 +30182,34 @@ SELECT KitID, OrdID, BatchID, CartID, KitExtCode FROM KitList WHERE (KitID = @Ki
public virtual int Update(int OrdID, int BatchID, int CartID, string KitExtCode, int Original_KitID, int Original_OrdID, int Original_BatchID, int Original_CartID, string Original_KitExtCode) {
return this.Update(OrdID, BatchID, CartID, KitExtCode, Original_KitID, Original_OrdID, Original_BatchID, Original_CartID, Original_KitExtCode, Original_KitID);
}
[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")]
public virtual int updateCartForBin(string CartDtmx) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4];
if ((CartDtmx == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
}
else {
command.Parameters[1].Value = ((string)(CartDtmx));
}
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;
}
}
/// <summary>
@@ -33498,7 +33463,6 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W
tableMapping.SourceTable = "Table";
tableMapping.DataSetTable = "CartOnKit";
tableMapping.ColumnMappings.Add("CartID", "CartID");
tableMapping.ColumnMappings.Add("BatchID", "BatchID");
tableMapping.ColumnMappings.Add("OrdID", "OrdID");
tableMapping.ColumnMappings.Add("CartIndex", "CartIndex");
tableMapping.ColumnMappings.Add("CartDtmx", "CartDtmx");
@@ -33533,7 +33497,10 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_CartKitDetail";
this._commandCollection[0].CommandText = "SELECT OrdID, CartID, CartIndex, CartDtmx, CreationDate, KittingStart, KittingEnd" +
", TotItem, TotItemCart, TotItemBinReq, NumPzBinAvail, NumPzWaiting, OtherQtyReq," +
" OtherQtyCur, OtherQtyWait, OrderExtCode, DestPlant, ModelCode, KitQty FROM v_Ca" +
"rtKitDetail";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
}
@@ -35071,10 +35038,9 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W
global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
tableMapping.SourceTable = "Table";
tableMapping.DataSetTable = "PackCheck";
tableMapping.ColumnMappings.Add("BatchID", "BatchID");
tableMapping.ColumnMappings.Add("CartID", "CartID");
tableMapping.ColumnMappings.Add("BatchName", "BatchName");
tableMapping.ColumnMappings.Add("OrdID", "OrdID");
tableMapping.ColumnMappings.Add("CartID", "CartID");
tableMapping.ColumnMappings.Add("CartDtmx", "CartDtmx");
tableMapping.ColumnMappings.Add("NumTot", "NumTot");
tableMapping.ColumnMappings.Add("NumProd", "NumProd");
AppData/DS_App.xsd
+14 -8
View File
@@ -1583,6 +1583,17 @@ SELECT KitID, OrdID, BatchID, CartID, KitExtCode FROM KitList WHERE (KitID = @Ki
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_KL_updateCartForBin" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateCartForBin" Modifier="Public" Name="updateCartForBin" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="updateCartForBin">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_KL_updateCartForBin</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="nvarchar" DbType="String" Direction="Input" ParameterName="@CartDtmx" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
</Sources>
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="NestingTableAdapter" GeneratorDataComponentClassName="NestingTableAdapter" Name="Nesting" UserDataComponentName="NestingTableAdapter">
@@ -2312,8 +2323,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W
<DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.v_CartKitDetail" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT *
FROM v_CartKitDetail</CommandText>
<CommandText>SELECT OrdID, CartID, CartIndex, CartDtmx, CreationDate, KittingStart, KittingEnd, TotItem, TotItemCart, TotItemBinReq, NumPzBinAvail, NumPzWaiting, OtherQtyReq, OtherQtyCur, OtherQtyWait, OrderExtCode, DestPlant, ModelCode, KitQty FROM v_CartKitDetail</CommandText>
<Parameters />
</DbCommand>
</SelectCommand>
@@ -2321,7 +2331,6 @@ FROM v_CartKitDetail</CommandText>
</MainSource>
<Mappings>
<Mapping SourceColumn="CartID" DataSetColumn="CartID" />
<Mapping SourceColumn="BatchID" DataSetColumn="BatchID" />
<Mapping SourceColumn="OrdID" DataSetColumn="OrdID" />
<Mapping SourceColumn="CartIndex" DataSetColumn="CartIndex" />
<Mapping SourceColumn="CartDtmx" DataSetColumn="CartDtmx" />
@@ -2680,10 +2689,9 @@ FROM v_PackListDet</CommandText>
</DbSource>
</MainSource>
<Mappings>
<Mapping SourceColumn="BatchID" DataSetColumn="BatchID" />
<Mapping SourceColumn="CartID" DataSetColumn="CartID" />
<Mapping SourceColumn="BatchName" DataSetColumn="BatchName" />
<Mapping SourceColumn="OrdID" DataSetColumn="OrdID" />
<Mapping SourceColumn="CartID" DataSetColumn="CartID" />
<Mapping SourceColumn="CartDtmx" DataSetColumn="CartDtmx" />
<Mapping SourceColumn="NumTot" DataSetColumn="NumTot" />
<Mapping SourceColumn="NumProd" DataSetColumn="NumProd" />
@@ -3585,7 +3593,6 @@ FROM v_OKIB</CommandText>
<xs:complexType>
<xs:sequence>
<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="BatchID" msprop:Generator_ColumnVarNameInTable="columnBatchID" msprop:Generator_ColumnPropNameInRow="BatchID" msprop:Generator_ColumnPropNameInTable="BatchIDColumn" msprop:Generator_UserColumnName="BatchID" type="xs:int" />
<xs:element name="OrdID" msprop:Generator_ColumnVarNameInTable="columnOrdID" msprop:Generator_ColumnPropNameInRow="OrdID" msprop:Generator_ColumnPropNameInTable="OrdIDColumn" msprop:Generator_UserColumnName="OrdID" type="xs:int" minOccurs="0" />
<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">
@@ -3922,7 +3929,7 @@ FROM v_OKIB</CommandText>
<xs:element name="PackCheck" msprop:Generator_TableClassName="PackCheckDataTable" msprop:Generator_TableVarName="tablePackCheck" msprop:Generator_RowChangedName="PackCheckRowChanged" msprop:Generator_TablePropName="PackCheck" msprop:Generator_RowDeletingName="PackCheckRowDeleting" msprop:Generator_RowChangingName="PackCheckRowChanging" msprop:Generator_RowEvHandlerName="PackCheckRowChangeEventHandler" msprop:Generator_RowDeletedName="PackCheckRowDeleted" msprop:Generator_RowClassName="PackCheckRow" msprop:Generator_UserTableName="PackCheck" msprop:Generator_RowEvArgName="PackCheckRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="BatchID" msprop:Generator_ColumnVarNameInTable="columnBatchID" msprop:Generator_ColumnPropNameInRow="BatchID" msprop:Generator_ColumnPropNameInTable="BatchIDColumn" msprop:Generator_UserColumnName="BatchID" type="xs:int" minOccurs="0" />
<xs:element name="CartID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnCartID" msprop:Generator_ColumnPropNameInRow="CartID" msprop:Generator_ColumnPropNameInTable="CartIDColumn" msprop:Generator_UserColumnName="CartID" type="xs:int" minOccurs="0" />
<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">
@@ -3931,7 +3938,6 @@ FROM v_OKIB</CommandText>
</xs:simpleType>
</xs:element>
<xs:element name="OrdID" msprop:Generator_ColumnVarNameInTable="columnOrdID" msprop:Generator_ColumnPropNameInRow="OrdID" msprop:Generator_ColumnPropNameInTable="OrdIDColumn" msprop:Generator_UserColumnName="OrdID" type="xs:int" minOccurs="0" />
<xs:element name="CartID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnCartID" msprop:Generator_ColumnPropNameInRow="CartID" msprop:Generator_ColumnPropNameInTable="CartIDColumn" msprop:Generator_UserColumnName="CartID" type="xs:int" minOccurs="0" />
<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>
<xs:restriction base="xs:string">
AppData/DS_App.xss
+12 -12
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="0" ViewPortY="960" 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="-6" ViewPortY="960" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:BatchList" ZOrder="11" X="291" Y="375" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:StackList" ZOrder="10" X="584" Y="890" Height="381" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
@@ -17,7 +17,7 @@
<Shape ID="DesignTable:Carts" ZOrder="23" X="600" Y="340" Height="286" Width="187" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:OfflineOrderList" ZOrder="21" X="939" Y="907" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:OffOrd2Item" ZOrder="43" X="1031" Y="660" Height="134" Width="219" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:KitList" ZOrder="41" X="604" Y="84" Height="229" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:KitList" ZOrder="41" X="612" Y="30" Height="248" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:Nesting" ZOrder="32" X="871" Y="458" Height="153" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:ImportLog" ZOrder="31" X="576" Y="628" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:BinList" ZOrder="35" X="1264" Y="323" Height="134" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
@@ -35,7 +35,7 @@
<Shape ID="DesignTable:ItemSearchDetail" ZOrder="14" X="1476" Y="37" Height="305" Width="244" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:PackListDet" ZOrder="9" X="939" Y="1452" Height="343" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:PackLog" ZOrder="8" X="1235" Y="1638" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
<Shape ID="DesignTable:PackCheck" ZOrder="7" X="644" Y="1492" Height="248" Width="206" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:PackCheck" ZOrder="7" X="644" Y="1492" Height="229" Width="206" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:OKIB" ZOrder="5" X="41" Y="1425" Height="324" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:OKIB_Sum" ZOrder="4" X="50" Y="1823" Height="362" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:OKOI" ZOrder="3" X="342" Y="1417" Height="324" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
@@ -82,12 +82,12 @@
<Connector ID="DesignRelation:FK_ItemList_KitList" ZOrder="40" LineWidth="11">
<RoutePoints>
<Point>
<X>788</X>
<Y>122</Y>
<X>823</X>
<Y>68</Y>
</Point>
<Point>
<X>861</X>
<Y>122</Y>
<Y>68</Y>
</Point>
</RoutePoints>
</Connector>
@@ -106,12 +106,12 @@
<Connector ID="DesignRelation:FK_KitList_Carts" ZOrder="36" LineWidth="11">
<RoutePoints>
<Point>
<X>699</X>
<X>707</X>
<Y>340</Y>
</Point>
<Point>
<X>699</X>
<Y>313</Y>
<X>707</X>
<Y>278</Y>
</Point>
</RoutePoints>
</Connector>
@@ -119,11 +119,11 @@
<RoutePoints>
<Point>
<X>550</X>
<Y>151</Y>
<Y>97</Y>
</Point>
<Point>
<X>604</X>
<Y>151</Y>
<X>612</X>
<Y>97</Y>
</Point>
</RoutePoints>
</Connector>
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=296']) {
withEnv(['NEXT_BUILD_NUMBER=298']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs
+4
View File
@@ -164,6 +164,10 @@ namespace NKC_WF.WebUserControls
tryImport(false);
}
processValidation();
if(imported)
{
raiseReset();
}
}
}
}
NKC_WF/WebUserControls/cmp_kitting.ascx.cs
+6
View File
@@ -8,5 +8,11 @@ namespace NKC_WF.WebUserControls
{
}
public void doUpdate()
{
cmp_kittingBin.doUpdate();
cmp_kittingCart.doUpdate();
}
}
}
NKC_WF/WebUserControls/cmp_kittingBin.ascx
+2 -4
View File
@@ -42,10 +42,8 @@
<div class="col-4 text-left">
Qty:
</div>
<div class="col-8 text-right"><asp:Label ID="lblTotItem" runat="server" Text='<%# Eval("TotItem") %>' />
/
<b>
<asp:Label ID="lblTotItemLoad" runat="server" Text='<%# Eval("TotItemLoad") %>' /></b>
<div class="col-8 text-right">
<b><asp:Label ID="lblTotItemLoad" runat="server" Text='<%# Eval("TotItemLoad") %>' /></b> / <asp:Label ID="lblTotItem" runat="server" Text='<%# Eval("TotItem") %>' />
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_kittingBin.ascx.cs
+5
View File
@@ -8,5 +8,10 @@ namespace NKC_WF.WebUserControls
{
}
public void doUpdate()
{
repBins.DataBind();
}
}
}
NKC_WF/WebUserControls/cmp_kittingCart.ascx.cs
+5
View File
@@ -34,5 +34,10 @@ namespace NKC_WF.WebUserControls
}
return answ;
}
public void doUpdate()
{
repCarts.DataBind();
}
}
}
NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs
+3 -1
View File
@@ -282,7 +282,7 @@ namespace NKC_WF.WebUserControls
var tabLog = DataLayer.man.taPLog.getByCartId(codeInt);
if (tabLog.Count > 0)
{
// verifico se sia completo -_> reset... altrimenti lascio così...
// verifico se sia completo --> reset... altrimenti lascio così...
var tabCOK = DataLayer.man.taCOK.GetData();
// cerco se sia "green" numWait + numReady + numOtherWait = 0
var tabGreen = tabCOK.Where(x => (x.NumPzWaiting + x.NumPzBinAvail + x.OtherQtyWait == 0) && x.CartDtmx == rawData).ToList();
@@ -327,6 +327,8 @@ namespace NKC_WF.WebUserControls
DataLayer.man.taPLog.acquireCart(rawData, currIpAddress(), user_std.UtSn.userNameAD);
displInfo($"OK: CART acquired {rawData} - item confirmed", true);
lastObject = "";
// eseguo comando x spostare i PAINT nel cart corretto...
DataLayer.man.taKL.updateCartForBin(rawData);
}
else
{
NKC_WF/site/KitRequestImporter.aspx
+13 -6
View File
@@ -17,13 +17,20 @@
<uc1:cmp_fileUpload runat="server" ID="cmp_fileUpload" isWriteEnabled="true" forceRedirect="false" />
<hr />
</div>
<div class="col-12">
<uc1:cmp_kitImpCheck runat="server" ID="cmp_kitImpCheck" />
</div>
<div class="col-12" runat="server" id="divKitList">
<uc1:cmp_kitList runat="server" ID="cmp_kitList" />
</div>
</div>
<asp:UpdatePanel ID="UpdatePanel1" runat="server">
<ContentTemplate>
<div class="row">
<div class="col-12">
<uc1:cmp_kitImpCheck runat="server" ID="cmp_kitImpCheck" />
</div>
<div class="col-12" runat="server" id="divKitList">
<uc1:cmp_kitList runat="server" ID="cmp_kitList" />
</div>
<asp:Timer ID="Timer1" runat="server" Interval="2000" OnTick="Timer1_Tick"></asp:Timer>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</div>
</div>
</div>
NKC_WF/site/KitRequestImporter.aspx.cs
+10 -1
View File
@@ -20,15 +20,20 @@ namespace NKC_WF
{
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
doUpdate();
cmp_kitImpCheck.Visible = false;
}
cmp_kitImpCheck.eh_doRefresh += Cmp_kitImpCheck_eh_doRefresh;
cmp_kitImpCheck.eh_doReset += cmp_kitImpCheck_eh_doReset;
cmp_fileUpload.eh_doRefresh += Cmp_fileUpload_eh_doRefresh;
cmp_fileUpload.eh_FileUploaded += Cmp_fileUpload_eh_FileUploaded;
}
private void cmp_kitImpCheck_eh_doReset(object sender, EventArgs e)
{
Response.Redirect(Request.RawUrl);
}
private void Cmp_kitImpCheck_eh_doRefresh(object sender, EventArgs e)
{
doUpdate();
@@ -74,5 +79,9 @@ namespace NKC_WF
{
cmp_kitList.doUpdate();
}
protected void Timer1_Tick(object sender, EventArgs e)
{
doUpdate();
}
}
}
NKC_WF/site/KitRequestImporter.aspx.designer.cs
Generated
+53 -35
View File
@@ -11,43 +11,61 @@ namespace NKC_WF
{
public partial class KitRequestImporter
{
public partial class KitRequestImporter
{
/// <summary>
/// Controllo cmp_fileUpload.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserContols.cmp_fileUpload cmp_fileUpload;
/// <summary>
/// Controllo cmp_fileUpload.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserContols.cmp_fileUpload cmp_fileUpload;
/// <summary>
/// Controllo cmp_kitImpCheck.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_kitImpCheck cmp_kitImpCheck;
/// <summary>
/// Controllo UpdatePanel1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel UpdatePanel1;
/// <summary>
/// Controllo divKitList.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divKitList;
/// <summary>
/// Controllo cmp_kitImpCheck.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_kitImpCheck cmp_kitImpCheck;
/// <summary>
/// Controllo cmp_kitList.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_kitList cmp_kitList;
}
/// <summary>
/// Controllo divKitList.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divKitList;
/// <summary>
/// Controllo cmp_kitList.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_kitList cmp_kitList;
/// <summary>
/// Controllo Timer1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.Timer Timer1;
}
}
NKC_WF/site/Kitting.aspx
+9 -4
View File
@@ -6,8 +6,13 @@
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="m-2">
<uc1:cmp_kitRunning runat="server" id="cmp_kitRunning" />
<uc1:cmp_kitting runat="server" ID="cmp_kitting" />
</div>
<asp:Timer ID="timerKitting" runat="server" Interval="1000" OnTick="timerKitting_Tick"></asp:Timer>
<asp:UpdatePanel runat="server" ID="UpdatePanel2" UpdateMode="Conditional">
<ContentTemplate>
<div class="m-2">
<uc1:cmp_kitRunning runat="server" ID="cmp_kitRunning" />
<uc1:cmp_kitting runat="server" ID="cmp_kitting" />
</div>
</ContentTemplate>
</asp:UpdatePanel>
</asp:Content>
NKC_WF/site/Kitting.aspx.cs
+6
View File
@@ -12,5 +12,11 @@ namespace NKC_WF.site
((SiteMaster)this.Master).showSearch = false;
}
}
protected void timerKitting_Tick(object sender, EventArgs e)
{
cmp_kitRunning.doUpdate();
cmp_kitting.doUpdate();
}
}
}
NKC_WF/site/Kitting.aspx.designer.cs
Generated
+18
View File
@@ -14,6 +14,24 @@ namespace NKC_WF.site
public partial class Kitting
{
/// <summary>
/// Controllo timerKitting.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.Timer timerKitting;
/// <summary>
/// Controllo UpdatePanel2.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel UpdatePanel2;
/// <summary>
/// Controllo cmp_kitRunning.
/// </summary>
NKC_WF/site/MachineLoad.aspx
+31 -20
View File
@@ -4,26 +4,37 @@
<%@ Register Src="~/WebUserControls/cmp_ML_ShDet.ascx" TagPrefix="uc1" TagName="cmp_ML_ShDet" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="card text-center" style="width: 100%;">
<h3 class="card-header"><%: traduci("MachineLoad") %></h3>
<div class="card-body py-1">
<div class="row">
<div class="col-12 mb-2">
<uc1:cmp_stackLoading runat="server" ID="cmp_stackLoading" />
<asp:Timer ID="timerLoad" runat="server" Interval="2000" OnTick="timerLoad_Tick"></asp:Timer>
<div class="card text-center" style="width: 100%;">
<h3 class="card-header"><%: traduci("MachineLoad") %></h3>
<div class="card-body py-1">
<asp:UpdatePanel runat="server" ID="upnlBCode" UpdateMode="Conditional" ChildrenAsTriggers="true">
<ContentTemplate>
<div class="row">
<div class="col-12 mb-2">
<uc1:cmp_stackLoading runat="server" ID="cmp_stackLoading" />
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
<asp:UpdatePanel runat="server" ID="upnlLoad" UpdateMode="Always">
<ContentTemplate>
<div class="row">
<div class="col-3">
<uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet" StatusReqStart="0" StatusReqEnd="0" />
</div>
<div class="col-3">
<uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet1" StatusReqStart="1" StatusReqEnd="2" />
</div>
<div class="col-3">
<uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet2" StatusReqStart="3" StatusReqEnd="4" />
</div>
<div class="col-3">
<uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet3" StatusReqStart="5" StatusReqEnd="5" />
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</div>
<div class="col-3">
<uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet" StatusReqStart="0" StatusReqEnd="0" />
</div>
<div class="col-3">
<uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet1" StatusReqStart="1" StatusReqEnd="2" />
</div>
<div class="col-3">
<uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet2" StatusReqStart="3" StatusReqEnd="4" />
</div>
<div class="col-3">
<uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet3" StatusReqStart="5" StatusReqEnd="5" />
</div>
</div>
</div>
</div>
</asp:Content>
NKC_WF/site/MachineLoad.aspx.cs
+6 -2
View File
@@ -9,8 +9,8 @@ namespace NKC_WF
if (!Page.IsPostBack)
{
((SiteContent)this.Master).showSearch = false;
forceRefresh();
}
forceRefresh();
cmp_stackLoading.eh_doRefresh += Cmp_stackLoading_eh_doRefresh;
}
@@ -25,11 +25,15 @@ namespace NKC_WF
cmp_ML_ShDet1.BatchId = cmp_stackLoading.BatchIdCurr;
cmp_ML_ShDet2.BatchId = cmp_stackLoading.BatchIdCurr;
cmp_ML_ShDet3.BatchId = cmp_stackLoading.BatchIdCurr;
// refresh vari!
cmp_ML_ShDet.doUpdate();
cmp_ML_ShDet1.doUpdate();
cmp_ML_ShDet2.doUpdate();
cmp_ML_ShDet3.doUpdate();
}
protected void timerLoad_Tick(object sender, EventArgs e)
{
forceRefresh();
}
}
}
NKC_WF/site/MachineLoad.aspx.designer.cs
Generated
+38 -9
View File
@@ -7,11 +7,31 @@
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace NKC_WF {
public partial class MachineLoad {
namespace NKC_WF
{
public partial class MachineLoad
{
/// <summary>
/// Controllo timerLoad.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.Timer timerLoad;
/// <summary>
/// Controllo upnlBCode.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel upnlBCode;
/// <summary>
/// Controllo cmp_stackLoading.
/// </summary>
@@ -20,7 +40,16 @@ namespace NKC_WF {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_stackLoading cmp_stackLoading;
/// <summary>
/// Controllo upnlLoad.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel upnlLoad;
/// <summary>
/// Controllo cmp_ML_ShDet.
/// </summary>
@@ -29,7 +58,7 @@ namespace NKC_WF {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_ML_ShDet cmp_ML_ShDet;
/// <summary>
/// Controllo cmp_ML_ShDet1.
/// </summary>
@@ -38,7 +67,7 @@ namespace NKC_WF {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_ML_ShDet cmp_ML_ShDet1;
/// <summary>
/// Controllo cmp_ML_ShDet2.
/// </summary>
@@ -47,7 +76,7 @@ namespace NKC_WF {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_ML_ShDet cmp_ML_ShDet2;
/// <summary>
/// Controllo cmp_ML_ShDet3.
/// </summary>
NKC_WF/site/MachineUnload.aspx
+43 -25
View File
@@ -8,30 +8,48 @@
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfSheetID" runat="server" />
<asp:UpdatePanel runat="server" ID="upnlDrawings">
<ContentTemplate>
<div class="mx-0">
<div class="card text-center" style="width: 100%;">
<h4 class="card-header bg-secondary text-light"><%: traduci("MachineUnload") %> <sub>(<%: hfBatchID.Value %>)</sub></h4>
<div class="card-body py-1 bg-dark">
<uc1:cmp_MU_stats runat="server" ID="cmp_MU_stats" />
<div class="row">
<div class="col-2 pr-0">
<uc1:cmp_MU_bins runat="server" ID="cmp_MU_bins" />
</div>
<div class="col-8 py-0 my-0 px-0">
<uc1:cmp_MU_svgViewer runat="server" id="cmp_MU_svgViewer" />
</div>
<div class="col-2 pl-0">
<uc1:cmp_MU_carts runat="server" ID="cmp_MU_carts" />
</div>
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfSheetID" runat="server" />
<asp:Timer ID="timerSvg" runat="server" Interval="5000" OnTick="timerSvg_Tick"></asp:Timer>
<asp:UpdatePanel runat="server" ID="UpdatePanel2" UpdateMode="Conditional">
<ContentTemplate>
<div class="mx-0">
<div class="card text-center" style="width: 100%;">
<h4 class="card-header bg-secondary text-light"><%: traduci("MachineUnload") %> <sub>(<%: hfBatchID.Value %>)</sub></h4>
<div class="card-body py-1 bg-dark">
<asp:UpdatePanel runat="server" ID="upnlStats" UpdateMode="Always">
<ContentTemplate>
<uc1:cmp_MU_stats runat="server" ID="cmp_MU_stats" />
<asp:Timer ID="timerStats" runat="server" OnTick="timerStats_Tick" Interval="3000"></asp:Timer>
</ContentTemplate>
</asp:UpdatePanel>
<div class="row">
<div class="col-2 pr-0">
<asp:UpdatePanel runat="server" ID="upnlBins" UpdateMode="Always">
<ContentTemplate>
<uc1:cmp_MU_bins runat="server" ID="cmp_MU_bins" />
</ContentTemplate>
</asp:UpdatePanel>
</div>
<div class="col-8 py-0 my-0 px-0">
<asp:UpdatePanel runat="server" ID="upnlDrawings" UpdateMode="Conditional">
<ContentTemplate>
<uc1:cmp_MU_svgViewer runat="server" ID="cmp_MU_svgViewer" />
</ContentTemplate>
</asp:UpdatePanel>
</div>
<div class="col-2 pl-0">
<asp:UpdatePanel runat="server" ID="upnlCarts" UpdateMode="Always">
<ContentTemplate>
<uc1:cmp_MU_carts runat="server" ID="cmp_MU_carts" />
</ContentTemplate>
</asp:UpdatePanel>
</div>
</div>
<uc1:cmp_MU_suggestions runat="server" ID="cmp_MU_suggestions" Visible="false" />
</div>
</div>
</div>
<uc1:cmp_MU_suggestions runat="server" id="cmp_MU_suggestions" Visible="false"/>
</div>
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</ContentTemplate>
</asp:UpdatePanel>
</asp:Content>
NKC_WF/site/MachineUnload.aspx.cs
+12
View File
@@ -80,5 +80,17 @@ namespace NKC_WF
BatchId = 0;
}
}
protected void timerStats_Tick(object sender, EventArgs e)
{
cmp_MU_stats.doUpdate();
cmp_MU_bins.doUpdate();
cmp_MU_carts.doUpdate();
}
protected void timerSvg_Tick(object sender, EventArgs e)
{
doUpdate();
}
}
}
NKC_WF/site/MachineUnload.aspx.designer.cs
Generated
+121 -67
View File
@@ -11,79 +11,133 @@ namespace NKC_WF
{
public partial class MachineUnload
{
public partial class MachineUnload
{
/// <summary>
/// Controllo hfBatchID.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfBatchID;
/// <summary>
/// Controllo hfBatchID.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfBatchID;
/// <summary>
/// Controllo hfSheetID.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfSheetID;
/// <summary>
/// Controllo hfSheetID.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfSheetID;
/// <summary>
/// Controllo upnlDrawings.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel upnlDrawings;
/// <summary>
/// Controllo timerSvg.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.Timer timerSvg;
/// <summary>
/// Controllo cmp_MU_stats.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_MU_stats cmp_MU_stats;
/// <summary>
/// Controllo UpdatePanel2.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel UpdatePanel2;
/// <summary>
/// Controllo cmp_MU_bins.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_MU_bins cmp_MU_bins;
/// <summary>
/// Controllo upnlStats.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel upnlStats;
/// <summary>
/// Controllo cmp_MU_svgViewer.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_MU_svgViewer cmp_MU_svgViewer;
/// <summary>
/// Controllo cmp_MU_stats.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_MU_stats cmp_MU_stats;
/// <summary>
/// Controllo cmp_MU_carts.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_MU_carts cmp_MU_carts;
/// <summary>
/// Controllo timerStats.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.Timer timerStats;
/// <summary>
/// Controllo cmp_MU_suggestions.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_MU_suggestions cmp_MU_suggestions;
}
/// <summary>
/// Controllo upnlBins.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel upnlBins;
/// <summary>
/// Controllo cmp_MU_bins.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_MU_bins cmp_MU_bins;
/// <summary>
/// Controllo upnlDrawings.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel upnlDrawings;
/// <summary>
/// Controllo cmp_MU_svgViewer.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_MU_svgViewer cmp_MU_svgViewer;
/// <summary>
/// Controllo upnlCarts.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel upnlCarts;
/// <summary>
/// Controllo cmp_MU_carts.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_MU_carts cmp_MU_carts;
/// <summary>
/// Controllo cmp_MU_suggestions.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_MU_suggestions cmp_MU_suggestions;
}
}
NKC_WF/site/OrderManager.aspx
+1 -1
View File
@@ -11,7 +11,7 @@
</div>
<div class="card-body">
<div class="row">
<div class="col-12 mb-2">
<div class="col-12">
<uc1:cmp_fileUpload runat="server" ID="cmp_fileUpload" isWriteEnabled="true" />
</div>
<div class="col-12" runat="server" id="divBatchList">
NKC_WF/site/OrderManager.aspx.cs
+2 -1
View File
@@ -163,7 +163,8 @@ namespace NKC_WF
catch
{ }
}
doUpdate();
Response.Redirect(Request.RawUrl);
//doUpdate();
}
/// <summary>
/// Effettua validazione dati