root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level :

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :


git-svn-id: svn://10.65.10.50/branches/R_10_00@21832 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2011-03-25 11:15:12 +00:00
parent 10d3030293
commit d8d45ccd28
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ha/hacnv400.cpp
View File

@ -185,7 +185,6 @@ bool THardy_movmag::scrivi_testata(const TRecordset& recset, TMov_mag& mov)
so = 0; so = 0;
conto2campo(hdtipoc, key, tipoc, gr, co, so); conto2campo(hdtipoc, key, tipoc, gr, co, so);
mov.zero(); mov.zero();
// posso lasciare vuoto numreg ??
mov.put(MOVMAG_ANNOES, recset.get("Esercizio").as_int()); mov.put(MOVMAG_ANNOES, recset.get("Esercizio").as_int());
mov.put(MOVMAG_DATAREG, recset.get("DataMovimento").as_string()); mov.put(MOVMAG_DATAREG, recset.get("DataMovimento").as_string());
mov.put(MOVMAG_DATACOMP, recset.get("DataCompetenza").as_string()); mov.put(MOVMAG_DATACOMP, recset.get("DataCompetenza").as_string());
@ -194,6 +193,12 @@ bool THardy_movmag::scrivi_testata(const TRecordset& recset, TMov_mag& mov)
mov.put(MOVMAG_CODINDSP, recset.get("IdDestinazione").as_string()); mov.put(MOVMAG_CODINDSP, recset.get("IdDestinazione").as_string());
mov.put(MOVMAG_CODCF, so); mov.put(MOVMAG_CODCF, so);
mov.put(MOVMAG_NUMREGST, recset.get("ProtGiornale").as_int()); mov.put(MOVMAG_NUMREGST, recset.get("ProtGiornale").as_int());
mov.put(MOVMAG_EXNUMDOC, recset.get("Protocollo").as_string());
TString80 descr = "Rif.Doc. ";
descr << recset.get("DataDocumento").as_string();
descr << " ";
descr << recset.get("RifDocumento").as_string();
mov.put(MOVMAG_DESCR, descr);
return true; return true;
} }
// legge righe del movmag e le scrive nel TMov_mag // legge righe del movmag e le scrive nel TMov_mag
@ -203,7 +208,9 @@ bool THardy_movmag::scrivi_righe(TMov_mag& mov)
query_righe << query_header(); query_righe << query_header();
query_righe << "SELECT * " query_righe << "SELECT * "
"FROM dbo.MovMagazzino " "FROM dbo.MovMagazzino "
"WHERE Protocollo="; "WHERE Esercizio=";
query_righe << _anno;
query_righe << " AND Protocollo=";
query_righe << _protocollo; query_righe << _protocollo;
TODBC_recordset recset_righe(query_righe); TODBC_recordset recset_righe(query_righe);
TLocalisamfile rmov(LF_RMOVMAG); TLocalisamfile rmov(LF_RMOVMAG);
@ -220,8 +227,15 @@ bool THardy_movmag::scrivi_righe(TMov_mag& mov)
rmov.put(RMOVMAG_CODMAG, format("%02d", codmag)); rmov.put(RMOVMAG_CODMAG, format("%02d", codmag));
rmov.put(RMOVMAG_CODART, recset_righe.get("IdProdotto").as_string()); rmov.put(RMOVMAG_CODART, recset_righe.get("IdProdotto").as_string());
rmov.put(RMOVMAG_QUANT, recset_righe.get("Quantita").as_string()); rmov.put(RMOVMAG_QUANT, recset_righe.get("Quantita").as_string());
rmov.put(RMOVMAG_UM, recset_righe.get("IdUmDoc").as_string()); TString4 um = recset_righe.get("IdUmDoc").as_string();
rmov.put(RMOVMAG_PREZZO, recset_righe.get("Prezzo").as_string()); if (um.blank())
{
TString80 key = recset_righe.get("IdProdotto").as_string();
key << "|1";
um = cache().get(LF_UMART, key, UMART_UM);
}
rmov.put(RMOVMAG_UM, um);
rmov.put(RMOVMAG_PREZZO, recset_righe.get("PrezzoMov").as_string());
const int kmovmag = recset_righe.get("KMovmag").as_int(); const int kmovmag = recset_righe.get("KMovmag").as_int();
TString80 idlotto; TString80 idlotto;
get_lotto(kmovmag, idlotto); get_lotto(kmovmag, idlotto);