Merge branch 'develop' into ES3
This commit is contained in:
Samuele E. Locatelli
Vendored
+1
-1
@@ -12,7 +12,7 @@ pipeline {
|
||||
steps {
|
||||
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
|
||||
script {
|
||||
withEnv(['NEXT_BUILD_NUMBER=1340']) {
|
||||
withEnv(['NEXT_BUILD_NUMBER=1341']) {
|
||||
// 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'
|
||||
|
||||
@@ -15,6 +15,55 @@ namespace MP_ADM
|
||||
|
||||
#endregion Internal Fields
|
||||
|
||||
#region Public Fields
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Controlli periodici
|
||||
/// </summary>
|
||||
public bool enableControlli = memLayer.ML.cdvb("enableControlli");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Disegno articolo
|
||||
/// </summary>
|
||||
public bool enableDisegno = memLayer.ML.cdvb("enableDisegno");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione grafici JScript
|
||||
/// </summary>
|
||||
public bool enableGraphJS = memLayer.ML.cdvb("enableGraphJS");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Pezzi LAsciati in macchina
|
||||
/// </summary>
|
||||
public bool enablePzProdLasciati = memLayer.ML.cdvb("enablePzProdLasciati");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Richieste - Promesse - ODL
|
||||
/// </summary>
|
||||
public bool enableRPO = memLayer.ML.cdvb("enableRPO");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione scarti
|
||||
/// </summary>
|
||||
public bool enableScarti = memLayer.ML.cdvb("enableScarti");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione scheda Tecnica
|
||||
/// </summary>
|
||||
public bool enableSchedaTecnica = memLayer.ML.cdvb("enableSchedaTecnica");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione SplitODL
|
||||
/// </summary>
|
||||
public bool enableSplitODL = memLayer.ML.cdvb("enableSplitODL");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Set PZ Pallet su tablet
|
||||
/// </summary>
|
||||
public bool enableTabSetPzPallet = memLayer.ML.cdvb("enableTabSetPzPallet");
|
||||
|
||||
#endregion Public Fields
|
||||
|
||||
#region Public Events
|
||||
|
||||
public event EventHandler eh_nuovoValore;
|
||||
|
||||
@@ -190,7 +190,7 @@ namespace MP_ADM.WebUserControls
|
||||
{
|
||||
get
|
||||
{
|
||||
return !memLayer.ML.CRB("enableRPO");
|
||||
return !enableRPO;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+49
-12
@@ -14,6 +14,55 @@ namespace MP_SITE
|
||||
|
||||
#endregion Internal Fields
|
||||
|
||||
#region Public Fields
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Controlli periodici
|
||||
/// </summary>
|
||||
public bool enableControlli = memLayer.ML.cdvb("enableControlli");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Disegno articolo
|
||||
/// </summary>
|
||||
public bool enableDisegno = memLayer.ML.cdvb("enableDisegno");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione grafici JScript
|
||||
/// </summary>
|
||||
public bool enableGraphJS = memLayer.ML.cdvb("enableGraphJS");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Pezzi LAsciati in macchina
|
||||
/// </summary>
|
||||
public bool enablePzProdLasciati = memLayer.ML.cdvb("enablePzProdLasciati");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Richieste - Promesse - ODL
|
||||
/// </summary>
|
||||
public bool enableRPO = memLayer.ML.cdvb("enableRPO");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione scarti
|
||||
/// </summary>
|
||||
public bool enableScarti = memLayer.ML.cdvb("enableScarti");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione scheda Tecnica
|
||||
/// </summary>
|
||||
public bool enableSchedaTecnica = memLayer.ML.cdvb("enableSchedaTecnica");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione SplitODL
|
||||
/// </summary>
|
||||
public bool enableSplitODL = memLayer.ML.cdvb("enableSplitODL");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Set PZ Pallet su tablet
|
||||
/// </summary>
|
||||
public bool enableTabSetPzPallet = memLayer.ML.cdvb("enableTabSetPzPallet");
|
||||
|
||||
#endregion Public Fields
|
||||
|
||||
#region Protected Properties
|
||||
|
||||
/// <summary>
|
||||
@@ -34,18 +83,6 @@ namespace MP_SITE
|
||||
|
||||
#endregion Protected Properties
|
||||
|
||||
#region Public Properties
|
||||
|
||||
public bool enableGraphJS
|
||||
{
|
||||
get
|
||||
{
|
||||
return memLayer.ML.CRB("enableGraphJS");
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Public Properties
|
||||
|
||||
#region Public Methods
|
||||
|
||||
/// <summary>
|
||||
|
||||
+49
-11
@@ -18,6 +18,55 @@ namespace MoonProTablet
|
||||
|
||||
#endregion Internal Fields
|
||||
|
||||
#region Public Fields
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Controlli periodici
|
||||
/// </summary>
|
||||
public bool enableControlli = memLayer.ML.cdvb("enableControlli");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Disegno articolo
|
||||
/// </summary>
|
||||
public bool enableDisegno = memLayer.ML.cdvb("enableDisegno");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione grafici JScript
|
||||
/// </summary>
|
||||
public bool enableGraphJS = memLayer.ML.cdvb("enableGraphJS");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Pezzi LAsciati in macchina
|
||||
/// </summary>
|
||||
public bool enablePzProdLasciati = memLayer.ML.cdvb("enablePzProdLasciati");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Richieste - Promesse - ODL
|
||||
/// </summary>
|
||||
public bool enableRPO = memLayer.ML.cdvb("enableRPO");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione scarti
|
||||
/// </summary>
|
||||
public bool enableScarti = memLayer.ML.cdvb("enableScarti");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione scheda Tecnica
|
||||
/// </summary>
|
||||
public bool enableSchedaTecnica = memLayer.ML.cdvb("enableSchedaTecnica");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione SplitODL
|
||||
/// </summary>
|
||||
public bool enableSplitODL = memLayer.ML.cdvb("enableSplitODL");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Set PZ Pallet su tablet
|
||||
/// </summary>
|
||||
public bool enableTabSetPzPallet = memLayer.ML.cdvb("enableTabSetPzPallet");
|
||||
|
||||
#endregion Public Fields
|
||||
|
||||
#region Protected Properties
|
||||
|
||||
/// <summary>
|
||||
@@ -36,17 +85,6 @@ namespace MoonProTablet
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Verifica (su tab config) se sia abilitata la gestione flusso RPO (Richieste - Promesse - ODL)
|
||||
/// </summary>
|
||||
protected bool enableRPO
|
||||
{
|
||||
get
|
||||
{
|
||||
return memLayer.ML.cdvb("enableRPO");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Verifica se la macchina MAIN sia MASTER
|
||||
/// </summary>
|
||||
|
||||
@@ -6,6 +6,20 @@ namespace MoonProTablet
|
||||
{
|
||||
public partial class DettaglioMacchina : BasePage
|
||||
{
|
||||
#region Private Methods
|
||||
|
||||
private void mod_confProd1_eh_newVal(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
private void mod_confProd1_eh_reset(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
#endregion Private Methods
|
||||
|
||||
#region Protected Methods
|
||||
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (!Page.IsPostBack)
|
||||
@@ -18,14 +32,6 @@ namespace MoonProTablet
|
||||
mod_confProd1.eh_reset += mod_confProd1_eh_reset;
|
||||
}
|
||||
|
||||
void mod_confProd1_eh_reset(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
void mod_confProd1_eh_newVal(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// evento timer
|
||||
/// </summary>
|
||||
@@ -35,25 +41,7 @@ namespace MoonProTablet
|
||||
{
|
||||
mod_dettMacchina1.doUpdate();
|
||||
}
|
||||
/// <summary>
|
||||
/// Verifica abilitazione gestione scarti
|
||||
/// </summary>
|
||||
public bool enableScarti
|
||||
{
|
||||
get
|
||||
{
|
||||
return memLayer.ML.cdvb("enableScarti");
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// Verifica abilitazione gestione scarti
|
||||
/// </summary>
|
||||
public bool enableControlli
|
||||
{
|
||||
get
|
||||
{
|
||||
return memLayer.ML.cdvb("enableControlli");
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Protected Methods
|
||||
}
|
||||
}
|
||||
@@ -15,7 +15,6 @@ namespace MoonProTablet
|
||||
|
||||
private void checkModuleEnabled()
|
||||
{
|
||||
bool enableSchedaTecnica = memLayer.ML.cdvb("enableSchedaTecnica");
|
||||
cmp_sheetTech.Visible = enableSchedaTecnica;
|
||||
cmp_disabled.Visible = !enableSchedaTecnica;
|
||||
}
|
||||
@@ -26,8 +25,15 @@ namespace MoonProTablet
|
||||
private void setArticolo()
|
||||
{
|
||||
// leggo riga...
|
||||
DS_ProdTempi.MappaStatoExplRow rigaDati = DataLayerObj.taMSE.getByIdxMacchina(idxMacchina)[0];
|
||||
cmp_sheetTech.CodArticolo = rigaDati.CodArticolo;
|
||||
if (idxODL > 0)
|
||||
{
|
||||
var rigaDati = DataLayerObj.taODL.getByIdx(idxODL, false)[0];
|
||||
cmp_sheetTech.CodArticolo = rigaDati.CodArticolo;
|
||||
}
|
||||
else
|
||||
{
|
||||
cmp_sheetTech.CodArticolo = "";
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Private Methods
|
||||
|
||||
@@ -60,6 +60,7 @@
|
||||
<add key="DevicesConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
|
||||
<add key="DevicesAuthConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
|
||||
<add key="MoonProConnectionStringArca" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_EdilChim;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
|
||||
<add key="MoonProConnectionStringMAG" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
|
||||
</appSettings>
|
||||
<connectionStrings>
|
||||
<add name="MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
||||
|
||||
@@ -32,6 +32,60 @@ namespace MoonProTablet.WebUserControls
|
||||
|
||||
#endregion Internal Fields
|
||||
|
||||
#region Public Fields
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Controlli periodici
|
||||
/// </summary>
|
||||
public bool enableControlli = memLayer.ML.cdvb("enableControlli");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Disegno articolo
|
||||
/// </summary>
|
||||
public bool enableDisegno = memLayer.ML.cdvb("enableDisegno");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione grafici JScript
|
||||
/// </summary>
|
||||
public bool enableGraphJS = memLayer.ML.cdvb("enableGraphJS");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione LOTTI in DB MAG
|
||||
/// </summary>
|
||||
public bool enableMagLotti = memLayer.ML.cdvb("enableMagLotti");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Pezzi LAsciati in macchina
|
||||
/// </summary>
|
||||
public bool enablePzProdLasciati = memLayer.ML.cdvb("enablePzProdLasciati");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Richieste - Promesse - ODL
|
||||
/// </summary>
|
||||
public bool enableRPO = memLayer.ML.cdvb("enableRPO");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione scarti
|
||||
/// </summary>
|
||||
public bool enableScarti = memLayer.ML.cdvb("enableScarti");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione scheda Tecnica
|
||||
/// </summary>
|
||||
public bool enableSchedaTecnica = memLayer.ML.cdvb("enableSchedaTecnica");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione SplitODL
|
||||
/// </summary>
|
||||
public bool enableSplitODL = memLayer.ML.cdvb("enableSplitODL");
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione gestione Set PZ Pallet su tablet
|
||||
/// </summary>
|
||||
public bool enableTabSetPzPallet = memLayer.ML.cdvb("enableTabSetPzPallet");
|
||||
|
||||
#endregion Public Fields
|
||||
|
||||
#region Public Events
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -36,6 +36,5 @@
|
||||
</div>
|
||||
<asp:ObjectDataSource ID="odsGroup" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="MapoDb.DS_SheetTechTableAdapters.ST_AnagGruppiTableAdapter"></asp:ObjectDataSource>
|
||||
<asp:HiddenField runat="server" ID="hfCodArticolo" Value="" />
|
||||
<asp:HiddenField runat="server" ID="hfIdxOdl" Value="0" />
|
||||
</div>
|
||||
</div>
|
||||
@@ -58,14 +58,5 @@ namespace MoonProTablet.WebUserControls
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.HiddenField hfCodArticolo;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo hfIdxOdl.
|
||||
/// </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 hfIdxOdl;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,17 +46,6 @@ namespace MoonProTablet.WebUserControls
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Verifica (su tab config) se sia abilitata la gestione flusso RPO (Richieste - Promesse - ODL)
|
||||
/// </summary>
|
||||
protected bool enableRPO
|
||||
{
|
||||
get
|
||||
{
|
||||
return memLayer.ML.cdvb("enableRPO");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Restituisce il codice IdxMacchina dell'altra tavola (se multi) altrimenti la stessa macchina...
|
||||
/// </summary>
|
||||
@@ -488,7 +477,6 @@ namespace MoonProTablet.WebUserControls
|
||||
}
|
||||
// deve controllare abbia ODL o PROMESSE odl...
|
||||
bool hasNewOdl = DataLayerObj.taSelOdlFree.getUnused(idxMacchinaFix, chkTutti.Checked).Rows.Count > 1;
|
||||
bool enableSchedaTecnica = memLayer.ML.CRB("enableSchedaTecnica");
|
||||
// sistemo buttons!
|
||||
lbtStartAttr.Enabled = (isEnabled && (!inAttr && hasNewOdl));
|
||||
lbtEndProd.Enabled = (isEnabled && (!inAttr && currHasOdl));
|
||||
@@ -677,7 +665,7 @@ namespace MoonProTablet.WebUserControls
|
||||
cmp_dettPODL.idxODLSel = idxODLSel;
|
||||
divDettPOdl.Visible = show && idxODLSel > 0;
|
||||
// se abilitato da config su DB mostro selezione del numPzPallet...
|
||||
cmp_selPzPallet.enableSet = memLayer.ML.CRB("enableTabSetPzPallet");
|
||||
cmp_selPzPallet.enableSet = enableTabSetPzPallet;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -788,7 +776,7 @@ namespace MoonProTablet.WebUserControls
|
||||
protected void lbtEndProd_Click(object sender, EventArgs e)
|
||||
{
|
||||
// leggo idxOdl da ultimo odl attivo x macchina
|
||||
int idxODL = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL;
|
||||
int idxODLCurr = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL;
|
||||
int idxEvento = 7; // !!!HARD CODED
|
||||
|
||||
// confermo prod vecchio ODL
|
||||
@@ -801,11 +789,11 @@ namespace MoonProTablet.WebUserControls
|
||||
try
|
||||
{
|
||||
// processo x macchina selezionata
|
||||
DataLayerObj.taODL.fineProd(idxODL, idxMacchinaFix);
|
||||
DataLayerObj.taODL.fineProd(idxODLCurr, idxMacchinaFix);
|
||||
string evText = "Registrata fine produzione per ODL {0}";
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.AppendLine(String.Format(evText, idxODL));
|
||||
processaEvento(idxMacchinaFix, idxEvento, sb.ToString(), idxODL);
|
||||
sb.AppendLine(String.Format(evText, idxODLCurr));
|
||||
processaEvento(idxMacchinaFix, idxEvento, sb.ToString(), idxODLCurr);
|
||||
// se è multi processo ANCHE x altra tavola...
|
||||
if (isMulti)
|
||||
{
|
||||
@@ -837,9 +825,9 @@ namespace MoonProTablet.WebUserControls
|
||||
try
|
||||
{
|
||||
// effettuo split su nuovo ODL
|
||||
DataLayerObj.taODL.splitODL(idxODL, DataLayerObj.MatrOpr, idxMacchinaFix, TCAssegnato(idxODL), PzPallet, string.Format("Fine Produzione, Sospensione ODL {0}, generato residuo con pari TCiclo: {1}", idxODL, TCAssegnato(idxODL)), false, 0);
|
||||
DataLayerObj.taODL.splitODL(idxODLCurr, DataLayerObj.MatrOpr, idxMacchinaFix, TCAssegnato(idxODLCurr), PzPallet, string.Format("Fine Produzione, Sospensione ODL {0}, generato residuo con pari TCiclo: {1}", idxODLCurr, TCAssegnato(idxODLCurr)), false, 0);
|
||||
// processo chiusura setup
|
||||
processaEvento(idxMacchinaFix, idxEvento, String.Format("Registrata fine produzione per ODL {0}, nuovo ODL per quantità residua", idxODL), idxODL);
|
||||
processaEvento(idxMacchinaFix, idxEvento, String.Format("Registrata fine produzione per ODL {0}, nuovo ODL per quantità residua", idxODLCurr), idxODLCurr);
|
||||
|
||||
// se è multi processo ANCHE x altra tavola...
|
||||
if (isMulti)
|
||||
@@ -869,6 +857,8 @@ namespace MoonProTablet.WebUserControls
|
||||
}
|
||||
// resetto ODL su redis...
|
||||
DataLayerObj.emptyCurrODL(idxMacchinaFix);
|
||||
// imposto odl a zero...
|
||||
idxOdl = 0;
|
||||
// aggiorno visualizzazione
|
||||
checkAll();
|
||||
// sollevo evento!
|
||||
@@ -1049,7 +1039,7 @@ namespace MoonProTablet.WebUserControls
|
||||
TCRichAttr = TCAssegnato(idxODLSel);
|
||||
}
|
||||
int idxODL = 0;
|
||||
if (memLayer.ML.CRB("enableSplitODL"))
|
||||
if (enableSplitODL)
|
||||
{
|
||||
// splitto VECCHIO ODL (se è rimasto qualcosa da produrre e se ce ne è rimasto uno.......)
|
||||
try
|
||||
@@ -1161,6 +1151,8 @@ namespace MoonProTablet.WebUserControls
|
||||
DataLayerObj.saveCounter(idxMacchinaFix, "0");
|
||||
// imposto ODL su redis...
|
||||
DataLayerObj.saveCurrODL(idxMacchinaFix, idxODL_curr.ToString());
|
||||
// salvo odl selezionato
|
||||
idxODL = idxODL_curr;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1187,12 +1179,12 @@ namespace MoonProTablet.WebUserControls
|
||||
TCRichAttr = TCAssegnato(idxODLSel);
|
||||
}
|
||||
// leggo idxOdl da ultimo odl attivo x macchina
|
||||
int idxODL = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL;
|
||||
int idxODLStart = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL;
|
||||
int idxEvento = 1; // !!!HARD CODED
|
||||
// aggiorno (se necessario) note e tempo setup
|
||||
DataLayerObj.taODL.updateSetup(idxODL, DataLayerObj.MatrOpr, TCRichAttr, PzPallet, txtNote.Text);
|
||||
DataLayerObj.taODL.updateSetup(idxODLStart, DataLayerObj.MatrOpr, TCRichAttr, PzPallet, txtNote.Text);
|
||||
// controllo se TC Assegnato != TCRichiesto allora invio email x verifiche...
|
||||
DS_ProdTempi.ODLRow rigaOdl = DataLayerObj.taODL.getByIdx(idxODL, false)[0];
|
||||
DS_ProdTempi.ODLRow rigaOdl = DataLayerObj.taODL.getByIdx(idxODLStart, false)[0];
|
||||
if (rigaOdl.TCAssegnato != TCRichAttr)
|
||||
{
|
||||
// invio email!
|
||||
@@ -1201,12 +1193,12 @@ namespace MoonProTablet.WebUserControls
|
||||
// processo chiusura setup
|
||||
string evText = "Registrata inizio produzione per ODL {0}";
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.AppendLine(String.Format(evText, idxODL));
|
||||
processaEvento(idxMacchinaFix, idxEvento, sb.ToString(), idxODL);
|
||||
sb.AppendLine(String.Format(evText, idxODLStart));
|
||||
processaEvento(idxMacchinaFix, idxEvento, sb.ToString(), idxODLStart);
|
||||
// indico INIZIO SETUP su REDIS come EXE della macchina...
|
||||
string ts = string.Format("{0:yyMMdd}T{0:HHmmss.fff}Z", DateTime.Now);
|
||||
//DataLayerObj.addTask4Machine(idxMacchina, "stopSetup", $"TS:{ts}|MATR:{DataLayerObj.MatrOpr}|ODL:{idxODL}");
|
||||
DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.stopSetup, $"TS:{ts}|MATR:{DataLayerObj.MatrOpr}|ODL:{idxODL}");
|
||||
DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.stopSetup, $"TS:{ts}|MATR:{DataLayerObj.MatrOpr}|ODL:{idxODLStart}");
|
||||
// se è multi processo chiusura setup x altra tavola...
|
||||
if (isMulti)
|
||||
{
|
||||
@@ -1220,9 +1212,11 @@ namespace MoonProTablet.WebUserControls
|
||||
{
|
||||
DataLayerObj.taODL.fixMachineSlave(idxMacchina, 30, 1);
|
||||
}
|
||||
// se c'è gesitone SchedaTecnica --> chiamo procedura update x lotti
|
||||
|
||||
// FixMe-ToDo
|
||||
// se c'è gestione SchedaTecnica --> chiamo procedura update x lotti
|
||||
if (enableSchedaTecnica)
|
||||
{
|
||||
DataLayerObj.taMagELotti.UpsertByOdl(idxODLStart, true);
|
||||
}
|
||||
|
||||
// riporto stringa
|
||||
lblOut.Text = sb.ToString().Replace("---", "<br/>");
|
||||
@@ -1230,6 +1224,8 @@ namespace MoonProTablet.WebUserControls
|
||||
showNoteTC(false);
|
||||
// update buttons...
|
||||
checkAll();
|
||||
// imposto odl...
|
||||
idxOdl = idxODLStart;
|
||||
// sollevo evento!
|
||||
if (eh_reqUpdate != null)
|
||||
{
|
||||
|
||||
@@ -239,7 +239,6 @@ namespace MoonProTablet.WebUserControls
|
||||
private void checkConfig()
|
||||
{
|
||||
// verifico SE sia permesso gestire i "Pezzi lasciati" in macchina...
|
||||
bool enablePzProdLasciati = memLayer.ML.cdvb("enablePzProdLasciati");
|
||||
lblNumLasciati.Visible = enablePzProdLasciati;
|
||||
txtNumLasciati.Visible = enablePzProdLasciati;
|
||||
lblEmptyNumLasciati.Visible = !enablePzProdLasciati;
|
||||
|
||||
@@ -91,7 +91,7 @@ namespace MoonProTablet.WebUserControls
|
||||
// default è ND...
|
||||
bool answ = false;
|
||||
// SE abilitata gestione controlli...
|
||||
if (memLayer.ML.cdvb("enableDisegno"))
|
||||
if (enableDisegno)
|
||||
{
|
||||
// recupero da anagrafica articoli...
|
||||
try
|
||||
|
||||
@@ -8,6 +8,20 @@ namespace MoonProTablet.WebUserControls
|
||||
{
|
||||
#region Private Methods
|
||||
|
||||
private void checkLottiOdl()
|
||||
{
|
||||
// controlla se abilitato check LOTTI MAG
|
||||
if (enableMagLotti)
|
||||
{
|
||||
// controlla se ci sia lotto x ODL
|
||||
if (DataLayerObj.taMagELotti.getByODL(idxOdl).Rows.Count == 0)
|
||||
{
|
||||
// se non c'è chiama stored x rigenerare
|
||||
DataLayerObj.taMagELotti.UpsertByOdl(idxOdl, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// popola le labels
|
||||
/// </summary>
|
||||
@@ -120,6 +134,13 @@ namespace MoonProTablet.WebUserControls
|
||||
/// <param name="e"></param>
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (!Page.IsPostBack)
|
||||
{
|
||||
if (enableSchedaTecnica)
|
||||
{
|
||||
checkLottiOdl();
|
||||
}
|
||||
}
|
||||
try
|
||||
{
|
||||
popolaLabels();
|
||||
|
||||
Generated
+2155
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--<autogenerated>
|
||||
This code was generated by a tool.
|
||||
Changes to this file may cause incorrect behavior and will be lost if
|
||||
the code is regenerated.
|
||||
</autogenerated>-->
|
||||
<DataSetUISetting Version="1.00" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
|
||||
<TableUISettings />
|
||||
</DataSetUISetting>
|
||||
@@ -0,0 +1,244 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<xs:schema id="DS_MAG" targetNamespace="http://tempuri.org/DS_MAG.xsd" xmlns:mstns="http://tempuri.org/DS_MAG.xsd" xmlns="http://tempuri.org/DS_MAG.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:msprop="urn:schemas-microsoft-com:xml-msprop" attributeFormDefault="qualified" elementFormDefault="qualified">
|
||||
<xs:annotation>
|
||||
<xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
|
||||
<DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
|
||||
<Connections>
|
||||
<Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="MoonPro_MAGConnectionString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="MoonPro_MAGConnectionString (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.MapoDb.Properties.Settings.GlobalReference.Default.MoonPro_MAGConnectionString" Provider="System.Data.SqlClient" />
|
||||
</Connections>
|
||||
<Tables>
|
||||
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="ElencoLottiTableAdapter" GeneratorDataComponentClassName="ElencoLottiTableAdapter" Name="ElencoLotti" UserDataComponentName="ElencoLottiTableAdapter">
|
||||
<MainSource>
|
||||
<DbSource ConnectionRef="MoonPro_MAGConnectionString (Settings)" DbObjectName="MoonPro_MAG.dbo.v_ElencoLotti" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
|
||||
<DeleteCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="false">
|
||||
<CommandText>DELETE FROM [dbo].[ElencoLotti] WHERE (([Lotto] = @Original_Lotto) AND ([IdxODL] = @Original_IdxODL) AND ([RifExt] = @Original_RifExt) AND ([TipoLotto] = @Original_TipoLotto) AND ([CodArt] = @Original_CodArt) AND ([CodStato] = @Original_CodStato) AND ([Origine] = @Original_Origine) AND ([DtCrea] = @Original_DtCrea) AND ([Note] = @Original_Note) AND ([QtaOrig] = @Original_QtaOrig) AND ([NumUdc] = @Original_NumUdc) AND ([QtaCurr] = @Original_QtaCurr) AND ([DtMod] = @Original_DtMod) AND ([Attivo] = @Original_Attivo))</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_Lotto" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Lotto" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_IdxODL" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxODL" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_RifExt" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="RifExt" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_TipoLotto" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="TipoLotto" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodArt" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodArt" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodStato" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodStato" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_Origine" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Origine" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_DtCrea" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtCrea" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_Note" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Note" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_QtaOrig" Precision="18" ProviderType="Decimal" Scale="9" Size="0" SourceColumn="QtaOrig" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_NumUdc" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="NumUdc" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_QtaCurr" Precision="18" ProviderType="Decimal" Scale="9" Size="0" SourceColumn="QtaCurr" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_DtMod" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtMod" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_Attivo" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="Attivo" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</DeleteCommand>
|
||||
<InsertCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="false">
|
||||
<CommandText>INSERT INTO [dbo].[ElencoLotti] ([Lotto], [IdxODL], [RifExt], [TipoLotto], [CodArt], [CodStato], [Origine], [DtCrea], [Note], [QtaOrig], [NumUdc], [QtaCurr], [DtMod], [Attivo]) VALUES (@Lotto, @IdxODL, @RifExt, @TipoLotto, @CodArt, @CodStato, @Origine, @DtCrea, @Note, @QtaOrig, @NumUdc, @QtaCurr, @DtMod, @Attivo);
|
||||
SELECT Lotto, IdxODL, RifExt, TipoLotto, CodArt, CodStato, Origine, DtCrea, Note, QtaOrig, NumUdc, QtaCurr, DtMod, Attivo FROM ElencoLotti WHERE (Lotto = @Lotto)</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Lotto" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Lotto" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IdxODL" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxODL" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@RifExt" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="RifExt" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@TipoLotto" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="TipoLotto" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodArt" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodArt" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodStato" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodStato" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Origine" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Origine" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@DtCrea" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtCrea" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Note" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Note" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@QtaOrig" Precision="18" ProviderType="Decimal" Scale="9" Size="0" SourceColumn="QtaOrig" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@NumUdc" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="NumUdc" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@QtaCurr" Precision="18" ProviderType="Decimal" Scale="9" Size="0" SourceColumn="QtaCurr" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@DtMod" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtMod" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Attivo" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="Attivo" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</InsertCommand>
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="false">
|
||||
<CommandText>SELECT Lotto, IdxODL, RifExt, TipoLotto, CodArt, CodStato, Origine, DtCrea, Note, QtaOrig, NumUdc, QtaCurr, DtMod, Attivo, DescrArt, CodArtExt, DescStato
|
||||
FROM v_ElencoLotti</CommandText>
|
||||
<Parameters />
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
<UpdateCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="false">
|
||||
<CommandText>UPDATE [dbo].[ElencoLotti] SET [Lotto] = @Lotto, [IdxODL] = @IdxODL, [RifExt] = @RifExt, [TipoLotto] = @TipoLotto, [CodArt] = @CodArt, [CodStato] = @CodStato, [Origine] = @Origine, [DtCrea] = @DtCrea, [Note] = @Note, [QtaOrig] = @QtaOrig, [NumUdc] = @NumUdc, [QtaCurr] = @QtaCurr, [DtMod] = @DtMod, [Attivo] = @Attivo WHERE (([Lotto] = @Original_Lotto) AND ([IdxODL] = @Original_IdxODL) AND ([RifExt] = @Original_RifExt) AND ([TipoLotto] = @Original_TipoLotto) AND ([CodArt] = @Original_CodArt) AND ([CodStato] = @Original_CodStato) AND ([Origine] = @Original_Origine) AND ([DtCrea] = @Original_DtCrea) AND ([Note] = @Original_Note) AND ([QtaOrig] = @Original_QtaOrig) AND ([NumUdc] = @Original_NumUdc) AND ([QtaCurr] = @Original_QtaCurr) AND ([DtMod] = @Original_DtMod) AND ([Attivo] = @Original_Attivo));
|
||||
SELECT Lotto, IdxODL, RifExt, TipoLotto, CodArt, CodStato, Origine, DtCrea, Note, QtaOrig, NumUdc, QtaCurr, DtMod, Attivo FROM ElencoLotti WHERE (Lotto = @Lotto)</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Lotto" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Lotto" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IdxODL" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxODL" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@RifExt" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="RifExt" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@TipoLotto" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="TipoLotto" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodArt" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodArt" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodStato" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodStato" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Origine" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Origine" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@DtCrea" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtCrea" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Note" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Note" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@QtaOrig" Precision="18" ProviderType="Decimal" Scale="9" Size="0" SourceColumn="QtaOrig" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@NumUdc" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="NumUdc" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@QtaCurr" Precision="18" ProviderType="Decimal" Scale="9" Size="0" SourceColumn="QtaCurr" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@DtMod" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtMod" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Attivo" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="Attivo" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_Lotto" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Lotto" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_IdxODL" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxODL" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_RifExt" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="RifExt" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_TipoLotto" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="TipoLotto" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodArt" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodArt" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodStato" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodStato" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_Origine" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Origine" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_DtCrea" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtCrea" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_Note" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Note" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_QtaOrig" Precision="18" ProviderType="Decimal" Scale="9" Size="0" SourceColumn="QtaOrig" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_NumUdc" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="NumUdc" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_QtaCurr" Precision="18" ProviderType="Decimal" Scale="9" Size="0" SourceColumn="QtaCurr" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_DtMod" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtMod" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_Attivo" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="Attivo" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</UpdateCommand>
|
||||
</DbSource>
|
||||
</MainSource>
|
||||
<Mappings>
|
||||
<Mapping SourceColumn="Lotto" DataSetColumn="Lotto" />
|
||||
<Mapping SourceColumn="IdxODL" DataSetColumn="IdxODL" />
|
||||
<Mapping SourceColumn="RifExt" DataSetColumn="RifExt" />
|
||||
<Mapping SourceColumn="TipoLotto" DataSetColumn="TipoLotto" />
|
||||
<Mapping SourceColumn="CodArt" DataSetColumn="CodArt" />
|
||||
<Mapping SourceColumn="CodStato" DataSetColumn="CodStato" />
|
||||
<Mapping SourceColumn="Origine" DataSetColumn="Origine" />
|
||||
<Mapping SourceColumn="DtCrea" DataSetColumn="DtCrea" />
|
||||
<Mapping SourceColumn="Note" DataSetColumn="Note" />
|
||||
<Mapping SourceColumn="QtaOrig" DataSetColumn="QtaOrig" />
|
||||
<Mapping SourceColumn="NumUdc" DataSetColumn="NumUdc" />
|
||||
<Mapping SourceColumn="QtaCurr" DataSetColumn="QtaCurr" />
|
||||
<Mapping SourceColumn="DtMod" DataSetColumn="DtMod" />
|
||||
<Mapping SourceColumn="Attivo" DataSetColumn="Attivo" />
|
||||
<Mapping SourceColumn="DescrArt" DataSetColumn="DescrArt" />
|
||||
<Mapping SourceColumn="CodArtExt" DataSetColumn="CodArtExt" />
|
||||
<Mapping SourceColumn="DescStato" DataSetColumn="DescStato" />
|
||||
</Mappings>
|
||||
<Sources>
|
||||
<DbSource ConnectionRef="MoonPro_MAGConnectionString (Settings)" DbObjectName="MoonPro_MAG.dbo.stp_EL_getByODL" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByODL" GetMethodModifier="Public" GetMethodName="getByODL" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByODL" UserSourceName="getByODL">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
|
||||
<CommandText>dbo.stp_EL_getByODL</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IdxODL" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
</DbSource>
|
||||
<DbSource ConnectionRef="MoonPro_MAGConnectionString (Settings)" DbObjectName="MoonPro_MAG.dbo.stp_EL_UpsertByOdl" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="UpsertByOdl" Modifier="Public" Name="UpsertByOdl" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="UpsertByOdl">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
|
||||
<CommandText>dbo.stp_EL_UpsertByOdl</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IdxODL" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@flgStorico" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
</DbSource>
|
||||
</Sources>
|
||||
</TableAdapter>
|
||||
</Tables>
|
||||
<Sources />
|
||||
</DataSource>
|
||||
</xs:appinfo>
|
||||
</xs:annotation>
|
||||
<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:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="Lotto" msprop:Generator_ColumnVarNameInTable="columnLotto" msprop:Generator_ColumnPropNameInRow="Lotto" msprop:Generator_ColumnPropNameInTable="LottoColumn" msprop:Generator_UserColumnName="Lotto">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="50" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="IdxODL" msprop:Generator_ColumnVarNameInTable="columnIdxODL" msprop:Generator_ColumnPropNameInRow="IdxODL" msprop:Generator_ColumnPropNameInTable="IdxODLColumn" msprop:Generator_UserColumnName="IdxODL" type="xs:int" />
|
||||
<xs:element name="RifExt" msprop:Generator_ColumnVarNameInTable="columnRifExt" msprop:Generator_ColumnPropNameInRow="RifExt" msprop:Generator_ColumnPropNameInTable="RifExtColumn" msprop:Generator_UserColumnName="RifExt">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="50" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="TipoLotto" msprop:Generator_ColumnVarNameInTable="columnTipoLotto" msprop:Generator_ColumnPropNameInRow="TipoLotto" msprop:Generator_ColumnPropNameInTable="TipoLottoColumn" msprop:Generator_UserColumnName="TipoLotto">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="50" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="CodArt" msprop:Generator_ColumnVarNameInTable="columnCodArt" msprop:Generator_ColumnPropNameInRow="CodArt" msprop:Generator_ColumnPropNameInTable="CodArtColumn" msprop:Generator_UserColumnName="CodArt">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="50" />
|
||||
</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:element name="Origine" msprop:Generator_ColumnVarNameInTable="columnOrigine" msprop:Generator_ColumnPropNameInRow="Origine" msprop:Generator_ColumnPropNameInTable="OrigineColumn" msprop:Generator_UserColumnName="Origine">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="50" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="DtCrea" msprop:Generator_ColumnVarNameInTable="columnDtCrea" msprop:Generator_ColumnPropNameInRow="DtCrea" msprop:Generator_ColumnPropNameInTable="DtCreaColumn" msprop:Generator_UserColumnName="DtCrea" type="xs:dateTime" />
|
||||
<xs:element name="Note" msprop:Generator_ColumnVarNameInTable="columnNote" msprop:Generator_ColumnPropNameInRow="Note" msprop:Generator_ColumnPropNameInTable="NoteColumn" msprop:Generator_UserColumnName="Note">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="250" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="QtaOrig" msprop:Generator_ColumnVarNameInTable="columnQtaOrig" msprop:Generator_ColumnPropNameInRow="QtaOrig" msprop:Generator_ColumnPropNameInTable="QtaOrigColumn" msprop:Generator_UserColumnName="QtaOrig" type="xs:decimal" />
|
||||
<xs:element name="NumUdc" msprop:Generator_ColumnVarNameInTable="columnNumUdc" msprop:Generator_ColumnPropNameInRow="NumUdc" msprop:Generator_ColumnPropNameInTable="NumUdcColumn" msprop:Generator_UserColumnName="NumUdc" type="xs:int" />
|
||||
<xs:element name="QtaCurr" msprop:Generator_ColumnVarNameInTable="columnQtaCurr" msprop:Generator_ColumnPropNameInRow="QtaCurr" msprop:Generator_ColumnPropNameInTable="QtaCurrColumn" msprop:Generator_UserColumnName="QtaCurr" type="xs:decimal" />
|
||||
<xs:element name="DtMod" msprop:Generator_ColumnVarNameInTable="columnDtMod" msprop:Generator_ColumnPropNameInRow="DtMod" msprop:Generator_ColumnPropNameInTable="DtModColumn" msprop:Generator_UserColumnName="DtMod" type="xs:dateTime" />
|
||||
<xs:element name="Attivo" msprop:Generator_ColumnVarNameInTable="columnAttivo" msprop:Generator_ColumnPropNameInRow="Attivo" msprop:Generator_ColumnPropNameInTable="AttivoColumn" msprop:Generator_UserColumnName="Attivo" type="xs:boolean" />
|
||||
<xs:element name="DescrArt" msprop:Generator_ColumnVarNameInTable="columnDescrArt" msprop:Generator_ColumnPropNameInRow="DescrArt" msprop:Generator_ColumnPropNameInTable="DescrArtColumn" msprop:Generator_UserColumnName="DescrArt">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="250" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="CodArtExt" msprop:Generator_ColumnVarNameInTable="columnCodArtExt" msprop:Generator_ColumnPropNameInRow="CodArtExt" msprop:Generator_ColumnPropNameInTable="CodArtExtColumn" msprop:Generator_UserColumnName="CodArtExt">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="50" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="DescStato" msprop:Generator_ColumnVarNameInTable="columnDescStato" msprop:Generator_ColumnPropNameInRow="DescStato" msprop:Generator_ColumnPropNameInTable="DescStatoColumn" msprop:Generator_UserColumnName="DescStato" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="50" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:choice>
|
||||
</xs:complexType>
|
||||
<xs:unique name="Constraint1" msdata:PrimaryKey="true">
|
||||
<xs:selector xpath=".//mstns:ElencoLotti" />
|
||||
<xs:field xpath="mstns:Lotto" />
|
||||
</xs:unique>
|
||||
</xs:element>
|
||||
</xs:schema>
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--<autogenerated>
|
||||
This code was generated by a tool to store the dataset designer's layout information.
|
||||
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="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
|
||||
<Shapes>
|
||||
<Shape ID="DesignTable:ElencoLotti" ZOrder="1" X="107" Y="183" Height="343" Width="240" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
|
||||
</Shapes>
|
||||
<Connectors />
|
||||
</DiagramLayout>
|
||||
@@ -56,6 +56,7 @@ namespace MapoDb
|
||||
public DS_ProdTempiTableAdapters.Macchine2SlaveTableAdapter taM2S;
|
||||
public DS_applicazioneTableAdapters.MacchineTableAdapter taMacchine;
|
||||
public DS_PlanTableAdapters.MachineParamsTableAdapter taMacParams;
|
||||
public DS_MAGTableAdapters.ElencoLottiTableAdapter taMagELotti;
|
||||
public DS_ProdTempiTableAdapters.MappaStatoExplTableAdapter taMSE;
|
||||
public DS_ProdTempiTableAdapters.ODLTableAdapter taODL;
|
||||
public DS_applicazioneTableAdapters.AnagraficaOperatoriTableAdapter taOp;
|
||||
@@ -506,6 +507,7 @@ namespace MapoDb
|
||||
taM2S = new DS_ProdTempiTableAdapters.Macchine2SlaveTableAdapter();
|
||||
taMacchine = new DS_applicazioneTableAdapters.MacchineTableAdapter();
|
||||
taMacParams = new DS_PlanTableAdapters.MachineParamsTableAdapter();
|
||||
taMagELotti = new DS_MAGTableAdapters.ElencoLottiTableAdapter();
|
||||
taMSE = new DS_ProdTempiTableAdapters.MappaStatoExplTableAdapter();
|
||||
taODL = new DS_ProdTempiTableAdapters.ODLTableAdapter();
|
||||
taOp = new DS_applicazioneTableAdapters.AnagraficaOperatoriTableAdapter();
|
||||
@@ -546,6 +548,7 @@ namespace MapoDb
|
||||
string connectionStringIS = memLayer.ML.confReadString("MoonProConnectionStringIS");
|
||||
string connectionStringArca = memLayer.ML.confReadString("MoonProConnectionStringArca");
|
||||
string connectionStringES3 = memLayer.ML.confReadString("MoonProConnectionStringES3");
|
||||
string connectionStringMAG = memLayer.ML.confReadString("MoonProConnectionStringMAG");
|
||||
// connections del db
|
||||
taAG.Connection.ConnectionString = connectionString;
|
||||
taAnagArt.Connection.ConnectionString = connectionString;
|
||||
@@ -569,6 +572,7 @@ namespace MapoDb
|
||||
taM2S.Connection.ConnectionString = connectionString;
|
||||
taMacchine.Connection.ConnectionString = connectionString;
|
||||
taMacParams.Connection.ConnectionString = connectionStringES3;
|
||||
taMagELotti.Connection.ConnectionString = connectionStringMAG;
|
||||
taMSE.Connection.ConnectionString = connectionString;
|
||||
taODL.Connection.ConnectionString = connectionString;
|
||||
taOp.Connection.ConnectionString = connectionString;
|
||||
|
||||
+16
-4
@@ -222,6 +222,11 @@
|
||||
<DesignTime>True</DesignTime>
|
||||
<DependentUpon>DS_IntServ.xsd</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DS_MAG.Designer.cs">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
<DependentUpon>DS_MAG.xsd</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DS_Plan.Designer.cs">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
@@ -301,6 +306,17 @@
|
||||
<None Include="DS_IntServ.xss">
|
||||
<DependentUpon>DS_IntServ.xsd</DependentUpon>
|
||||
</None>
|
||||
<None Include="DS_MAG.xsc">
|
||||
<DependentUpon>DS_MAG.xsd</DependentUpon>
|
||||
</None>
|
||||
<None Include="DS_MAG.xsd">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSDataSetGenerator</Generator>
|
||||
<LastGenOutput>DS_MAG.Designer.cs</LastGenOutput>
|
||||
</None>
|
||||
<None Include="DS_MAG.xss">
|
||||
<DependentUpon>DS_MAG.xsd</DependentUpon>
|
||||
</None>
|
||||
<None Include="DS_Plan.xsc">
|
||||
<DependentUpon>DS_Plan.xsd</DependentUpon>
|
||||
</None>
|
||||
@@ -397,10 +413,6 @@
|
||||
<Content Include="Core\Compression\Zstandard\lib\win\libzstd.dll" />
|
||||
<Content Include="ExtLib\Microsoft.ReportViewer.WinForms.dll" />
|
||||
<Content Include="ExtLib\Microsoft.ReportViewer.WinForms.xml" />
|
||||
<Content Include="libzstd.dll" />
|
||||
<Content Include="mongocrypt.dll" />
|
||||
<Content Include="snappy32.dll" />
|
||||
<Content Include="snappy64.dll" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\MapoSDK\MapoSDK.csproj">
|
||||
|
||||
Generated
+12
-1
@@ -12,7 +12,7 @@ namespace MapoDb.Properties {
|
||||
|
||||
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
|
||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||
|
||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||
@@ -77,5 +77,16 @@ namespace MapoDb.Properties {
|
||||
return ((string)(this["MoonPro_IS_ArcaConnectionString"]));
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.ApplicationScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;Use" +
|
||||
"r ID=sa;Password=keyhammer16")]
|
||||
public string MoonPro_MAGConnectionString {
|
||||
get {
|
||||
return ((string)(this["MoonPro_MAGConnectionString"]));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,5 +42,13 @@
|
||||
</SerializableConnectionString></DesignTimeValue>
|
||||
<Value Profile="(Default)">Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_EdilChim;Persist Security Info=True;User ID=sa;Password=keyhammer16</Value>
|
||||
</Setting>
|
||||
<Setting Name="MoonPro_MAGConnectionString" Type="(Connection string)" Scope="Application">
|
||||
<DesignTimeValue Profile="(Default)"><?xml version="1.0" encoding="utf-16"?>
|
||||
<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||
<ConnectionString>Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;User ID=sa;Password=keyhammer16</ConnectionString>
|
||||
<ProviderName>System.Data.SqlClient</ProviderName>
|
||||
</SerializableConnectionString></DesignTimeValue>
|
||||
<Value Profile="(Default)">Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;User ID=sa;Password=keyhammer16</Value>
|
||||
</Setting>
|
||||
</Settings>
|
||||
</SettingsFile>
|
||||
+22
-8
@@ -1,16 +1,30 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
|
||||
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
||||
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
|
||||
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
||||
</configSections>
|
||||
<connectionStrings>
|
||||
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
||||
<add name="MapoDb.Properties.Settings.MoonPro_IS_ConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_Donati;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
|
||||
<add name="MapoDb.Properties.Settings.C_TRACKConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=C_TRACK;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
|
||||
<add name="MapoDb.Properties.Settings.MoonPro_ES3ConnectionString" connectionString="Data Source=sql2016dev;Initial Catalog=MoonPro_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
|
||||
<add name="MapoModel" connectionString="data source=SQL2016DEV;initial catalog=MoonPro;persist security info=True;user id=sa;password=keyhammer16;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
|
||||
<add name="MapoDb.Properties.Settings.MoonPro_IS_ArcaConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_EdilChim;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
|
||||
<add name="MapoDb.Properties.Settings.MoonProConnectionString"
|
||||
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;"
|
||||
providerName="System.Data.SqlClient" />
|
||||
<add name="MapoDb.Properties.Settings.MoonPro_IS_ConnectionString"
|
||||
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_Donati;Persist Security Info=True;User ID=sa;Password=keyhammer16"
|
||||
providerName="System.Data.SqlClient" />
|
||||
<add name="MapoDb.Properties.Settings.C_TRACKConnectionString"
|
||||
connectionString="Data Source=SQL2016DEV;Initial Catalog=C_TRACK;Persist Security Info=True;User ID=sa;Password=keyhammer16"
|
||||
providerName="System.Data.SqlClient" />
|
||||
<add name="MapoDb.Properties.Settings.MoonPro_ES3ConnectionString"
|
||||
connectionString="Data Source=sql2016dev;Initial Catalog=MoonPro_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16"
|
||||
providerName="System.Data.SqlClient" />
|
||||
<add name="MapoModel" connectionString="data source=SQL2016DEV;initial catalog=MoonPro;persist security info=True;user id=sa;password=keyhammer16;MultipleActiveResultSets=True;App=EntityFramework"
|
||||
providerName="System.Data.SqlClient" />
|
||||
<add name="MapoDb.Properties.Settings.MoonPro_IS_ArcaConnectionString"
|
||||
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_EdilChim;Persist Security Info=True;User ID=sa;Password=keyhammer16"
|
||||
providerName="System.Data.SqlClient" />
|
||||
<add name="MapoDb.Properties.Settings.MoonPro_MAGConnectionString"
|
||||
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;User ID=sa;Password=keyhammer16"
|
||||
providerName="System.Data.SqlClient" />
|
||||
</connectionStrings>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
|
||||
|
||||
Reference in New Issue
Block a user