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

Clkeanup unused function labels print + new rel

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-06 14:37:12 +02:00
parent 2c9c2c9f5a
commit f1e5153fb5
2 changed files with 7 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=308']) {
withEnv(['NEXT_BUILD_NUMBER=309']) {
// 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}')
NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs
+6 -74
View File
@@ -196,12 +196,14 @@ namespace NKC_WF.WebUserControls
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
break;
case codeType.ItemGeneric:
cmp_barcode.showOutput("badge badge-success", $"Valid IG Code: {decoData.rawData}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
cmp_barcode.showOutput("badge badge-success", $"IG Code - ignored: {decoData.rawData}");
resetDisplay(true);
doRaiseEv = true;
break;
case codeType.OtherItem:
cmp_barcode.showOutput("badge badge-success", $"Valid Generic PART Code: {decoData.rawData}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
cmp_barcode.showOutput("badge badge-success", $"Generic PART Code - ignored: {decoData.rawData}");
resetDisplay(true);
doRaiseEv = true;
break;
case codeType.Material:
cmp_barcode.showOutput("badge badge-warning", $"MATERIAL - ignored: {decoData.description}");
@@ -226,10 +228,6 @@ namespace NKC_WF.WebUserControls
case codeType.Cart:
cmp_barcode.showOutput("badge badge-warning", $"CART - ignored: {decoData.description}");
resetDisplay(true);
#if false
cmp_barcode.showOutput("badge badge-success", $"Valid CR Code: {decoData.description}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
#endif
doRaiseEv = true;
break;
case codeType.Bin:
@@ -240,10 +238,6 @@ namespace NKC_WF.WebUserControls
case codeType.BinProcessed:
cmp_barcode.showOutput("badge badge-warning", $"BIN PAINTED - ignored: {decoData.description}");
resetDisplay(true);
#if false
cmp_barcode.showOutput("badge badge-success", $"Valid BP Code: {decoData.description}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
#endif
doRaiseEv = true;
break;
default:
@@ -282,68 +276,6 @@ namespace NKC_WF.WebUserControls
// mostro print!
lbtPrintLabels.Visible = true;
break;
case codeType.ItemGeneric:
//// PRIMA CERCA SE ne ho in stato 1..3
//tabItem = DataLayer.man.taIL.getBySearch(0, rawData, 1, 3);
//if (tabItem.Count == 0)
//{
// // se NON ne trovo cerci FINO a stato 5...
// tabItem = DataLayer.man.taIL.getBySearch(0, rawData, 1, 5);
//}
//if (tabItem.Count == 1)
//{
// showItemDetail(true, tabItem[0], false);
//}
//else if (tabItem.Count == 0)
//{
// showItemDetail(false, null, true);
//}
// mostro print!
lbtPrintLabels.Visible = true;
break;
case codeType.OtherItem:
#if false
// recupero la tab OKOI x iniziare a controllare i dati...
var tabOKOI = DataLayer.man.taOKOI.getByOtherItemDtmx(rawData);
// PRIMO: verifico SE ho delle righe valide...
if (tabOKOI.Count == 0)
{
displError($"PART: Code not found {rawData}, please retry", true);
// reset preliminare
resetOtherItem();
}
else
{
var listAvailable = tabOKOI.Where(x => x.IsOnCartDateNull()).ToList();
if (listAvailable.Count == 0)
{
displError($"PART: No item available for pickup on target CART for code {rawData} | item {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}, please retry", true);
// reset preliminare
resetOtherItem();
}
else
{
// verifico SE ci sia ALMENO UN CART in postazione (iniziato KIT ma NON finito)...
var listCartAvailable = tabOKOI.Where(x => !x.IsCartKitStartNull() && x.IsCartKitEndNull()).ToList();
if (listCartAvailable.Count == 0)
{
displError($"PART: No CART available to proceed: {rawData} | item {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}", true);
// reset preliminare
resetOtherItem();
}
else
{
// mostro OtherItem!
setOtherItem(rawData, codeInt);
}
}
}
#endif
// mostro print!
lbtPrintLabels.Visible = true;
break;
default:
lastObject = "";
// nascondo print!