diff --git a/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bp/ListaBolleScaricoGenerateBP.java b/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bp/ListaBolleScaricoGenerateBP.java index 7351f3175b..54729a7fda 100644 --- a/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bp/ListaBolleScaricoGenerateBP.java +++ b/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bp/ListaBolleScaricoGenerateBP.java @@ -1,24 +1,40 @@ package it.cnr.contab.ordmag.magazzino.bp; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Date; import java.util.List; import java.util.Optional; +import java.util.UUID; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import it.cnr.contab.config00.contratto.bulk.ContrattoBulk; import it.cnr.contab.config00.service.ContrattoService; +import it.cnr.contab.docamm00.docs.bulk.Fattura_attivaBulk; +import it.cnr.contab.docamm00.ejb.FatturaAttivaSingolaComponentSession; +import it.cnr.contab.docamm00.service.DocumentiCollegatiDocAmmService; import it.cnr.contab.ordmag.magazzino.bulk.BollaScaricoMagBulk; +import it.cnr.contab.ordmag.magazzino.bulk.BollaScaricoMagKey; +import it.cnr.contab.reports.bulk.Print_spoolerBulk; +import it.cnr.contab.reports.bulk.Report; +import it.cnr.contab.reports.service.PrintService; import it.cnr.contab.service.SpringUtil; +import it.cnr.contab.spring.storage.StorageObject; +import it.cnr.jada.UserContext; import it.cnr.jada.action.ActionContext; import it.cnr.jada.action.BusinessProcessException; import it.cnr.jada.action.Config; +import it.cnr.jada.action.HttpActionContext; +import it.cnr.jada.util.DateUtils; import it.cnr.jada.util.action.SelezionatoreListaBP; import it.cnr.jada.util.jsp.Button; public class ListaBolleScaricoGenerateBP extends SelezionatoreListaBP { private transient final static Logger logger = LoggerFactory.getLogger(ListaBolleScaricoGenerateBP.class); private static final long serialVersionUID = 1L; + private static final String NOME_REPORT = "/ordmag/magazzino/bolla_scarico.jasper"; private List bolle; @Override @@ -57,4 +73,49 @@ public void setBolle(List bolle) { this.bolle = bolle; } + public void stampaBollaScarico(ActionContext actioncontext) throws Exception { + Integer esercizio = Integer.valueOf(((HttpActionContext)actioncontext).getParameter("esercizio")); + String cds = ((HttpActionContext)actioncontext).getParameter("cds"); + String magazzino = ((HttpActionContext)actioncontext).getParameter("magazzino"); + String numeratore = ((HttpActionContext)actioncontext).getParameter("numeratore"); + Integer pgBolla = Integer.valueOf(((HttpActionContext)actioncontext).getParameter("pgBolla")); + BollaScaricoMagBulk bolla = new BollaScaricoMagBulk(cds, magazzino, esercizio, numeratore, pgBolla); + InputStream is = getStreamBollaScarico(actioncontext, bolla); + if (is != null){ + ((HttpActionContext)actioncontext).getResponse().setContentType("application/pdf"); + OutputStream os = ((HttpActionContext)actioncontext).getResponse().getOutputStream(); + ((HttpActionContext)actioncontext).getResponse().setDateHeader("Expires", 0); + byte[] buffer = new byte[((HttpActionContext)actioncontext).getResponse().getBufferSize()]; + int buflength; + while ((buflength = is.read(buffer)) > 0) { + os.write(buffer,0,buflength); + } + is.close(); + os.flush(); + } + } + + + private InputStream getStreamBollaScarico(ActionContext actioncontext, + BollaScaricoMagKey bollaScarico) + throws Exception { + InputStream is; + Print_spoolerBulk print = new Print_spoolerBulk(); + print.setPgStampa(UUID.randomUUID().getLeastSignificantBits()); + print.setFlEmail(false); + print.setReport(NOME_REPORT); + print.setNomeFile(bollaScarico.toString()); + print.setUtcr(actioncontext.getUserContext().getUser()); + print.addParam("cds", bollaScarico.getCdCds(), String.class); + print.addParam("esercizio", bollaScarico.getEsercizio().intValue(), Integer.class); + print.addParam("magazzino", bollaScarico.getCdMagazzino(), String.class); + print.addParam("numeratore", bollaScarico.getCdNumeratoreMag(), String.class); + print.addParam("bollaSca", bollaScarico.getPgBollaSca().longValue(), Long.class); + + Report report = SpringUtil.getBean("printService", + PrintService.class).executeReport(actioncontext.getUserContext(), + print); + return report.getInputStream(); + } + } diff --git a/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoMagBulk.java b/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoMagBulk.java index e6e7c776cb..840ebf9d6d 100644 --- a/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoMagBulk.java +++ b/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoMagBulk.java @@ -251,10 +251,10 @@ public int addToRighe( BollaScaricoRigaMagBulk nuovoRigo ) righe.add(nuovoRigo); int max = 0; for (Iterator i = righe.iterator(); i.hasNext();) { - int prog = ((BollaScaricoRigaMagBulk)i.next()).getConsegna(); + int prog = ((BollaScaricoRigaMagBulk)i.next()).getRigaBollaSca(); if (prog > max) max = prog; } - nuovoRigo.setRigbollaScaN(new Integer(max+1)); + nuovoRigo.setRigaBollaSca(new Integer(max+1)); return righe.size()-1; } diff --git a/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoMagHome.java b/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoMagHome.java index 58723c1845..1b1022e627 100644 --- a/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoMagHome.java +++ b/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoMagHome.java @@ -74,7 +74,7 @@ public Persistent completeBulkRowByRow(UserContext userContext, Persistent persistent) throws PersistencyException { BollaScaricoMagBulk bolla = (BollaScaricoMagBulk)persistent; bolla.setStampaBollaScarico(""); return super.completeBulkRowByRow(userContext, persistent); diff --git a/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoMagKey.java b/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoMagKey.java index a0a466ec19..fda07f9c6a 100644 --- a/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoMagKey.java +++ b/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoMagKey.java @@ -116,4 +116,9 @@ public void setPgBollaSca(java.lang.Integer pgBollaSca) { public java.lang.Integer getPgBollaSca() { return pgBollaSca; } + @Override + public String toString() { + return cdCds + "_" + "_" + esercizio + cdMagazzino + + "_" + cdNumeratoreMag + "_" + pgBollaSca; + } } \ No newline at end of file diff --git a/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoRigaMagBase.java b/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoRigaMagBase.java index a1758c8d72..0227be5d13 100644 --- a/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoRigaMagBase.java +++ b/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoRigaMagBase.java @@ -90,8 +90,8 @@ public class BollaScaricoRigaMagBase extends BollaScaricoRigaMagKey implements K public BollaScaricoRigaMagBase() { super(); } - public BollaScaricoRigaMagBase(java.lang.String cdCds, java.lang.String cdMagazzino, java.lang.Integer esercizio, java.lang.String cdNumeratoreMag, java.lang.Integer pgBollaSca, java.lang.Integer rigbollaScaN) { - super(cdCds, cdMagazzino, esercizio, cdNumeratoreMag, pgBollaSca, rigbollaScaN); + public BollaScaricoRigaMagBase(java.lang.String cdCds, java.lang.String cdMagazzino, java.lang.Integer esercizio, java.lang.String cdNumeratoreMag, java.lang.Integer pgBollaSca, java.lang.Integer rigaBollaSca) { + super(cdCds, cdMagazzino, esercizio, cdNumeratoreMag, pgBollaSca, rigaBollaSca); } /** * Created by BulkGenerator 2.0 [07/12/2009] diff --git a/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoRigaMagBulk.java b/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoRigaMagBulk.java index 034fa29fdc..1f239bc33d 100644 --- a/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoRigaMagBulk.java +++ b/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoRigaMagBulk.java @@ -25,8 +25,8 @@ public BollaScaricoRigaMagBulk() { * Created by BulkGenerator 2.0 [07/12/2009] * Table name: BOLLA_SCARICO_RIGA_MAG **/ - public BollaScaricoRigaMagBulk(java.lang.String cdCds, java.lang.String cdMagazzino, java.lang.Integer esercizio, java.lang.String cdNumeratoreMag, java.lang.Integer pgBollaSca, java.lang.Integer rigbollaScaN) { - super(cdCds, cdMagazzino, esercizio, cdNumeratoreMag, pgBollaSca, rigbollaScaN); + public BollaScaricoRigaMagBulk(java.lang.String cdCds, java.lang.String cdMagazzino, java.lang.Integer esercizio, java.lang.String cdNumeratoreMag, java.lang.Integer pgBollaSca, java.lang.Integer rigaBollaSca) { + super(cdCds, cdMagazzino, esercizio, cdNumeratoreMag, pgBollaSca, rigaBollaSca); setBollaScaricoMag( new BollaScaricoMagBulk(cdCds,cdMagazzino,esercizio,cdNumeratoreMag,pgBollaSca) ); } /** diff --git a/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoRigaMagKey.java b/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoRigaMagKey.java index d9782c8fd3..ba55fc6b67 100644 --- a/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoRigaMagKey.java +++ b/sigla-ejb/src/main/java/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoRigaMagKey.java @@ -11,7 +11,7 @@ public class BollaScaricoRigaMagKey extends OggettoBulk implements KeyedPersiste private java.lang.Integer esercizio; private java.lang.String cdNumeratoreMag; private java.lang.Integer pgBollaSca; - private java.lang.Integer rigbollaScaN; + private java.lang.Integer rigaBollaSca; /** * Created by BulkGenerator 2.0 [07/12/2009] * Table name: BOLLA_SCARICO_RIGA_MAG @@ -19,14 +19,14 @@ public class BollaScaricoRigaMagKey extends OggettoBulk implements KeyedPersiste public BollaScaricoRigaMagKey() { super(); } - public BollaScaricoRigaMagKey(java.lang.String cdCds, java.lang.String cdMagazzino, java.lang.Integer esercizio, java.lang.String cdNumeratoreMag, java.lang.Integer pgBollaSca, java.lang.Integer rigbollaScaN) { + public BollaScaricoRigaMagKey(java.lang.String cdCds, java.lang.String cdMagazzino, java.lang.Integer esercizio, java.lang.String cdNumeratoreMag, java.lang.Integer pgBollaSca, java.lang.Integer rigaBollaSca) { super(); this.cdCds=cdCds; this.cdMagazzino=cdMagazzino; this.esercizio=esercizio; this.cdNumeratoreMag=cdNumeratoreMag; this.pgBollaSca=pgBollaSca; - this.rigbollaScaN=rigbollaScaN; + this.rigaBollaSca=rigaBollaSca; } public boolean equalsByPrimaryKey(Object o) { if (this== o) return true; @@ -37,7 +37,7 @@ public boolean equalsByPrimaryKey(Object o) { if (!compareKey(getEsercizio(), k.getEsercizio())) return false; if (!compareKey(getCdNumeratoreMag(), k.getCdNumeratoreMag())) return false; if (!compareKey(getPgBollaSca(), k.getPgBollaSca())) return false; - if (!compareKey(getRigbollaScaN(), k.getRigbollaScaN())) return false; + if (!compareKey(getRigaBollaSca(), k.getRigaBollaSca())) return false; return true; } public int primaryKeyHashCode() { @@ -47,7 +47,7 @@ public int primaryKeyHashCode() { i = i + calculateKeyHashCode(getEsercizio()); i = i + calculateKeyHashCode(getCdNumeratoreMag()); i = i + calculateKeyHashCode(getPgBollaSca()); - i = i + calculateKeyHashCode(getRigbollaScaN()); + i = i + calculateKeyHashCode(getRigaBollaSca()); return i; } /** @@ -124,14 +124,14 @@ public java.lang.Integer getPgBollaSca() { * Created by BulkGenerator 2.0 [07/12/2009] * Restituisce il valore di: [rigbollaScaN] **/ - public void setRigbollaScaN(java.lang.Integer rigbollaScaN) { - this.rigbollaScaN=rigbollaScaN; + public void setRigaBollaSca(java.lang.Integer rigaBollaSca) { + this.rigaBollaSca=rigaBollaSca; } /** * Created by BulkGenerator 2.0 [07/12/2009] * Setta il valore di: [rigbollaScaN] **/ - public java.lang.Integer getRigbollaScaN() { - return rigbollaScaN; + public java.lang.Integer getRigaBollaSca() { + return rigaBollaSca; } } \ No newline at end of file diff --git a/sigla-ejb/src/main/java/it/cnr/contab/ordmag/ordini/comp/OrdineAcqComponent.java b/sigla-ejb/src/main/java/it/cnr/contab/ordmag/ordini/comp/OrdineAcqComponent.java index 3bd87d7803..4da8cd8c0d 100644 --- a/sigla-ejb/src/main/java/it/cnr/contab/ordmag/ordini/comp/OrdineAcqComponent.java +++ b/sigla-ejb/src/main/java/it/cnr/contab/ordmag/ordini/comp/OrdineAcqComponent.java @@ -2022,12 +2022,13 @@ public OrdineAcqBulk creaOrdineDaRichieste(it.cnr.jada.UserContext userContext, } private void creaRigaOrdine(it.cnr.jada.UserContext userContext, OrdineAcqBulk ordine, RichiestaUopRigaBulk rigaRichiesta) throws it.cnr.jada.comp.ComponentException,javax.ejb.EJBException { boolean trovataRiga = false; + OrdineAcqRigaBulk rigaOrdine = null; for (Object riga : ordine.getRigheOrdineColl()){ - OrdineAcqRigaBulk rigaOrdine = (OrdineAcqRigaBulk)riga; + rigaOrdine = (OrdineAcqRigaBulk)riga; // if (rigaOrdine.get) } if (!trovataRiga){ - OrdineAcqRigaBulk rigaOrdine = new OrdineAcqRigaBulk(); + rigaOrdine = new OrdineAcqRigaBulk(); rigaOrdine = (OrdineAcqRigaBulk)rigaOrdine.inizializzaPerInserimento(userContext); rigaOrdine.setBeneServizio(rigaRichiesta.getBeneServizio()); rigaOrdine.setDsBeneServizio(rigaRichiesta.getDsBeneServizio()); diff --git a/sigla-ejb/src/main/resources/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoRigaMagBulkInfo.xml b/sigla-ejb/src/main/resources/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoRigaMagBulkInfo.xml index 75e9afa93e..3f97f4d2e7 100644 --- a/sigla-ejb/src/main/resources/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoRigaMagBulkInfo.xml +++ b/sigla-ejb/src/main/resources/it/cnr/contab/ordmag/magazzino/bulk/BollaScaricoRigaMagBulkInfo.xml @@ -63,15 +63,15 @@ nullable="false" label="pgBollaSca" /> + label="Riga" /> + name="rigaBollaSca" /> + name="rigaBollaSca" /> + name="rigaBollaSca" /> + name="rigaBollaSca" /> \ No newline at end of file diff --git a/sigla-web/src/main/webapp/ordmag/magazzini/lista_bolle_scarico_generate.jsp b/sigla-web/src/main/webapp/ordmag/magazzini/lista_bolle_scarico_generate.jsp index 9d1be4e1de..1d5c39c577 100644 --- a/sigla-web/src/main/webapp/ordmag/magazzini/lista_bolle_scarico_generate.jsp +++ b/sigla-web/src/main/webapp/ordmag/magazzini/lista_bolle_scarico_generate.jsp @@ -22,8 +22,8 @@ ListaBolleScaricoGenerateBP bp = (ListaBolleScaricoGenerateBP)BusinessProcess.ge bp.openFormWindow(pageContext); %>