Merge branch 'develop' into SDK
This commit is contained in:
Vendored
+1
-1
@@ -11,7 +11,7 @@ pipeline {
|
||||
steps {
|
||||
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
|
||||
script {
|
||||
withEnv(['NEXT_BUILD_NUMBER=332']) {
|
||||
withEnv(['NEXT_BUILD_NUMBER=333']) {
|
||||
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
|
||||
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
|
||||
env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
|
||||
|
||||
@@ -57,14 +57,18 @@ namespace NKC_WF.Controllers
|
||||
// se vuoto lo calcolo...
|
||||
answ = ComLib.getCurrentCss(sheetID);
|
||||
}
|
||||
// salvo ANCHE per foglio 0...
|
||||
memLayer.ML.setRSV(redKeyZero, answ, 60);
|
||||
|
||||
// salvo ANCHE per foglio 0... per 5 minuti
|
||||
memLayer.ML.setRSV(redKeyZero, answ, 60 * 5);
|
||||
}
|
||||
else
|
||||
{
|
||||
// leggo ultimo...
|
||||
answ = memLayer.ML.getRSV(redKeyZero);
|
||||
try
|
||||
{
|
||||
answ = memLayer.ML.getRSV(redKeyZero);
|
||||
}
|
||||
catch
|
||||
{ }
|
||||
}
|
||||
// restituisco css
|
||||
return answ;
|
||||
|
||||
+221
-207
@@ -6,397 +6,411 @@
|
||||
<configuration>
|
||||
<configSections>
|
||||
<sectionGroup name="elmah">
|
||||
<section name="security" requirePermission="false" type="Elmah.SecuritySectionHandler, Elmah" />
|
||||
<section name="errorLog" requirePermission="false" type="Elmah.ErrorLogSectionHandler, Elmah" />
|
||||
<section name="errorMail" requirePermission="false" type="Elmah.ErrorMailSectionHandler, Elmah" />
|
||||
<section name="errorFilter" requirePermission="false" type="Elmah.ErrorFilterSectionHandler, Elmah" />
|
||||
<section name="security" requirePermission="false" type="Elmah.SecuritySectionHandler, Elmah"/>
|
||||
<section name="errorLog" requirePermission="false" type="Elmah.ErrorLogSectionHandler, Elmah"/>
|
||||
<section name="errorMail" requirePermission="false" type="Elmah.ErrorMailSectionHandler, Elmah"/>
|
||||
<section name="errorFilter" requirePermission="false" type="Elmah.ErrorFilterSectionHandler, Elmah"/>
|
||||
</sectionGroup>
|
||||
</configSections>
|
||||
<system.web>
|
||||
<compilation targetFramework="4.6.2" debug="true" />
|
||||
<httpRuntime targetFramework="4.6.2" />
|
||||
<compilation targetFramework="4.6.2" debug="true"/>
|
||||
<httpRuntime targetFramework="4.6.2"/>
|
||||
<pages>
|
||||
<namespaces>
|
||||
<add namespace="System.Web.Optimization" />
|
||||
<add namespace="System.Web.Optimization"/>
|
||||
</namespaces>
|
||||
<controls>
|
||||
<add assembly="Microsoft.AspNet.Web.Optimization.WebForms" namespace="Microsoft.AspNet.Web.Optimization.WebForms" tagPrefix="webopt" />
|
||||
<add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
|
||||
<add assembly="Microsoft.AspNet.Web.Optimization.WebForms" namespace="Microsoft.AspNet.Web.Optimization.WebForms" tagPrefix="webopt"/>
|
||||
<add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit"/>
|
||||
</controls>
|
||||
</pages>
|
||||
<sessionState mode="Custom" customProvider="MySessionStateStore">
|
||||
<providers>
|
||||
<add name="MySessionStateStore" type="Microsoft.Web.Redis.RedisSessionStateProvider" host="127.0.0.1" accessKey="" ssl="false" applicationName="NKC" databaseId="0" timeout="120" />
|
||||
<add name="MySessionStateStore" type="Microsoft.Web.Redis.RedisSessionStateProvider" host="127.0.0.1" accessKey="" ssl="false"
|
||||
applicationName="NKC" databaseId="0" timeout="120"/>
|
||||
</providers>
|
||||
</sessionState>
|
||||
<httpModules>
|
||||
<add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah" />
|
||||
<add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" />
|
||||
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" />
|
||||
<add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah"/>
|
||||
<add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah"/>
|
||||
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah"/>
|
||||
</httpModules>
|
||||
<!--Nascondo gli erroracci-->
|
||||
<!--<customErrors mode="On" defaultRedirect="~/site/Default"/>-->
|
||||
<customErrors mode="On" defaultRedirect="~/" />
|
||||
<!--<customErrors mode="On" defaultRedirect="~/"/>-->
|
||||
<customErrors mode="On" defaultRedirect="~/site/ErrorsLog"/>
|
||||
<!--Mostro gli erroracci-->
|
||||
<!--<customErrors mode="Off"/>-->
|
||||
</system.web>
|
||||
<appSettings>
|
||||
<!--Configurazioni generali-->
|
||||
<add key="intUpdatePagina_ms" value="120000" />
|
||||
<add key="appName" value="NKC" />
|
||||
<add key="CodModulo" value="NKC" />
|
||||
<add key="copyRight" value="Egaltech & Steamware " />
|
||||
<add key="authSenzaDominio" value="true" />
|
||||
<add key="_safePages" value="Test#Home#Default" />
|
||||
<add key="BaseUrl" value="http://IIS02/NKC" />
|
||||
<add key="intUpdatePagina_ms" value="120000"/>
|
||||
<add key="appName" value="NKC"/>
|
||||
<add key="CodModulo" value="NKC"/>
|
||||
<add key="copyRight" value="Egaltech & Steamware "/>
|
||||
<add key="authSenzaDominio" value="true"/>
|
||||
<add key="_safePages" value="Test#Home#Default"/>
|
||||
<add key="BaseUrl" value="http://IIS02/NKC"/>
|
||||
<!--Updater area-->
|
||||
<add key="downloadPath" value="c:\Steamware\installers\" />
|
||||
<add key="appVers" value="stable" />
|
||||
<add key="downloadPath" value="c:\Steamware\installers\"/>
|
||||
<add key="appVers" value="stable"/>
|
||||
<!--area logger-->
|
||||
<add key="_logDir" value="~/logs/" />
|
||||
<add key="enableDumpDiag" value="false" />
|
||||
<add key="doShrinkFolder" value="true" />
|
||||
<add key="_logLevel" value="6" />
|
||||
<add key="_logMaxMb" value="30" />
|
||||
<add key="logMitigSec" value="30" />
|
||||
<add key="_logDir" value="~/logs/"/>
|
||||
<add key="enableDumpDiag" value="false"/>
|
||||
<add key="doShrinkFolder" value="true"/>
|
||||
<add key="_logLevel" value="6"/>
|
||||
<add key="_logMaxMb" value="30"/>
|
||||
<add key="logMitigSec" value="30"/>
|
||||
<!--Impostazione gestione serializzazione variabili in sessione (es per Redis)-->
|
||||
<add key="serializeSession" value="true" />
|
||||
<add key="errorPageRedirect" value="./Reset?Action=CDV" />
|
||||
<add key="maxAgeAppConf_min" value="5" />
|
||||
<add key="serializeSession" value="true"/>
|
||||
<add key="errorPageRedirect" value="./Reset?Action=CDV"/>
|
||||
<add key="maxAgeAppConf_min" value="5"/>
|
||||
<!--minima durata x validità in stima PARTS singole -->
|
||||
<add key="minValidEstSec" value="2" />
|
||||
<add key="minValidEstSec" value="2"/>
|
||||
<!--Configurazioni Redis-->
|
||||
<add key="RedisConn" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password" />
|
||||
<add key="RedisConnAdmin" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password,allowAdmin=true" />
|
||||
<add key="redisDb" value="0" />
|
||||
<add key="RedisConn" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password"/>
|
||||
<add key="RedisConnAdmin" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password,allowAdmin=true"/>
|
||||
<add key="redisDb" value="0"/>
|
||||
<!--MongoDB-->
|
||||
<add key="mdbConnString" value="mongodb://W2019-MONGODB:27017" />
|
||||
<add key="enableMongo" value="true" />
|
||||
<add key="mdbConnString" value="mongodb://W2019-MONGODB:27017"/>
|
||||
<add key="enableMongo" value="true"/>
|
||||
<!--Configurazioni DB per classi referenziate AppData e Steamware dll-->
|
||||
<add key="NKC_WFConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
|
||||
<add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
|
||||
<add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
|
||||
<add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
|
||||
<add key="PermessiConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
|
||||
<add key="NKC_WFConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
|
||||
<add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
|
||||
<add key="VocabolarioConnectionString"
|
||||
value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
|
||||
<add key="UtenteCdcConnectionString"
|
||||
value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
|
||||
<add key="PermessiConnectionString"
|
||||
value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
|
||||
</appSettings>
|
||||
<connectionStrings>
|
||||
<add name="AppData.Properties.Settings.Sauder_NKCConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
|
||||
<add name="AppData.Properties.Settings.Sauder_NKCConnectionString"
|
||||
connectionString="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16"
|
||||
providerName="System.Data.SqlClient"/>
|
||||
</connectionStrings>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="DnsClient" publicKeyToken="4574BB5573C51424" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0" />
|
||||
<assemblyIdentity name="DnsClient" publicKeyToken="4574BB5573C51424" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
|
||||
<assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Xml.XmlSerializer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
|
||||
<assemblyIdentity name="System.Xml.XmlSerializer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Xml.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
|
||||
<assemblyIdentity name="System.Xml.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
|
||||
<assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
|
||||
<assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Threading.Timer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||
<assemblyIdentity name="System.Threading.Timer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Threading.Tasks.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||
<assemblyIdentity name="System.Threading.Tasks.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
|
||||
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Threading.Overlapped" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
|
||||
<assemblyIdentity name="System.Threading.Overlapped" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Threading" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
|
||||
<assemblyIdentity name="System.Threading" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Text.RegularExpressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
|
||||
<assemblyIdentity name="System.Text.RegularExpressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Text.Encoding.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
|
||||
<assemblyIdentity name="System.Text.Encoding.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Text.Encoding" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
|
||||
<assemblyIdentity name="System.Text.Encoding" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Security.SecureString" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
|
||||
<assemblyIdentity name="System.Security.SecureString" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Security.Principal" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||
<assemblyIdentity name="System.Security.Principal" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
|
||||
<assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.Serialization.Xml" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
|
||||
<assemblyIdentity name="System.Runtime.Serialization.Xml" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
|
||||
<assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.Serialization.Json" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||
<assemblyIdentity name="System.Runtime.Serialization.Json" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.Numerics" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||
<assemblyIdentity name="System.Runtime.Numerics" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
|
||||
<assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
|
||||
<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
|
||||
<assemblyIdentity name="System.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Resources.ResourceManager" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||
<assemblyIdentity name="System.Resources.ResourceManager" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Reflection.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||
<assemblyIdentity name="System.Reflection.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Reflection.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||
<assemblyIdentity name="System.Reflection.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Reflection" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
|
||||
<assemblyIdentity name="System.Reflection" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.ObjectModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
|
||||
<assemblyIdentity name="System.ObjectModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Net.Sockets" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
|
||||
<assemblyIdentity name="System.Net.Sockets" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Net.Requests" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
|
||||
<assemblyIdentity name="System.Net.Requests" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Net.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
|
||||
<assemblyIdentity name="System.Net.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Net.NetworkInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
|
||||
<assemblyIdentity name="System.Net.NetworkInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Net.Http" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
|
||||
<assemblyIdentity name="System.Net.Http" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Linq.Queryable" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||
<assemblyIdentity name="System.Linq.Queryable" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Linq.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||
<assemblyIdentity name="System.Linq.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Linq.Expressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
|
||||
<assemblyIdentity name="System.Linq.Expressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Linq" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
|
||||
<assemblyIdentity name="System.Linq" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.IO" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
|
||||
<assemblyIdentity name="System.IO" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.IO.Compression" publicKeyToken="B77A5C561934E089" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
|
||||
<assemblyIdentity name="System.IO.Compression" publicKeyToken="B77A5C561934E089" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Globalization.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
|
||||
<assemblyIdentity name="System.Globalization.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Globalization" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
|
||||
<assemblyIdentity name="System.Globalization" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Dynamic.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
|
||||
<assemblyIdentity name="System.Dynamic.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
|
||||
<assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Diagnostics.Tools" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||
<assemblyIdentity name="System.Diagnostics.Tools" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
|
||||
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Diagnostics.Debug" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
|
||||
<assemblyIdentity name="System.Diagnostics.Debug" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Diagnostics.Contracts" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||
<assemblyIdentity name="System.Diagnostics.Contracts" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Data.Common" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
|
||||
<assemblyIdentity name="System.Data.Common" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.ComponentModel.EventBasedAsync" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
|
||||
<assemblyIdentity name="System.ComponentModel.EventBasedAsync" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.ComponentModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||
<assemblyIdentity name="System.ComponentModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Collections" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
|
||||
<assemblyIdentity name="System.Collections" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Collections.Concurrent" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
|
||||
<assemblyIdentity name="System.Collections.Concurrent" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
|
||||
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
|
||||
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
|
||||
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
|
||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
|
||||
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
|
||||
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
|
||||
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
|
||||
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
|
||||
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
|
||||
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
|
||||
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
|
||||
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
|
||||
<assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
|
||||
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="SharpCompress" publicKeyToken="afb0a02973931d96" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-0.26.0.0" newVersion="0.26.0.0" />
|
||||
<assemblyIdentity name="SharpCompress" publicKeyToken="afb0a02973931d96" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-0.26.0.0" newVersion="0.26.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
|
||||
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
|
||||
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<system.codedom>
|
||||
<compilers>
|
||||
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
|
||||
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\"Web\" /optionInfer+" />
|
||||
<compiler language="c#;cs;csharp" extension=".cs"
|
||||
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
|
||||
warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701"/>
|
||||
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb"
|
||||
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
|
||||
warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\"Web\" /optionInfer+"/>
|
||||
</compilers>
|
||||
</system.codedom>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<remove name="Session" />
|
||||
<add name="Session" type="Microsoft.AspNet.SessionState.SessionStateModuleAsync, Microsoft.AspNet.SessionState.SessionStateModule, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="integratedMode" />
|
||||
<add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah" preCondition="managedHandler" />
|
||||
<add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" preCondition="managedHandler" />
|
||||
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" preCondition="managedHandler" />
|
||||
<remove name="Session"/>
|
||||
<add name="Session"
|
||||
type="Microsoft.AspNet.SessionState.SessionStateModuleAsync, Microsoft.AspNet.SessionState.SessionStateModule, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
|
||||
preCondition="integratedMode"/>
|
||||
<add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah" preCondition="managedHandler"/>
|
||||
<add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" preCondition="managedHandler"/>
|
||||
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" preCondition="managedHandler"/>
|
||||
</modules>
|
||||
<validation validateIntegratedModeConfiguration="false" />
|
||||
<validation validateIntegratedModeConfiguration="false"/>
|
||||
<handlers>
|
||||
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
|
||||
<remove name="OPTIONSVerbHandler" />
|
||||
<remove name="TRACEVerbHandler" />
|
||||
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
|
||||
<remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
|
||||
<remove name="OPTIONSVerbHandler"/>
|
||||
<remove name="TRACEVerbHandler"/>
|
||||
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler"
|
||||
preCondition="integratedMode,runtimeVersionv4.0"/>
|
||||
</handlers>
|
||||
<staticContent>
|
||||
<clientCache cacheControlCustom="public" cacheControlMode="UseMaxAge" cacheControlMaxAge="1.00:00:00" />
|
||||
<remove fileExtension=".woff" />
|
||||
<remove fileExtension=".woff2" />
|
||||
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
|
||||
<mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
|
||||
<clientCache cacheControlCustom="public" cacheControlMode="UseMaxAge" cacheControlMaxAge="1.00:00:00"/>
|
||||
<remove fileExtension=".woff"/>
|
||||
<remove fileExtension=".woff2"/>
|
||||
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff"/>
|
||||
<mimeMap fileExtension=".woff2" mimeType="application/font-woff2"/>
|
||||
</staticContent>
|
||||
</system.webServer>
|
||||
<elmah>
|
||||
@@ -404,20 +418,20 @@
|
||||
See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for
|
||||
more information on remote access and securing ELMAH.
|
||||
-->
|
||||
<security allowRemoteAccess="false" />
|
||||
<security allowRemoteAccess="false"/>
|
||||
</elmah>
|
||||
<!--Autorizzaione di windows FORZATA solo sulla subdir SITE-->
|
||||
<location path="site">
|
||||
<system.web>
|
||||
<authorization>
|
||||
<deny users="?" />
|
||||
<deny users="?"/>
|
||||
</authorization>
|
||||
</system.web>
|
||||
</location>
|
||||
<location path="elmah.axd" inheritInChildApplications="false">
|
||||
<system.web>
|
||||
<httpHandlers>
|
||||
<add verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah" />
|
||||
<add verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah"/>
|
||||
</httpHandlers>
|
||||
<!--
|
||||
See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for
|
||||
@@ -431,7 +445,7 @@
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<handlers>
|
||||
<add name="ELMAH" verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah" preCondition="integratedMode" />
|
||||
<add name="ELMAH" verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah" preCondition="integratedMode"/>
|
||||
</handlers>
|
||||
</system.webServer>
|
||||
</location>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_barcode.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_barcode" %>
|
||||
<div class="form-group bigText">
|
||||
<%--AutoPostBack="True"--%>
|
||||
<asp:TextBox runat="server" ID="txtBarcode" class="form-control" autofocus="true" OnTextChanged="txtBarcode_TextChanged"></asp:TextBox>
|
||||
<asp:Label ID="lblOutput" runat="server" for="txtBarcode" Width="100%" />
|
||||
<asp:TextBox runat="server" ID="txtBarcode" class="form-control" autofocus="true" OnTextChanged="txtBarcode_TextChanged"></asp:TextBox>
|
||||
<asp:Label ID="lblOutput" runat="server" for="txtBarcode" Width="100%" />
|
||||
<asp:HiddenField ID="hfLastCmd" runat="server" />
|
||||
</div>
|
||||
|
||||
@@ -97,7 +97,7 @@ namespace NKC_WF.WebUserControls
|
||||
|
||||
private void cmp_KS_Items_eh_doRefresh(object sender, EventArgs e)
|
||||
{
|
||||
displInfo("PART added", true);
|
||||
displInfo("PART added");
|
||||
// resetto BIN & CART
|
||||
resetBin();
|
||||
resetCart();
|
||||
@@ -106,7 +106,7 @@ namespace NKC_WF.WebUserControls
|
||||
|
||||
private void cmp_KS_OtherItemsCart_eh_doRefresh(object sender, EventArgs e)
|
||||
{
|
||||
displInfo("Other PART added", true);
|
||||
displInfo("Other PART added");
|
||||
// resetto BIN & CART
|
||||
resetBin();
|
||||
resetCart();
|
||||
@@ -115,7 +115,7 @@ namespace NKC_WF.WebUserControls
|
||||
|
||||
private void cmp_KS_BinCart_eh_doRefresh(object sender, EventArgs e)
|
||||
{
|
||||
displInfo("PAINT PART added", true);
|
||||
displInfo("PAINT PART added");
|
||||
// resetto BIN & CART
|
||||
resetBin();
|
||||
resetCart();
|
||||
@@ -208,7 +208,7 @@ namespace NKC_WF.WebUserControls
|
||||
{
|
||||
case codeType.UNK:
|
||||
cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action");
|
||||
resetSelection(false);
|
||||
resetSelection();
|
||||
doRaiseEv = true;
|
||||
break;
|
||||
case codeType.Item:
|
||||
@@ -254,7 +254,7 @@ namespace NKC_WF.WebUserControls
|
||||
break;
|
||||
default:
|
||||
cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action");
|
||||
resetSelection(false);
|
||||
resetSelection();
|
||||
break;
|
||||
}
|
||||
return doRaiseEv;
|
||||
@@ -279,7 +279,7 @@ namespace NKC_WF.WebUserControls
|
||||
var tabOrdini = DataLayer.man.taOL.getByCart(rawData);
|
||||
if (tabOrdini.Count == 0)
|
||||
{
|
||||
displError($"CART: Order not found for Cart {rawData}, {traduci("ErrPleaseRetry")}", true);
|
||||
displError($"{traduci("KS_PIS_CartNotFound")} {rawData}, {traduci("ErrPleaseRetry")}");
|
||||
resetCart();
|
||||
}
|
||||
else
|
||||
@@ -290,7 +290,7 @@ namespace NKC_WF.WebUserControls
|
||||
// controllo se trovo righe...
|
||||
if (tabPLD.Count == 0)
|
||||
{
|
||||
displError($"KIT REQuest: PackList not found for Cart {rawData} --> OrdExtCode {rigaOrd.OrderExtCode}, {traduci("ErrPleaseRetry")}", true);
|
||||
displError($"KIT REQuest: PackList not found for Cart {rawData} --> OrdExtCode {rigaOrd.OrderExtCode}, {traduci("ErrPleaseRetry")}");
|
||||
resetCart();
|
||||
}
|
||||
else
|
||||
@@ -313,7 +313,7 @@ namespace NKC_WF.WebUserControls
|
||||
// --> metto cart in scarico e registro LOG come se avesse appena letto 1:1 ogni Dtmx
|
||||
DataLayer.man.taPLog.closeCart(codeInt);
|
||||
// mostro che ho fatto
|
||||
displInfo($"OK: CART removed {rawData}", true);
|
||||
displInfo($"OK: CART removed {rawData}");
|
||||
lastObject = "";
|
||||
// resetto BIN & CART
|
||||
resetBin();
|
||||
@@ -322,7 +322,7 @@ namespace NKC_WF.WebUserControls
|
||||
else
|
||||
{
|
||||
lastObject = rawData;
|
||||
displInfo($"Cart already completed, please read CART another time: Cart {rawData}", true);
|
||||
displInfo($"Cart already completed, please read CART another time: Cart {rawData}");
|
||||
}
|
||||
resetCart();
|
||||
}
|
||||
@@ -333,7 +333,7 @@ namespace NKC_WF.WebUserControls
|
||||
var tabPLCheck = DataLayer.man.taPLC.GetData(rawData);
|
||||
if (tabPLCheck.Count == 0)
|
||||
{
|
||||
displError($"ERROR evaluating CART: {rawData}", true);
|
||||
displError($"ERROR evaluating CART: {rawData}");
|
||||
resetCart();
|
||||
}
|
||||
else
|
||||
@@ -347,7 +347,7 @@ namespace NKC_WF.WebUserControls
|
||||
{
|
||||
// --> metto cart in scarico e registro LOG come se avesse appena letto 1:1 ogni Dtmx
|
||||
DataLayer.man.taPLog.acquireCart(rawData, currIpAddress(), user_std.UtSn.userNameAD);
|
||||
displInfo($"OK: CART acquired {rawData} - item confirmed", true);
|
||||
displInfo($"OK: CART acquired {rawData} - item confirmed");
|
||||
lastObject = "";
|
||||
// eseguo comando x spostare i PAINT nel cart corretto...
|
||||
DataLayer.man.taKL.updateCartForBin(rawData);
|
||||
@@ -358,12 +358,12 @@ namespace NKC_WF.WebUserControls
|
||||
else
|
||||
{
|
||||
lastObject = rawData;
|
||||
displError($"Please read CART another time: Cart {rawData}", true);
|
||||
displError($"Please read CART another time: Cart {rawData}");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
displError($"ERROR CART contains KIT already on download: {rawData}", true);
|
||||
displError($"ERROR CART contains KIT already on download: {rawData}");
|
||||
resetCart();
|
||||
}
|
||||
}
|
||||
@@ -377,7 +377,7 @@ namespace NKC_WF.WebUserControls
|
||||
// PRIMO: verifico SE ho delle righe valide...
|
||||
if (tabOKIB.Count == 0)
|
||||
{
|
||||
displError($"BIN: Code not found {rawData}, {traduci("ErrPleaseRetry")}", true);
|
||||
displError($"BIN: Code not found {rawData}, {traduci("ErrPleaseRetry")}");
|
||||
// reset preliminare
|
||||
resetBin();
|
||||
}
|
||||
@@ -386,7 +386,7 @@ namespace NKC_WF.WebUserControls
|
||||
var listPainted = tabOKIB.Where(x => !x.IsPaintDateNull()).ToList();
|
||||
if (listPainted.Count == 0)
|
||||
{
|
||||
displError($"BIN: Paint Date missing for item {tabOKIB[0].ItemDesc} | order {tabOKIB[0].OrderExtCode}, {traduci("ErrPleaseRetry")}", true);
|
||||
displError($"BIN: Paint Date missing for item {tabOKIB[0].ItemDesc} | order {tabOKIB[0].OrderExtCode}, {traduci("ErrPleaseRetry")}");
|
||||
// reset preliminare
|
||||
resetBin();
|
||||
}
|
||||
@@ -395,7 +395,7 @@ namespace NKC_WF.WebUserControls
|
||||
var listAvailable = tabOKIB.Where(x => !x.IsPaintDateNull() && x.IsOnCartDateNull()).ToList();
|
||||
if (listAvailable.Count == 0)
|
||||
{
|
||||
displError($"BIN: No item available for pickup on target CART for code {rawData} | item {tabOKIB[0].ItemDesc} | order {tabOKIB[0].OrderExtCode}, {traduci("ErrPleaseRetry")}", true);
|
||||
displError($"BIN: No item available for pickup on target CART for code {rawData} | item {tabOKIB[0].ItemDesc} | order {tabOKIB[0].OrderExtCode}, {traduci("ErrPleaseRetry")}");
|
||||
// reset preliminare
|
||||
resetBin();
|
||||
}
|
||||
@@ -405,7 +405,7 @@ namespace NKC_WF.WebUserControls
|
||||
var listCartAvailable = tabOKIB.Where(x => !x.IsCartKitStartNull() && x.IsCartKitEndNull()).ToList();
|
||||
if (listCartAvailable.Count == 0)
|
||||
{
|
||||
displError($"BIN: No CART available to proceed: {rawData} | item {tabOKIB[0].ItemDesc} | order {tabOKIB[0].OrderExtCode}", true);
|
||||
displError($"BIN: No CART available to proceed: {rawData} | item {tabOKIB[0].ItemDesc} | order {tabOKIB[0].OrderExtCode}");
|
||||
// reset preliminare
|
||||
resetBin();
|
||||
}
|
||||
@@ -423,7 +423,7 @@ namespace NKC_WF.WebUserControls
|
||||
var listBinNotCompleted = tabOKIB.Where(x => !x.IsCartKitStartNull() && x.IsCartKitEndNull() && !x.IsBinKitStartNull() && x.IsBinKitEndNull()).ToList();
|
||||
if (listBinNotCompleted.Count == 0)
|
||||
{
|
||||
displError($"BIN: already completed: {rawData} | item {tabOKIB[0].ItemDesc} | order {tabOKIB[0].OrderExtCode}", true);
|
||||
displError($"BIN: already completed: {rawData} | item {tabOKIB[0].ItemDesc} | order {tabOKIB[0].OrderExtCode}");
|
||||
// reset preliminare
|
||||
resetBin();
|
||||
}
|
||||
@@ -443,7 +443,7 @@ namespace NKC_WF.WebUserControls
|
||||
{
|
||||
// chiedo seconda lettura
|
||||
lastObject = rawData;
|
||||
displError($"Please read BIN another time: BIN {rawData}", true);
|
||||
displError($"Please read BIN another time: BIN {rawData}");
|
||||
// reset preliminare
|
||||
resetBin();
|
||||
}
|
||||
@@ -458,7 +458,7 @@ namespace NKC_WF.WebUserControls
|
||||
tabItem = DataLayer.man.taIL.getBySearch(codeInt, rawData, 0, 999);
|
||||
if (tabItem.Count == 0)
|
||||
{
|
||||
displError($"{traduci("ErrPartNotFound")} {rawData}, {traduci("ErrPleaseRetry")}", true);
|
||||
displError($"{traduci("ErrPartNotFound")} {rawData}, {traduci("ErrPleaseRetry")}");
|
||||
showItemDetail(false, null, true);
|
||||
}
|
||||
else if (tabItem.Count == 1)
|
||||
@@ -469,7 +469,7 @@ namespace NKC_WF.WebUserControls
|
||||
if (!itemRow.IsOnCartDateNull())
|
||||
{
|
||||
// se caricato --> mostro che è già a posto
|
||||
displError($"{traduci("ErrPartAlreadyOnCart")} {rawData}, {traduci("ErrPleaseRetry")}", true);
|
||||
displError($"{traduci("ErrPartAlreadyOnCart")} {rawData}, {traduci("ErrPleaseRetry")}");
|
||||
resetItem();
|
||||
}
|
||||
else
|
||||
@@ -489,7 +489,7 @@ namespace NKC_WF.WebUserControls
|
||||
// PRIMO: verifico SE ho delle righe valide...
|
||||
if (tabOKOI.Count == 0)
|
||||
{
|
||||
displError($"{traduci("ErrPartNotFound")} {rawData}, {traduci("ErrPleaseRetry")}", true);
|
||||
displError($"{traduci("ErrPartNotFound")} {rawData}, {traduci("ErrPleaseRetry")}");
|
||||
// reset preliminare
|
||||
resetOtherItem();
|
||||
}
|
||||
@@ -498,7 +498,7 @@ namespace NKC_WF.WebUserControls
|
||||
var listAvailable = tabOKOI.Where(x => x.IsOnCartDateNull()).ToList();
|
||||
if (listAvailable.Count == 0)
|
||||
{
|
||||
displError($"{traduci("ErrPartNoItemAvail")} {rawData} | item {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}, {traduci("ErrPleaseRetry")}", true);
|
||||
displError($"{traduci("ErrPartNoItemAvail")} {rawData} | item {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}, {traduci("ErrPleaseRetry")}");
|
||||
// reset preliminare
|
||||
resetOtherItem();
|
||||
}
|
||||
@@ -508,7 +508,7 @@ namespace NKC_WF.WebUserControls
|
||||
var listCartAvailable = tabOKOI.Where(x => !x.IsCartKitStartNull() && x.IsCartKitEndNull()).ToList();
|
||||
if (listCartAvailable.Count == 0)
|
||||
{
|
||||
displError($"{traduci("ErrPartNoCartAvail")}: {rawData} | item {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}", true);
|
||||
displError($"{traduci("ErrPartNoCartAvail")}: {rawData} | item {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}");
|
||||
// reset preliminare
|
||||
resetOtherItem();
|
||||
}
|
||||
@@ -618,47 +618,29 @@ namespace NKC_WF.WebUserControls
|
||||
/// Mostra INFO ed effettua reset vari...
|
||||
/// </summary>
|
||||
/// <param name="infoMessage"></param>
|
||||
/// <param name="resetStatus"></param>
|
||||
protected void displInfo(string infoMessage, bool resetStatus)
|
||||
protected void displInfo(string infoMessage)
|
||||
{
|
||||
lblSuccessMsg.Text = infoMessage;
|
||||
divError.Visible = false;
|
||||
divInfo.Visible = true;
|
||||
resetSelection(resetStatus);
|
||||
resetSelection();
|
||||
}
|
||||
/// <summary>
|
||||
/// Mostra ERROR ed effettua reset vari...
|
||||
/// </summary>
|
||||
/// <param name="errorMessage"></param>
|
||||
/// <param name="resetStatus"></param>
|
||||
protected void displError(string errorMessage, bool resetStatus)
|
||||
protected void displError(string errorMessage)
|
||||
{
|
||||
lblErrorMsg.Text = errorMessage;
|
||||
divError.Visible = true;
|
||||
divInfo.Visible = false;
|
||||
resetSelection(resetStatus);
|
||||
resetSelection();
|
||||
}
|
||||
/// <summary>
|
||||
/// Reset selezione item + blocchi suggerimento + sel REDIS x pagina unload
|
||||
/// </summary>
|
||||
/// <param name="resetStatus"></param>
|
||||
protected void resetSelection(bool resetStatus)
|
||||
protected void resetSelection()
|
||||
{
|
||||
if (resetStatus)
|
||||
{
|
||||
try
|
||||
{
|
||||
// SE item esiste...
|
||||
var tabItem = DataLayer.man.taIL.getBySearch(itemIdSelected, itemIdSelected.ToString(), 0, 999);
|
||||
if (tabItem.Count == 1)
|
||||
{
|
||||
// riporto item a status 1...
|
||||
DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId);
|
||||
}
|
||||
}
|
||||
catch
|
||||
{ }
|
||||
}
|
||||
// elimino item sel...
|
||||
itemIdSelected = 0;
|
||||
resetShowData();
|
||||
@@ -677,7 +659,7 @@ namespace NKC_WF.WebUserControls
|
||||
divError.Visible = showError;
|
||||
if (showError)
|
||||
{
|
||||
displError("Item not found", true);
|
||||
displError("Item not found");
|
||||
}
|
||||
if (showItem)
|
||||
{
|
||||
@@ -702,33 +684,31 @@ namespace NKC_WF.WebUserControls
|
||||
switch (itemRow.StatusID)
|
||||
{
|
||||
case 0:
|
||||
displError("ERROR: Item not ready", false);
|
||||
displError("ERROR: Item not ready");
|
||||
break;
|
||||
case 1:
|
||||
case 2:
|
||||
case 100:
|
||||
// salvo che è in STATO 2 (picked up)
|
||||
DataLayer.man.taIL.updateStatus(itemRow.ItemID, 2, PlaceId);
|
||||
doUpdate();
|
||||
break;
|
||||
case 3:
|
||||
displError("Item already on CART!", false);
|
||||
displError("Item already on CART!");
|
||||
break;
|
||||
case 4:
|
||||
// fino a concorrenza qta richiesta sposto, POI do errori
|
||||
displError("ALL Item already scanned on BIN!", false);
|
||||
displError("ALL Item already scanned on BIN!");
|
||||
break;
|
||||
case 5:
|
||||
displError("Item already at KIT STATION!", false);
|
||||
displError("Item already at KIT STATION!");
|
||||
break;
|
||||
case 990:
|
||||
displError("Item declared SCRAP!", false);
|
||||
displError("Item declared SCRAP!");
|
||||
break;
|
||||
case 991:
|
||||
displError("Item declared SCRAP with CNC program created!", false);
|
||||
displError("Item declared SCRAP with CNC program created!");
|
||||
break;
|
||||
default:
|
||||
displError("ERROR: Item status UNKNOWN!", false);
|
||||
displError("ERROR: Item status UNKNOWN!");
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -796,9 +776,7 @@ namespace NKC_WF.WebUserControls
|
||||
|
||||
protected void lbtCancel_Click(object sender, EventArgs e)
|
||||
{
|
||||
// resetto item selezionato...
|
||||
DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId);
|
||||
resetSelection(true);
|
||||
resetSelection();
|
||||
showItemDetail(false, null, false);
|
||||
}
|
||||
protected void lbtResetSel_Click(object sender, EventArgs e)
|
||||
@@ -809,7 +787,7 @@ namespace NKC_WF.WebUserControls
|
||||
resetShowData();
|
||||
// resetto sheet selezionato...
|
||||
DataLayer.man.taIL.updateSheetStatusPU(tabSheet[0].SheetID, PlaceId);
|
||||
resetSelection(true);
|
||||
resetSelection();
|
||||
showItemDetail(false, null, false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -421,11 +421,6 @@ namespace NKC_WF.WebUserControls
|
||||
|
||||
protected void lbtCancel_Click(object sender, EventArgs e)
|
||||
{
|
||||
// FIXME TODO va eliminata?!?!?!?
|
||||
// resetto item selezionato...
|
||||
DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId);
|
||||
|
||||
|
||||
resetDisplay(true);
|
||||
showItemDetail(false, null, false);
|
||||
}
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
<div class="col-12 shortcuts small" runat="server" id="divSim">
|
||||
<div class="row table-warning">
|
||||
<div class="col">
|
||||
<h3> <%: traduci("ProdSimul") %></h3>
|
||||
<h3><%: traduci("ProdSimul") %></h3>
|
||||
</div>
|
||||
<div class="col">
|
||||
<asp:LinkButton runat="server" ID="lbtAdvanceProd" class="shortcut" OnClick="lbtAdvanceProd_Click"> <i class="fa fa-wrench shortcut-icon"></i><span class="shortcut-label"><b><%: traduci("Advance") %></b> #<%: traduci("Prod") %></span> </asp:LinkButton>
|
||||
<asp:LinkButton runat="server" ID="lbtAdvanceProd" class="shortcut" OnClick="lbtAdvanceProd_Click"> <i class="fa fa-wrench shortcut-icon"></i><span class="shortcut-label"><b><%: traduci("Advance") %></b> #<%: traduci("Prod") %></span></asp:LinkButton>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -21,25 +21,28 @@
|
||||
<asp:FormView ID="frmView" runat="server" DataKeyNames="BatchID" DataSourceID="ods" Width="100%" OnDataBound="frmView_DataBound">
|
||||
<ItemTemplate>
|
||||
<div class="row border bg-success text-light rounded">
|
||||
<div class="col-4 text-left">
|
||||
<%: traduci("Batch") %><b>
|
||||
<div class="col-12 col-lg-4 text-left">
|
||||
<%: traduci("Batch") %><b>
|
||||
<asp:Label ID="TaktLabel" runat="server" Text='<%# Eval("Takt") %>' /></b>
|
||||
<br />
|
||||
<%: traduci("TotBunk") %><b>
|
||||
<asp:Label ID="BatchIDLabel" runat="server" Text='<%# Eval("NumStacks") %>' /></b>
|
||||
</div>
|
||||
<div class="col-4 text-center">
|
||||
<div class="d-none d-lg-block col-4 text-center">
|
||||
<b><%: traduci("BatchCurrent") %></b>
|
||||
<br />
|
||||
<%: traduci("TotSheets") %><b>
|
||||
<asp:Label ID="Label1" runat="server" Text='<%# Eval("NumSheets") %>' /></b>
|
||||
</div>
|
||||
<div class="col-4 text-right">
|
||||
<%: traduci("DueDate") %> <b>
|
||||
<div class="d-none d-lg-block col-4 text-right">
|
||||
<%: traduci("DueDate") %> <b>
|
||||
<asp:Label ID="DueDateLabel" runat="server" Text='<%# Eval("DueDate", "{0:ddd yyyy.MM.dd}") %>' /></b>
|
||||
<br />
|
||||
<%: traduci("TotItems") %><b>
|
||||
<asp:Label ID="NumStacksLabel" runat="server" Text='<%# Eval("NumItems") %>' /></b>
|
||||
</div>
|
||||
<div class="d-none d-lg-block col-4 text-left">
|
||||
<%: traduci("TotBunk") %><b>
|
||||
<asp:Label ID="Label3" runat="server" Text='<%# Eval("NumStacks") %>' /></b>
|
||||
</div>
|
||||
<div class="d-none d-lg-block col-4 text-center">
|
||||
<%: traduci("TotSheets") %><b>
|
||||
<asp:Label ID="Label4" runat="server" Text='<%# Eval("NumSheets") %>' /></b>
|
||||
</div>
|
||||
<div class="d-none d-lg-block col-4 text-right">
|
||||
<%: traduci("TotItems") %><b>
|
||||
<asp:Label ID="Label6" runat="server" Text='<%# Eval("NumItems") %>' /></b>
|
||||
</div>
|
||||
</div>
|
||||
</ItemTemplate>
|
||||
|
||||
@@ -31,7 +31,6 @@ namespace NKC_WF.WebUserControls
|
||||
private void fixDisplay()
|
||||
{
|
||||
cmp_barcode.Visible = enableBCode;
|
||||
frmView.Visible = !enableBCode;
|
||||
}
|
||||
|
||||
public bool enableBCode
|
||||
@@ -48,6 +47,7 @@ namespace NKC_WF.WebUserControls
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Comando barcode letto
|
||||
/// </summary>
|
||||
@@ -101,9 +101,24 @@ namespace NKC_WF.WebUserControls
|
||||
}
|
||||
private void Cmp_barcode_eh_doRefresh(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
bool doRaiseEv = false;
|
||||
// processo evento..
|
||||
lastCmd = cmp_barcode.inputAcquired.ToUpper();
|
||||
doRaiseEv = processLastCmd(doRaiseEv);
|
||||
// reset comando
|
||||
cmp_barcode.inputAcquired = "";
|
||||
// aggiorno...
|
||||
doUpdate();
|
||||
// se richiesto faccio raiseEvent
|
||||
if (doRaiseEv)
|
||||
{
|
||||
cmp_stackNextloading.doUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
private bool processLastCmd(bool doRaiseEv)
|
||||
{
|
||||
if (string.IsNullOrEmpty(lastCmd))
|
||||
{
|
||||
doRaiseEv = true;
|
||||
@@ -112,27 +127,16 @@ namespace NKC_WF.WebUserControls
|
||||
decodedData decoData = DataLayer.man.decodeBcode(lastCmd);
|
||||
switch (decoData.codeType)
|
||||
{
|
||||
case codeType.UNK:
|
||||
cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action");
|
||||
doRaiseEv = true;
|
||||
break;
|
||||
case codeType.Item:
|
||||
case codeType.ItemGeneric:
|
||||
cmp_barcode.showOutput("text-warning", $"Item - ignored: {decoData.description}");
|
||||
doRaiseEv = true;
|
||||
break;
|
||||
case codeType.Material:
|
||||
cmp_barcode.showOutput("badge badge-warning", $"Material - ignored: {decoData.description}");
|
||||
doRaiseEv = true;
|
||||
break;
|
||||
case codeType.Sheet:
|
||||
cmp_barcode.showOutput("badge badge-warning", $"Sheet - ignored: {decoData.description}");
|
||||
doRaiseEv = true;
|
||||
break;
|
||||
case codeType.Stack:
|
||||
// verifico SE lo stack esista...
|
||||
DS_App.StackListDataTable tabStack = DataLayer.man.taSTL.getByKey(decoData.codeInt);
|
||||
if (tabStack.Count == 0)
|
||||
DS_App.StackListDataTable tabStack = null;
|
||||
try
|
||||
{
|
||||
tabStack = DataLayer.man.taSTL.getByKey(decoData.codeInt);
|
||||
}
|
||||
catch
|
||||
{ }
|
||||
if (tabStack != null && tabStack.Count == 0)
|
||||
{
|
||||
cmp_barcode.showOutput("badge badge-danger", $"BUNK NOT FOUND: {decoData.description}");
|
||||
doRaiseEv = true;
|
||||
@@ -202,25 +206,15 @@ namespace NKC_WF.WebUserControls
|
||||
}
|
||||
}
|
||||
break;
|
||||
case codeType.Batch:
|
||||
cmp_barcode.showOutput("badge badge-warning", $"Batch - ignored: {decoData.description}");
|
||||
doRaiseEv = true;
|
||||
break;
|
||||
default:
|
||||
cmp_barcode.showOutput("text-danger", $"Data Ignored: {decoData.rawData} --> no action");
|
||||
doRaiseEv = true;
|
||||
break;
|
||||
}
|
||||
// reset comando
|
||||
cmp_barcode.resetInput();
|
||||
// aggiorno...
|
||||
doUpdate();
|
||||
// se richiesto faccio raiseEvent
|
||||
if (doRaiseEv)
|
||||
{
|
||||
cmp_stackNextloading.doUpdate();
|
||||
raiseEvent();
|
||||
}
|
||||
|
||||
return doRaiseEv;
|
||||
}
|
||||
|
||||
protected bool currentBunkAlreadyWorking(int StackIdRequested)
|
||||
{
|
||||
bool answ = false;
|
||||
@@ -280,7 +274,7 @@ namespace NKC_WF.WebUserControls
|
||||
protected void checkVisibility()
|
||||
{
|
||||
lblLoaded.Visible = StackId != 0;
|
||||
frmView.Visible = !lblLoaded.Visible && !enableBCode;
|
||||
frmView.Visible = !lblLoaded.Visible;
|
||||
// fix div di simulazione
|
||||
divSim.Visible = (memLayer.ML.CRS("environment") == "DEV" && !enableBCode);
|
||||
}
|
||||
@@ -291,6 +285,11 @@ namespace NKC_WF.WebUserControls
|
||||
}
|
||||
|
||||
|
||||
protected void timerLoad_Tick(object sender, EventArgs e)
|
||||
{
|
||||
checkVisibility();
|
||||
cmp_stackNextloading.doUpdate();
|
||||
}
|
||||
|
||||
protected void frmView_DataBound(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
<%: traduci("Items") %><b>
|
||||
<asp:Label ID="lblNumItems" runat="server" Text='<%# Eval("NumItems") %>' /></b>
|
||||
</div>
|
||||
<div class="col-12 col-lg-3 text-right text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsWorked").ToString() %>'>
|
||||
<div class="d-none d-lg-block col-lg-3 text-right text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsWorked").ToString() %>'>
|
||||
<%: traduci("Items") %><b>
|
||||
<asp:Label ID="Label3" runat="server" Text='<%# Eval("NumItems") %>' /></b>
|
||||
</div>
|
||||
@@ -85,10 +85,10 @@
|
||||
</ItemTemplate>
|
||||
<EmptyDataTemplate>
|
||||
<div class="row border border-primary rounded">
|
||||
<div class="col-12 col-lg-6 text-left text-secondary">
|
||||
<div class="col-6 text-left text-secondary">
|
||||
<b> <%: traduci("NoNextBunk") %></b>
|
||||
</div>
|
||||
<div class="col-12 col-lg-6 text-right text-secondary">
|
||||
<div class="col-6 text-right text-secondary">
|
||||
<%: traduci("BatchComplete") %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -49,7 +49,10 @@ namespace NKC_WF.WebUserControls
|
||||
get
|
||||
{
|
||||
int answ = 0;
|
||||
int.TryParse(frmViewNext.SelectedValue.ToString(), out answ);
|
||||
if (frmViewNext.SelectedValue != null)
|
||||
{
|
||||
int.TryParse(frmViewNext.SelectedValue.ToString(), out answ);
|
||||
}
|
||||
return answ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,16 +7,11 @@
|
||||
<div class="card text-center" style="width: 100%;">
|
||||
<h4 class="card-header p-1 bg-secondary text-light"><%: traduci("MachineLoad") %></h4>
|
||||
<div class="card-body py-1">
|
||||
<asp:UpdatePanel runat="server" ID="upnlBCode" UpdateMode="Conditional" ChildrenAsTriggers="true">
|
||||
<ContentTemplate>
|
||||
<asp:Timer ID="timerLoad" runat="server" Interval="30000" OnTick="timerLoad_Tick"></asp:Timer>
|
||||
<div class="row">
|
||||
<div class="col-12 mb-2">
|
||||
<uc1:cmp_stackLoading runat="server" ID="cmp_stackLoading" enableBCode="true" />
|
||||
</div>
|
||||
</div>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
<div class="row">
|
||||
<div class="col-12 mb-2">
|
||||
<uc1:cmp_stackLoading runat="server" ID="cmp_stackLoading" enableBCode="true" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -23,10 +23,5 @@ namespace NKC_WF.site
|
||||
{
|
||||
cmp_stackLoading.doUpdate();
|
||||
}
|
||||
|
||||
protected void timerLoad_Tick(object sender, EventArgs e)
|
||||
{
|
||||
forceRefresh();
|
||||
}
|
||||
}
|
||||
}
|
||||
-18
@@ -14,24 +14,6 @@ namespace NKC_WF.site
|
||||
public partial class MachineLoadSmart
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Controllo upnlBCode.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.UpdatePanel upnlBCode;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo timerLoad.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.Timer timerLoad;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo cmp_stackLoading.
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user