modifiche (parziali) a liste di prelievo smart

git-svn-id: https://keyhammer.ath.cx/svn/GMW/trunk@429 365432ac-a1b5-4ffd-bb28-6d3099d32164

GMW/GMW/GMW.csproj

@@ -1111,6 +1111,11 @@
     <Content Include="WS\AutoCompletamento.asmx" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Style_prod.css" />
+    <Content Include="Style_test.css" />
+    <Content Include="images\lista_00-Smart_l.png" />
+    <Content Include="images\lista_00-Smart_m.png" />
+    <Content Include="images\lista_00-Smart_s.png" />
     <Content Include="Reports\CartellinoAnime.rdlc" />
   </ItemGroup>
   <ItemGroup>

GMW/GMW/Style.css

@@ -554,7 +554,7 @@
     background-repeat: repeat-x;
     background-position: 0% 0%;
     background-attachment: scroll;
-    background-image: url(images/bluGrad32.png);
+    background-image: url(images/orangeGrad32.png);
 }
 .ShadowText
 {
@@ -646,7 +646,7 @@
 }
 .barraTitolo
 {
-    background-color: #4C90FF;
+    background-color: #FF904C;
     vertical-align: middle;
     height: 20pt;
     text-align: center;

GMW/GMW/Web.config

@@ -135,6 +135,9 @@
     <add key="IdxPosizioneLiquidi" value="24" />
     <add key="IdxPosizioneAnime" value="2" />
 
+    <!--Setup codMag-->
+    <add key="CodMagMP_NC" value="6666" />
+
     <!--Setup stampa cartellini-->
     <add key="printerCartCompleto" value="\\Vostro410\PDFCreator"/>
     <add key="PageWidthCartCompleto" value="21cm" />

GMW/GMW_data/GMW_data.csproj

@@ -271,16 +271,26 @@
     <None Include="SqlScripts\V1.1\GMW_00225.sql" />
     <None Include="SqlScripts\V1.1\GMW_00230.sql" />
     <None Include="SqlScripts\V1.1\GMW_00360.sql" />
+    <None Include="SqlScripts\V1.2\GMW_00414.sql" />
+    <None Include="SqlScripts\V1.2\GMW_410_TEKAL\01-Da TK_GMWTEst 395 a 409 TABELLE.sql" />
+    <None Include="SqlScripts\V1.2\GMW_410_TEKAL\02-Da TK_GMWTEst 395 a 409 STORED.sql" />
+    <None Include="SqlScripts\V1.2\GMW_410_TEKAL\03-Da TK_GMWTEst 395 a 409 VISTE.sql" />
+    <None Include="SqlScripts\V1.2\GMW_410_TEKAL\GMW_00410.sql" />
+    <None Include="SqlScripts\V1.2\GMW_00415.sql" />
     <None Include="SqlScripts\V1.2\GMW_00409.sql" />
     <None Include="SqlScripts\V1.2\GMW_00408.sql" />
     <None Include="SqlScripts\V1.2\GMW_00407.sql" />
     <None Include="SqlScripts\V1.2\GMW_00403.sql" />
     <None Include="SqlScripts\V1.2\GMW_00402.sql" />
     <None Include="SqlScripts\V1.2\GMW_00401.sql" />
+    <None Include="SqlScripts\V1.2\GMW_410_TEKAL\SincVocabolario_TK_409.sql" />
     <None Include="SqlScripts\Vocabolario\vocab_409.sql" />
     <None Include="SqlScripts\Vocabolario\vocab_401.sql" />
     <None Include="SqlScripts\Vocabolario\vocab_000.sql" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="SqlScripts\V1.2\GMW_410_TEKAL\Sincroniz da TK_GMWTest a TK_GMW NON USARE.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

GMW/GMW_data/MagClass.cs

@@ -1611,7 +1611,7 @@ namespace GMW_data
                         answ = true;
 
                         // per ogni riga creo un UDC 
-                        DS_Applicazione.ElencoCartelliniDataTable tabCartellini = DataProxy.obj.taCartellini.stp_insNewFull(memLayer.ML.confReadString("CodCS"), memLayer.ML.confReadString("BilanciaMP"), string.Format("{0:yy}", DateTime.Now), rqRow.CodFor, rqRow.CodLega, "", "", "", "", DateTime.Now, 0, memLayer.ML.confReadString("CodImballoMP"), CodSoggCurrUser, 0, memLayer.ML.confReadInt("IdxPosizMP"), "M", "UDC_MP", rqRow.Qta, Convert.ToDouble(rqRow.Qta), 1, memLayer.ML.confReadString("CodStatoMP"), "", false, note); // UDC_MP HARD CODED!!!
+                        DS_Applicazione.ElencoCartelliniDataTable tabCartellini = DataProxy.obj.taCartellini.stp_insNewFull(memLayer.ML.confReadString("CodCS"), memLayer.ML.confReadString("BilanciaMP"), string.Format("{0:yy}", DateTime.Now), rqRow.CodFor, rqRow.CodLega, "", "", "", "", DateTime.Now, 0, memLayer.ML.confReadString("CodImballoMP"), CodSoggCurrUser, 0, memLayer.ML.confReadInt("IdxPosizMP"), "M", "UDC_MP", rqRow.Qta, Convert.ToDouble(rqRow.Qta), 1, memLayer.ML.confReadString("CodStatoMP"), rqRow.ProgUDC, false, note); // UDC_MP HARD CODED!!!
                         try
                         {
                             UDC = tabCartellini[0].UDC;
@@ -1620,7 +1620,20 @@ namespace GMW_data
                         }
                         catch (Exception e)
                         {
-                            logger.lg.scriviLog(string.Format("Non sono riuscito a creare associazioen UDC / rapp qual: UDC creato: {0}, progRappQual: {1}, eccezione: {2}", UDC, rqRow.ProgUDC, e), tipoLog.EXCEPTION);
+                            logger.lg.scriviLog(string.Format("Non sono riuscito a creare associazione UDC / rapp qual: UDC creato: {0}, progRappQual: {1}, eccezione: {2}", UDC, rqRow.ProgUDC, e), tipoLog.EXCEPTION);
+                        }
+                        try
+                        {
+                            if (rqRow.BenesQual == "N")
+                            {
+                                // se non c'è benestare cambio posizione ad un altra cella, la prima (terra) del cod blocco MP - N.C.
+                                int idxPosizTo = taCelle.getByCodMag(memLayer.ML.confReadString("CodCS"), memLayer.ML.confReadString("CodMagMP_NC"))[0].IdxCella;
+                                magazzino.spostaUDC(memLayer.ML.confReadString("CodCS"), UDC, idxPosizTo, true);
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            logger.lg.scriviLog(string.Format("Non sono riuscito a spostare UDC non conforme: UDC creato: {0}, progRappQual: {1}, eccezione: {2}", UDC, rqRow.ProgUDC, e), tipoLog.EXCEPTION);
                         }
                     }
                 }
@@ -1647,7 +1660,7 @@ namespace GMW_data
                 answ = true;
             }
             catch
-            { }            
+            { }
             return answ;
         }
         /// <summary>