midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1003856 IDEMPIERE-1951 Run report as a background job. Fix bug discover during testing.

This commit is contained in:
Heng Sin Low 2014-04-24 22:44:16 +08:00
parent c73000c38b
commit c232e04e04
3 changed files with 94 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
org.adempiere.base/src/org/compiere/print/ServerReportCtl.java
View File

@ -13,6 +13,7 @@ import org.compiere.process.ProcessInfoParameter;
import org.compiere.process.ServerProcessCtl;
import org.compiere.util.CLogger;
import org.compiere.util.Env;
import org.compiere.util.Trx;
@ -28,6 +29,19 @@ public class ServerReportCtl {
/** Static Logger */
private static CLogger s_log = CLogger.getCLogger (ServerReportCtl.class);
/**
* Start Document Print for Type with specified printer.
* @param type
* @param customPrintFormat
* @param Record_ID
* @param printerName
* @return
*/
public static boolean startDocumentPrint (int type, MPrintFormat customPrintFormat, int Record_ID, String printerName)
{
return startDocumentPrint(type, customPrintFormat, Record_ID, printerName, null);
}
/**
* Start Document Print for Type with specified printer.
* @param type document type in ReportEngine
@ -35,9 +49,10 @@ public class ServerReportCtl {
* @param parent The window which invoked the printing
* @param WindowNo The windows number which invoked the printing
* @param printerName Specified printer name
* @param pi
* @return true if success
*/
public static boolean startDocumentPrint (int type, MPrintFormat customPrintFormat, int Record_ID, String printerName)
public static boolean startDocumentPrint (int type, MPrintFormat customPrintFormat, int Record_ID, String printerName, ProcessInfo pi)
{
ReportEngine re = ReportEngine.get (Env.getCtx(), type, Record_ID);
if (re == null)
@ -59,21 +74,27 @@ public class ServerReportCtl {
// ==============================
if(format.getJasperProcess_ID() > 0)
{
boolean result = runJasperProcess(Record_ID, re, true, printerName);
boolean result = runJasperProcess(Record_ID, re, true, printerName, pi);
return(result);
}
else
// Standard Print Format (Non-Jasper)
// ==================================
{
createOutput(re, printerName);
if (pi != null && pi.isBatch() && pi.isPrintPreview())
{
pi.setPDFReport(re.getPDF());
}
else
{
createOutput(re, printerName);
}
ReportEngine.printConfirm (type, Record_ID);
}
}
return true;
} // StartDocumentPrint
/**
* Runs a Jasper process that prints the record
*
@ -85,10 +106,29 @@ public class ServerReportCtl {
* @return
*/
public static boolean runJasperProcess(int Record_ID, ReportEngine re, boolean IsDirectPrint, String printerName) {
return runJasperProcess(Record_ID, re, IsDirectPrint, printerName, null);
}
/**
* Runs a Jasper process that prints the record
*
* @param format
* @param Record_ID
* @param re
* @param IsDirectPrint
* @param printerName
* @return
*/
public static boolean runJasperProcess(int Record_ID, ReportEngine re, boolean IsDirectPrint, String printerName, ProcessInfo pi) {
MPrintFormat format = re.getPrintFormat();
ProcessInfo pi = new ProcessInfo ("", format.getJasperProcess_ID());
pi.setPrintPreview( !IsDirectPrint );
pi.setRecord_ID ( Record_ID );
ProcessInfo jasperProcessInfo = new ProcessInfo ("", format.getJasperProcess_ID());
if (pi != null) {
jasperProcessInfo.setPrintPreview(pi.isPrintPreview());
jasperProcessInfo.setIsBatch(pi.isBatch());
} else {
jasperProcessInfo.setPrintPreview( !IsDirectPrint );
}
jasperProcessInfo.setRecord_ID ( Record_ID );
ArrayList<ProcessInfoParameter> jasperPrintParams = new ArrayList<ProcessInfoParameter>();
ProcessInfoParameter pip;
if (printerName!=null && printerName.trim().length()>0) {
@ -101,11 +141,15 @@ public class ServerReportCtl {
pip = new ProcessInfoParameter(PARAM_PRINT_INFO, re.getPrintInfo(), null, null, null);
jasperPrintParams.add(pip);
pi.setParameter(jasperPrintParams.toArray(new ProcessInfoParameter[]{}));
jasperProcessInfo.setParameter(jasperPrintParams.toArray(new ProcessInfoParameter[]{}));
ServerProcessCtl.process(pi, null);
ServerProcessCtl.process(jasperProcessInfo, pi != null ? Trx.get(pi.getTransactionName(),false) : null);
boolean result = true;
boolean result = !jasperProcessInfo.isError();
if (result && pi != null && pi.isBatch())
{
pi.setPDFReport(jasperProcessInfo.getPDFReport());
}
return(result);
}
@ -139,21 +183,21 @@ public class ServerReportCtl {
* Order Print
*/
if (pi.getAD_Process_ID() == 110) // C_Order
return startDocumentPrint(ReportEngine.ORDER, null, pi.getRecord_ID(), null);
return startDocumentPrint(ReportEngine.ORDER, null, pi.getRecord_ID(), null, pi);
if (pi.getAD_Process_ID() == MProcess.getProcess_ID("Rpt PP_Order", null)) // C_Order
return startDocumentPrint(ReportEngine.MANUFACTURING_ORDER, null, pi.getRecord_ID(), null);
return startDocumentPrint(ReportEngine.MANUFACTURING_ORDER, null, pi.getRecord_ID(), null, pi);
if (pi.getAD_Process_ID() == MProcess.getProcess_ID("Rpt DD_Order", null)) // C_Order
return startDocumentPrint(ReportEngine.DISTRIBUTION_ORDER, null, pi.getRecord_ID(), null);
return startDocumentPrint(ReportEngine.DISTRIBUTION_ORDER, null, pi.getRecord_ID(), null, pi);
else if (pi.getAD_Process_ID() == 116) // C_Invoice
return startDocumentPrint(ReportEngine.INVOICE, null, pi.getRecord_ID(), null);
return startDocumentPrint(ReportEngine.INVOICE, null, pi.getRecord_ID(), null, pi);
else if (pi.getAD_Process_ID() == 117) // M_InOut
return startDocumentPrint(ReportEngine.SHIPMENT, null, pi.getRecord_ID(), null);
return startDocumentPrint(ReportEngine.SHIPMENT, null, pi.getRecord_ID(), null, pi);
else if (pi.getAD_Process_ID() == 217) // C_Project
return startDocumentPrint(ReportEngine.PROJECT, null, pi.getRecord_ID(), null);
return startDocumentPrint(ReportEngine.PROJECT, null, pi.getRecord_ID(), null, pi);
else if (pi.getAD_Process_ID() == 276) // C_RfQResponse
return startDocumentPrint(ReportEngine.RFQ, null, pi.getRecord_ID(), null);
return startDocumentPrint(ReportEngine.RFQ, null, pi.getRecord_ID(), null, pi);
else if (pi.getAD_Process_ID() == 159) // Dunning
return startDocumentPrint(ReportEngine.DUNNING, null, pi.getRecord_ID(), null);
return startDocumentPrint(ReportEngine.DUNNING, null, pi.getRecord_ID(), null, pi);
else if (pi.getAD_Process_ID() == 202 // Financial Report
|| pi.getAD_Process_ID() == 204) // Financial Statement
return startFinReport (pi);
@ -203,7 +247,14 @@ public class ServerReportCtl {
MQuery query = MQuery.get (ctx, pi.getAD_PInstance_ID(), TableName);
PrintInfo info = new PrintInfo(pi);
re = new ReportEngine(ctx, format, query, info);
createOutput(re, null);
if (pi.isPrintPreview() && pi.isBatch())
{
pi.setPDFReport(re.getPDF());
}
else
{
createOutput(re, null);
}
return true;
}
//
@ -217,7 +268,14 @@ public class ServerReportCtl {
}
}
createOutput(re, null);
if (pi.isPrintPreview() && pi.isBatch())
{
pi.setPDFReport(re.getPDF());
}
else
{
createOutput(re, null);
}
return true;
} // startStandardReport
@ -247,7 +305,14 @@ public class ServerReportCtl {
PrintInfo info = new PrintInfo(pi);
ReportEngine re = new ReportEngine(Env.getCtx(), format, query, info);
createOutput(re, null);
if (pi.isPrintPreview() && pi.isBatch())
{
pi.setPDFReport(re.getPDF());
}
else
{
createOutput(re, null);
}
return true;
} // startFinReport

32
org.adempiere.server/src/main/server/org/compiere/server/Scheduler.java
View File

@ -41,7 +41,6 @@ import org.compiere.model.MScheduler;
import org.compiere.model.MSchedulerLog;
import org.compiere.model.MSchedulerPara;
import org.compiere.model.MUser;
import org.compiere.print.ReportEngine;
import org.compiere.process.ProcessInfo;
import org.compiere.process.ProcessInfoUtil;
import org.compiere.process.ServerProcessCtl;
@ -173,6 +172,7 @@ public class Scheduler extends AdempiereServer
pi.setAD_Client_ID(m_model.getAD_Client_ID());
pi.setAD_PInstance_ID(pInstance.getAD_PInstance_ID());
pi.setIsBatch(true);
pi.setPrintPreview(true);
MUser from = new MUser(getCtx(), pi.getAD_User_ID(), null);
ServerProcessCtl.process(pi, m_trx);
@ -220,31 +220,7 @@ public class Scheduler extends AdempiereServer
ProcessInfoUtil.setLogFromDB(pi);
List<File> fileList = new ArrayList<File>();
if (isReport) {
// Report
ReportEngine re = ReportEngine.get(m_schedulerctx, pi);
if(re != null && re.getPrintFormat().getJasperProcess_ID() > 0)
{
// We have a Jasper Print Format
// ==============================
ProcessInfo jasperpi = new ProcessInfo ("", re.getPrintFormat().getJasperProcess_ID());
jasperpi.setIsBatch(true);
ServerProcessCtl.process(jasperpi, null);
fileList.add(jasperpi.getPDFReport());
}
else if (process.getJasperReport() != null)
{
fileList.add(pi.getPDFReport());
}
else
{
// Standard Print Format (Non-Jasper)
// ==================================
if (re == null)
return "Cannot create Report AD_Process_ID=" + process.getAD_Process_ID()
+ " - " + process.getName();
fileList.add(re.getPDF());
}
fileList.add(pi.getPDFReport());
}
if (pi.isExport() && pi.getExportFile() != null)
{
@ -303,7 +279,7 @@ public class Scheduler extends AdempiereServer
if (fileList != null && !fileList.isEmpty()) {
client.sendEMailAttachments(from, user, m_model.getName(), m_model.getDescription(), fileList);
} else {
client.sendEMail(from, user, m_model.getName(), pi.getSummary() + " " + pi.getLogInfo(), null);
client.sendEMail(from, user, m_model.getName(), pi.getSummary() + " " + pi.getLogInfo(true), null, true);
}
}
@ -366,7 +342,7 @@ public class Scheduler extends AdempiereServer
|| DisplayType.isID(sPara.getDisplayType()))
{
BigDecimal bd = toBigDecimal(value);
iPara.setP_Number(bd);
iPara.setP_Number(bd);
if (toValue != null)
{
bd = toBigDecimal(toValue);

33
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java
View File

@ -57,7 +57,6 @@ import org.compiere.model.MProcess;
import org.compiere.model.MSysConfig;
import org.compiere.model.MUser;
import org.compiere.model.Query;
import org.compiere.print.ReportEngine;
import org.compiere.process.ProcessInfo;
import org.compiere.process.ProcessInfoUtil;
import org.compiere.process.ServerProcessCtl;
@ -667,6 +666,7 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
{
ProcessInfo m_pi = getProcessInfo();
m_pi.setIsBatch(true);
m_pi.setPrintPreview(true);
MPInstance instance = new MPInstance(m_ctx, m_pi.getAD_PInstance_ID(), null);
String notificationType = instance.getNotificationType();
@ -687,36 +687,11 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
boolean isReport = (process.isReport() || process.getAD_ReportView_ID() > 0 || process.getJasperReport() != null || process.getAD_PrintFormat_ID() > 0);
if (isReport)
{
ReportEngine re = ReportEngine.get(m_ctx, m_pi);
if(re != null && re.getPrintFormat().getJasperProcess_ID() > 0)
{
ProcessInfo jasperpi = new ProcessInfo ("", re.getPrintFormat().getJasperProcess_ID());
jasperpi.setIsBatch(true);
ServerProcessCtl.process(jasperpi, null);
File report = jasperpi.getPDFReport();
if (report != null)
download(report);
}
else if (process.getJasperReport() != null)
{
download(m_pi.getPDFReport());
}
else
{
if (re == null)
log.log(Level.SEVERE, "Cannot create Report AD_Process_ID=" + process.getAD_Process_ID() + " - " + process.getName());
else
{
File report = re.getPDF();
if (report != null)
download(report);
}
}
download(m_pi.getPDFReport());
}
File generatedFile = m_pi.isExport() ? m_pi.getExportFile() : m_pi.getPDFReport();
if (generatedFile != null)
download(generatedFile);
if (m_pi.isExport() && m_pi.getExportFile() != null)
download(m_pi.getExportFile());
}
if (sendEmail)