Patch level :

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :


git-svn-id: svn://10.65.10.50/branches/R_10_00@22171 c028cbd2-c16b-5b4b-a496-9718f37d4682

lv/f169.dir

@@ -1,3 +1,3 @@
 169
 0
-$lvrcondv|0|0|228|0|Righe del contratto|||
+$lvrcondv|0|0|276|0|Righe del contratto|||

lv/f169.trr

@@ -1,5 +1,5 @@
 169
-27
+35
 CODCF|3|6|0|Codice cliente
 CODCONT|3|6|0|Codice contratto
 CODART|1|20|0|Codice articolo
@@ -27,5 +27,13 @@ NOLCIC|1|1|0|Scelta per dotazione odierna o iniziale
 VCARTCLI|1|1|0|Scelta per la % sul val.conv su articolo <A> o cliente <C>
 DATAINS|5|8|0|Data inserimento articolo
 CONTPUL|8|1|0|Flag di conteggio pulito
+PRECEDENZA|3|6|0|Precedenza
+SEPARATORE|3|6|0|Separatore
+QTAMAXXS|3|6|0|Qta. max. XS
+QTAMAXM|3|6|0|Qta. max. M
+QTAMAXXL|3|6|0|Qta. max. XL
+QTANORMXS|3|6|0|Qta. norm. XS
+QTANORMM|3|6|0|Qta. norm. M
+QTANORMXL|3|6|0|Qta. norm. XL
 1
 CODCF+CODCONT+CODART| 

lv/lv0400.cpp

@@ -12,6 +12,7 @@
 #include "lvrcondv.h"
 
 #include "lvlib.h"
+#include "lvlib2.h"
 #include "../mg/clifogiac.h"
 #include "../ve/rcondv.h"
 
@@ -324,6 +325,50 @@ bool TContratti_msk::on_art_select(TField_event e)
     rowmask.field(S_CONG).enable();
     TToken_string row = ss.row(ss.selected());
   }
+
+  TLvanamag lvana(codart);
+  if(rowmask.get_int(S_PREC) == 0)
+  {
+    const int prec = lvana.precedenza();
+    rowmask.set(S_PREC, prec);
+    row.add(prec, ss.cid2index(S_PREC));
+  }
+  if(rowmask.get_int(S_QTAMAXXS) == 0)
+  {
+    const int qtamaxxs = lvana.riempi_c_xs();
+    rowmask.set(S_QTAMAXXS, qtamaxxs);
+    row.add(qtamaxxs, ss.cid2index(S_QTAMAXXS));
+  }
+  if(rowmask.get_int(S_QTAMAXM) == 0)
+ {
+    const int qtamaxm = lvana.riempi_c_m();
+    rowmask.set(S_QTAMAXXS, qtamaxm);
+    row.add(qtamaxm, ss.cid2index(S_QTAMAXM));
+  }
+  if(rowmask.get_int(S_QTAMAXXL) == 0)
+ {
+    const int qtamaxxl = lvana.riempi_c_xl();
+    rowmask.set(S_QTAMAXXL, qtamaxxl);
+    row.add(qtamaxxl, ss.cid2index(S_QTAMAXXL));
+  }
+  if(rowmask.get_int(S_QTANORMXS) == 0)
+  {
+    const int qtanormxs = lvana.riempi_s_xs();
+    rowmask.set(S_QTANORMXS, qtanormxs);
+    row.add(qtanormxs, ss.cid2index(S_QTANORMXS));
+  }
+  if(rowmask.get_int(S_QTANORMM) == 0)
+  {
+    const int qtanormm = lvana.riempi_s_m();
+    rowmask.set(S_QTANORMM, qtanormm);
+    row.add(qtanormm, ss.cid2index(S_QTANORMM));
+  }
+  if(rowmask.get_int(S_QTANORMXL) == 0)
+  {
+    const int qtanormxl = lvana.riempi_s_xl();
+    rowmask.set(S_QTANORMXL, qtanormxl);
+    row.add(qtanormxl, ss.cid2index(S_QTANORMXL));
+  }
 	return true;
 }
 

lv/lv0400.h

@@ -109,8 +109,16 @@
 #define S_FATTKG       128
 #define S_UM           129
 #define S_PPCONF       130
-#define S_DATAINS      131
+#define S_PREC         131
-#define S_CONTPUL      132
+#define S_SEPAR        132
+#define S_QTAMAXXS     133
+#define S_QTAMAXM      134
+#define S_QTAMAXXL     135
+#define S_QTANORMXS    136
+#define S_QTANORMM     137
+#define S_QTANORMXL    138
+#define S_DATAINS      139
+#define S_CONTPUL      140
 
 #define S_CODCF        301
 #define S_RAGSOC       302
@@ -119,14 +127,3 @@
 #define T_CODCF        401
 #define T_RAGSOC       402
 #define T_CODCONT      403 
-#define S_PREC         405
-#define S_QTAMAXXS     406
-#define S_QTAMAXM      407
-#define S_QTAMAXXL     408
-#define S_QTANORMXS    409
-#define S_QTANORMM     410
-#define S_QTANORMXL    411
-
-
-
-

lv/lv0400a.uml

@@ -154,6 +154,14 @@ BEGIN
   ITEM "Fatturazione\na kg"
   ITEM "UM@3"
   ITEM "Pezzi per\nPacco"
+  ITEM "Precedenza"
+  ITEM "Separatore"
+  ITEM "Qta. max.\nXS"
+  ITEM "Qta. max.\nM" 
+  ITEM "Qta. max.\nXL"
+  ITEM "Qta. norm.\nXS"
+  ITEM "Qta. norm.\nM"
+  ITEM "Qta. norm.\nXL"
   ITEM "Data\nIns."
   ITEM "Conta\npul."
 END
@@ -836,7 +844,7 @@ END
 
 NUMBER S_MINCIC 4 2
 BEGIN
-   PROMPT 58 11 "Min.ciclaggio"
+   PROMPT 61 11 "Min.ciclaggio"
    FIELD MINCIC
 END
 
@@ -966,50 +974,56 @@ END
 
 NUMBER S_PPCONF 15 5
 BEGIN 
-  PROMPT 2 1 "Pezzi per Pacco      "
+  PROMPT 2 1 "Pz. per pacco "
   FLAGS "DG"
 END 
 
 NUMBER S_PREC 2
 BEGIN 
-  PROMPT 50 1 "Precedenza "
+  PROMPT 35 1 "Precedenza "
-  FLAGS "D"
+  FIELD PRECEDENZA
+END
+
+NUMBER S_SEPAR 2
+BEGIN
+  PROMPT 50 1 "Separatore "
+  FIELD SEPARATORE
 END
 
 NUMBER S_QTAMAXXS 6
 BEGIN 
   PROMPT 2 2 "Qta. max.XS  "
-  FLAGS "D"
+  FIELD QTAMAXXS
 END 
 
 NUMBER S_QTAMAXM 6
 BEGIN 
   PROMPT 30 2 "Qta. max.M  " 
-  FLAGS "D"
+  FIELD QTAMAXM
 END 
 
 NUMBER S_QTAMAXXL 6
 BEGIN 
   PROMPT 55 2 "Qta. max.XL  "
-  FLAGS "D"
+  FIELD QTAMAXXL
 END 
 
 NUMBER S_QTANORMXS 6
 BEGIN 
   PROMPT 2 3 "Qta. norm.XS "
-  FLAGS "D"
+  FIELD QTANORMXS
 END 
 
 NUMBER S_QTANORMM 6
 BEGIN 
   PROMPT 30 3 "Qta. norm.M "
-  FLAGS "D"
+  FIELD QTANORMM
 END 
 
 NUMBER S_QTANORMXL 6
 BEGIN 
   PROMPT 55 3 "Qta. norm.XL "
-  FLAGS "D"
+  FIELD QTANORMXL
 END 
 
 ENDMASK