root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 10.0 918

Browse Source 
Files correlati     : mg3.exe
Ricompilazione Demo : [ ]
Commento            :

Bug 0001770: 003343 - Diana 2000

Il cliente richiede che nella stampa disponibilità e giacenze venga inserito un filtro per magazzino e deposito.


git-svn-id: svn://10.65.10.50/branches/R_10_00@21635 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2011-02-12 00:48:12 +00:00
parent 8d0e77813d
commit 2a7d0abdc4
9 changed files with 117 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
mg/mg3100.cpp
View File

@ -352,13 +352,25 @@ void TStampa_datistorici::setprint_permagazzini()
if (_mask->get(F_DAMAG).full()) if (_mask->get(F_DAMAG).full())
{ {
darec.put("CODMAG",_mask->get(F_DAMAG)); darec.put("CODMAG",_mask->get(F_DAMAG));
srangem << "da \"" << _mask->get(F_DAMAG) << "\" "; srangem << "da " << _mask->get(F_DAMAG) << " ";
} }
if (_mask->get(F_AMAG).full()) if (_mask->get(F_AMAG).full())
{ {
arec.put("CODMAG",_mask->get(F_AMAG)); arec.put("CODMAG",_mask->get(F_AMAG));
srangem << "fino a \"" << _mask->get(F_AMAG) << "\" "; srangem << "a " << _mask->get(F_AMAG) << " ";
} }
if (_mask->get(F_DADEP).full())
{
cfilter << "(" << LF_MAG<< "->CODMAG[4,5]>=" <<'"' << _mask->get(F_DADEP)<< "\")&&" ;
srangem << TR("deposito da ") << _mask->get(F_DADEP) << " ";
}
if (_mask->get(F_ADEP).full())
{
cfilter << "(" << LF_MAG<< "->CODMAG[4,5]<=" <<'"' << _mask->get(F_ADEP)<< "\")&&" ;
srangem << TR("a ") << _mask->get(F_ADEP) << " ";
}
if (cfilter.full())
cfilter.rtrim(2);
rangem.set(srangem.empty() ? TR("Tutti i magazzini") : format(FR("Magazzini %s"), (const char *)srangem)); rangem.set(srangem.empty() ? TR("Tutti i magazzini") : format(FR("Magazzini %s"), (const char *)srangem));
darec.put("ANNOES",_mask->get(F_ANNOES)); darec.put("ANNOES",_mask->get(F_ANNOES));
arec.put("ANNOES",_mask->get(F_ANNOES)); arec.put("ANNOES",_mask->get(F_ANNOES));
@ -383,9 +395,19 @@ void TStampa_datistorici::setprint_perarticoli()
_cur = _form->cursor(); _cur = _form->cursor();
if (_mask->get(F_DAMAG).full()) if (_mask->get(F_DAMAG).full())
srangem << "da \"" << _mask->get(F_DAMAG) << "\" "; srangem << "da " << _mask->get(F_DAMAG) << " ";
if (_mask->get(F_AMAG).full()) if (_mask->get(F_AMAG).full())
srangem << "fino a \"" << _mask->get(F_AMAG) << "\""; srangem << " a " << _mask->get(F_AMAG) << " ";
if (_mask->get(F_DADEP).full())
{
filter << "(" << LF_MAG<< "->CODMAG[4,5]>=" <<'"' << _mask->get(F_DADEP)<< "\")&&" ;
srangem << TR("deposito ") << _mask->get(F_DADEP) << " ";
}
if (_mask->get(F_ADEP).full())
{
filter << "(" << LF_MAG<< "->CODMAG[4,5]<=" <<'"' << _mask->get(F_ADEP)<< "\")&&" ;
srangem << TR("a ") << _mask->get(F_ADEP) << " ";
}
rangem.set(srangem.blank()? TR("Tutti i magazzini") : format(FR("Magazzini %s"),(const char *)srangem)); rangem.set(srangem.blank()? TR("Tutti i magazzini") : format(FR("Magazzini %s"),(const char *)srangem));
@ -555,12 +577,22 @@ void TStampa_datistorici::setprint_perarticoli_all()
if (_mask->get(F_DAMAG).full()) if (_mask->get(F_DAMAG).full())
{ {
filter << "(" << LF_MAG <<"->CODMAG[1,3]>=" <<'"' << _mask->get(F_DAMAG)<< "\")&&" ; filter << "(" << LF_MAG <<"->CODMAG[1,3]>=" <<'"' << _mask->get(F_DAMAG)<< "\")&&" ;
srangem << "da \"" << _mask->get(F_DAMAG) << "\" "; srangem << "da " << _mask->get(F_DAMAG) << " ";
} }
if (_mask->get(F_AMAG).full()) if (_mask->get(F_AMAG).full())
{ {
filter << "(" << LF_MAG <<"->CODMAG[1,3]<=" <<'"' << _mask->get(F_AMAG)<< "\")&&" ; filter << "(" << LF_MAG <<"->CODMAG[1,3]<=" <<'"' << _mask->get(F_AMAG)<< "\")&&" ;
srangem << "fino a \"" << _mask->get(F_AMAG) << "\""; srangem << "a " << _mask->get(F_AMAG) << " ";
}
if (_mask->get(F_DADEP).full())
{
filter << "(" << LF_MAG<< "->CODMAG[4,5]>=" <<'"' << _mask->get(F_DADEP)<< "\")&&" ;
srangem << TR("deposito da ") << _mask->get(F_DADEP) << " ";
}
if (_mask->get(F_ADEP).full())
{
filter << "(" << LF_MAG<< "->CODMAG[4,5]<=" <<'"' << _mask->get(F_ADEP)<< "\")&&" ;
srangem << TR("a ") << _mask->get(F_ADEP) << " ";
} }
rangem.set(srangem.blank()? TR("Tutti i magazzini") : format(FR("Magazzini %s"),(const char *)srangem)); rangem.set(srangem.blank()? TR("Tutti i magazzini") : format(FR("Magazzini %s"),(const char *)srangem));

2
mg/mg3100.h
View File

@ -28,6 +28,8 @@
#define F_CATVENLISTINO 129 #define F_CATVENLISTINO 129
#define F_DAUSR 130 #define F_DAUSR 130
#define F_AUSR 131 #define F_AUSR 131
#define F_DADEP 132
#define F_ADEP 133
#define G_CATMER 1 #define G_CATMER 1
#define G_CODART 2 #define G_CODART 2

24
mg/mg3100.uml
View File

@ -203,6 +203,19 @@ BEGIN
OUTPUT F_DAMAG CODTAB OUTPUT F_DAMAG CODTAB
END END
STRING F_DADEP 2
BEGIN
PROMPT 30 10 "Deposito "
FLAGS "U"
USE MAG SELECT CODTAB[4,5]!=""
INPUT CODTAB[1,3] F_DAMAG SELECT
INPUT CODTAB[4,5] F_DADEP
DISPLAY "Codice magazzino" CODTAB[1,3]
DISPLAY "Deposito" CODTAB[4,5]
DISPLAY "Descr@50" S0
OUTPUT F_DADEP CODTAB[4,5]
END
STRING F_AMAG 3 STRING F_AMAG 3
BEGIN BEGIN
PROMPT 2 11 "Al magazzino " PROMPT 2 11 "Al magazzino "
@ -213,6 +226,17 @@ BEGIN
OUTPUT F_AMAG CODTAB OUTPUT F_AMAG CODTAB
END END
STRING F_ADEP 2
BEGIN
PROMPT 30 11 "Deposito "
FLAGS "U"
COPY USE F_DADEP
INPUT CODTAB[1,3] F_AMAG SELECT
INPUT CODTAB F_ADEP
COPY DISPLAY F_DADEP
OUTPUT F_ADEP CODTAB
END
STRING F_DACATMER 3 STRING F_DACATMER 3
BEGIN BEGIN
PROMPT 2 12 "Dal gruppo " PROMPT 2 12 "Dal gruppo "

2
mg/mg3100a.frm
View File

@ -68,7 +68,7 @@ BEGIN
PROMPT 1 3 "" PROMPT 1 3 ""
END END
STRINGA FF_RANGEMAGAZ 40 STRINGA FF_RANGEMAGAZ 60
BEGIN BEGIN
KEY "RANGE" KEY "RANGE"
PROMPT 1 4 "" PROMPT 1 4 ""

2
mg/mg3100aa.frm
View File

@ -68,7 +68,7 @@ BEGIN
PROMPT 1 3 "" PROMPT 1 3 ""
END END
STRINGA FF_RANGEMAGAZ 40 STRINGA FF_RANGEMAGAZ 60
BEGIN BEGIN
KEY "RANGE" KEY "RANGE"
PROMPT 1 4 "" PROMPT 1 4 ""

2
mg/mg3100b.frm
View File

@ -67,7 +67,7 @@ BEGIN
PROMPT 1 4 "" PROMPT 1 4 ""
END END
STRINGA FF_RANGEMAGAZ 40 STRINGA FF_RANGEMAGAZ 60
BEGIN BEGIN
KEY "RANGE" KEY "RANGE"
PROMPT 1 3 "" PROMPT 1 3 ""

26
mg/mg3200.cpp
View File

@ -284,6 +284,18 @@ void TStampa_disp::setprint_permagazzini()
srangem << TR("da \"") << _mask->get(F_DAMAG) << "\" "; srangem << TR("da \"") << _mask->get(F_DAMAG) << "\" ";
if (_mask->get(F_AMAG).full()) if (_mask->get(F_AMAG).full())
srangem << TR("fino a \"") << _mask->get(F_AMAG) << "\" "; srangem << TR("fino a \"") << _mask->get(F_AMAG) << "\" ";
if (_mask->get(F_DADEP).full())
{
cfilter << "(" << LF_MAG<< "->CODMAG[4,5]>=" <<'"' << _mask->get(F_DADEP)<< "\")&&" ;
srangem << TR("deposito da ") << _mask->get(F_DADEP) << " ";
}
if (_mask->get(F_ADEP).full())
{
cfilter << "(" << LF_MAG<< "->CODMAG[4,5]<=" <<'"' << _mask->get(F_ADEP)<< "\")&&" ;
srangem << TR("a ") << _mask->get(F_ADEP) << " ";
}
if (cfilter.full())
cfilter.rtrim(2);
rangem.set(srangem.empty() ? TR("Tutti i magazzini") : format(FR("Magazzini %s"),(const char *)srangem)); rangem.set(srangem.empty() ? TR("Tutti i magazzini") : format(FR("Magazzini %s"),(const char *)srangem));
cur.setfilter(cfilter); cur.setfilter(cfilter);
@ -308,12 +320,22 @@ void TStampa_disp::setprint_perarticoli()
if (_mask->get(F_DAMAG).full()) if (_mask->get(F_DAMAG).full())
{ {
filter << "(" << LF_MAG<< "->CODMAG[1,3]>=" <<'"' << _mask->get(F_DAMAG)<< "\")&&" ; filter << "(" << LF_MAG<< "->CODMAG[1,3]>=" <<'"' << _mask->get(F_DAMAG)<< "\")&&" ;
srangem << TR("da \"") << _mask->get(F_DAMAG) << "\" "; srangem << TR("da ") << _mask->get(F_DAMAG) << " ";
} }
if (_mask->get(F_AMAG).full()) if (_mask->get(F_AMAG).full())
{ {
filter << "(" << LF_MAG<< "->CODMAG[1,3]<=" <<'"' << _mask->get(F_AMAG)<< "\")&&" ; filter << "(" << LF_MAG<< "->CODMAG[1,3]<=" <<'"' << _mask->get(F_AMAG)<< "\")&&" ;
srangem << TR("fino a \"") << _mask->get(F_AMAG) << "\" "; srangem << TR("a ") << _mask->get(F_AMAG) << " ";
}
if (_mask->get(F_DADEP).full())
{
filter << "(" << LF_MAG<< "->CODMAG[4,5]>=" <<'"' << _mask->get(F_DADEP)<< "\")&&" ;
srangem << TR("deposito da") << _mask->get(F_DADEP) << " ";
}
if (_mask->get(F_ADEP).full())
{
filter << "(" << LF_MAG<< "->CODMAG[4,5]<=" <<'"' << _mask->get(F_ADEP)<< "\")&&" ;
srangem << TR("a ") << _mask->get(F_ADEP) << " ";
} }
rangem.set(srangem.empty() ? TR("Tutti i magazzini") : format(FR("Magazzini %s"),(const char *)srangem)); rangem.set(srangem.empty() ? TR("Tutti i magazzini") : format(FR("Magazzini %s"),(const char *)srangem));
if (filter.not_empty()) if (filter.not_empty())

2
mg/mg3200.h
View File

@ -10,6 +10,8 @@
#define F_ACATMER 110 #define F_ACATMER 110
#define F_DADES 111 #define F_DADES 111
#define F_ADES 112 #define F_ADES 112
#define F_DADEP 113
#define F_ADEP 114
#define F_TOTALIMAGAZZINI 119 #define F_TOTALIMAGAZZINI 119
#define F_TOTALIDEPOSITI 120 #define F_TOTALIDEPOSITI 120

24
mg/mg3200.uml
View File

@ -133,6 +133,19 @@ BEGIN
OUTPUT F_DAMAG CODTAB OUTPUT F_DAMAG CODTAB
END END
STRING F_DADEP 2
BEGIN
PROMPT 30 10 "Deposito "
FLAGS "U"
USE MAG SELECT CODTAB[4,5]!=""
INPUT CODTAB[1,3] F_DAMAG SELECT
INPUT CODTAB[4,5] F_DADEP
DISPLAY "Codice magazzino" CODTAB[1,3]
DISPLAY "Deposito" CODTAB[4,5]
DISPLAY "Descr@50" S0
OUTPUT F_DADEP CODTAB[4,5]
END
STRING F_AMAG 3 STRING F_AMAG 3
BEGIN BEGIN
PROMPT 2 11 "Al magazzino " PROMPT 2 11 "Al magazzino "
@ -143,6 +156,17 @@ BEGIN
OUTPUT F_AMAG CODTAB OUTPUT F_AMAG CODTAB
END END
STRING F_ADEP 2
BEGIN
PROMPT 30 11 "Deposito "
FLAGS "U"
COPY USE F_DADEP
INPUT CODTAB[1,3] F_AMAG SELECT
INPUT CODTAB F_ADEP
COPY DISPLAY F_DADEP
OUTPUT F_ADEP CODTAB
END
STRING F_DACATMER 3 STRING F_DACATMER 3
BEGIN BEGIN
PROMPT 2 12 "Dal gruppo " PROMPT 2 12 "Dal gruppo "