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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-01-31 13:16:41 +01:00
parent 4d36711661 c64858a13a
commit 20af11c601
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=247']) {
withEnv(['NEXT_BUILD_NUMBER=249']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/Web.config
+1
View File
@@ -36,6 +36,7 @@
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah"/>
</httpModules>
<!--<customErrors mode="On" defaultRedirect="~/ErrorPages/Oops.aspx"/>-->
<customErrors mode="Off"/>
</system.web>
<appSettings>
<!--Configurazioni generali-->
NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs
+14 -4
View File
@@ -391,8 +391,18 @@ namespace NKC_WF.WebUserControls
{
if (resetStatus)
{
// riposto item a status 1...
DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId);
try
{
// SE item esiste...
var tabItem = DataLayer.man.taIL.getBySearch(itemIdSelected, itemIdSelected.ToString(), 0, 999);
if (tabItem.Count == 1)
{
// riposto item a status 1...
DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId);
}
}
catch
{ }
}
// elimino item sel...
itemIdSelected = 0;
@@ -411,7 +421,7 @@ namespace NKC_WF.WebUserControls
divItemError.Visible = showError;
if (showError)
{
displError("Item not found",true);
displError("Item not found", true);
}
if (showItem)
{
@@ -451,7 +461,7 @@ namespace NKC_WF.WebUserControls
displError("Item declared SCRAP!", false);
break;
case 991:
displError("Item declared SCRAP with CNC program created!",false);
displError("Item declared SCRAP with CNC program created!", false);
break;
default:
displError("ERROR: Item status UNKNOWN!", false);