This commit is contained in:
Samuele Locatelli
2022-04-07 13:00:09 +02:00
parent 531eb4d79a
commit ac70c48a2d
4 changed files with 19 additions and 12 deletions
+6 -4
View File
@@ -5,10 +5,12 @@
</startup>
<appSettings>
<add key="appName" value="LPA" />
<add key="serverBaseAddr" value="http://iis01/MP/MAG/" />
<add key="serverIp" value="iis01" />
<!--<add key="serverBaseAddr" value="http://iis02/NKC/" />
<add key="serverIp" value="iis02" />-->
<!--<add key="serverBaseAddr" value="http://iis01/MP/MAG/" />
<add key="serverIp" value="iis01" />-->
<add key="serverBaseAddr" value="http://iis01.egalware.com/NKC/" />
<add key="serverIp" value="iis01.egalware.com" />
<!--<add key="serverBaseAddr" value="http://iis02.egalware.com/NKC/" />
<add key="serverIp" value="iis02.egalware.com" />-->
<add key="localReportPath" value="reports" />
<add key="localPdfPath" value="pdf" />
<add key="_logDir" value="/logs/" />
-2
View File
@@ -312,8 +312,6 @@
<Content Include="Core\Compression\Snappy\lib\win\snappy64.dll" />
<Content Include="Core\Compression\Zstandard\lib\win\libzstd.dll" />
<Content Include="Resources\SteamWare.ico" />
<Content Include="snappy32.dll" />
<Content Include="snappy64.dll" />
<Content Include="SqlServerTypes\readme.htm" />
<Content Include="SqlServerTypes\x64\msvcr120.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+12 -4
View File
@@ -642,11 +642,19 @@ namespace LPA
{
// parto da template base
template = item.template;
// cerco nel dato da singolo item
var templateConf = reportConf.Find(conf => conf.name == item.template);
if (reportConf != null)
//se non c'è uso quello della cosa...
if (string.IsNullOrEmpty(template))
{
template = templateConf.template;
template = confCoda.template;
}
else
{
// cerco nel dato da singolo item
var templateConf = reportConf.Find(conf => conf.name == item.template);
if (reportConf != null)
{
template = templateConf.template;
}
}
// stampo
fatto = rPrint.printReport(template, localReportPath, coda.Value.Printer, item.rdsData, confCoda.deviceInfoParam, true);
+1 -2
View File
@@ -301,8 +301,7 @@ namespace LPA
}
// ottengo elenco files *.emf
fileMover.obj.setDirectory(currPath);
//var _fis = fileMover.obj.elencoFiles_FI("*.EMF");
var _fis=Directory.GetFiles(currPath, "*.EMF");
var _fis = Directory.GetFiles(currPath, "*.EMF");
bool fatto = false;
foreach (var _fileName in _fis)
{