Patch level :

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :


git-svn-id: svn://10.65.10.50/trunk@17160 c028cbd2-c16b-5b4b-a496-9718f37d4682

lv/lv0400.cpp

@@ -4,6 +4,7 @@
 #include <recset.h>
 
 #include "lv0400.h"
+#include "../mg/anamag.h"
 
 class TContratti_app: public TRelation_application
 {
@@ -103,7 +104,27 @@ bool TContratti_app::notify( TSheet_field& ss, int r, KEY key )
       const TString80 codart(row.get(ss.cid2index(S_CODART)));
       const TRectype & artrec = cache().get(LF_ANAMAG, codart);
 
+      m.set(F_GRMERC,artrec.get(ANAMAG_GRMERC).sleft(3));
+      m.set(F_COLORE,artrec.get(ANAMAG_COLORE));
+      m.set(F_LIVELLO,artrec.get(ANAMAG_LIVELLO));
+      m.set(F_PPCONF,artrec.get(ANAMAG_PPCONF));
+      m.set(F_PPCOLLO,artrec.get(ANAMAG_PPCOLLO));
+      m.set(F_PPPALLET,artrec.get(ANAMAG_PPPALLET));
+      m.set(F_TIPOPARTE,artrec.get(ANAMAG_TIPOPARTE));
+      m.set(F_CODLAV1,artrec.get(ANAMAG_CODLAV1));
+      m.set(F_CODLAV2,artrec.get(ANAMAG_CODLAV2));
+      m.set(F_LINDEST1,artrec.get(ANAMAG_LINDEST1));
+      m.set(F_LINDEST2,artrec.get(ANAMAG_LINDEST2));
+      m.set(F_LAVATRICE,artrec.get(ANAMAG_LAVATRICE));
+      m.set(F_ARTLAVCONT,artrec.get(ANAMAG_ARTLAVCONT));
+      m.set(F_MANGDEST,artrec.get(ANAMAG_MANGDEST));
+   
+      const bool varclcons = m.get_int(F_PPCONF)>0;
 
+      ss.enable_cell(ss.selected(),ss.cid2index(S_CALCCONS));
+
+      ss.sheet_mask().set(S_CALCCONS,"0"); 
+      row.add("0",ss.cid2index(S_CALCCONS));
     }
 	  break;
 	default:

lv/lv0400.h

@@ -4,7 +4,7 @@
 #define F_DATAIN       204
 #define F_DATASC       205
 #define F_RIGHE        206
-#define F_TIPOLOGIA    207
+#define F_GRMERC       207
 #define F_COLORE       208
 #define F_LIVELLO      209
 #define F_PPCONF       210 
@@ -16,7 +16,7 @@
 #define F_LINDEST1     216
 #define F_LINDEST2     217
 #define F_LAVATRICE    218
-#define F_ARTLAVONCT   219
+#define F_ARTLAVCONT   219
 #define F_MANGDEST     220
 #define F_PERFAT       221
 #define F_TIPOCAN      222
@@ -48,6 +48,10 @@
 #define F_NUMUT        248
 #define F_NUMETI       249
 #define F_RITAUDTTMP   250
+#define F_DOTOD        251
+#define F_CONSMESE     252
+#define F_CONSANNO     253
+#define DLG_PLANNING   254
 #define S_CODART       101
 #define S_DESCR        102
 #define S_UM           103
@@ -57,21 +61,18 @@
 #define S_IMPFISART    107
 #define S_SCONTO       108
 #define S_DOTIN        109
-#define S_DOTOD        110
+#define S_DOTTMP       110
-#define S_CONSMESE     111
+#define S_PRZDTTMP     111
-#define S_CONSANNO     112
+#define S_INDTTMP      112
-#define S_DOTTMP       113
+#define S_FIDTTMP      113
-#define S_PRZDTTMP     114
+#define S_PREZDAN      114
-#define S_INDTTMP      115
+#define S_VALCONV      115
-#define S_FIDTTMP      116
+#define S_ARTBLOC      116
-#define S_PREZDAN      117
+#define S_CALCCONS     117
-#define S_VALCONV      118
+#define S_TIPOFORF     118
-#define S_ARTBLOC      119
+#define S_FORFPERCL    119
-#define S_CALCCONS     120
+#define S_CAUSMAG      120
-#define S_TIPOFORF     121
+#define S_TIPONOL      121
-#define S_FORFPERCL    122
+#define S_RITAUDTTMP   122 
-#define S_CAUSMAG      123
+#define S_FATTKG       123
-#define S_TIPONOL      124
+#define S_ARROT        124
-#define S_RITAUDTTMP   125 
-#define S_FATTKG       126
-#define S_ARROT        127

lv/lv0400a.uml

@@ -6,14 +6,14 @@ ENDPAGE
 
 PAGE "Contratto" 0 2 0 0
 
-GROUPBOX DLG_NULL 78 4
+GROUPBOX DLG_NULL 78 5
 BEGIN
 	PROMPT 1 1 "@bContratti"
 END
 
 NUMBER F_CODCF 6
 BEGIN
-  PROMPT 2 2 "Cliente     " 
+  PROMPT 2 2 "Cliente      " 
   FIELD CODCF
   FLAGS "U"
   KEY 1
@@ -27,9 +27,9 @@ BEGIN
   CHECKTYPE REQUIRED 
 END
 
-STRING F_RAGSOC 50
+STRING F_RAGSOC 50 30
 BEGIN
-  PROMPT 26 2 ""
+  PROMPT 2 3 "Ragione soc. "
   KEY 2
   USE LF_CLIFO KEY 2
   INPUT TIPOCF "C"
@@ -42,7 +42,7 @@ END
 
 NUMBER F_CODCONT 6
 BEGIN
-  PROMPT 2 3 "Contratto N."
+  PROMPT 2 4 "Contratto N. "
   USE LF_LVCONDV 
   JOIN LF_CLIFO INTO TIPOCF="C" CODCF=CODCF
   INPUT CODCF F_CODCF  
@@ -63,21 +63,27 @@ END
 
 DATE F_DATAIN
 BEGIN
-  PROMPT 24 3 "Data di inizio"
+  PROMPT 51 2 "Inizio       "
   FIELD DATAIN
   CHECKTYPE REQUIRED
 END
 
 DATE F_DATASC
 BEGIN
-  PROMPT 51 3 "Data di scadenza"
+  PROMPT 51 3 "Scadenza     "
   FIELD DATASC
   CHECKTYPE REQUIRED
 END
 
-SPREADSHEET F_RIGHE 0 -6
+BUTTON DLG_PLANNING 10
 BEGIN
-  PROMPT 0 5 "Righe contratto"
+  PROMPT 51 4 "~Planning"
+  MESSAGE RUN,lv0 -4 #F_CODCF #F_CODCONT
+END
+
+SPREADSHEET F_RIGHE 0 -7
+BEGIN
+  PROMPT 0 6 "Righe contratto"
   ITEM "Articolo@20"
   ITEM "Descrizione@50"
   ITEM "UM"
@@ -87,9 +93,6 @@ BEGIN
   ITEM "Importo fisso"
   ITEM "Sconto %"
   ITEM "Dot.Iniziale"
-  ITEM "Dot.Odierna"
-  ITEM "Consegnato Mese*"
-  ITEM "Consegnato anno"
   ITEM "Dot.Temporanea"
   ITEM "Prezzo Dot.Temp."
   ITEM "Inizio Dot.Temp."
@@ -107,84 +110,115 @@ BEGIN
   ITEM "Arrotondamento"
 END
 
-LISTBOX F_TIPOLOGIA 12
+NUMBER F_DOTOD 9 
 BEGIN
-  PROMPT 1 -5 "Tipologia:"
+   PROMPT 1 -6 "Dotazione odierna "
-  ITEM  "0|Nessuno"
+   FLAGS "D"
-  ITEM  "1|Sala bianca"
-  ITEM  "2|Sala colore"
-  ITEM  "3|Camera"
-  ITEM  "4|Bagno cotone"
-  ITEM  "5|Bagno spugna"
-  ITEM  "6|Di proprietà"
-  ITEM  "7|Sala bianca"
 END
 
-STRING F_COLORE 20
+STRING F_GRMERC 3
 BEGIN
-  PROMPT 28 -5 "Colore"
+  PROMPT 30 -6 "Tipologia "
-END 
+  FLAG "UD"
+  USE GMC KEY 1 SELECT CODTAB[4,5]==""
+  INPUT CODTAB F_GRMERC
+  DISPLAY "Codice" CODTAB[1,3]
+  DISPLAY "Descrizione@50" S0
+  OUTPUT F_GRMERC CODTAB[1,3]
+  CHECKTYPE NORMAL
+END
 
-STRING F_LIVELLO 1
+STRING F_COLORE 20 15
 BEGIN
-  PROMPT 57 -5 "Livello"
+  PROMPT 52 -6 "Colore "
+  FLAGS "D"
 END 
 
 NUMBER F_PPCONF 9
 BEGIN 
-  PROMPT 1 -4 "Pezzi per Pacco:"
+  PROMPT 1 -5 "Pz. per Pacco     "
+  FLAGS "D"
 END 
 
 NUMBER F_PPCOLLO 9
 BEGIN 
-  PROMPT 28 -4 "Per Sacco:"
+  PROMPT 30 -5 "Per Sacco "
+  FLAGS "D"
 END 
 
 NUMBER F_PPPALLET 9
 BEGIN 
-  PROMPT 50 -4 "Per Carrello:"
+  PROMPT 52 -5 "Per Carrello "
+  FLAGS "D"
 END 
 
-STRING F_TIPOPARTE 1
+NUMBER F_CONSMESE 9
 BEGIN
-  PROMPT 1 -3 "Tipo Parte"
+   PROMPT 1 -4 "Consegnato mese   "
-END 
+   FLAGS "D"
+END
 
-STRING F_CODLAV1 3
+NUMBER F_CONSANNO 9
 BEGIN
-  PROMPT 25 -3 "Cod. Lavaggio 1"
+   PROMPT 30 -4 "Consegnato anno "
-END 
+   FLAGS "D"
-
+END
-STRING F_CODLAV2 3
-BEGIN
-  PROMPT 50 -3 "Cod. Lavaggio 2"
-END 
-
-STRING F_LINDEST1 3
-BEGIN
-  PROMPT 1 -2 "Linea destinazione 1"
-END 
-
-STRING F_LINDEST2 3
-BEGIN
-  PROMPT 25 -2 "Linea destinazione 2"
-END 
 
 STRING F_LAVATRICE 3
 BEGIN
-  PROMPT 50 -2 "Lavatrice"
+  PROMPT 1 -3 "Lavatrice         "
+  FLAGS "D"
 END 
 
-STRING F_ARTLAVONCT 4
+STRING F_ARTLAVCONT 4
 BEGIN
-  PROMPT 1 -1 "Art. Lavacont"
+  PROMPT 30 -3 "Art.Lavacont "
+  FLAGS "D"
 END 
 
 STRING F_MANGDEST 3
 BEGIN
-  PROMPT 50 -1 "Mangano Destinazione"
+  PROMPT 50 -3 "Mangano Destinazione "
+  FLAGS "D"
 END 
 
+STRING F_CODLAV1 3
+BEGIN
+  PROMPT 1 -2 "Cod. Lavaggio 1     "
+  FLAGS "D"
+END 
+
+STRING F_CODLAV2 3
+BEGIN
+  PROMPT 30 -2 "Cod. Lavaggio 2      "
+  FLAGS "D"
+END
+
+STRING F_LIVELLO 1
+BEGIN
+  PROMPT 60 -2 "Livello      "
+  FLAGS "D"
+END 
+
+STRING F_LINDEST1 3
+BEGIN
+  PROMPT 1 -1 "Linea destinazione 1"
+  FLAGS "D"
+END 
+
+STRING F_LINDEST2 3
+BEGIN
+  PROMPT 30 -1 "Linea destinazione 2 "
+  FLAGS "D"
+END 
+
+STRING F_TIPOPARTE 1
+BEGIN
+  PROMPT 60 -1 "Tipo Parte   "
+  FLAGS "D"
+END 
+
+
 ENDPAGE
 
 PAGE "Opzioni" 0 2 0 0
@@ -336,7 +370,7 @@ END
 
 ENDPAGE
 
-PAGE "Opzioni 2" 0 2 0 0
+PAGE "Opzioni" 0 2 0 0
 
 GROUPBOX DLG_NULL 58 16
 BEGIN
@@ -573,30 +607,12 @@ BEGIN
    FIELD CALCCONS
 END
 
-NUMBER S_CONSMESE 9
-BEGIN
-   PROMPT 14 11 "Qtà. consegnata nel mese  "
-   FIELD CONSMESE
-END
-
-NUMBER S_CONSANNO 9
-BEGIN
-   PROMPT 14 12 "Qtà. consegnata nell'anno "
-   FIELD CONSANNO
-END
-
 NUMBER S_DOTIN 9 
 BEGIN
    PROMPT 1 13 "Dotazione iniziale     "
    FIELD DOTIN
 END
 
-NUMBER S_DOTOD 9 
-BEGIN
-   PROMPT 40 13 "Dotazione odierna     "
-   FIELD DOTOD
-END
-
 NUMBER S_DOTTMP 9 
 BEGIN
    PROMPT 1 14 "Dotazione temporanea   "

ve/ve2400.cpp

@@ -1811,6 +1811,8 @@ bool TAnagrafica_magazzino::user_create()
   _rel= new TRelation(LF_ANAMAG);
 
   _msk= new TMask_anamag(_rel);
+  if (!app().has_module(LVAUT,CHK_DONGLE))
+    _msk->hide(-G_LV);
   
   set_search_field(F_CODART); //serve per avere come campo di ricerca il codice articolo intero
                               //invece che l'ultimo campo del codice multilivello (se c'e')

ve/ve2400.h

@@ -67,6 +67,9 @@
 #define F_A_LOTTOIRIOR     177
 #define F_A_GIORNIRIOR     178
 
+
+
+
 #define F_INDBILA        179
 #define F_INDBILV        180
 
@@ -162,6 +165,19 @@
 #define F_DESSTAGIONE    308
 #define F_LIVPERART      309
 
+#define F_TIPOLOGIA    310
+#define F_COLORE       311
+#define F_LIVELLO      312
+#define F_PPPALLET     313
+#define F_TIPOPARTE    314
+#define F_CODLAV1      315
+#define F_CODLAV2      316
+#define F_LINDEST1     317
+#define F_LINDEST2     318
+#define F_LAVATRICE    319
+#define F_ARTLAVCONT   320
+#define F_MANGDEST     321
+
 #define F_CONTOPCIA       401
 #define F_DESCRCONTOPCIA  411
 
@@ -177,6 +193,7 @@
 #define G_CONVEN 7
 #define G_RAGGFISC 8
 #define G_VD 9
+#define G_LV 10
 
 // definizioni per l'archivio di misura articoli
 #define FS_CODUM         101

ve/ve2400.uml

@@ -567,9 +567,15 @@ BEGIN
     FIELD LF_ANAMAG->PPCOLLO
 END
 
+NUMBER F_PPPALLET 9
+BEGIN 
+  PROMPT 1 14 "Pz. per pallet          "
+  FIELD PPPALLET
+END 
+
 CURRENCY F_VALSTATUN 15
 BEGIN
-    PROMPT 1 14 "Valore statistico     "
+    PROMPT 42 14 "Valore statistico     "
     FIELD LF_ANAMAG->VALSTATUN
     FLAGS "U"
 END
@@ -1242,6 +1248,76 @@ END
 
 ENDPAGE
 
+PAGE "Lavanderie" 0 0 80 15
+
+STRING F_COLORE 20
+BEGIN
+  PROMPT 1 3 "Colore               "
+  FIELD COLORE
+END 
+
+STRING F_LIVELLO 1
+BEGIN
+  PROMPT 50 3 "Livello              "
+  FIELD LIVELLO
+END 
+
+STRING F_TIPOPARTE 1
+BEGIN
+  PROMPT 1 4 "Tipo Parte           "
+  FIELD TIPOPARTE
+END 
+
+STRING F_LAVATRICE 3
+BEGIN
+  PROMPT 50 4 "Lavatrice            "
+  FIELD LAVATRICE
+  USE &LVT
+  INPUT CODTAB F_LAVTRICE
+  DISPLAY "Codice" CODTAB
+  DISPLAY "Descrizioni@50" S0
+  OUTPUT F_LAVATRICE CODTAB
+  CHECKTYPE NORMAL
+END 
+
+STRING F_CODLAV1 3
+BEGIN
+  PROMPT 1 5 "Cod. Lavaggio 1      "
+  FIELD CODLAV1
+END 
+
+STRING F_CODLAV2 3
+BEGIN
+  PROMPT 50 5 "Cod. Lavaggio 2      "
+  FIELD CODLAV2
+END 
+
+STRING F_LINDEST1 3
+BEGIN
+  PROMPT 1 6 "Linea destinazione 1 "
+  FIELD LINDEST1
+END 
+
+STRING F_LINDEST2 3
+BEGIN
+  PROMPT 50 6 "Linea destinazione 2 "
+  FIELD LINDEST2
+END 
+
+STRING F_ARTLAVCONT 4
+BEGIN
+  PROMPT 1 7 "Art. Lavacont        "
+  FIELD ARTLAVCONT
+END 
+
+STRING F_MANGDEST 3
+BEGIN
+  PROMPT 50 7 "Mangano Destinazione "
+  FIELD MANGDEST
+END 
+
+ENDPAGE
+
 PAGE "Utente" 0 0 70 20
 
 GROUPBOX DLG_NULL 78 3