diff --git a/mg/clifogiac.h b/mg/clifogiac.h index c8ebe25d5..0e5d72c7b 100755 --- a/mg/clifogiac.h +++ b/mg/clifogiac.h @@ -29,6 +29,9 @@ #define CLIFOGIAC_ACL "ACL" #define CLIFOGIAC_PRODCOMP "PRODCOMP" #define CLIFOGIAC_PRODFIN "PRODFIN" +#define CLIFOGIAC_DOTIN "DOTIN" +#define CLIFOGIAC_DOTOD "DOTOD" +#define CLIFOGIAC_DOTTM "DOTTM" #define CLIFOGIAC_NLABEL "NLABEL" #define CLIFOGIAC_NDIST "NDIST" #define CLIFOGIAC_SCARTI "SCARTI" diff --git a/mg/f166.dir b/mg/f166.dir index 36c40351c..b2eec5342 100755 --- a/mg/f166.dir +++ b/mg/f166.dir @@ -1,3 +1,3 @@ 166 0 -$clifogiac|0|0|697|0|Giacenze per cliente||| +$clifogiac|0|0|742|0|Giacenze per cliente||| diff --git a/mg/f166.trr b/mg/f166.trr index 028eec969..1415a1328 100755 --- a/mg/f166.trr +++ b/mg/f166.trr @@ -1,5 +1,5 @@ 166 -49 +52 ANNOES|1|4|0|Codice esercizio TIPOCF|1|1|0|Tipo liente ornitore CODCF|3|6|0|Codice Cliente Fornitore @@ -37,6 +37,9 @@ LOTTORIOR|4|15|3|Lotto minimo di riordino LOTTOIRIOR|4|15|3|Lotto incrementale di riordino GIORNIRIOR|4|5|1|Numero di giorni di riordino SCORTAMIN|4|15|5|Scorta minima +DOTIN|4|15|5|Dotazione iniziale (lavanderie) +DOTOD|4|15|5|Dotazione odierna (lavanderie) +DOTTM|4|15|5|Dotazione temporanea (lavanderie) USER1|4|15|5|campo definito dall'utente USERVAL1|4|18|3|valore USER2|4|15|5|campo definito dall'utente diff --git a/mg/mg0400a.h b/mg/mg0400a.h index dd6261ed3..83b813655 100755 --- a/mg/mg0400a.h +++ b/mg/mg0400a.h @@ -6,45 +6,45 @@ #define F_DESART 306 #define F_ANNOES 307 #define F_SHEETGIAC 309 +#define F_INDSPED 310 // colonne visibili dello Sheet di mg0400a -#define F_INDSPED 101 -#define F_LIV1 102 -#define F_LIV2 103 -#define F_LIV3 104 -#define F_LIV4 105 -#define F_DATARIF 106 -#define F_UBICAZ 107 -#define F_LIVRIOR 108 -#define F_SCORTAMIN 109 -#define F_LOTTORIOR 110 -#define F_LOTTOIRIOR 111 -#define F_GIORNIRIOR 112 -#define F_GIAC 113 -#define F_VALGIAC 114 -#define F_RIM 115 -#define F_VRIM 116 -#define F_ACQ 117 -#define F_VACQ 118 -#define F_ENTR 119 -#define F_VENTR 120 -#define F_VEN 121 -#define F_VVEN 122 -#define F_USC 123 -#define F_VUSC 124 -#define F_ORDF 125 -#define F_VORDF 126 -#define F_ORDC 127 -#define F_VORDC 128 -#define F_SCARTI 129 -#define F_VSCARTI 130 -#define F_INPRODC 131 -#define F_INPRODF 132 -#define F_ACL 133 -#define F_INCL 134 -#define F_LABELS 135 -#define F_NDIST 136 +#define F_LIV1 101 +#define F_LIV2 102 +#define F_LIV3 103 +#define F_LIV4 104 +#define F_DATARIF 105 +#define F_UBICAZ 106 +#define F_LIVRIOR 107 +#define F_SCORTAMIN 108 +#define F_LOTTORIOR 109 +#define F_LOTTOIRIOR 110 +#define F_GIORNIRIOR 111 +#define F_GIAC 112 +#define F_VALGIAC 113 +#define F_RIM 114 +#define F_VRIM 115 +#define F_ACQ 116 +#define F_VACQ 117 +#define F_ENTR 118 +#define F_VENTR 119 +#define F_VEN 120 +#define F_VVEN 121 +#define F_USC 122 +#define F_VUSC 123 +#define F_ORDF 124 +#define F_VORDF 125 +#define F_ORDC 126 +#define F_VORDC 127 +#define F_SCARTI 128 +#define F_VSCARTI 129 +#define F_INPRODC 130 +#define F_INPRODF 131 +#define F_ACL 132 +#define F_INCL 133 +#define F_LABELS 134 +#define F_NDIST 135 // colonne non visibili dello Sheet #define F_UBICAZD 154 diff --git a/mg/mglib02a.cpp b/mg/mglib02a.cpp index 6a5a8dc30..b4361704e 100755 --- a/mg/mglib02a.cpp +++ b/mg/mglib02a.cpp @@ -777,6 +777,9 @@ void TMov_mag::update_balances_clifo(TRectype & clifomagrec, const TSaldo_mag_cl update_balance(clifomagrec, CLIFOGIAC_ACL, diff * (real)caus.sgn(s_incl)); update_balance(clifomagrec, CLIFOGIAC_PRODCOMP, -diff * (real)caus.sgn(s_prodc)); update_balance(clifomagrec, CLIFOGIAC_PRODFIN, -diff * (real)caus.sgn(s_prodf)); + update_balance(clifomagrec, CLIFOGIAC_DOTIN, diff * (real)caus.sgn(s_dotin)); + update_balance(clifomagrec, CLIFOGIAC_DOTOD, diff * (real)caus.sgn(s_dotod)); + update_balance(clifomagrec, CLIFOGIAC_DOTTM, diff * (real)caus.sgn(s_dottm)); update_balance(clifomagrec, CLIFOGIAC_USER1, diff * (real)caus.sgn(s_user1)); update_balance(clifomagrec, CLIFOGIAC_USER2, diff * (real)caus.sgn(s_user2)); update_balance(clifomagrec, CLIFOGIAC_USER3, diff * (real)caus.sgn(s_user3));