Egalware/GMW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

COmpeltata integrazione anime x

Browse Source 
- controllo OpAuth (sennò non stampa)
- salvataggio attributo OpAuth (OC)
- install su iis02 + zip x TK
This commit is contained in:
Samuele E. Locatelli
2015-09-29 11:52:48 +02:00
parent 57d1f767e8
commit c58f9545d7
22 changed files with 64 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW-RT/bin/GMW-RT.dll
BIN
View File
Binary file not shown.
GMW-RT/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW-RT/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/GMW-UT.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/GMW.csproj
-1
View File
@@ -451,7 +451,6 @@
<DependentUpon>compilerconfig.json</DependentUpon>
</Content>
<None Include="Properties\PublishProfiles\IIS02_SP.pubxml" />
<None Include="Properties\PublishProfiles\Test218.pubxml" />
<Content Include="Post_SterrTaglio.aspx" />
<Content Include="Post_SterrTaglioFC.aspx" />
<Content Include="RimuoviNC.aspx" />
GMW/GMW.csproj.user
+1 -1
View File
@@ -2,7 +2,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>TK_test</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>IIS02_TK</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
GMW/Properties/PublishProfiles/TK_prod.pubxml
+2 -2
View File
@@ -18,11 +18,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<ObjectGroup Name="GMW_data.Properties.Settings.GMWConnectionString" Order="1" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=10.74.82.217\sql2008r2;InitialCatalog=TK_GMW;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
<PreSource Path="Data Source=10.74.82.217\sql2008r2;Initial Catalog=TK_GMW;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\GMW_data.Properties.Settings.GMWConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=10.74.82.217\sql2008r2;InitialCatalog=TK_GMW;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
<Source MatchValue="Data Source=10.74.82.217\sql2008r2;Initial Catalog=TK_GMW;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
</Objects>
GMW/Properties/PublishProfiles/Test218.pubxml
-23
View File
@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>MSDeploy</WebPublishMethod>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data>
<MSDeployServiceURL>https://10.74.82.218:8172/MsDeploy.axd</MSDeployServiceURL>
<DeployIisAppPath>Default Web Site/GMW</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>True</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<UserName>Administrator</UserName>
<_SavePWD>True</_SavePWD>
</PropertyGroup>
</Project>
GMW/Properties/PublishProfiles/Test218.pubxml.user
-11
View File
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile>2014-10-23T19:00:49.9701048+02:00</TimeStampOfAssociatedLegacyPublishXmlFile>
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAADfdPkbM5mUeaV6YvQx8NEwAAAAACAAAAAAADZgAAwAAAABAAAABretqmeAwoN8dwwUym0l6uAAAAAASAAACgAAAAEAAAANS9Yunkzc8Nyn9LraBErMgQAAAArKgvGhTAwNnTbdGD8tmWohQAAAC/UZP/r9BIjbarE1TjmEMK+wszYw==</EncryptedPassword>
</PropertyGroup>
</Project>
GMW/Web.config
+6 -6
View File
@@ -72,6 +72,12 @@
<add key="maxRefreshToReload" value="60" />
<!--gestione numKey-->
<add key="showNumKey" value="false" />
<!--setup gestione OpAuth-->
<add key="prefCodSogg" value="O" />
<add key="resetCodSogg" value="000" />
<add key="defRemAuth" value="1" />
<add key="defMinScad" value="15" />
<add key="attrOpAuth" value="OC" />
<!--area temp-->
<add key="maxAgeTempAreaHours" value="24" />
<!--area logger-->
@@ -247,12 +253,6 @@
<add key="ReportDatasourceAL" value="GMWDataSet_stp_prtCartAL" />
<add key="ReportDatasourceALRX" value="GMWDataSet_stp_prtCartAL" />
<add key="ReportDatasourceALTT" value="GMWDataSet_stp_prtCartAL" />
<!--setup gestione OpAuth-->
<add key="prefCodSogg" value="O" />
<add key="resetCodSogg" value="000" />
<add key="defRemAuth" value="1" />
<add key="defMinScad" value="15" />
<!--setup comandi barcode-->
<add key="prefComandi" value="CMD" />
<add key="prefDateTime" value="DT" />
GMW/WebUserControls/mod_anime.ascx.cs
+49 -35
View File
@@ -73,7 +73,7 @@ namespace GMW.WebUserControls
/// </summary>
private void checkNumKeyIn()
{
if(memLayer.ML.isInSessionObject("numKeyIn"))
if (memLayer.ML.isInSessionObject("numKeyIn"))
{
barcodeIn = memLayer.ML.StringSessionObj("numKeyIn");
// svuoto valore in sessione...
@@ -488,55 +488,69 @@ namespace GMW.WebUserControls
// !!!FARE!!!
// controllo che abbia CodSogg auth...
// OC Soggetto creatore UDC --> mettere "OC" in web.config
// OC Soggetto creatore UDC --> "OC" in web.config "attrOpAuth"
// verifico postazione x procedere...
if (Postazione.printer != "n.d.")
{
string newUdcChild = "";
string noteTrim = txtNote.Text.Trim();
// effettuo controlli che cod_soggetto e cod particolare siano disponibili...
string codSogg = "";
string particolare = "";
try
// verifico auth utente...
if (OpAuth.isAuth)
{
codSogg = MagClass.magazzino.CodSoggCurrUser;
particolare = currParticolare;
}
catch
{
}
if (codSogg != "" && particolare != "")
{
// genero cartellino liquidi
DateTime adesso = DateTime.Now;
string newUdcChild = "";
string noteTrim = txtNote.Text.Trim();
// effettuo controlli che cod_soggetto e cod particolare siano disponibili...
string codSogg = "";
string particolare = "";
try
{
// creo nuovo UDC del trattamento liquidi
newUdcChild = MagClass.magazzino.creaUdc(flusso, "", particolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoAnime"), "U", codSogg, qta, 0, 0, adesso, 0, statoUDC, memLayer.ML.confReadInt("IdxPosizioneAnime"), "IdxPosizioneAnime", "UDC_ANIMA", noteTrim, "", adesso.Year, Request.UserHostName);
// registro creazione nuovo UDC
MagClass.magazzino.taSAO.insertQuery(adesso, codSogg, Postazione.name, Postazione.IP, newUdcChild, particolare, "creaUDC", string.Format("Creato nuovo UDC Anime - qta:{0} {1}", qta, noteTrim));
codSogg = MagClass.magazzino.CodSoggCurrUser;
particolare = currParticolare;
}
catch (Exception exc)
catch
{
httpLog(string.Format("Errore creazione UDC anime: {0}", exc), tipoLog.EXCEPTION);
}
// se ho cart stampo!
if (newUdcChild != "")
if (codSogg != "" && particolare != "")
{
// ora stampo il nuovo cartellino!!!
MagClass.magazzino.stampaUdc(newUdcChild, Postazione.printer, tipoCartellino.cartAnime, Request.UserHostName);
// incremento timing...
adesso = DateTime.Now;
adesso = adesso.AddSeconds(1);
// registro stampa nuovo UDC
MagClass.magazzino.taSAO.insertQuery(adesso, codSogg, Postazione.name, Postazione.IP, newUdcChild, particolare, "stampaUDC", "Stampato UDC Anime");
// genero cartellino liquidi
DateTime adesso = DateTime.Now;
try
{
// creo nuovo UDC del trattamento liquidi
newUdcChild = MagClass.magazzino.creaUdc(flusso, "", particolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoAnime"), "U", codSogg, qta, 0, 0, adesso, 0, statoUDC, memLayer.ML.confReadInt("IdxPosizioneAnime"), "IdxPosizioneAnime", "UDC_ANIMA", noteTrim, "", adesso.Year, Request.UserHostName);
// salvo attributo dell'OpAuth...
MagClass.magazzino.taAtt2UDC.Insert(newUdcChild, memLayer.ML.CRS("attrOpAuth"), OpAuth.currAuth.CodSoggetto, DateTime.Now, codSogg);
// consumo una auth...
OpAuth.currAuth.remAuth--;
// registro creazione nuovo UDC
MagClass.magazzino.taSAO.insertQuery(adesso, codSogg, Postazione.name, Postazione.IP, newUdcChild, particolare, "creaUDC", string.Format("Creato nuovo UDC Anime - qta:{0} {1}", qta, noteTrim));
}
catch (Exception exc)
{
httpLog(string.Format("Errore creazione UDC anime: {0}", exc), tipoLog.EXCEPTION);
}
// se ho cart stampo!
if (newUdcChild != "")
{
// ora stampo il nuovo cartellino!!!
MagClass.magazzino.stampaUdc(newUdcChild, Postazione.printer, tipoCartellino.cartAnime, Request.UserHostName);
// incremento timing...
adesso = DateTime.Now;
adesso = adesso.AddSeconds(1);
// registro stampa nuovo UDC
MagClass.magazzino.taSAO.insertQuery(adesso, codSogg, Postazione.name, Postazione.IP, newUdcChild, particolare, "stampaUDC", "Stampato UDC Anime");
}
}
else
{
httpLog(string.Format("Errore persi utente/particolare, ricarico!"), tipoLog.ERROR);
Response.Redirect("~/login.aspx");
}
}
else
{
httpLog(string.Format("Errore persi utente/particolare, ricarico!"), tipoLog.ERROR);
Response.Redirect("~/login.aspx");
Postazione.messaggiText = traduci("noOpAuth");
Postazione.CssClass = "stileComandoKo";
httpLog(string.Format("Errore manca OpAuth x UDC anime"), tipoLog.ERROR);
}
}
else
GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/bin/GMW.dll.config
+6 -6
View File
@@ -72,6 +72,12 @@
<add key="maxRefreshToReload" value="60" />
<!--gestione numKey-->
<add key="showNumKey" value="false" />
<!--setup gestione OpAuth-->
<add key="prefCodSogg" value="O" />
<add key="resetCodSogg" value="000" />
<add key="defRemAuth" value="1" />
<add key="defMinScad" value="15" />
<add key="attrOpAuth" value="OC" />
<!--area temp-->
<add key="maxAgeTempAreaHours" value="24" />
<!--area logger-->
@@ -247,12 +253,6 @@
<add key="ReportDatasourceAL" value="GMWDataSet_stp_prtCartAL" />
<add key="ReportDatasourceALRX" value="GMWDataSet_stp_prtCartAL" />
<add key="ReportDatasourceALTT" value="GMWDataSet_stp_prtCartAL" />
<!--setup gestione OpAuth-->
<add key="prefCodSogg" value="O" />
<add key="resetCodSogg" value="000" />
<add key="defRemAuth" value="1" />
<add key="defMinScad" value="15" />
<!--setup comandi barcode-->
<add key="prefComandi" value="CMD" />
<add key="prefDateTime" value="DT" />
GMW/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/bin/VersGen.dll
BIN
View File
Binary file not shown.
GMW_data/bin/TK_prod/GMW_data.dll
BIN
View File
Binary file not shown.
GMW_data/bin/TK_prod/SteamWare.dll
BIN
View File
Binary file not shown.
ReleaseClienti/TK_prod/GMW.zip
BIN
View File
Binary file not shown.
ReleaseClienti/TK_test/GMW.zip
BIN
View File
Binary file not shown.