Patch level :

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :


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

ha/ha0200a.uml

@@ -642,7 +642,7 @@ END
 STRING F_CAUSMAG_APERTURA 5
 BEGIN
   PROMPT 2 4 "Causale apertura  "
-  USE MAG
+  USE %CAU
   INPUT CODTAB F_CAUSMAG_APERTURA
   DISPLAY "Codice" CODTAB
   DISPLAY "Descrizione@50" S0
@@ -656,7 +656,7 @@ END
 STRING F_CAUSMAG_APERTURA_DESCR 50 46
 BEGIN
   PROMPT 28 4 ""
-  USE MAG KEY 2
+  USE %CAU KEY 2
   INPUT S0 F_CAUSMAG_APERTURA_DESCR
   DISPLAY "Descrizione@50" S0
   DISPLAY "Codice" CODTAB

ha/ha3800.cpp

@@ -86,9 +86,8 @@ void TInserimento_storico::elabora(const TMask& mask)
   const TDate a_data = mask.get_date(F_ADATA);
 
   //2) raccatta le numerazioni valide in base al tipo di documento in configurazione 
-  const TString& str_tipo = cache().get("%TIP", tipo2elab, "I1"); 
   TString_array num_doc;
-  const int num_del_tipo = numerazioni_documenti(num_doc, str_tipo);
+  const int num_del_tipo = numerazioni_documenti(num_doc, tipo2elab);
 
 #ifdef DBG
   ofstream numerazioni("c:/temp/numerazioni.txt", ios::app);
@@ -150,8 +149,8 @@ void TInserimento_storico::elabora(const TMask& mask)
 
         //comunque deve scrivere il cliente e la data perchè è un'apertura quindi la macchina è assegnata..
         //..al cliente con questo documento
-        const long doc_clifo = rdoc_recset.get(DOC_CODCF).as_int();
+        const long doc_clifo = rdoc_recset.get("33.CODCF").as_int();
-        const TDate doc_datadoc = rdoc_recset.get(DOC_DATADOC).as_date();
+        const TDate doc_datadoc = rdoc_recset.get("33.DATADOC").as_date();
 
         //se la macchina viene assegnata ad un cliente (movimento di apertura) -> va messo il clifo..
         if (bopen)
@@ -217,15 +216,20 @@ void TInserimento_storico::elabora(const TMask& mask)
         new_codtab.format("%30s%05d", (const char*) codtab, n_line_to_update);
         tab_his.put("CODTAB", new_codtab);
         //ed aggiunge tutti i campi
-        tab_his.put("S0", rdoc_recset.get(RDOC_DESCR).as_string());
+        const TString& descr = rdoc_recset.get(RDOC_DESCR).as_string();
+        tab_his.put("S0", descr);
         //tab_his.put("S2", articolo_collegato);
-        tab_his.put("S3", rdoc_recset.get(RDOC_CODMAG).as_string());
+        const TString& codmag = rdoc_recset.get(RDOC_CODMAG).as_string();
-        tab_his.put("S4[1,4]", doc_anno);
+        tab_his.put("S3", codmag);
-        tab_his.put("S4[5,8]", doc_codnum);
+        TString16 str_key_doc;
-        tab_his.put("S4[9,15]", doc_ndoc);
+        str_key_doc.format("%4d%4s%7d", doc_anno, (const char*)doc_codnum, doc_ndoc);
+        if (bopen)
+          tab_his.put("S4", str_key_doc);
+        else
+          tab_his.put("S5", str_key_doc);
         tab_his.put("S6", rdoc_recset.get(RDOC_UMQTA).as_string());
         tab_his.put("S7", "C");
-        tab_his.put("I0", rdoc_recset.get(DOC_CODCF).as_string());
+        tab_his.put("I0", doc_clifo);
         tab_his.put("D0", doc_datadoc);
         const real qta = rdoc_recset.get(RDOC_QTA).as_real();
         tab_his.put("R0", qta);

ha/ha3900a.uml

@@ -99,7 +99,7 @@ END
 
 TLIST F_ATTREZZATURE 78 5
 BEGIN
-  PROMPT 1 6 "Attrezzatura"
+  PROMPT 0 6 "Attrezzatura"
   DISPLAY "Codice@20" CODTAB
   DISPLAY "Descrizione@35" S0
   DISPLAY "Cliente" I0

ha/hagiri.msk

@@ -0,0 +1,93 @@
+TOOLBAR "Topbar" 0 0 0 2
+BU 1 2 2
+BE
+PR 1 1 "Elabora"
+PI 120
+EN
+BU -1 2 2
+BE
+PR -1 1 ""
+PI 0
+EN
+BU 33 2 2
+BE
+PR 1 1 "Info"
+ME EXIT,332
+PI 162
+EN
+BU 34 2 2
+BE
+PR 2 1 "Help"
+ME EXIT,331
+PI 163
+EN
+BU -1 2 2
+BE
+PR -1 0 ""
+PI 0
+EN
+BU 9 2 2
+BE
+PR 3 1 "Fine"
+ME EXIT,20334
+PI 114
+EN
+EN
+PA "Report Giri Agenti" -1 -1 80 10
+ST 30 50
+BE
+PR 1 -1 "Profilo "
+PSELECT
+FL "H"
+EN
+
+// ******************* Criteri di Ricerca 
+
+GR -1 78 8
+BE
+PR 1 1 "@bSelezione"
+EN
+
+ST 104 6
+BE
+PR 2 3 "Agente:   "
+US 122 
+KE 1
+IN CODAGE 104
+DI "Codice@6" CODAGE
+DI "Ragione Sociale@50" RAGSOC
+OU 104 CODAGE
+OU 154 RAGSOC
+FI CODAG
+CH NO
+EN
+
+ST 154 50
+BE
+PR 25 3 ""
+US 20 
+KE 2
+IN RAGSOC 154
+DI "Ragione Sociale@50" RAGSOC
+DI "Codice@6" CODAGE
+CH NO
+CO OU 104
+EN
+
+
+LI 119 1 33
+BE
+PR 2 7 "Giorno "
+IT "0|Tutti"
+IT "1|Lunedì"
+IT "2|Martedì"
+IT "3|Mercoledì"
+IT "4|Giovedì"
+IT "5|Venerdì'"
+IT "6|Sabato"
+IT "7|Domenica"
+FI DAY
+EN
+
+EN
+ENDMASK

ha/hagiri.rep

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<report name="r_giri" orientation="2" lpi="6">
+ <description>Report Giri</description>
+ <font face="Arial" size="8" />
+ <section type="Head" pattern="1">
+  <field x="1" type="Stringa" width="50" pattern="1">
+   <font face="Arial" bold="1" size="10" />
+   <source>#SYSTEM.RAGSOC</source>
+  </field>
+  <field x="133" type="Data" width="25" pattern="1" text="Data di Stampa:">
+   <source>#SYSTEM.DATE</source>
+  </field>
+  <field x="160" type="Stringa" width="10" pattern="1" text="Pag.">
+   <source>#PAGE</source>
+  </field>
+ </section>
+ <section type="Head" level="1" pattern="1" />
+ <section repeat="1" type="Head" level="2" page_break="1" pattern="1">
+  <groupby>CODTAB[1,5]</groupby>
+  <field border="2" x="1" y="1.5" type="Linea" width="168" height="0" pattern="1" />
+  <field x="2" type="Stringa" hidden="1" width="5" id="10" pattern="1">
+   <source>CODTAB[1,5]</source>
+  </field>
+  <field x="15" y="0.5" type="Stringa" hidden="1" width="10" id="20" pattern="1">
+   <source>"REPORT GIRI  AGENTE  -  "</source>
+   <prescript description="H2.20 PRESCRIPT">MESSAGE COPY,50</prescript>
+  </field>
+  <field x="25" y="0.5" type="Stringa" hidden="1" align="center" width="20" id="30" pattern="1">
+   <font face="Arial" bold="1" size="10" />
+   <prescript description="H2.30 PRESCRIPT">MESSAGE ISAMREAD,122,CODAGE=#10,RAGSOC
+MESSAGE APPEND,50</prescript>
+  </field>
+  <field x="8" type="Stringa" align="center" width="160" id="50" pattern="1">
+   <font face="Arial" bold="1" size="10" />
+  </field>
+ </section>
+ <section type="Head" level="3" pattern="1">
+  <groupby>CODTAB[6,6]</groupby>
+  <field x="1" type="Array" width="13.5" pattern="1">
+   <font face="Arial" bold="1" size="8" />
+   <source>CODTAB[6,6]</source>
+   <list>
+    <li Value="Luned&#EC;" Code="1" />
+    <li Value="Marted&#EC;" Code="2" />
+    <li Value="Mercoled&#EC;" Code="3" />
+    <li Value="Gioved&#EC;" Code="4" />
+    <li Value="Venerd&#EC;" Code="5" />
+    <li Value="Sabato" Code="6" />
+    <li Value="Domenica" Code="7" />
+   </list>
+  </field>
+  <field x="17" type="Stringa" hidden="1" width="10" pattern="1">
+   <source>#DAY</source>
+  </field>
+ </section>
+ <section type="Body" pattern="1" />
+ <section type="Body" level="1" pattern="1">
+  <field x="3" type="Stringa" hidden="1" width="3" pattern="1">
+   <source>CODTAB[6,6]</source>
+  </field>
+  <field x="7" type="Numero" align="right" width="4" pattern="1">
+   <source>I0</source>
+  </field>
+  <field x="12" type="Stringa" width="6" pattern="1">
+   <source>CODTAB[7,12]</source>
+  </field>
+  <field x="19" type="Stringa" width="50" pattern="1">
+   <source>20.RAGSOC</source>
+  </field>
+  <field x="70" type="Stringa" width="35" pattern="1">
+   <source>20.INDCF</source>
+  </field>
+  <field x="107" type="Stringa" width="5" pattern="1">
+   <source>20.CAPCF</source>
+  </field>
+  <field x="151" type="Stringa" width="31" pattern="1">
+   <source>20.TEL</source>
+  </field>
+  <field x="98" y="1" type="Stringa" hidden="1" width="4" pattern="1">
+   <source>20.COMCF</source>
+  </field>
+  <field x="114" y="3" type="Stringa" hidden="1" width="10" id="90" pattern="1">
+   <source>20.LOCALITACF</source>
+   <prescript description="B1.90 PRESCRIPT">MESSAGE COPY,110</prescript>
+  </field>
+  <field x="114" y="2" type="Stringa" hidden="1" width="10" id="100" pattern="1">
+   <prescript description="B1.100 PRESCRIPT">MESSAGE ISAMREAD,13,STATO=''!COM=20.COMCF,DENCOM
+MESSAGE APPEND,110</prescript>
+  </field>
+  <field x="113" type="Stringa" width="37" id="110" pattern="1" />
+ </section>
+ <section type="Foot" pattern="1" />
+ <section type="Foot" level="1" pattern="1" />
+ <section type="Foot" level="2" pattern="1" />
+ <section type="Foot" level="3" pattern="1" />
+ <sql>USE &#26;HAHGI SELECT ((CODTAB[1,5]=#CODAG)||(#CODAG=''))&#26;&#26;((CODTAB[6,6]=#DAY)||(#DAY=0))
+BY CODTAB[1,6] I0
+JOIN 20 INTO TIPOCF="C" CODCF==CODTAB[7,12]</sql>
+</report>

ha/hamenu.men

@@ -8,7 +8,7 @@ Item_02 = "Gestione contratti premio", [HAMENU_003]
 Item_03 = "Collegamento terminalini", [HAMENU_004]
 Item_04 = "Procedura Esselunga", [HAMENU_006]
 Item_05 = "Gestione attrezzature", [HAMENU_007]
-Item_06 = "Gestione dei giri", "ha3 -0", ""
+Item_06 = "Gestione giri", [HAMENU_008]
 Item_07 = "Servizi", [HAMENU_005]
 
 [HAMENU_002]
@@ -67,3 +67,13 @@ Flags   = "F"
 Item_01 = "Tabella attrezzature", "ha0 -0 &ATT", ""
 Item_02 = "Gestione attrezzature", "ha3 -8", ""
 Item_03 = "Generazione storico da documenti", "ha3 -7", ""
+Item_04 = "Stampa attrezzature per cliente", "ba8 -4 hastatt", ""
+Item_05 = "Stampa storico attrezzature", "ba8 -4 hasthis", ""
+
+[HAMENU_008]
+Caption = "Gestione giri"
+Picture = <ha01>
+Module  = 46
+Flags   = "F"
+Item_01 = "Gestione giri", "ha3 -0", ""
+Item_02 = "Stampa giri", "ba8 -4 hagiri", ""

ha/hastatt.rep

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<report name="hastatt" orientation="1" lpi="6">
+ <description>Attrezzature Hardy</description>
+ <font face="Arial" size="8" />
+ <section type="Head" pattern="1">
+  <field x="1" type="Testo" width="10" pattern="1" text="Cliente">
+   <font face="Arial" bold="1" size="8" />
+  </field>
+  <field x="2" y="1" type="Testo" width="6" pattern="1" text="Codice" />
+  <field x="9" y="1" type="Testo" width="10" pattern="1" text="Matricola" />
+  <field x="25" y="1" type="Testo" width="10" pattern="1" text="Descrizione" />
+  <field x="76" y="1" type="Testo" width="12" pattern="1" text="Assegnamento" />
+  <field border="1" y="2" type="Linea" width="100" height="0" pattern="1" />
+ </section>
+ <section type="Head" level="1" pattern="1">
+  <field border="1" radius="50" x="19" y="0.5" type="Testo" valign="center" align="center" shade_offset="50" width="60" height="2" pattern="2" text="ATTREZZATURE  PER  CLIENTE">
+   <font face="Arial" bold="1" size="14" />
+  </field>
+ </section>
+ <section type="Head" level="2" pattern="1">
+  <groupby>I0</groupby>
+  <font face="Arial" bold="1" size="8" />
+  <field x="8" y="0.75" type="Stringa" width="50" pattern="1">
+   <prescript description="H2.0 PRESCRIPT">MESSAGE ISAMREAD,20,TIPOCF='C'!CODCF=#101,RAGSOC</prescript>
+  </field>
+  <field x="1" y="0.75" type="Stringa" width="6" id="101" pattern="1">
+   <source>I0</source>
+  </field>
+ </section>
+ <section type="Body" pattern="1" />
+ <section type="Body" level="1" pattern="1">
+  <field x="9" type="Stringa" width="15" pattern="1">
+   <source>CODTAB[16,30]</source>
+  </field>
+  <field x="25" type="Stringa" width="50" pattern="1">
+   <prescript description="B1.0 PRESCRIPT">MESSAGE ISAMREAD,47,CODART=#101,DESCR</prescript>
+  </field>
+  <field x="76" type="Data" width="10" pattern="1">
+   <source>D0</source>
+  </field>
+  <field x="3" type="Stringa" width="5" id="101" pattern="1">
+   <source>CODTAB[1,15]</source>
+  </field>
+ </section>
+ <section type="Foot" pattern="1" />
+ <section type="Foot" level="1" pattern="1" />
+ <section type="Foot" level="2" pattern="1" />
+ <sql>USE &#26;HAATT
+SELECT STR(BETWEEN(I0,#CODCF,#CODCF))</sql>
+</report>

ha/hastatt.uml

@@ -0,0 +1,39 @@
+#include "hatbatt.h"
+
+PAGE "Attrezzature" -1 -1 78 3
+
+NUMBER F_CODCF 6
+BEGIN
+  PROMPT 1 1 "Cliente " 
+  FLAGS "U"  
+  USE LF_CLIFO
+  INPUT TIPOCF "C"
+  INPUT CODCF F_CODCF
+  DISPLAY "Codice" CODCF
+  DISPLAY "Descrizione@50" RAGSOC
+  OUTPUT F_CODCF CODCF
+  OUTPUT F_RAGSOC RAGSOC
+  CHECKTYPE NORMAL
+  FIELD #CODCF
+END
+
+STRING F_RAGSOC 50
+BEGIN
+  PROMPT 20 1 ""
+  USE LF_CLIFO KEY 2
+  INPUT TIPOCF "C"
+  INPUT RAGSOC F_RAGSOC
+  DISPLAY "Descrizione@50" RAGSOC
+  DISPLAY "Codice" CODCF
+  COPY OUTPUT F_CODCF
+  CHECKTYPE NORMAL
+END
+
+ENDPAGE
+
+
+TOOLBAR "" 0 0 0 2
+#include "printbar.h"
+ENDPAGE
+
+ENDMAK