diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj
index d3a5c59f..01abc704 100644
--- a/GMW/GMW/GMW.csproj
+++ b/GMW/GMW/GMW.csproj
@@ -262,21 +262,18 @@
mod_anagBlocchi.ascx
- ASPXCodeBehind
mod_anagBlocchi.ascx
mod_anagCelle.ascx
- ASPXCodeBehind
mod_anagCelle.ascx
mod_anagMagazzini.ascx
- ASPXCodeBehind
mod_anagMagazzini.ascx
@@ -290,14 +287,12 @@
mod_chLang.ascx
- ASPXCodeBehind
mod_chLang.ascx
mod_confMag.ascx
- ASPXCodeBehind
mod_confMag.ascx
@@ -311,7 +306,6 @@
mod_delibera.ascx
- ASPXCodeBehind
mod_delibera.ascx
@@ -339,21 +333,18 @@
mod_detailParticolari.ascx
- ASPXCodeBehind
mod_detailParticolari.ascx
mod_detailUDC.ascx
- ASPXCodeBehind
mod_detailUDC.ascx
mod_dettaglioBlocco.ascx
- ASPXCodeBehind
mod_dettaglioBlocco.ascx
@@ -367,7 +358,6 @@
mod_elencoListePrelievo.ascx
- ASPXCodeBehind
mod_elencoListePrelievo.ascx
@@ -409,49 +399,42 @@
mod_filtro.ascx
- ASPXCodeBehind
mod_filtro.ascx
mod_labAssStampaUdc.ascx
- ASPXCodeBehind
mod_labAssStampaUdc.ascx
mod_labConsUdc.ascx
- ASPXCodeBehind
mod_labConsUdc.ascx
mod_lemmiVocab.ascx
- ASPXCodeBehind
mod_lemmiVocab.ascx
mod_listParticolari.ascx
- ASPXCodeBehind
mod_listParticolari.ascx
mod_login.ascx
- ASPXCodeBehind
mod_login.ascx
mod_main_help.ascx
- ASPXCodeBehind
mod_main_help.ascx
@@ -472,14 +455,12 @@
mod_menuSx.ascx
- ASPXCodeBehind
mod_menuSx.ascx
mod_menuTop.ascx
- ASPXCodeBehind
mod_menuTop.ascx
@@ -507,21 +488,18 @@
mod_pageTitleAndSearch.ascx
- ASPXCodeBehind
mod_pageTitleAndSearch.ascx
mod_paretoPartByFullSpec.ascx
- ASPXCodeBehind
mod_paretoPartByFullSpec.ascx
mod_paretoUdcBlocco.ascx
- ASPXCodeBehind
mod_paretoUdcBlocco.ascx
@@ -535,7 +513,6 @@
mod_ricercaGenerica.ascx
- ASPXCodeBehind
mod_ricercaGenerica.ascx
@@ -549,7 +526,6 @@
mod_listImballi.ascx
- ASPXCodeBehind
mod_listImballi.ascx
@@ -605,42 +581,36 @@
mod_selettore_ajax.ascx
- ASPXCodeBehind
mod_selettore_ajax.ascx
mod_listUDC.ascx
- ASPXCodeBehind
mod_listUDC.ascx
mod_statoMag.ascx
- ASPXCodeBehind
mod_statoMag.ascx
mod_statoMagLogico.ascx
- ASPXCodeBehind
mod_statoMagLogico.ascx
mod_tipoCella.ascx
- ASPXCodeBehind
mod_tipoCella.ascx
mod_UdcCella.ascx
- ASPXCodeBehind
mod_UdcCella.ascx
@@ -654,14 +624,12 @@
mod_viewRigheListaPrelievo.ascx
- ASPXCodeBehind
mod_viewRigheListaPrelievo.ascx
mod_vocabolario.ascx
- ASPXCodeBehind
mod_vocabolario.ascx
@@ -981,7 +949,7 @@
False
True
- 58064
+ 62600
/
http://localhost/GMW
True
diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config
index a0b000f0..eeb9122c 100644
--- a/GMW/GMW/Web.config
+++ b/GMW/GMW/Web.config
@@ -62,7 +62,7 @@
-
+
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index a786f797..90de12c2 100644
Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ
diff --git a/GMW/GMW/bin/GMW_data.dll b/GMW/GMW/bin/GMW_data.dll
index d0d3f75b..fc1fa8c6 100644
Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ
diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config
index 8ea10f94..a7952c22 100644
--- a/GMW/GMW/mazzAppSettings.config
+++ b/GMW/GMW/mazzAppSettings.config
@@ -7,7 +7,7 @@
-
+
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index a786f797..ed25d09e 100644
Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ
diff --git a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache
index 9d37a524..1f2172a4 100644
Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll
index 022ab197..90de12c2 100644
Binary files a/GMW/GMW/obj/Release/GMW.dll and b/GMW/GMW/obj/Release/GMW.dll differ
diff --git a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache
index 98788eb4..b0b7f845 100644
Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config
index 3735cb12..7639a3f1 100644
--- a/GMW/GMW_Term/Web.config
+++ b/GMW/GMW_Term/Web.config
@@ -58,7 +58,7 @@
-
+
diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll
index 29bdbbd3..decd6297 100644
Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ
diff --git a/GMW/GMW_Term/bin/GMW_data.dll b/GMW/GMW_Term/bin/GMW_data.dll
index 9a17d969..e4d73998 100644
Binary files a/GMW/GMW_Term/bin/GMW_data.dll and b/GMW/GMW_Term/bin/GMW_data.dll differ
diff --git a/GMW/GMW_Term/mazzAppSettings.config b/GMW/GMW_Term/mazzAppSettings.config
index b2aed67e..d4d1e1fa 100644
--- a/GMW/GMW_Term/mazzAppSettings.config
+++ b/GMW/GMW_Term/mazzAppSettings.config
@@ -7,7 +7,7 @@
-
+
diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll
index 29bdbbd3..4a89c3b2 100644
Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ
diff --git a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache
index b8764d4c..18877c77 100644
Binary files a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj
index 7e4c02b2..c1f11b2b 100644
--- a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj
+++ b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj
@@ -330,14 +330,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW_Term"
- "ProductCode" = "8:{677D3CA0-5628-4280-BAA0-1B19ADF08B7D}"
- "PackageCode" = "8:{9C651D00-5F92-4CE0-9E22-F6ED872170B7}"
+ "ProductCode" = "8:{7CB4D0AA-04F4-4DA1-941D-30C26B52991B}"
+ "PackageCode" = "8:{9A7250B6-67C7-4C48-9370-65636E65C7C9}"
"UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.0.325"
+ "ProductVersion" = "8:1.0.330"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
diff --git a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi
index 93feeedb..fa6e09fd 100644
Binary files a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi and b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi differ
diff --git a/GMW/GMW_WS/Web.config b/GMW/GMW_WS/Web.config
index b388b4c3..5d0ec741 100644
--- a/GMW/GMW_WS/Web.config
+++ b/GMW/GMW_WS/Web.config
@@ -88,7 +88,7 @@
-
+
diff --git a/GMW/GMW_WS/bilance.asmx.cs b/GMW/GMW_WS/bilance.asmx.cs
index 3e15b2af..62edf64c 100644
--- a/GMW/GMW_WS/bilance.asmx.cs
+++ b/GMW/GMW_WS/bilance.asmx.cs
@@ -14,7 +14,7 @@ namespace GMW_WS
///
/// WebService per gestione sw bilance
///
- [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.1.0.325")]
+ [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.1.0.330")]
[WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
[System.ComponentModel.ToolboxItem(false)]
public class bilance : System.Web.Services.WebService
@@ -802,7 +802,6 @@ namespace GMW_WS
{
// consuma il vecchio (parent) in magazzino... da 84 a -84...
MagClass.magazzino.scaricaUdcMpWip(UDC_ParentTrim);
-
answ = true;
}
catch (Exception e)
@@ -1068,17 +1067,8 @@ namespace GMW_WS
// se richiesto faccio consumo immediato...
if (memLayer.ML.confReadBool("Cosumo84PostDelibera"))
{
- string Particolare = rigaUdc.Particolare;
- int IdxPosizione = 84; // rigaUdc.IdxPosizione;
- decimal Quantita = -rigaUdc.Qta;
// faccio spostamento!
bool fatto = MagClass.magazzino.scaricaUdcMpWip(UDC_req);
- // calcolo l'eventuale rettifica x AS
- if (fatto)
- {
- // devo fare un movimento di compensazioen su mag 84 x non scaricare subito la quantità che ho appena messo in AS400...
- DataProxy.obj.taCartellini.stp_rettMovAs400(Particolare, UDC_req, IdxPosizione.ToString(), Quantita, "UDC_NOQTY");
- }
}
}
return answ;
diff --git a/GMW/GMW_WS/bin/GMW.dll b/GMW/GMW_WS/bin/GMW.dll
index 7949d051..4d9975a4 100644
Binary files a/GMW/GMW_WS/bin/GMW.dll and b/GMW/GMW_WS/bin/GMW.dll differ
diff --git a/GMW/GMW_WS/bin/GMW_WS.dll b/GMW/GMW_WS/bin/GMW_WS.dll
index 514ae959..08fcfbfe 100644
Binary files a/GMW/GMW_WS/bin/GMW_WS.dll and b/GMW/GMW_WS/bin/GMW_WS.dll differ
diff --git a/GMW/GMW_WS/bin/GMW_data.dll b/GMW/GMW_WS/bin/GMW_data.dll
index 2f6da48c..e4d73998 100644
Binary files a/GMW/GMW_WS/bin/GMW_data.dll and b/GMW/GMW_WS/bin/GMW_data.dll differ
diff --git a/GMW/GMW_WS/mazzAppSettings.config b/GMW/GMW_WS/mazzAppSettings.config
index 987cc2ae..f56864e4 100644
--- a/GMW/GMW_WS/mazzAppSettings.config
+++ b/GMW/GMW_WS/mazzAppSettings.config
@@ -6,7 +6,7 @@
-
+
diff --git a/GMW/GMW_WS/obj/Debug/GMW_WS.dll b/GMW/GMW_WS/obj/Debug/GMW_WS.dll
index a6e44d41..20169c18 100644
Binary files a/GMW/GMW_WS/obj/Debug/GMW_WS.dll and b/GMW/GMW_WS/obj/Debug/GMW_WS.dll differ
diff --git a/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache
index 7234389f..bcff6bb0 100644
Binary files a/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_WS/obj/Release/GMW_WS.dll b/GMW/GMW_WS/obj/Release/GMW_WS.dll
index 514ae959..08fcfbfe 100644
Binary files a/GMW/GMW_WS/obj/Release/GMW_WS.dll and b/GMW/GMW_WS/obj/Release/GMW_WS.dll differ
diff --git a/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache
index e95571d8..dfa072bc 100644
Binary files a/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_WS_installer/GMW_WS_installer.vdproj b/GMW/GMW_WS_installer/GMW_WS_installer.vdproj
index b1f35a61..5eee09ee 100644
--- a/GMW/GMW_WS_installer/GMW_WS_installer.vdproj
+++ b/GMW/GMW_WS_installer/GMW_WS_installer.vdproj
@@ -344,14 +344,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW_WS"
- "ProductCode" = "8:{840FE6BD-2BF2-44F4-A0A0-88C39EEE6C1B}"
- "PackageCode" = "8:{A6264CDE-5990-4A3B-80BD-568FD73FC7A0}"
+ "ProductCode" = "8:{1AD4372A-EAE1-450D-9F01-9474FD2E9FC9}"
+ "PackageCode" = "8:{479AA99D-DD79-46F3-B05C-D7173BE2A97B}"
"UpgradeCode" = "8:{BA470335-3D4B-4C20-8152-90A5F0F14FE0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.0.325"
+ "ProductVersion" = "8:1.0.330"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
@@ -824,7 +824,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C1E28C0CBEB3498E83D9B97B28568D55"
{
- "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe"
+ "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_B61BA0CAC3474474B971A8F12A1C93F2"
@@ -852,7 +852,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D67ABEB91C7F428EB3C512E4A505628A"
{
- "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe"
+ "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_B61BA0CAC3474474B971A8F12A1C93F2"
diff --git a/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi b/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi
index c47d52d0..48ee9cb3 100644
Binary files a/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi and b/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi differ
diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj
index 25dd175a..8e2355de 100644
--- a/GMW/GMW_data/GMW_data.csproj
+++ b/GMW/GMW_data/GMW_data.csproj
@@ -161,6 +161,7 @@
SettingsSingleFileGenerator
Settings.Designer.cs
+
diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs
index 1dac1b6d..54d85c69 100644
--- a/GMW/GMW_data/MagClass.cs
+++ b/GMW/GMW_data/MagClass.cs
@@ -993,49 +993,10 @@ namespace GMW_data
IdxPosizione = rigaUdc.IdxPosizione;
Quantita = -rigaUdc.Qta;
}
- // sposto UDC
+ // sposto UDC, e così facendo genero movimenti batch x AS400
fatto = scaricaUDC(UDC, idxCellaFrom, idxPosizUdcDest);
// dopo aver scaricato UDC sistemo eventuali Righe di Prelievo x lo stesso pending...
magazzino.taRigheListePrelievo.stp_RLP_sbloccaNonPrelevate(CodLista, UDC);
-
- // in caso di prelievo x spedizione cliente
- if (codTipoListaAttuale == "02-PreCli")
- {
- // calcolo l'eventuale rettifica x AS
- if (fatto)
- {
- // devo fare un movimento di compensazione su mag 84 x non scaricare quello che andrà in bolla AS400...
- DataProxy.obj.taCartellini.stp_rettMovAs400(Particolare, UDC, IdxPosizione.ToString(), Quantita, "UDC_NOQTY");
- }
- }
- // in caso di prelievo x terzista...
- if (codTipoListaAttuale == "03-TerWip")
- {
- // e SE specificato nel web.config...
- if (memLayer.ML.confReadBool("Cosumo84PostDelibera"))
- {
- // calcolo l'eventuale rettifica x AS
- if (fatto)
- {
- // devo fare un movimento di compensazione su mag 84 x non scaricare quello che andrà in bolla AS400...
- DataProxy.obj.taCartellini.stp_rettMovAs400(Particolare, UDC, IdxPosizione.ToString(), Quantita, "UDC_NOQTY");
- }
- }
- }
- // in caso di prelievo WIP da OVAS...
- if (codTipoListaAttuale == "01-PreFus")
- {
- // e SE specificato nel web.config...
- if (memLayer.ML.confReadBool("Cosumo84PostDelibera"))
- {
- // SE si tratta di mag 84, sposto da 84 a -84...
- if (fatto && IdxPosizione == 84)
- {
- // devo fare un movimento di compensazione su mag 84 x non scaricare subito la quantità che ho appena messo in AS400...
- DataProxy.obj.taCartellini.stp_rettMovAs400(Particolare, UDC, IdxPosizione.ToString(), Quantita, "UDC_NOQTY");
- }
- }
- }
}
// segna come scaricata la lista prelievo
taElencoListePrelievo.updateStato(CodSoggetto, CodLista, (int)statoLista.scaricata);
diff --git a/GMW/GMW_data/SqlScripts/GMW_00327.sql b/GMW/GMW_data/SqlScripts/GMW_00327.sql
new file mode 100644
index 00000000..cc781990
--- /dev/null
+++ b/GMW/GMW_data/SqlScripts/GMW_00327.sql
@@ -0,0 +1,429 @@
+set xact_abort on
+go
+
+begin transaction
+go
+
+set ANSI_NULLS on
+go
+
+alter VIEW v_selUdcByPart
+AS
+SELECT UDC AS value, ISNULL(RTRIM(UDC), '-') + ' - ' + ISNULL(RTRIM(Particolare), '...') + ' (' + ISNULL(RTRIM(DescParticolare), '') + ') ' + ISNULL(RTRIM(DisegnoGrezzo), '-')
+ + ' pz. ' + ISNULL(CAST(Qta AS varchar), '0') AS label, Particolare, IdxPosizione, CodCS
+FROM dbo.ElencoCartellini
+WHERE (NOT (Particolare IS NULL)) AND (IdxPosizione >= 0)
+go
+
+exec sp_updateextendedproperty 'MS_DiagramPane1', '[0E232FF0-B466-11cf-A24F-00AA00A3EFFF, 1.00]
+Begin DesignProperties =
+ Begin PaneConfigurations =
+ Begin PaneConfiguration = 0
+ NumPanes = 4
+ Configuration = "(H (1[40] 4[20] 2[20] 3) )"
+ End
+ Begin PaneConfiguration = 1
+ NumPanes = 3
+ Configuration = "(H (1 [50] 4 [25] 3))"
+ End
+ Begin PaneConfiguration = 2
+ NumPanes = 3
+ Configuration = "(H (1 [50] 2 [25] 3))"
+ End
+ Begin PaneConfiguration = 3
+ NumPanes = 3
+ Configuration = "(H (4 [30] 2 [40] 3))"
+ End
+ Begin PaneConfiguration = 4
+ NumPanes = 2
+ Configuration = "(H (1 [56] 3))"
+ End
+ Begin PaneConfiguration = 5
+ NumPanes = 2
+ Configuration = "(H (2 [66] 3))"
+ End
+ Begin PaneConfiguration = 6
+ NumPanes = 2
+ Configuration = "(H (4 [50] 3))"
+ End
+ Begin PaneConfiguration = 7
+ NumPanes = 1
+ Configuration = "(V (3))"
+ End
+ Begin PaneConfiguration = 8
+ NumPanes = 3
+ Configuration = "(H (1[56] 4[18] 2) )"
+ End
+ Begin PaneConfiguration = 9
+ NumPanes = 2
+ Configuration = "(H (1 [75] 4))"
+ End
+ Begin PaneConfiguration = 10
+ NumPanes = 2
+ Configuration = "(H (1[66] 2) )"
+ End
+ Begin PaneConfiguration = 11
+ NumPanes = 2
+ Configuration = "(H (4 [60] 2))"
+ End
+ Begin PaneConfiguration = 12
+ NumPanes = 1
+ Configuration = "(H (1) )"
+ End
+ Begin PaneConfiguration = 13
+ NumPanes = 1
+ Configuration = "(V (4))"
+ End
+ Begin PaneConfiguration = 14
+ NumPanes = 1
+ Configuration = "(V (2))"
+ End
+ ActivePaneConfig = 0
+ End
+ Begin DiagramPane =
+ Begin Origin =
+ Top = 0
+ Left = 0
+ End
+ Begin Tables =
+ Begin Table = "ElencoCartellini"
+ Begin Extent =
+ Top = 6
+ Left = 38
+ Bottom = 319
+ Right = 208
+ End
+ DisplayFlags = 280
+ TopColumn = 0
+ End
+ End
+ End
+ Begin SQLPane =
+ End
+ Begin DataPane =
+ Begin ParameterDefaults = ""
+ End
+ Begin ColumnWidths = 9
+ Width = 284
+ Width = 1500
+ Width = 8910
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ End
+ End
+ Begin CriteriaPane =
+ Begin ColumnWidths = 11
+ Column = 1440
+ Alias = 900
+ Table = 1170
+ Output = 720
+ Append = 1400
+ NewValue = 1170
+ SortType = 1350
+ SortOrder = 1410
+ GroupBy = 1350
+ Filter = 1350
+ Or = 1350
+ Or = 1350
+ Or = 1350
+ End
+ End
+End
+', 'SCHEMA', 'dbo', 'VIEW', 'v_selUdcByPart'
+go
+
+commit
+go
+
+set xact_abort on
+go
+
+begin transaction
+go
+
+set ANSI_NULLS on
+go
+
+/***************************************
+* STORED stp_ParticolariOverviewPerListaPrelievo
+*
+* elenco di overview sull'impiego dei particolari (dettaglio a "maglie larghe") x una possibile lista di prelievo
+*
+* Steamware, S.E.L.
+* mod: 2010.05.31
+*
+****************************************/
+alter PROCEDURE stp_ParticolariOverviewPerListaPrelievo
+(
+ @Particolare VARCHAR(50),
+ @CodCS VARCHAR(2),
+ @Esponente NVARCHAR(6),
+ @Figura NVARCHAR(4),
+ @CodImballo NVARCHAR(15),
+ @CodTipoLista NVARCHAR (10)
+)
+AS
+ SELECT RilPro.AnagParticolari.Particolare, RilPro.AnagParticolari.DescParticolare, ISNULL(COUNT(dbo.ElencoCartellini.UDC), 0) AS NumUDC,
+ ISNULL(SUM(dbo.ElencoCartellini.Qta), 0) AS TotQta, ISNULL(COUNT(dbo.PosizioneUdcCorrente.IdxCella), 0) AS NumInMag
+ FROM RilPro.AnagParticolari LEFT OUTER JOIN
+ dbo.ElencoCartellini ON RilPro.AnagParticolari.Particolare = dbo.ElencoCartellini.Particolare LEFT OUTER JOIN
+ dbo.PosizioneUdcCorrente ON dbo.ElencoCartellini.UDC = dbo.PosizioneUdcCorrente.UDC
+ WHERE RilPro.AnagParticolari.CodCS = @CodCS AND
+ RilPro.AnagParticolari.Particolare = @Particolare AND
+ (IdxPosizione IN (SELECT tt.IdxPosizione
+ FROM TipoListaPrelievo tlp INNER JOIN TabTranPosizEventi tt ON tlp.CodEvento = tt.CodEvento
+ WHERE (tlp.CodTipoLista = @CodTipoLista))) AND
+ (dbo.ElencoCartellini.Figura = CASE WHEN @Figura = '*' THEN dbo.ElencoCartellini.Figura ELSE @Figura END) AND
+ (dbo.ElencoCartellini.Esponente = CASE WHEN @Esponente = '*' THEN dbo.ElencoCartellini.Esponente ELSE @Esponente END) AND
+ (dbo.ElencoCartellini.CodImballo = CASE WHEN @CodImballo = '*' THEN dbo.ElencoCartellini.CodImballo ELSE @CodImballo END)
+ /*
+ AND ElencoCartellini.UDC NOT IN (
+ SELECT DISTINCT UDC
+ FROM RigheListePrelievo INNER JOIN ElencoListePrelievo
+ ON RigheListePrelievo.CodLista = ElencoListePrelievo.CodLista
+ WHERE (CodStatoLista > 1 AND Prelevato = 1)
+ )
+ */
+ GROUP BY RilPro.AnagParticolari.Particolare, RilPro.AnagParticolari.DescParticolare
+
+RETURN
+go
+
+commit
+go
+
+
+set xact_abort on
+go
+
+begin transaction
+go
+
+set ANSI_NULLS on
+go
+
+/***************************************
+* STORED stp_ParticolariOverviewPerListaPrelievo
+*
+* elenco degli UDC x lista di prelievo e particolare
+*
+* Steamware, S.E.L.
+* mod: 2010.11.26
+*
+****************************************/
+create PROCEDURE stp_UdcPerParticolareCodLista
+(
+ @Particolare VARCHAR(50),
+ @CodCS VARCHAR(2),
+ @CodTipoLista NVARCHAR (10)
+)
+AS
+ SELECT *
+ FROM v_selUdcByPart
+ WHERE (Particolare = @Particolare) AND (CodCS = @CodCS)
+ AND (IdxPosizione IN (SELECT tt.IdxPosizione
+ FROM TipoListaPrelievo tlp INNER JOIN TabTranPosizEventi tt ON tlp.CodEvento = tt.CodEvento
+ WHERE (tlp.CodTipoLista = @CodTipoLista)))
+
+
+RETURN
+go
+
+commit
+go
+
+
+set xact_abort on
+go
+
+begin transaction
+go
+
+alter table TabTranPosizEventi add
+ toAs400 bit constraint DF_TabTranPosizEventi_toAs400 default (1)
+go
+
+update TabTranPosizEventi set toAs400=1
+go
+
+set ANSI_NULLS on
+go
+
+-- =============================================
+-- Author: Samuele E. Locatelli
+-- Create date: 2009-09-20
+-- Description: trigger x inserimento movimenti
+-- nella coda di trasferimento batch
+-- verso AS400 x UPDATE UDC
+-- =============================================
+alter TRIGGER trg_updMovAS
+ ON ElencoCartellini
+ AFTER UPDATE
+AS
+BEGIN
+
+ -- setup variabili e verbosità
+ SET NOCOUNT ON;
+ DECLARE @partOk AS BIT
+ DECLARE @IdxPosFrom AS INT
+ DECLARE @IdxPosTo AS INT
+ DECLARE @magFrom AS NVARCHAR(50)
+ DECLARE @magTo AS NVARCHAR(50)
+ DECLARE @qta AS DECIMAL(10,2)
+ DECLARE @qtaOld AS DECIMAL(10,2)
+ DECLARE @IdxPosizioneComp INT
+ DECLARE @toAs400 BIT
+
+ -- controllo che CI SIA il particolare (altrimenti non eseguo)
+ SET @partOk = (SELECT CASE WHEN ISNULL(Particolare,'n.d.') = 'n.d.' THEN 0 ELSE 1 END FROM deleted)
+
+ IF(@partOk = 1)
+ SET @qta = (SELECT Qta FROM inserted)
+ SET @qtaOld = (SELECT Qta FROM deleted)
+ -- se c'è stata modifica di quantità inizio a rettificare quella
+ IF ((UPDATE(Qta)) AND(@qta <> @qtaOld))
+ BEGIN
+ -- registro il VERO movimento
+ INSERT INTO AS400_BatchMovimenti(DataIns, CodEvento, Particolare, UDC, CodMagAS, Quantita)
+ (
+ SELECT GETDATE(), 'UDC_MOD', Particolare, UDC, CAST(IdxPosizione AS NVARCHAR(50)), @qta - Qta
+ FROM deleted
+ WHERE CAST(IdxPosizione AS NVARCHAR(50)) IN (SELECT CodMagAS FROM AS400_MagCont WHERE Attivo = 1)
+ )
+ -- controllo: se il magazzino di destinazione richiede una compensazione registro il 2° movimento di compensazione
+ SET @IdxPosFrom = (SELECT IdxPosizione FROM deleted)
+ SET @IdxPosTo = (SELECT IdxPosizione FROM inserted)
+ -- calcolo il mag di compensazione
+ SET @IdxPosizioneComp = (SELECT CAST(ISNULL(CodMagAS_compensaz,0) AS INT) FROM AS400_MagCont WHERE (Attivo = 1) AND (CodMagAS = CAST(@IdxPosFrom AS NVARCHAR(50))))
+ IF (@IdxPosizioneComp > 0)
+ BEGIN
+ INSERT INTO AS400_BatchMovimenti(DataIns, CodEvento, Particolare, UDC, CodMagAS, Quantita)
+ (
+ SELECT GETDATE(), 'UDC_COMP', Particolare, UDC, CAST(@IdxPosizioneComp AS NVARCHAR(50)), Qta - @qta
+ FROM deleted
+ WHERE CAST(IdxPosizione AS NVARCHAR(50)) IN (SELECT CodMagAS FROM AS400_MagCont WHERE Attivo = 1)
+ )
+ END
+ END
+
+ -- Prendo le posizioni di magazzino precedente e nuova
+ SET @IdxPosFrom = (SELECT IdxPosizione FROM deleted)
+ SET @IdxPosTo = (SELECT IdxPosizione FROM inserted)
+
+ -- controllo se devo fare rettifiche quantità...
+ SET @toAs400 = (
+ SELECT TOP 1 ISNULL(toAs400, 0) as valore
+ FROM TabTranPosizEventi
+ WHERE IdxPosizione = @IdxPosFrom AND IdxPosizioneTo = @IdxPosTo
+ )
+
+ -- controllo poi se sia cambiato il magazzino logico (IdxPosizione) e si richieda update verso AS400, altrimenti non lo inserisco
+ IF ((UPDATE(IdxPosizione)) AND @toAs400 = 1)
+ BEGIN
+ -- Le trasformo nelle equivalenti stringhe del codMag SE attive
+ SET @magFrom = (SELECT ISNULL(CodMagAS,'---') FROM AS400_MagCont WHERE Attivo = 1 AND CodMagAs = CAST(@IdxPosFrom AS NVARCHAR(50)))
+ SET @magTo = (SELECT ISNULL(CodMagAS,'---') FROM AS400_MagCont WHERE Attivo = 1 AND CodMagAs = CAST(@IdxPosTo AS NVARCHAR(50)))
+
+ -- inserisco un movimento di deposito verso mag nuovo (SE attivo)
+ IF (@magFrom <> '---')
+ BEGIN
+ INSERT INTO AS400_BatchMovimenti(DataIns, CodEvento, Particolare, UDC, CodMagAS, Quantita)
+ (
+ SELECT GETDATE(), 'UDC_MOV', Particolare, UDC, CAST(IdxPosizione AS NVARCHAR(50)), -@qta
+ FROM deleted
+ WHERE CAST(IdxPosizione AS NVARCHAR(50)) IN (SELECT CodMagAS FROM AS400_MagCont WHERE Attivo = 1)
+ )
+ END
+ -- inserisco un movimento di prelievo verso mag vecchio (SE attivo)
+ IF (@magTo <> '---')
+ BEGIN
+ INSERT INTO AS400_BatchMovimenti(DataIns, CodEvento, Particolare, UDC, CodMagAS, Quantita)
+ (
+ SELECT GETDATE(), 'UDC_MOV', Particolare, UDC, CAST(IdxPosizione AS NVARCHAR(50)), @qta
+ FROM inserted
+ WHERE CAST(IdxPosizione AS NVARCHAR(50)) IN (SELECT CodMagAS FROM AS400_MagCont WHERE Attivo = 1)
+ )
+ END
+ END
+
+END
+go
+
+commit
+go
+
+set xact_abort on
+go
+
+begin transaction
+go
+
+INSERT INTO dbo.AnagTipoEvento
+ VALUES (N'UDC_RIEN', N'Rientro UDC da 88')
+go
+
+commit transaction
+go
+
+
+set xact_abort on
+go
+
+begin transaction
+go
+
+UPDATE dbo.TabTranPosizEventi SET
+ toAs400=0
+ WHERE CodEvento=N'DelWipPost' and IdxPosizione=305
+UPDATE dbo.TabTranPosizEventi SET
+ toAs400=0
+ WHERE CodEvento=N'DelWipPre' and IdxPosizione=290
+UPDATE dbo.TabTranPosizEventi SET
+ toAs400=0
+ WHERE CodEvento=N'MagPreFin' and IdxPosizione=54
+UPDATE dbo.TabTranPosizEventi SET
+ toAs400=0
+ WHERE CodEvento=N'MagPreFus' and IdxPosizione=80
+UPDATE dbo.TabTranPosizEventi SET
+ toAs400=0
+ WHERE CodEvento=N'MagPreFus' and IdxPosizione=84
+UPDATE dbo.TabTranPosizEventi SET
+ toAs400=0
+ WHERE CodEvento=N'MagPreWip' and IdxPosizione=84
+UPDATE dbo.TabTranPosizEventi SET
+ toAs400=0
+ WHERE CodEvento=N'SpeWipTerz' and IdxPosizione=290
+UPDATE dbo.TabTranPosizEventi SET
+ toAs400=0
+ WHERE CodEvento=N'SpeWipTerz' and IdxPosizione=295
+UPDATE dbo.TabTranPosizEventi SET
+ toAs400=0
+ WHERE CodEvento=N'UDC_CONS' and IdxPosizione=54
+UPDATE dbo.TabTranPosizEventi SET
+ toAs400=0
+ WHERE CodEvento=N'UDC_CONS' and IdxPosizione=56
+UPDATE dbo.TabTranPosizEventi SET
+ toAs400=0
+ WHERE CodEvento=N'UDC_CONS' and IdxPosizione=84
+INSERT INTO dbo.TabTranPosizEventi
+ VALUES (N'UDC_RIEN', 88, 84, 1)
+go
+
+commit transaction
+go
+
+
+
+
+
+
+
+
+
+-- registro versione...
+INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(327, GETDATE())
+GO
diff --git a/GMW/GMW_data/StateMachine.cs b/GMW/GMW_data/StateMachine.cs
index d453175c..7a528c5b 100644
--- a/GMW/GMW_data/StateMachine.cs
+++ b/GMW/GMW_data/StateMachine.cs
@@ -62,12 +62,6 @@ namespace GMW_data
decimal Quantita = -riga.Qta;
// da db determino che non faccio scaricamento automatico da altre posizioni terzisti/clienti (solo 84) xché non c'è in TabTranEventi
fatto = MagClass.magazzino.scaricaUdcMpWip(UDC);
- // calcolo l'eventuale rettifica x AS
- if (fatto)
- {
- // devo fare un movimento di compensazioen su mag 84 x non scaricare subito la quantità che ho appena messo in AS400...
- DataProxy.obj.taCartellini.stp_rettMovAs400(Particolare, UDC, IdxPosizione.ToString(), Quantita, "UDC_NOQTY");
- }
}
}
catch (Exception e)
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index d0d3f75b..770aac50 100644
Binary files a/GMW/GMW_data/bin/Debug/GMW_data.dll and b/GMW/GMW_data/bin/Debug/GMW_data.dll differ
diff --git a/GMW/GMW_data/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll
index 874c103d..fc1fa8c6 100644
Binary files a/GMW/GMW_data/bin/Release/GMW_data.dll and b/GMW/GMW_data/bin/Release/GMW_data.dll differ
diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll
index d0d3f75b..770aac50 100644
Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ
diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll
index 874c103d..fc1fa8c6 100644
Binary files a/GMW/GMW_data/obj/Release/GMW_data.dll and b/GMW/GMW_data/obj/Release/GMW_data.dll differ
diff --git a/GMW/GMW_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj
index b9de4f0d..614d9119 100644
--- a/GMW/GMW_installer/GMW_installer.vdproj
+++ b/GMW/GMW_installer/GMW_installer.vdproj
@@ -349,14 +349,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW"
- "ProductCode" = "8:{C0AEED31-261D-4C90-9760-7B1DF9950427}"
- "PackageCode" = "8:{F01142FE-83CD-4527-98C6-7B3427A5CF6A}"
+ "ProductCode" = "8:{8391B290-0F5F-41F0-A300-490F94C9E6DE}"
+ "PackageCode" = "8:{C6A287BB-0A2A-4585-8D74-C4E0E875F318}"
"UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.0.326"
+ "ProductVersion" = "8:1.0.330"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi
index 6ba77192..1ab64acd 100644
Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ