diff --git a/ha/ha3.h b/ha/ha3.h index 5c7709dfb..48fdaf8a7 100755 --- a/ha/ha3.h +++ b/ha/ha3.h @@ -1,3 +1,4 @@ int ha3100(int argc, char* argv[]); +int ha3700(int argc, char* argv[]); int ha3800(int argc, char* argv[]); int ha3900(int argc, char* argv[]); \ No newline at end of file diff --git a/ha/ha3800.cpp b/ha/ha3800.cpp index 392ca84a2..5d1e05024 100755 --- a/ha/ha3800.cpp +++ b/ha/ha3800.cpp @@ -172,6 +172,7 @@ void TInserimento_storico::elabora(const TMask& mask) //..al cliente con questo documento const long doc_clifo = rdoc_recset.get("33.CODCF").as_int(); const TDate doc_datadoc = rdoc_recset.get("33.DATADOC").as_date(); + const int indsped = rdoc_recset.get("33.CODINDSP").as_int(); //se la macchina viene assegnata ad un cliente (movimento di apertura) -> va messo il clifo.. if (bopen) @@ -180,6 +181,7 @@ void TInserimento_storico::elabora(const TMask& mask) tab_att.put("I0", 0L); tab_att.put("D0", doc_datadoc); + tab_att.put("I1", indsped); tab_att.write_rewrite(); @@ -264,6 +266,7 @@ void TInserimento_storico::elabora(const TMask& mask) s7 << "C" << codmag; tab_his.put("S7", s7); tab_his.put("I0", doc_clifo); + tab_his.put("I1", indsped); tab_his.put("D0", doc_datadoc); const real qta = rdoc_recset.get(RDOC_QTA).as_real(); tab_his.put("R0", qta); diff --git a/ha/ha3900a.h b/ha/ha3900a.h index f4c42629d..962cb792f 100755 --- a/ha/ha3900a.h +++ b/ha/ha3900a.h @@ -32,9 +32,11 @@ #define S_BOL_CLOSE_NDOC 113 #define S_CODCF 114 -#define S_CODMAG 115 -#define S_CLOSED 116 +#define S_INDSPED 115 +#define S_CODMAG 116 +#define S_CLOSED 117 #define S_DESART 144 #define S_DESCF 154 -#define S_DESMAG 155 \ No newline at end of file +#define S_DESCINDSPED 155 +#define S_DESMAG 157 \ No newline at end of file diff --git a/ha/ha3900a.uml b/ha/ha3900a.uml index e476a0460..47c0a54da 100755 --- a/ha/ha3900a.uml +++ b/ha/ha3900a.uml @@ -129,7 +129,6 @@ BEGIN DISPLAY "Cliente" I0 COPY OUTPUT F_PROGRESSIVO CHECKTYPE SEARCH - FIELD S1 END @@ -177,6 +176,7 @@ BEGIN ITEM "Codnum\nChiu.@5" ITEM "N.doc.\nChiu.@7" ITEM "Cliente" + ITEM "Sede" ITEM "Mag" ITEM "Chiusa" END @@ -389,9 +389,31 @@ BEGIN CHECKTYPE NORMAL END +NUMBER S_INDSPED 3 +BEGIN + PROMPT 1 11 "Sede " + USE LF_INDSP + INPUT TIPOCF "C" + INPUT CODCF S_CODCF SELECT + INPUT CODIND S_INDSPED + DISPLAY "Cod." CODIND + DISPLAY "Indirizzo@35" INDIR + DISPLAY "Ragione sociale@50" RAGSOC + OUTPUT S_INDSPED CODIND + OUTPUT S_DESCINDSPED RAGSOC + CHECKTYPE NORMAL + FIELD I1 +END + +STRING S_DESCINDSPED 50 +BEGIN + PROMPT 20 11 "" + FLAGS "D" +END + STRING S_CODMAG 3 BEGIN - PROMPT 1 11 "Magazzino " + PROMPT 1 12 "Magazzino " USE MAG INPUT CODTAB[1,3] S_CODMAG DISPLAY "Codice" CODTAB[1,3] @@ -404,7 +426,7 @@ END STRING S_DESMAG 50 BEGIN - PROMPT 20 11 "" + PROMPT 20 12 "" USE MAG KEY 2 INPUT S0 S_DESMAG DISPLAY "Descrizione@50" S0 @@ -449,7 +471,6 @@ CODTAB[1,5] = codart (A) CODTAB[6,12] = progressivo (N z) CODTAB[13,17] = numero riga (N z) S0 = descrizione -S1[1,10] = cpdice cespite (A) S3[1,5] = codart collegato S4[1,4] = anno doc. apertura (N) S4[5,8] = numerazione doc. apertura (A) @@ -461,6 +482,7 @@ S6[1,2] = umqta S7[1,1] = tipo S7[2,4] = codmag I0 = codice cliente +I1 = codice indirizzo spedizione R0 = quantita R1 = importo D0 = data intervento diff --git a/ha/hamenu.men b/ha/hamenu.men index 2685da4f9..9b1239acd 100755 --- a/ha/hamenu.men +++ b/ha/hamenu.men @@ -68,7 +68,7 @@ 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", "" +Item_05 = "Stampa storico attrezzature", "ha3 -6", "" [HAMENU_008] Caption = "Gestione giri" diff --git a/ha/hasthis.uml b/ha/hasthis.uml deleted file mode 100755 index 5a80bf665..000000000 --- a/ha/hasthis.uml +++ /dev/null @@ -1,39 +0,0 @@ -#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 \ No newline at end of file diff --git a/ha/hatbatt.h b/ha/hatbatt.h index 205e7f8e4..f49df8fb8 100755 --- a/ha/hatbatt.h +++ b/ha/hatbatt.h @@ -6,6 +6,10 @@ #define F_DATA_FABBR 206 #define F_CESPITE 207 #define F_DESC_CES 208 + #define F_CODCF 210 #define F_DESCF 211 -#define F_DATA_CONSEGNA 212 \ No newline at end of file +#define F_DATA_CONSEGNA 212 +#define F_CODINDSP 213 +#define F_INDSP 214 +#define F_RAGSOCINDSP 215 \ No newline at end of file diff --git a/ha/hatbatt.uml b/ha/hatbatt.uml index e1d82c31b..53de6e50f 100755 --- a/ha/hatbatt.uml +++ b/ha/hatbatt.uml @@ -121,7 +121,7 @@ BEGIN FIELD D1 END -GROUPBOX DLG_NULL 76 5 +GROUPBOX DLG_NULL 76 8 BEGIN PROMPT 1 7 "@bCliente" END @@ -155,11 +155,47 @@ END DATE F_DATA_CONSEGNA BEGIN - PROMPT 2 10 "Data presa in consegna " + PROMPT 2 10 "Data presa in consegna " CHECKTYPE REQUIRED FIELD D0 END +TEXT DLG_NULL +BEGIN + PROMPT 2 11 "@bIndirizzo di spedizione" +END + +NUMBER F_CODINDSP 3 +BEGIN + PROMPT 2 12 "Codice " + USE LF_INDSP + INPUT TIPOCF "C" + INPUT CODCF F_CODCF SELECT + INPUT CODIND F_CODINDSP + DISPLAY "Cod." CODIND + DISPLAY "Indirizzo@35" INDIR + DISPLAY "Ragione sociale@50" RAGSOC + OUTPUT F_CODINDSP CODIND + OUTPUT F_INDSP INDIR + OUTPUT F_RAGSOCINDSP RAGSOC + CHECKTYPE NORMAL + FIELD I1 +END + +STRING F_INDSP 35 +BEGIN + PROMPT 17 12 "Indirizzo " + FLAGS "D" + CHECKTYPE SEARCH +END + +STRING F_RAGSOCINDSP 50 +BEGIN + PROMPT 2 13 "Ragsoc. " + FLAGS "D" + CHECKTYPE SEARCH +END + ENDPAGE ENDMASK @@ -173,6 +209,7 @@ S0[1,5] = codart per matricola (A) S0[6,20] = matricola (A) S1[1,10] = codice cespite (A) I0 = codice cliente +I1 = codice indirizzo spedizione D0 = data assegnamento D1 = data fabbricazione */ \ No newline at end of file