Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'TAB' into MAG

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-01-11 19:21:59 +01:00
parent ee8519fd64 1e83a56e68
commit 122b5703b6
20 changed files with 314 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1360']) {
withEnv(['NEXT_BUILD_NUMBER=1362']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-MAG/BasePage.cs
+45
View File
@@ -0,0 +1,45 @@
using MapoDb;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace MP_MAG
{
public class BasePage : UserPage
{
#region Internal Fields
/// <summary>
/// Oggetto datalayer specifico
/// </summary>
internal DataLayer DataLayerObj = new DataLayer();
#endregion Internal Fields
#region Public Methods
/// <summary>
/// effettua traduzione del lemma
/// </summary>
/// <param name="lemma"></param>
/// <returns></returns>
public string traduci(string lemma)
{
return user_std.UtSn.Traduci(lemma);
}
/// <summary>
/// effettua traduzione in inglese del lemma
/// </summary>
/// <param name="lemma"></param>
/// <returns></returns>
public string traduciEn(string lemma)
{
return user_std.UtSn.TraduciEn(lemma);
}
#endregion Public Methods
}
}
MP-MAG/BaseUserControl.cs
+15
View File
@@ -1,4 +1,5 @@
using MagData;
using MapoDb;
using Newtonsoft.Json;
using SteamWare;
using System;
@@ -10,6 +11,20 @@ namespace MP_MAG
{
public class BaseUserControl : System.Web.UI.UserControl
{
#region Internal Fields
/// <summary>
/// Oggetto datalayer specifico
/// </summary>
internal DataLayer DataLayerObj = new DataLayer();
/// <summary>
/// Oggetto datalayer specifico
/// </summary>
internal MagDataLayer MagDataLayerObj = new MagDataLayer();
#endregion Internal Fields
#region Public Events
/// <summary>
MP-MAG/MP-MAG.csproj
+25 -5
View File
@@ -274,6 +274,9 @@
<Compile Include="Areas\HelpPage\SampleGeneration\SampleDirection.cs" />
<Compile Include="Areas\HelpPage\SampleGeneration\TextSample.cs" />
<Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" />
<Compile Include="BasePage.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="BaseUserControl.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
@@ -284,6 +287,13 @@
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
<Compile Include="jumper.aspx.cs">
<DependentUpon>jumper.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="jumper.aspx.designer.cs">
<DependentUpon>jumper.aspx</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Site.Master.cs">
<DependentUpon>Site.Master</DependentUpon>
@@ -306,12 +316,12 @@
<Compile Include="SMART\EnrollDevice.aspx.designer.cs">
<DependentUpon>EnrollDevice.aspx</DependentUpon>
</Compile>
<Compile Include="SMART\jumper.ascx.cs">
<DependentUpon>jumper.ascx</DependentUpon>
<Compile Include="SMART\jumper.aspx.cs">
<DependentUpon>jumper.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SMART\jumper.ascx.designer.cs">
<DependentUpon>jumper.ascx</DependentUpon>
<Compile Include="SMART\jumper.aspx.designer.cs">
<DependentUpon>jumper.aspx</DependentUpon>
</Compile>
<Compile Include="SMART\login.aspx.cs">
<DependentUpon>login.aspx</DependentUpon>
@@ -439,6 +449,13 @@
<Compile Include="WebUserControls\cmp_footer.ascx.designer.cs">
<DependentUpon>cmp_footer.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_jumper.ascx.cs">
<DependentUpon>cmp_jumper.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_jumper.ascx.designer.cs">
<DependentUpon>cmp_jumper.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_menuTop.ascx.cs">
<DependentUpon>cmp_menuTop.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -660,12 +677,14 @@
<Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\CollectionModelDescription.cshtml" />
<Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\ApiGroup.cshtml" />
<Content Include="Areas\HelpPage\Views\Help\Api.cshtml" />
<Content Include="images\favicon.ico" />
<Content Include="images\favicon.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="images\LogoHighResWhite.png" />
<Content Include="images\LogoSteamware.png" />
<Content Include="images\SteamwareLogo.png" />
<Content Include="jumper.aspx" />
<Content Include="Resources\ChangeLog.html">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -740,7 +759,7 @@
<Content Include="Reports\queueConf.json" />
<Content Include="SMART\Default.aspx" />
<Content Include="SMART\EnrollDevice.aspx" />
<Content Include="SMART\jumper.ascx" />
<Content Include="SMART\jumper.aspx" />
<Content Include="SMART\login.aspx" />
<Content Include="SMART\packList.aspx" />
<Content Include="SMART\PLScanner.aspx" />
@@ -761,6 +780,7 @@
<Content Include="WebUserControls\cmp_elencoPedane.ascx" />
<Content Include="WebUserControls\cmp_elencoUDC.ascx" />
<Content Include="WebUserControls\cmp_footer.ascx" />
<Content Include="WebUserControls\cmp_jumper.ascx" />
<Content Include="WebUserControls\cmp_menuTop.ascx" />
<Content Include="WebUserControls\cmp_numRow.ascx" />
<Content Include="WebUserControls\cmp_OrderList.ascx" />
MP-MAG/SMART/jumper.ascx
-1
View File
@@ -1 +0,0 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="jumper.ascx.cs" Inherits="MP_MAG.SMART.jumper" %>
MP-MAG/SMART/jumper.aspx
+19
View File
@@ -0,0 +1,19 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="jumper.aspx.cs" Inherits="MP_MAG.SMART.jumper" %>
<%@ Register Src="~/WebUserControls/cmp_jumper.ascx" TagPrefix="uc1" TagName="cmp_jumper" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
</head>
<body>
<form id="form1" runat="server">
<div>
<uc1:cmp_jumper runat="server" id="cmp_jumper" />
</div>
</form>
</body>
</html>
MP-MAG/SMART/jumper.aspx.cs
+17
View File
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_MAG.SMART
{
public partial class jumper : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
MP-MAG/SMART/jumper.aspx.designer.cs
Generated
+35
View File
@@ -0,0 +1,35 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MP_MAG.SMART
{
public partial class jumper
{
/// <summary>
/// Controllo form1.
/// </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.HtmlForm form1;
/// <summary>
/// Controllo cmp_jumper.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MP_MAG.WebUserControls.cmp_jumper cmp_jumper;
}
}
MP-MAG/WebUserControls/cmp_jumper.ascx
+1
View File
@@ -0,0 +1 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_jumper.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_jumper" %>
MP-MAG/SMART/jumper.ascx.cs → MP-MAG/WebUserControls/cmp_jumper.ascx.cs
+20 -9
View File
@@ -6,9 +6,9 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_MAG.SMART
namespace MP_MAG.WebUserControls
{
public partial class jumper : System.Web.UI.UserControl
public partial class cmp_jumper : BaseUserControl
{
#region Protected Methods
@@ -19,17 +19,27 @@ namespace MP_MAG.SMART
int IdxODL = memLayer.ML.QSI("IdxODL");
string IdxMacchina = memLayer.ML.QSS("IdxMacchina");
int QtaUdc = memLayer.ML.QSI("QtaUdc");
MagData.prodPrintData newProdPrintData = new MagData.prodPrintData(MatrOpr, IdxODL, IdxMacchina, QtaUdc);
bool isFinito = false;
// recupero articolo
var tabOdl = DataLayerObj.taODL.getByIdx(IdxODL, false);
if (tabOdl.Rows.Count > 0)
{
string codArt = tabOdl[0].CodArticolo;
var tabArt = MagDataLayerObj.taAA.getByKey(codArt);
if (tabArt.Rows.Count > 0)
{
isFinito = tabArt[0].CodStato == "FIN";
}
}
MagData.prodPrintData newProdPrintData = new MagData.prodPrintData(MatrOpr, IdxODL, IdxMacchina, QtaUdc, isFinito);
// salvo in oggetto dedicato...
MagData.MagDataLayer.man.currProdPrintData = newProdPrintData;
string tgtPage = "";
// se l'operatore in sessione è DIVERSO da quello appena inviato --> effettuo NUOVO login
if (MatrOpr == memLayer.ML.IntSessionObj("MatrOpr"))
{
// rimando a pagina di stampa.. secondo tipo finiti / semilavorati
// FARE!!! verifica SL/FI (NON E' ancora implementato davvero
string tgtPage = newProdPrintData.isProdFinito ? "prtFiniti" : "prtSemilav";
Response.Redirect(tgtPage);
tgtPage = newProdPrintData.isProdFinito ? "prtFiniti" : "prtSemilav";
}
else
{
@@ -46,10 +56,11 @@ namespace MP_MAG.SMART
// salvo in sessione
memLayer.ML.setSessionVal("MatrOpr", MatrOpr);
memLayer.ML.setSessionVal("UserAuthKey", UserAuthKey);
// redirect x login...
tgtPage = "tryLogin";
}
// redirect x login...
Response.Redirect("tryLogin");
}
Response.Redirect($"~/SMART/{tgtPage}");
}
#endregion Protected Methods
MP-MAG/SMART/jumper.ascx.designer.cs → MP-MAG/WebUserControls/cmp_jumper.ascx.designer.cs
Generated
+2 -2
View File
@@ -8,9 +8,9 @@
//------------------------------------------------------------------------------
namespace MP_MAG.SMART
namespace MP_MAG.WebUserControls
{
public partial class jumper
public partial class cmp_jumper
{
}
}
MP-MAG/favicon.ico
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

MP-MAG/images/favicon.ico
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

MP-MAG/jumper.aspx
+19
View File
@@ -0,0 +1,19 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="jumper.aspx.cs" Inherits="MP_MAG.jumper" %>
<%@ Register Src="~/WebUserControls/cmp_jumper.ascx" TagPrefix="uc1" TagName="cmp_jumper" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
</head>
<body>
<form id="form1" runat="server">
<div>
<uc1:cmp_jumper runat="server" id="cmp_jumper" />
</div>
</form>
</body>
</html>
MP-MAG/jumper.aspx.cs
+17
View File
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_MAG
{
public partial class jumper : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
MP-MAG/jumper.aspx.designer.cs
Generated
+35
View File
@@ -0,0 +1,35 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MP_MAG
{
public partial class jumper
{
/// <summary>
/// Controllo form1.
/// </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.HtmlForm form1;
/// <summary>
/// Controllo cmp_jumper.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MP_MAG.WebUserControls.cmp_jumper cmp_jumper;
}
}
MagData/DS_Mag.Designer.cs
Generated
+30 -2
View File
@@ -1720,6 +1720,8 @@ namespace MagData {
private global::System.Data.DataColumn columnCodArtExt;
private global::System.Data.DataColumn columnCodStato;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public AnagArtDataTable() {
@@ -1777,6 +1779,14 @@ namespace MagData {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn CodStatoColumn {
get {
return this.columnCodStato;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1814,12 +1824,13 @@ namespace MagData {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public AnagArtRow AddAnagArtRow(string CodArt, string DescrArt, string CodArtExt) {
public AnagArtRow AddAnagArtRow(string CodArt, string DescrArt, string CodArtExt, string CodStato) {
AnagArtRow rowAnagArtRow = ((AnagArtRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
CodArt,
DescrArt,
CodArtExt};
CodArtExt,
CodStato};
rowAnagArtRow.ItemArray = columnValuesArray;
this.Rows.Add(rowAnagArtRow);
return rowAnagArtRow;
@@ -1852,6 +1863,7 @@ namespace MagData {
this.columnCodArt = base.Columns["CodArt"];
this.columnDescrArt = base.Columns["DescrArt"];
this.columnCodArtExt = base.Columns["CodArtExt"];
this.columnCodStato = base.Columns["CodStato"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1863,6 +1875,8 @@ namespace MagData {
base.Columns.Add(this.columnDescrArt);
this.columnCodArtExt = new global::System.Data.DataColumn("CodArtExt", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCodArtExt);
this.columnCodStato = new global::System.Data.DataColumn("CodStato", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCodStato);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnCodArt}, true));
this.columnCodArt.AllowDBNull = false;
@@ -1872,6 +1886,8 @@ namespace MagData {
this.columnDescrArt.MaxLength = 250;
this.columnCodArtExt.AllowDBNull = false;
this.columnCodArtExt.MaxLength = 50;
this.columnCodStato.AllowDBNull = false;
this.columnCodStato.MaxLength = 50;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4693,6 +4709,17 @@ namespace MagData {
this[this.tableAnagArt.CodArtExtColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string CodStato {
get {
return ((string)(this[this.tableAnagArt.CodStatoColumn]));
}
set {
this[this.tableAnagArt.CodStatoColumn] = value;
}
}
}
/// <summary>
@@ -6669,6 +6696,7 @@ namespace MagData.DS_MagTableAdapters {
tableMapping.ColumnMappings.Add("CodArt", "CodArt");
tableMapping.ColumnMappings.Add("DescrArt", "DescrArt");
tableMapping.ColumnMappings.Add("CodArtExt", "CodArtExt");
tableMapping.ColumnMappings.Add("CodStato", "CodStato");
this._adapter.TableMappings.Add(tableMapping);
}
MagData/DS_Mag.xsd
+18 -10
View File
@@ -246,6 +246,7 @@ FROM dbo.v_AnagArt
<Mapping SourceColumn="CodArt" DataSetColumn="CodArt" />
<Mapping SourceColumn="DescrArt" DataSetColumn="DescrArt" />
<Mapping SourceColumn="CodArtExt" DataSetColumn="CodArtExt" />
<Mapping SourceColumn="CodStato" DataSetColumn="CodStato" />
</Mappings>
<Sources>
<DbSource ConnectionRef="MoonPro_MAGConnectionString (Settings)" DbObjectName="MoonPro_MAG.dbo.stp_AA_getDiBaByHashList" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByHashList" GetMethodModifier="Public" GetMethodName="getByHashList" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByHashList" UserSourceName="getByHashList">
@@ -439,7 +440,7 @@ FROM dbo.ElencoPost2Queue
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="MoonPro_MAGConnectionString (Settings)" DbObjectName="MoonPro_MAG.dbo.stp_EAL_updatePList" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updatePList" Modifier="Public" Name="updatePList" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="updatePList">
<DbSource ConnectionRef="MoonPro_MAGConnectionString (Settings)" DbObjectName="MoonPro_MAG.dbo.stp_EAL_updatePList" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updatePList" Modifier="Public" Name="updatePList" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="updatePList">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_EAL_updatePList</CommandText>
@@ -451,7 +452,7 @@ FROM dbo.ElencoPost2Queue
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="MoonPro_MAGConnectionString (Settings)" DbObjectName="MoonPro_MAG.dbo.stp_EAL_updateQuery" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateQuery" Modifier="Public" Name="updateQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="updateQuery">
<DbSource ConnectionRef="MoonPro_MAGConnectionString (Settings)" DbObjectName="MoonPro_MAG.dbo.stp_EAL_updateQuery" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateQuery" Modifier="Public" Name="updateQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="updateQuery">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_EAL_updateQuery</CommandText>
@@ -615,7 +616,7 @@ SELECT AL, UDC, OrderListID FROM ElencoAL2UDC WHERE (AL = @AL) AND (UDC = @UDC)<
<xs:element name="DS_Mag" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_Mag" msprop:Generator_UserDSName="DS_Mag">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="ElencoLotti" msprop:Generator_TableClassName="ElencoLottiDataTable" msprop:Generator_TableVarName="tableElencoLotti" msprop:Generator_TablePropName="ElencoLotti" msprop:Generator_RowDeletingName="ElencoLottiRowDeleting" msprop:Generator_RowChangingName="ElencoLottiRowChanging" msprop:Generator_RowEvHandlerName="ElencoLottiRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoLottiRowDeleted" msprop:Generator_UserTableName="ElencoLotti" msprop:Generator_RowChangedName="ElencoLottiRowChanged" msprop:Generator_RowEvArgName="ElencoLottiRowChangeEvent" msprop:Generator_RowClassName="ElencoLottiRow">
<xs:element name="ElencoLotti" msprop:Generator_TableClassName="ElencoLottiDataTable" msprop:Generator_TableVarName="tableElencoLotti" msprop:Generator_RowChangedName="ElencoLottiRowChanged" msprop:Generator_TablePropName="ElencoLotti" msprop:Generator_RowDeletingName="ElencoLottiRowDeleting" msprop:Generator_RowChangingName="ElencoLottiRowChanging" msprop:Generator_RowEvHandlerName="ElencoLottiRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoLottiRowDeleted" msprop:Generator_RowClassName="ElencoLottiRow" msprop:Generator_UserTableName="ElencoLotti" msprop:Generator_RowEvArgName="ElencoLottiRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="Lotto" msprop:Generator_ColumnVarNameInTable="columnLotto" msprop:Generator_ColumnPropNameInRow="Lotto" msprop:Generator_ColumnPropNameInTable="LottoColumn" msprop:Generator_UserColumnName="Lotto">
@@ -690,7 +691,7 @@ SELECT AL, UDC, OrderListID FROM ElencoAL2UDC WHERE (AL = @AL) AND (UDC = @UDC)<
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ElencoUdc" msprop:Generator_TableClassName="ElencoUdcDataTable" msprop:Generator_TableVarName="tableElencoUdc" msprop:Generator_RowChangedName="ElencoUdcRowChanged" msprop:Generator_TablePropName="ElencoUdc" msprop:Generator_RowDeletingName="ElencoUdcRowDeleting" msprop:Generator_RowChangingName="ElencoUdcRowChanging" msprop:Generator_RowEvHandlerName="ElencoUdcRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoUdcRowDeleted" msprop:Generator_RowClassName="ElencoUdcRow" msprop:Generator_UserTableName="ElencoUdc" msprop:Generator_RowEvArgName="ElencoUdcRowChangeEvent">
<xs:element name="ElencoUdc" msprop:Generator_TableClassName="ElencoUdcDataTable" msprop:Generator_TableVarName="tableElencoUdc" msprop:Generator_TablePropName="ElencoUdc" msprop:Generator_RowDeletingName="ElencoUdcRowDeleting" msprop:Generator_RowChangingName="ElencoUdcRowChanging" msprop:Generator_RowEvHandlerName="ElencoUdcRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoUdcRowDeleted" msprop:Generator_UserTableName="ElencoUdc" msprop:Generator_RowChangedName="ElencoUdcRowChanged" msprop:Generator_RowEvArgName="ElencoUdcRowChangeEvent" msprop:Generator_RowClassName="ElencoUdcRow">
<xs:complexType>
<xs:sequence>
<xs:element name="UDC" msprop:Generator_ColumnVarNameInTable="columnUDC" msprop:Generator_ColumnPropNameInRow="UDC" msprop:Generator_ColumnPropNameInTable="UDCColumn" msprop:Generator_UserColumnName="UDC">
@@ -845,7 +846,7 @@ SELECT AL, UDC, OrderListID FROM ElencoAL2UDC WHERE (AL = @AL) AND (UDC = @UDC)<
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AnagArt" msprop:Generator_TableClassName="AnagArtDataTable" msprop:Generator_TableVarName="tableAnagArt" msprop:Generator_TablePropName="AnagArt" msprop:Generator_RowDeletingName="AnagArtRowDeleting" msprop:Generator_RowChangingName="AnagArtRowChanging" msprop:Generator_RowEvHandlerName="AnagArtRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagArtRowDeleted" msprop:Generator_UserTableName="AnagArt" msprop:Generator_RowChangedName="AnagArtRowChanged" msprop:Generator_RowEvArgName="AnagArtRowChangeEvent" msprop:Generator_RowClassName="AnagArtRow">
<xs:element name="AnagArt" msprop:Generator_TableClassName="AnagArtDataTable" msprop:Generator_TableVarName="tableAnagArt" msprop:Generator_RowChangedName="AnagArtRowChanged" msprop:Generator_TablePropName="AnagArt" msprop:Generator_RowDeletingName="AnagArtRowDeleting" msprop:Generator_RowChangingName="AnagArtRowChanging" msprop:Generator_RowEvHandlerName="AnagArtRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagArtRowDeleted" msprop:Generator_RowClassName="AnagArtRow" msprop:Generator_UserTableName="AnagArt" msprop:Generator_RowEvArgName="AnagArtRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="CodArt" msprop:Generator_ColumnVarNameInTable="columnCodArt" msprop:Generator_ColumnPropNameInRow="CodArt" msprop:Generator_ColumnPropNameInTable="CodArtColumn" msprop:Generator_UserColumnName="CodArt">
@@ -869,10 +870,17 @@ SELECT AL, UDC, OrderListID FROM ElencoAL2UDC WHERE (AL = @AL) AND (UDC = @UDC)<
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="CodStato" msprop:Generator_ColumnVarNameInTable="columnCodStato" msprop:Generator_ColumnPropNameInRow="CodStato" msprop:Generator_ColumnPropNameInTable="CodStatoColumn" msprop:Generator_UserColumnName="CodStato">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ODL" msprop:Generator_TableClassName="ODLDataTable" msprop:Generator_TableVarName="tableODL" msprop:Generator_RowChangedName="ODLRowChanged" msprop:Generator_TablePropName="ODL" msprop:Generator_RowDeletingName="ODLRowDeleting" msprop:Generator_RowChangingName="ODLRowChanging" msprop:Generator_RowEvHandlerName="ODLRowChangeEventHandler" msprop:Generator_RowDeletedName="ODLRowDeleted" msprop:Generator_RowClassName="ODLRow" msprop:Generator_UserTableName="ODL" msprop:Generator_RowEvArgName="ODLRowChangeEvent">
<xs:element name="ODL" msprop:Generator_TableClassName="ODLDataTable" msprop:Generator_TableVarName="tableODL" msprop:Generator_TablePropName="ODL" msprop:Generator_RowDeletingName="ODLRowDeleting" msprop:Generator_RowChangingName="ODLRowChanging" msprop:Generator_RowEvHandlerName="ODLRowChangeEventHandler" msprop:Generator_RowDeletedName="ODLRowDeleted" msprop:Generator_UserTableName="ODL" msprop:Generator_RowChangedName="ODLRowChanged" msprop:Generator_RowEvArgName="ODLRowChangeEvent" msprop:Generator_RowClassName="ODLRow">
<xs:complexType>
<xs:sequence>
<xs:element name="IdxODL" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnIdxODL" msprop:Generator_ColumnPropNameInRow="IdxODL" msprop:Generator_ColumnPropNameInTable="IdxODLColumn" msprop:Generator_UserColumnName="IdxODL" type="xs:int" />
@@ -939,7 +947,7 @@ SELECT AL, UDC, OrderListID FROM ElencoAL2UDC WHERE (AL = @AL) AND (UDC = @UDC)<
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Elencopost2Queue" msprop:Generator_TableClassName="Elencopost2QueueDataTable" msprop:Generator_TableVarName="tableElencopost2Queue" msprop:Generator_RowChangedName="Elencopost2QueueRowChanged" msprop:Generator_TablePropName="Elencopost2Queue" msprop:Generator_RowDeletingName="Elencopost2QueueRowDeleting" msprop:Generator_RowChangingName="Elencopost2QueueRowChanging" msprop:Generator_RowEvHandlerName="Elencopost2QueueRowChangeEventHandler" msprop:Generator_RowDeletedName="Elencopost2QueueRowDeleted" msprop:Generator_RowClassName="Elencopost2QueueRow" msprop:Generator_UserTableName="Elencopost2Queue" msprop:Generator_RowEvArgName="Elencopost2QueueRowChangeEvent">
<xs:element name="Elencopost2Queue" msprop:Generator_TableClassName="Elencopost2QueueDataTable" msprop:Generator_TableVarName="tableElencopost2Queue" msprop:Generator_TablePropName="Elencopost2Queue" msprop:Generator_RowDeletingName="Elencopost2QueueRowDeleting" msprop:Generator_RowChangingName="Elencopost2QueueRowChanging" msprop:Generator_RowEvHandlerName="Elencopost2QueueRowChangeEventHandler" msprop:Generator_RowDeletedName="Elencopost2QueueRowDeleted" msprop:Generator_UserTableName="Elencopost2Queue" msprop:Generator_RowChangedName="Elencopost2QueueRowChanged" msprop:Generator_RowEvArgName="Elencopost2QueueRowChangeEvent" msprop:Generator_RowClassName="Elencopost2QueueRow">
<xs:complexType>
<xs:sequence>
<xs:element name="CodPost" msprop:Generator_ColumnVarNameInTable="columnCodPost" msprop:Generator_ColumnPropNameInRow="CodPost" msprop:Generator_ColumnPropNameInTable="CodPostColumn" msprop:Generator_UserColumnName="CodPost">
@@ -959,7 +967,7 @@ SELECT AL, UDC, OrderListID FROM ElencoAL2UDC WHERE (AL = @AL) AND (UDC = @UDC)<
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ElencoAL" msprop:Generator_TableClassName="ElencoALDataTable" msprop:Generator_TableVarName="tableElencoAL" msprop:Generator_RowChangedName="ElencoALRowChanged" msprop:Generator_TablePropName="ElencoAL" msprop:Generator_RowDeletingName="ElencoALRowDeleting" msprop:Generator_RowChangingName="ElencoALRowChanging" msprop:Generator_RowEvHandlerName="ElencoALRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoALRowDeleted" msprop:Generator_RowClassName="ElencoALRow" msprop:Generator_UserTableName="ElencoAL" msprop:Generator_RowEvArgName="ElencoALRowChangeEvent">
<xs:element name="ElencoAL" msprop:Generator_TableClassName="ElencoALDataTable" msprop:Generator_TableVarName="tableElencoAL" msprop:Generator_TablePropName="ElencoAL" msprop:Generator_RowDeletingName="ElencoALRowDeleting" msprop:Generator_RowChangingName="ElencoALRowChanging" msprop:Generator_RowEvHandlerName="ElencoALRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoALRowDeleted" msprop:Generator_UserTableName="ElencoAL" msprop:Generator_RowChangedName="ElencoALRowChanged" msprop:Generator_RowEvArgName="ElencoALRowChangeEvent" msprop:Generator_RowClassName="ElencoALRow">
<xs:complexType>
<xs:sequence>
<xs:element name="AL" msprop:Generator_ColumnVarNameInTable="columnAL" msprop:Generator_ColumnPropNameInRow="AL" msprop:Generator_ColumnPropNameInTable="ALColumn" msprop:Generator_UserColumnName="AL">
@@ -995,7 +1003,7 @@ SELECT AL, UDC, OrderListID FROM ElencoAL2UDC WHERE (AL = @AL) AND (UDC = @UDC)<
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AnagClienti" msprop:Generator_TableClassName="AnagClientiDataTable" msprop:Generator_TableVarName="tableAnagClienti" msprop:Generator_TablePropName="AnagClienti" msprop:Generator_RowDeletingName="AnagClientiRowDeleting" msprop:Generator_RowChangingName="AnagClientiRowChanging" msprop:Generator_RowEvHandlerName="AnagClientiRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagClientiRowDeleted" msprop:Generator_UserTableName="AnagClienti" msprop:Generator_RowChangedName="AnagClientiRowChanged" msprop:Generator_RowEvArgName="AnagClientiRowChangeEvent" msprop:Generator_RowClassName="AnagClientiRow">
<xs:element name="AnagClienti" msprop:Generator_TableClassName="AnagClientiDataTable" msprop:Generator_TableVarName="tableAnagClienti" msprop:Generator_RowChangedName="AnagClientiRowChanged" msprop:Generator_TablePropName="AnagClienti" msprop:Generator_RowDeletingName="AnagClientiRowDeleting" msprop:Generator_RowChangingName="AnagClientiRowChanging" msprop:Generator_RowEvHandlerName="AnagClientiRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagClientiRowDeleted" msprop:Generator_RowClassName="AnagClientiRow" msprop:Generator_UserTableName="AnagClienti" msprop:Generator_RowEvArgName="AnagClientiRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="CodCliente" msprop:Generator_ColumnVarNameInTable="columnCodCliente" msprop:Generator_ColumnPropNameInRow="CodCliente" msprop:Generator_ColumnPropNameInTable="CodClienteColumn" msprop:Generator_UserColumnName="CodCliente">
@@ -1050,7 +1058,7 @@ SELECT AL, UDC, OrderListID FROM ElencoAL2UDC WHERE (AL = @AL) AND (UDC = @UDC)<
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ElencoAL2UDC" msprop:Generator_TableClassName="ElencoAL2UDCDataTable" msprop:Generator_TableVarName="tableElencoAL2UDC" msprop:Generator_TablePropName="ElencoAL2UDC" msprop:Generator_RowDeletingName="ElencoAL2UDCRowDeleting" msprop:Generator_RowChangingName="ElencoAL2UDCRowChanging" msprop:Generator_RowEvHandlerName="ElencoAL2UDCRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoAL2UDCRowDeleted" msprop:Generator_UserTableName="ElencoAL2UDC" msprop:Generator_RowChangedName="ElencoAL2UDCRowChanged" msprop:Generator_RowEvArgName="ElencoAL2UDCRowChangeEvent" msprop:Generator_RowClassName="ElencoAL2UDCRow">
<xs:element name="ElencoAL2UDC" msprop:Generator_TableClassName="ElencoAL2UDCDataTable" msprop:Generator_TableVarName="tableElencoAL2UDC" msprop:Generator_RowChangedName="ElencoAL2UDCRowChanged" msprop:Generator_TablePropName="ElencoAL2UDC" msprop:Generator_RowDeletingName="ElencoAL2UDCRowDeleting" msprop:Generator_RowChangingName="ElencoAL2UDCRowChanging" msprop:Generator_RowEvHandlerName="ElencoAL2UDCRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoAL2UDCRowDeleted" msprop:Generator_RowClassName="ElencoAL2UDCRow" msprop:Generator_UserTableName="ElencoAL2UDC" msprop:Generator_RowEvArgName="ElencoAL2UDCRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="AL" msprop:Generator_ColumnVarNameInTable="columnAL" msprop:Generator_ColumnPropNameInRow="AL" msprop:Generator_ColumnPropNameInTable="ALColumn" msprop:Generator_UserColumnName="AL">
MagData/DS_Mag.xss
+9 -8
View File
@@ -4,15 +4,16 @@
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="137" ViewPortY="-10" 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="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:ElencoLotti" ZOrder="5" X="213" Y="99" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:ElencoUdc" ZOrder="2" X="555" Y="133" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagArt" ZOrder="7" X="279" Y="548" Height="172" Width="193" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:ODL" ZOrder="4" X="885" Y="112" Height="324" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Elencopost2Queue" ZOrder="6" X="264" Y="791" Height="134" Width="252" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:ElencoAL" ZOrder="1" X="882" Y="491" Height="438" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagClienti" ZOrder="3" X="544" Y="542" Height="210" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:ElencoLotti" ZOrder="6" X="213" Y="99" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:ElencoUdc" ZOrder="3" X="555" Y="133" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagArt" ZOrder="8" X="279" Y="548" Height="191" Width="193" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:ODL" ZOrder="5" X="885" Y="112" Height="324" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Elencopost2Queue" ZOrder="7" X="264" Y="791" Height="134" Width="252" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:ElencoAL" ZOrder="2" X="882" Y="491" Height="438" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagClienti" ZOrder="4" X="544" Y="542" Height="210" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:ElencoAL2UDC" ZOrder="1" X="53" Y="377" Height="153" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="100" />
</Shapes>
<Connectors />
</DiagramLayout>
MagData/Objects.cs
+6 -4
View File
@@ -136,12 +136,14 @@ namespace MagData
/// <param name="IdxOdl"></param>
/// <param name="IdxMacchina"></param>
/// <param name="QtaUdc"></param>
public prodPrintData(int MatrOpr, int IdxOdl, string IdxMacchina, int QtaUdc)
/// <param name="isProdFinito"></param>
public prodPrintData(int MatrOpr, int IdxOdl, string IdxMacchina, int QtaUdc, bool isProdFinito)
{
this.MatrOpr = MatrOpr;
this.IdxOdl = IdxOdl;
this.IdxMacchina = IdxMacchina;
this.QtaUdc = QtaUdc;
this.isProdFinito = isProdFinito;
}
public prodPrintData()
@@ -150,6 +152,7 @@ namespace MagData
this.IdxOdl = 0;
this.IdxMacchina = "";
this.QtaUdc = 1;
this.isProdFinito = false;
}
#endregion Public Constructors
@@ -167,10 +170,9 @@ namespace MagData
public int IdxOdl { get; set; }
/// <summary>
/// Indica se si tratta di un FINITO (cs semilavorato)
/// FIXME TODO FARE !!!!
/// Indica se si tratta di un FINITO (vs semilavorato)
/// </summary>
public bool isProdFinito { get; set; } = true;
public bool isProdFinito { get; set; }
/// <summary>
/// Matricola Operatore