+
-
diff --git a/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs b/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs
index 2a810d69..adbd4a5e 100644
--- a/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs
+++ b/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs
@@ -90,8 +90,12 @@ namespace MoonProTablet.WebUserControls
private void processInput()
{
bool found = false;
+ MapoDb.DS_Arca.GiacenzeDataTable tabGiacenzeLotto = new MapoDb.DS_Arca.GiacenzeDataTable();
+ MapoDb.DS_SheetTech.ST_ActualRowDataTable tabRichieste = new MapoDb.DS_SheetTech.ST_ActualRowDataTable();
+ MapoDb.DS_SheetTech.ST_ActualRowRow datiBatchCheck;
+ MapoDb.DS_Arca.GiacenzeRow datiLotto;
// per prima cosa recupero i valori "Pending" da leggere come candidati...
- var tabRichieste = DataLayerObj.taSTAR.getPendingByOdl(idxOdl);
+ tabRichieste = DataLayerObj.taSTAR.getPendingByOdl(idxOdl);
if (tabRichieste != null && tabRichieste.Count > 0)
{
// cerco per EQ come primo step...
@@ -111,30 +115,55 @@ namespace MoonProTablet.WebUserControls
// se non trovato
if (!found)
{
+ // recupero record.. cercando in giacenza il LOTTO...
+ tabGiacenzeLotto = DataLayerObj.taArcaGiac.getBySearch(null, "", BCodeVal, "", false);
// controllo condizione tipo BATCH (speciale) - prima solo che CI SIA una richiesta di questo tipo
var trovatoBatch = tabRichieste.Where(x => x.CheckType == "BATCH");
if (trovatoBatch != null && trovatoBatch.Count() > 0)
{
- // recupero record.. cercando in giacenza il LOTTO...
- var tabGiacenzeLotto = DataLayerObj.taArcaGiac.getBySearch(null, "", BCodeVal, "", false);
if (tabGiacenzeLotto != null && tabGiacenzeLotto.Count > 0)
{
- var datiBatchCheck = trovatoBatch.FirstOrDefault();
- var datiLotto = tabGiacenzeLotto.FirstOrDefault();
+ datiBatchCheck = trovatoBatch.FirstOrDefault();
+ datiLotto = tabGiacenzeLotto.FirstOrDefault();
// registro trovato
found = true;
- lblMessage.Text = $"Parametro acquisito: {BCodeVal} --> {datiLotto.Cd_AR}";
- lblMessage.CssClass = "text-success";
// upsert controllo
DataLayerObj.taSTChk.upsertQuery(idxOdl, datiBatchCheck.IdxST, datiBatchCheck.Oggetto, datiBatchCheck.Num, BCodeVal, datiLotto.Cd_AR, true, user_std.UtSn.utente);
+ // conto quanti check ci sono dopo, se calati --> ok altrimenti errore
+ var tabRichiestePost = DataLayerObj.taSTAR.getPendingByOdl(idxOdl);
+ if (tabRichiestePost.Count < tabRichieste.Count)
+ {
+ lblMessage.Text = $"Lotto riconosciuto: {BCodeVal} --> {datiLotto.Cd_AR} | Articolo acquisito";
+ lblMessage.CssClass = "text-success";
+ }
+ else
+ {
+ lblMessage.Text = $"Lotto: {BCodeVal} --> {datiLotto.Cd_AR} | Articolo NON richiesto";
+ lblMessage.CssClass = "text-danger";
+ }
}
}
}
+ // se non trovato
+ if (!found)
+ {
+ if (tabGiacenzeLotto != null && tabGiacenzeLotto.Count > 0)
+ {
+ datiLotto = tabGiacenzeLotto.FirstOrDefault();
+ lblMessage.Text = $"Lotto: {BCodeVal} --> {datiLotto.Cd_AR} | Articolo NON richiesto";
+ lblMessage.CssClass = "text-danger";
+ }
+ else
+ {
+ lblMessage.Text = $"Parametro non riconosciuto: {BCodeVal}";
+ lblMessage.CssClass = "text-secondary";
+ }
+ }
}
else
{
- lblMessage.Text = "Parametro non valido";
+ lblMessage.Text = $"Parametro non valido: {BCodeVal}";
lblMessage.CssClass = "text-secondary";
}
diff --git a/WebConfigSetter/CONF/Valvital.json b/WebConfigSetter/CONF/Valvital.json
new file mode 100644
index 00000000..2b466e6c
--- /dev/null
+++ b/WebConfigSetter/CONF/Valvital.json
@@ -0,0 +1,26 @@
+{
+ "appSettRules": {
+ "DbConfConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Valvital_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;",
+ "MoonProConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Valvital_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;",
+ "MoonProConnectionStringIS": "Data Source=SQL2016PROD;Initial Catalog=Valvital_MoonPro_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;",
+ "MoonProConnectionStringES3": "Data Source=SQL2016PROD;Initial Catalog=Valvital_MoonPro_ES3_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;",
+ "PermessiConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Valvital_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;",
+ "UtenteCdcConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;",
+ "VocabolarioConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Valvital_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;",
+ "DevicesConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;",
+ "DevicesAuthConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Valvital_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;",
+ "MoonProConnectionStringArca": "Data Source=SQL2016PROD;Initial Catalog=Valvital_MoonPro_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;",
+ "MoonProConnectionStringMAG": "Data Source=SQL2016PROD;Initial Catalog=Valvital_MoonPro_MAG_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;"
+ },
+ "connStrRules": {
+ "MoonProConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Valvital_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;",
+ "MapoDb.Properties.Settings.MoonProConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Valvital_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;",
+ "MapoDb.Properties.Settings.MoonPro_IS_ConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Valvital_MoonPro_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;",
+ "MapoDb.Properties.Settings.C_TRACKConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Valvital_C_TRACK_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;",
+ "MapoDb.Properties.Settings.MoonPro_ES3ConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Valvital_MoonPro_ES3_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16",
+ "ErrorLog": "Data Source=SQL2016PROD;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;",
+ "MoonProEntities": "metadata=res://*/Models.MPModel.csdl|res://*/Models.MPModel.ssdl|res://*/Models.MPModel.msl;provider=System.Data.SqlClient;provider connection string=\"data source=SQL2016PROD;initial Catalog=Valvital_MoonPro_Prod;persist security info=True;user id=sa;password=keyhammer16;multipleactiveresultsets=True;application name=EntityFramework\"",
+ "MapoMonEntities": "metadata=res://*/Models.MapoModel.csdl|res://*/Models.MapoModel.ssdl|res://*/Models.MapoModel.msl;provider=System.Data.SqlClient;provider connection string=\"data source=SQL2016PROD;initial Catalog=Valvital_MoonPro_Prod;persist security info=True;user id=sa;password=keyhammer16;multipleactiveresultsets=True;application name=EntityFramework\"",
+ "SteamWare.Properties.Settings.DbConfConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Valvital_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;"
+ }
+}
\ No newline at end of file
diff --git a/WebConfigSetter/WebConfigSetter.csproj b/WebConfigSetter/WebConfigSetter.csproj
index 76fe124b..fa9a39dc 100644
--- a/WebConfigSetter/WebConfigSetter.csproj
+++ b/WebConfigSetter/WebConfigSetter.csproj
@@ -45,5 +45,8 @@
Always
+
+ Always
+
\ No newline at end of file