diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll index 246b8dca..9053606c 100644 Binary files a/GMW-RT/bin/GMW-RT.dll and b/GMW-RT/bin/GMW-RT.dll differ diff --git a/GMW-RT/bin/GMW_data.dll b/GMW-RT/bin/GMW_data.dll index eab6ea98..ba5c306d 100644 Binary files a/GMW-RT/bin/GMW_data.dll and b/GMW-RT/bin/GMW_data.dll differ diff --git a/GMW-UT/bin/GMW_data.dll b/GMW-UT/bin/GMW_data.dll index eab6ea98..ba5c306d 100644 Binary files a/GMW-UT/bin/GMW_data.dll and b/GMW-UT/bin/GMW_data.dll differ diff --git a/GMW/GMW.csproj.user b/GMW/GMW.csproj.user index 8d09597d..ced5e251 100644 --- a/GMW/GMW.csproj.user +++ b/GMW/GMW.csproj.user @@ -2,7 +2,7 @@ ShowAllFiles - SP_test + SP_prod diff --git a/GMW/WebUserControls/mod_PostRX_DT.ascx.cs b/GMW/WebUserControls/mod_PostRX_DT.ascx.cs index c7d43e60..637d725e 100644 --- a/GMW/WebUserControls/mod_PostRX_DT.ascx.cs +++ b/GMW/WebUserControls/mod_PostRX_DT.ascx.cs @@ -308,7 +308,7 @@ namespace GMW.WebUserControls switch (MagClass.tipoBCode(barcodeIn)) { case tipoCodiceBarcode.DateTime: - okDTL = getDateTimeLine(); + okDTL = getDateTimeLine(false); if (okDTL) { Postazione.messaggiText = traduci("SetDataFus"); @@ -323,7 +323,7 @@ namespace GMW.WebUserControls } break; case tipoCodiceBarcode.DateTimeLine: - okDTL = getDateTimeLine(); + okDTL = getDateTimeLine(true); if (okDTL) { Postazione.messaggiText = traduci("SetDataFus"); @@ -513,7 +513,9 @@ namespace GMW.WebUserControls /// /// recupera da barcode dataOra e linea fusione (SE presenti) /// - private bool getDateTimeLine() + /// + /// + private bool getDateTimeLine(bool readline) { bool okData = false; bool okLinea = false; @@ -535,31 +537,38 @@ namespace GMW.WebUserControls { dataFus = oldDataFus; } - if (okData) + if (readline) { - try + if (okData) { - newLinea = barcodeIn.Replace(memLayer.ML.confReadString("prefDateTime"), "").Substring(10, barcodeIn.Length - 10 - memLayer.ML.confReadString("prefDateTime").Length); - if ((newLinea != "") && (DataProxy.obj.taElPost.getByCod(newLinea).Rows.Count > 0)) + try { - lineaFus = newLinea; - okLinea = true; + newLinea = barcodeIn.Replace(memLayer.ML.confReadString("prefDateTime"), "").Substring(10, barcodeIn.Length - 10 - memLayer.ML.confReadString("prefDateTime").Length); + if ((newLinea != "") && (DataProxy.obj.taElPost.getByCod(newLinea).Rows.Count > 0)) + { + lineaFus = newLinea; + okLinea = true; + } + else + { + lineaFus = ""; + dataFus = oldDataFus; + } } - else + catch { lineaFus = ""; dataFus = oldDataFus; } } - catch + else { lineaFus = ""; - dataFus = oldDataFus; } } else { - lineaFus = ""; + okLinea = true; } return okData && okLinea; } @@ -806,7 +815,7 @@ namespace GMW.WebUserControls } else { - // 2014.10.02 TOLTO eprché ripoerta a 1 la qty prima dell'update... inutile! tanto poi ricalcola... + // 2014.10.02 TOLTO perché ripoerta a 1 la qty prima dell'update... inutile! tanto poi ricalcola... #if false // aggiorno quantità! MagClass.magazzino.taCartellini.updateQty(newUdcChild, MagClass.magazzino.CodSoggCurrUser, "U", codEventoUdc, qta); diff --git a/GMW/WebUserControls/mod_PostRX_NT.ascx.cs b/GMW/WebUserControls/mod_PostRX_NT.ascx.cs index 8a335117..bc9d4e58 100644 --- a/GMW/WebUserControls/mod_PostRX_NT.ascx.cs +++ b/GMW/WebUserControls/mod_PostRX_NT.ascx.cs @@ -254,7 +254,7 @@ namespace GMW.WebUserControls { case tipoCodiceBarcode.DateTime: // imposto NUOVA dataora fusione... - okDTL = getDateTimeLine(); + okDTL = getDateTimeLine(false); if (okDTL) { Postazione.messaggiText = traduci("SetDataFus"); @@ -269,7 +269,7 @@ namespace GMW.WebUserControls } break; case tipoCodiceBarcode.DateTimeLine: - okDTL = getDateTimeLine(); + okDTL = getDateTimeLine(true); if (okDTL) { Postazione.messaggiText = traduci("SetDataFus"); @@ -326,7 +326,9 @@ namespace GMW.WebUserControls /// /// recupera da barcode dataOra e linea fusione (SE presenti) /// - private bool getDateTimeLine() + /// + /// + private bool getDateTimeLine(bool readline) { bool okData = false; bool okLinea = false; @@ -348,31 +350,38 @@ namespace GMW.WebUserControls { dataFus = oldDataFus; } - if (okData) + if (readline) { - try + if (okData) { - newLinea = barcodeIn.Replace(memLayer.ML.confReadString("prefDateTime"), "").Substring(10, barcodeIn.Length - 10 - memLayer.ML.confReadString("prefDateTime").Length); - if ((newLinea != "") && (DataProxy.obj.taElPost.getByCod(newLinea).Rows.Count > 0)) + try { - lineaFus = newLinea; - okLinea = true; + newLinea = barcodeIn.Replace(memLayer.ML.confReadString("prefDateTime"), "").Substring(10, barcodeIn.Length - 10 - memLayer.ML.confReadString("prefDateTime").Length); + if ((newLinea != "") && (DataProxy.obj.taElPost.getByCod(newLinea).Rows.Count > 0)) + { + lineaFus = newLinea; + okLinea = true; + } + else + { + lineaFus = ""; + dataFus = oldDataFus; + } } - else + catch { lineaFus = ""; dataFus = oldDataFus; } } - catch + else { lineaFus = ""; - dataFus = oldDataFus; } } else { - lineaFus = ""; + okLinea = true; } return okData && okLinea; } diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 3568a272..83120ef2 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index eab6ea98..ba5c306d 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/ReleaseClienti/SP_prod/GMW.zip b/ReleaseClienti/SP_prod/GMW.zip index 2be68236..99ee5ef3 100644 Binary files a/ReleaseClienti/SP_prod/GMW.zip and b/ReleaseClienti/SP_prod/GMW.zip differ diff --git a/ReleaseClienti/SP_test/GMW.zip b/ReleaseClienti/SP_test/GMW.zip index e1ddb653..28d01334 100644 Binary files a/ReleaseClienti/SP_test/GMW.zip and b/ReleaseClienti/SP_test/GMW.zip differ