From 2955c4120a132830234a04d7468794abc3e10cb3 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 28 Oct 2008 20:02:49 +0000 Subject: [PATCH] Patch level : 10.0 148 Files correlati : mg0.exe Ricompilazione Demo : [ ] Commento : Aggiunti i flag di lavanderia alle causali di magazzino git-svn-id: svn://10.65.10.50/trunk@17494 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- mg/batbcau.h | 6 ++++- mg/batbcau.uml | 72 ++++++++++++++++++++++++++++++++++++++----------- mg/f166.trr | 2 +- mg/mg0100.cpp | 2 ++ mg/mglib.h | 13 ++++++--- mg/mglib02.cpp | 23 ++++------------ mg/mglib02a.cpp | 3 ++- 7 files changed, 80 insertions(+), 41 deletions(-) diff --git a/mg/batbcau.h b/mg/batbcau.h index d23e27139..7bc2bf9fe 100755 --- a/mg/batbcau.h +++ b/mg/batbcau.h @@ -41,8 +41,12 @@ #define F_STOP_PROD 148 #define F_MOV_SOSP 149 #define F_SCAR_ALT 150 -#define F_CAMPOQTA 151 #define F_GIACCF 152 +#define F_SGNDOTIN 153 +#define F_SGNDOTOD 154 +#define F_SGNDOTTM 155 +#define F_SGNCONYR 156 +#define F_SGNCONMN 157 #define G_SGNVAL 20 #define G_SGNQTA 21 diff --git a/mg/batbcau.uml b/mg/batbcau.uml index a5d09f2e8..4b30499d2 100755 --- a/mg/batbcau.uml +++ b/mg/batbcau.uml @@ -1,4 +1,5 @@ #include "batbcau.h" +#include TOOLBAR "Toolbar" 0 0 0 2 @@ -86,8 +87,6 @@ BEGIN ITEM "V|varie" ITEM "C|carico" ITEM "S|scarico" -// STR_EXPR (#F_TIPOMOV=="V")||(#F_RAGGF!="") -// WARNING "Necessario indicare il raggruppamento fiscale" END LISTBOX F_TIPOPR 16 @@ -99,30 +98,20 @@ BEGIN ITEM "L|Libero" END -LISTBOX F_CAMPOQTA 6 21 -BEGIN - PROMPT 2 9 "Q.tà sui documenti " - FIELD S5 - ITEM "|Default" - ITEM "QTAGG1|Quantità aggiuntiva 1" - ITEM "QTAGG2|Quantità aggiuntiva 2" - ITEM "QTAGG3|Quantità aggiuntiva 3" - ITEM "QTAGG4|Quantità aggiuntiva 4" - ITEM "QTAGG5|Quantità aggiuntiva 5" -END - BOOL F_MOVQTA BEGIN FIELD B0 PROMPT 2 10 "Movimenta solo quantita'" - MESSAGE TRUE RESET,F_MOVVAL + MESSAGE FALSE ENABLE,F_MOVVAL + MESSAGE TRUE CLEAR,F_MOVVAL END BOOL F_MOVVAL BEGIN FIELD B1 PROMPT 42 10 "Movimenta solo valori" - MESSAGE TRUE RESET,F_MOVQTA + MESSAGE FALSE ENABLE,F_MOVQTA + MESSAGE TRUE CLEAR,F_MOVQTA END BOOL F_UPDTULC @@ -135,6 +124,8 @@ BOOLEAN F_GIACCF BEGIN FIELD B7 PROMPT 42 11 "Aggiorna giacenze per cliente/fornitore " + MESSAGE FALSE CLEAR,LVAUT@ + MESSAGE TRUE ENABLE,LVAUT@ END @@ -461,6 +452,55 @@ BEGIN GROUP G_SGNVAL END +LISTBOX F_SGNDOTIN 1 +BEGIN + PROMPT 42 4 "Movimentazione dotazione iniziale " + FIELD S2[29,30] + ITEM "0| " + ITEM "+1|+" + ITEM "-1|-" + GROUP LVAUT +END + +LISTBOX F_SGNDOTOD 1 +BEGIN + PROMPT 42 5 " '' '' dotazione ordierna " + FIELD S2[31,32] + ITEM "0| " + ITEM "+1|+" + ITEM "-1|-" + GROUP LVAUT +END + +LISTBOX F_SGNDOTTM 1 +BEGIN + PROMPT 42 6 " '' '' dotazione temporanea " + FIELD S2[33,34] + ITEM "0| " + ITEM "+1|+" + ITEM "-1|-" + GROUP LVAUT +END + +LISTBOX F_SGNCONYR 1 +BEGIN + PROMPT 42 7 " '' '' consegnato anno " + FIELD S2[35,36] + ITEM "0| " + ITEM "+1|+" + ITEM "-1|-" + GROUP LVAUT +END + +LISTBOX F_SGNCONMN 1 +BEGIN + PROMPT 42 8 " '' '' consegnato mese " + FIELD S2[37,38] + ITEM "0| " + ITEM "+1|+" + ITEM "-1|-" + GROUP LVAUT +END NUMBER F_SUMSIGN 4 0 BEGIN diff --git a/mg/f166.trr b/mg/f166.trr index d01b712cc..028eec969 100755 --- a/mg/f166.trr +++ b/mg/f166.trr @@ -50,6 +50,6 @@ USERVAL5|4|18|3|valore USER6|4|15|5|campo definito dall'utente USERVAL6|4|18|3|valore 3 -ANNOES+TIPOCF+CODCF+INDSPED+CODART+LIVELLO+NRIGA| +ANNOES+TIPOCF+CODCF+INDSPED+CODART+NRIGA| ANNOES+TIPOCF+CODCF+INDSPED+CODART+LIVELLO|X ANNOES+CODART+LIVELLO+TIPOCF+CODCF+INDSPED|X diff --git a/mg/mg0100.cpp b/mg/mg0100.cpp index fe7378788..efe750fa5 100755 --- a/mg/mg0100.cpp +++ b/mg/mg0100.cpp @@ -83,6 +83,8 @@ TMask_tabmag::TMask_tabmag(const char * _maskname, const TString &tabname) if (!main_app().has_module(DBAUT)) hide(F_DIBAEXPLOSION); set_handler(F_SGNGIAC, sumsign_handler); + if (!main_app().has_module(LVAUT)) + hide(-LVAUT); } else if (tabname == "FCA") // FORMATO CODICE ARTICOLI { diff --git a/mg/mglib.h b/mg/mglib.h index 174bd7739..852407801 100755 --- a/mg/mglib.h +++ b/mg/mglib.h @@ -265,9 +265,9 @@ public: class TArticolo_giacenza_data : public TArticolo_giacenza { protected: - virtual int write(TBaseisamfile&) const; - virtual int rewrite(TBaseisamfile&) const; - virtual int remove(TBaseisamfile&) const; + virtual int write(TBaseisamfile&) const { return _iseof; } + virtual int rewrite(TBaseisamfile&) const { return _iseof; } + virtual int remove(TBaseisamfile&) const { return _iseof; } public: void al(const TDate& data, const char* codmag = NULL, const char* livello = NULL, @@ -485,7 +485,12 @@ typedef enum s_user3, s_user4, s_user5, - s_user6 + s_user6, + s_dotin, + s_dotod, + s_dottm, + s_consanno, + s_consmese } TTipo_saldomag; class TCausale_magazzino : public TRectype diff --git a/mg/mglib02.cpp b/mg/mglib02.cpp index cbcc77e83..c4fa004de 100755 --- a/mg/mglib02.cpp +++ b/mg/mglib02.cpp @@ -1514,18 +1514,6 @@ TArticolo_giacenza::TArticolo_giacenza(const TRectype& rec) // Giacenze alla data -int TArticolo_giacenza_data::write(TBaseisamfile&) const -{ - NFCHECK("Non e' possibile scrivere un Articolo con giacenza alla data"); - return NOERR; -} - -int TArticolo_giacenza_data::rewrite(TBaseisamfile& f) const -{ return write(f); } - -int TArticolo_giacenza_data::remove(TBaseisamfile& f) const -{ return write(f); } - void TArticolo_giacenza_data::al(const TDate& data, const char* codmag, const char* livello, TTipo_valorizz tipo, const char* catven, const char* codlis) { @@ -1695,12 +1683,11 @@ int TCausale_magazzino::sgn(TTipo_saldomag tiposaldo) const case s_rim : index = 22; break; case s_scart: index = 24; break; case s_label: index = 26; break; - case s_user1: index = 28; break; - case s_user2: index = 30; break; - case s_user3: index = 32; break; - case s_user4: index = 34; break; - case s_user5: index = 36; break; - case s_user6: index = 38; break; + case s_dotin: index = 28; break; + case s_dotod: index = 30; break; + case s_dottm: index = 32; break; + case s_consanno: index = 34; break; + case s_consmese: index = 36; break; default : index = -1; break; } int segno = 0; diff --git a/mg/mglib02a.cpp b/mg/mglib02a.cpp index 00536b8e8..f6c9624fc 100755 --- a/mg/mglib02a.cpp +++ b/mg/mglib02a.cpp @@ -666,6 +666,7 @@ bool TMov_mag::update_balances(bool lock) if (clifomag.read() != NOERR) { // non trovato: aggiungo + clifomag.setkey(1); giac_putkey_clifo(clifomag, saldo); clifomag.put(CLIFOGIAC_NRIGA, 999); if (clifomag.read(_isgteq) == NOERR) @@ -674,13 +675,13 @@ bool TMov_mag::update_balances(bool lock) if (clifomag.get_int(CLIFOGIAC_ANNOES) == saldo.codes() && clifomag.get_char(CLIFOGIAC_TIPOCF) == saldo.tipocf() && clifomag.get(CLIFOGIAC_CODCF) == saldo.codcf() && - clifomag.get(CLIFOGIAC_INDSPED) == saldo.codindsp() && clifomag.get(CLIFOGIAC_CODART) == saldo.codart() && clifomag.get(CLIFOGIAC_LIVELLO ) == saldo.livello()) nriga = clifomag.get_int(CLIFOGIAC_NRIGA) + 1; giac_putkey_clifo(clifomag, saldo); clifomag.put(CLIFOGIAC_NRIGA, nriga); clifomag.write(); + clifomag.setkey(2); } update_balances_clifo(clifomag.curr(), saldo); clifomag.rewrite();