Merge pull request '报表增强' (#29) from dev into sit
Reviewed-on: #29
This commit was merged in pull request #29.
This commit is contained in:
@@ -11,9 +11,11 @@
|
||||
</Exec>
|
||||
<If condition="~RetCod=1"> <!--存在-->
|
||||
<Set>ORD_DT=$ORD_DT</Set>
|
||||
<Set>ORD_DT2=$ORD_DT</Set>
|
||||
</If>
|
||||
<Else>
|
||||
<Set>ORD_DT=CALCDATE($AC_DT,-,d,1)</Set>
|
||||
<Set>ORD_DT2=$ORD_DT</Set>
|
||||
</Else>
|
||||
|
||||
|
||||
@@ -31,6 +33,7 @@
|
||||
<Arg name="RptName" value="$RPTNAME" />
|
||||
<Arg name="RptFile" value="$CR_RPT_FILE" />
|
||||
<Arg name="ORD_DT" value="$ORD_DT" />
|
||||
<Arg name="ORD_DT2" value="$ORD_DT2" />
|
||||
</Exec>
|
||||
<If condition="~RetCod=-1">
|
||||
<Exec func="PUB:GWASetMsg">
|
||||
|
||||
@@ -12,10 +12,14 @@
|
||||
<If condition="~RetCod=1"> <!--存在-->
|
||||
<Set>MONTH=SUBSTR(CALCDATE($CHK_DAT,-,m,1),1,6)</Set>
|
||||
<Set>MONTH2=$MONTH</Set>
|
||||
<Set>MONTH3=$MONTH</Set>
|
||||
<Set>MONTH4=$MONTH</Set>
|
||||
</If>
|
||||
<Else>
|
||||
<Set>MONTH=SUBSTR(CALCDATE($AC_DT,-,m,1),1,6)</Set>
|
||||
<Set>MONTH2=$MONTH</Set>
|
||||
<Set>MONTH3=$MONTH</Set>
|
||||
<Set>MONTH4=$MONTH</Set>
|
||||
</Else>
|
||||
|
||||
|
||||
@@ -34,6 +38,8 @@
|
||||
<Arg name="RptFile" value="$CR_RPT_FILE" />
|
||||
<Arg name="MONTH" value="$MONTH" />
|
||||
<Arg name="MONTH2" value="$MONTH2" />
|
||||
<Arg name="MONTH3" value="$MONTH3" />
|
||||
<Arg name="MONTH4" value="$MONTH4" />
|
||||
</Exec>
|
||||
<If condition="~RetCod=-1">
|
||||
<Exec func="PUB:GWASetMsg">
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user