From 7c0c11274a54c2cecc42b0ebe601200a17622c4e Mon Sep 17 00:00:00 2001
From: mtollari <mtollari@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 20 Dec 2016 17:05:01 +0000
Subject: [PATCH] Patch level         : 12.0 no-patch Files correlati     :
 Commento            : Aggiornamento Campo/Compass, modificata query O02A,
 modificato campo CCLIH in O02A/C

git-svn-id: svn://10.65.10.50/branches/R_10_00@23465 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 src/mr/mr0600.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mr/mr0600.cpp b/src/mr/mr0600.cpp
index f11c00e2c..d1362d0f1 100644
--- a/src/mr/mr0600.cpp
+++ b/src/mr/mr0600.cpp
@@ -532,7 +532,7 @@ bool TCampass_app::o02a(const TString CodNum, const TString id) const
 	TString msg("Esportazione tabella "); msg << "O02A - " << CodNum;
 	// Creo il filtro per la chiave del cursore, da quel che ho capito le chiavi sono pių veloci di un filtro (come č possibile?)
 	TRectype filtroRDoc(rdoc.curr()); filtroRDoc.put("CODNUM", CodNum);
-	TCursor curRDoc(&rdoc, "", 1, &filtroRDoc, &filtroRDoc);
+	TCursor curRDoc(&rdoc, "RIGAEVASA != \"X\"", 1, &filtroRDoc, &filtroRDoc);
 	items = curRDoc.items();
 
 	TProgress_monitor p(items, msg);
@@ -562,7 +562,7 @@ bool TCampass_app::o02a(const TString CodNum, const TString id) const
 
 		// Inserisco IKRUNIMP, FAZI, CStr, CMAG, CCLIH, CCLIR, CCLI
 		sqlQuery << "INSERT INTO O02A ( IKRUNIMP, FAZI, CStr, CMAG, CCLIH, CCLIR, CCLI, FLGSTA, XRIFCLI, XNOTE, CART, QCORD, QCSPE, DCCONF ) \
-								VALUES('" << id << "','U','DBS','" << rowRDoc.get("CODMAG") << "','" << rowRDoc.get("ANNO") << "." << zeroFill(rowRDoc.get("NDOC")) << "','" << rowRDoc.get("NRIGA") << "','" << zeroFill(rowDoc.get("CODCF")) << "','";
+								VALUES('" << id << "','U','DBS','" << rowRDoc.get("CODMAG") << "','" << rowRDoc.get("ANNO") << "." << CodNum << "." << zeroFill(rowRDoc.get("NDOC")) << "','" << rowRDoc.get("NRIGA") << "','" << zeroFill(rowDoc.get("CODCF")) << "','";
 		// Inserisco FLGSTA
 		sqlQuery << (rowRDoc.get("RIGAEVASA") == "X" ? "C" : "A");
 		// Inserisco XRIFCLI, XNOTE, CART, QCORD, QCSPE, DCCONF
@@ -619,7 +619,7 @@ bool TCampass_app::o02c(const TString CodNum, const TString id) const
 
 				// Inserisco Tutto (yeeeeeeeeeeeeeee)
 				sqlQuery << "INSERT INTO O02C ( IKRUNIMP, CStr, CPRD, CCLIH, CCLIR, BVAL) \
-										VALUES('" << id << "','DBS','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("NRIGA") << "','" << zeroFill(rowRDoc.get("DANDOC")) << "','" << rowRDoc.get("DAIDRIGA") << "','1');";
+										VALUES('" << id << "','DBS','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("NRIGA") << "','" << rowRDoc.get("ANNO") << "." << CodNum << zeroFill(rowRDoc.get("DANDOC")) << "','" << rowRDoc.get("DAIDRIGA") << "','1');";
 
 				if(sqlset.exec(sqlQuery) != 1)
 				{