Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bcode specifici (formato ENG-IT)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-10-04 09:58:17 +02:00
parent 1dd2a79b9d
commit c9ab8d349b
2 changed files with 30 additions and 2 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=840']) {
withEnv(['NEXT_BUILD_NUMBER=841']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-Admin/WebUserControls/mod_barcode.ascx.cs
+29 -1
View File
@@ -121,6 +121,14 @@ namespace MoonProAdmin.WebUserControls
/// </summary>
protected string regExp_OK = memLayer.ML.cdv("regExp_OK");
/// <summary>
/// RegExp x Find --> replace (se vettore è | delimited)
/// </summary>
protected string regExp_Find = memLayer.ML.cdv("regExp_Find");
/// <summary>
/// RegExp x Replace da Find (se vettore è | delimited)
/// </summary>
protected string regExp_Replace = memLayer.ML.cdv("regExp_Replace");
/// <summary>
/// titolo pagina
/// </summary>
public string titolo
@@ -388,8 +396,28 @@ namespace MoonProAdmin.WebUserControls
private bool checkIntServ()
{
bool answ = false;
// IN PRIMIS se c'è in config preprocesso BCode x Find-Replace
string BCodeFilt = BCodeVal;
if (regExp_Find != "")
{
// splitto i vettori
var vettFind = regExp_Find.Split('|');
var vettRepl = regExp_Replace.Split('|');
// se ho tanti find quanti replace procedo...
if (vettFind.Length == vettRepl.Length)
{
for (int i = 0; i < vettFind.Length; i++)
{
BCodeFilt = BCodeFilt.Replace(vettFind[i], vettRepl[i]);
}
}
else
{
logger.lg.scriviLog(string.Format("Attenzione: problema in decodifica barcode find/replace, i aprametri non corrispondono una votla esplosi i vettori:{0}find: {1}{0}replace:{2}", Environment.NewLine, regExp_Find, regExp_Replace));
}
}
// cerco esplicitamente sul DB IntegrationServices...
var risultato = DataLayer.obj.taIS_TrDati.getOrdini(BCodeVal);
var risultato = DataLayer.obj.taIS_TrDati.getOrdini(BCodeFilt);
if (risultato.Rows.Count > 0)
{
var rRes = risultato[0];