diff --git a/mmpac/src/client/nccloud/web/mmpac/issue/action/IssuePrintAction.java b/mmpac/src/client/nccloud/web/mmpac/issue/action/IssuePrintAction.java index e9754967..c6b0ac02 100644 --- a/mmpac/src/client/nccloud/web/mmpac/issue/action/IssuePrintAction.java +++ b/mmpac/src/client/nccloud/web/mmpac/issue/action/IssuePrintAction.java @@ -18,6 +18,6 @@ public class IssuePrintAction extends AbstractPrintAction { } public WebFileType getWebFileType() { - return WebFileType.Pdf; + return WebFileType.Excel; } } diff --git a/mmpac/src/private/nccloud/pubimpl/mmpac/issue/service/IssuePickmPrintDataSource.java b/mmpac/src/private/nccloud/pubimpl/mmpac/issue/service/IssuePickmPrintDataSource.java index ba53e1f6..359c8e64 100644 --- a/mmpac/src/private/nccloud/pubimpl/mmpac/issue/service/IssuePickmPrintDataSource.java +++ b/mmpac/src/private/nccloud/pubimpl/mmpac/issue/service/IssuePickmPrintDataSource.java @@ -1,10 +1,13 @@ package nccloud.pubimpl.mmpac.issue.service; import nc.bs.framework.common.NCLocator; +import nc.itf.mmpac.pickm.IPickmQueryService; import nc.md.model.MetaDataException; import nc.md.persist.framework.IMDPersistenceQueryService; import nc.ui.pub.print.IMetaDataDataSource; +import nc.vo.mmpac.pickm.entity.AggPickmVO; import nc.vo.mmpac.reqpickm.entity.AggReqPickmVO; +import nc.vo.pub.BusinessException; import nc.vo.pubapp.pattern.exception.ExceptionUtils; /** @@ -21,14 +24,14 @@ public class IssuePickmPrintDataSource implements IMetaDataDataSource { @Override public Object[] getMDObjects() { - IMDPersistenceQueryService bs = NCLocator.getInstance().lookup(IMDPersistenceQueryService.class); - AggReqPickmVO[] aggvos = new AggReqPickmVO[]{}; + IPickmQueryService service = (IPickmQueryService) NCLocator.getInstance().lookup(IPickmQueryService.class); + AggPickmVO[] vos = null; try { - aggvos =(AggReqPickmVO[]) bs.queryBillOfVOByPKs(AggReqPickmVO.class, this.olds, false).toArray(new AggReqPickmVO[0]); - }catch(MetaDataException e){ - ExceptionUtils.wrappException(e); + vos = service.queryAggPickmVObyBid(olds); + } catch (BusinessException e) { + throw new RuntimeException(e); } - return aggvos; + return vos; } @Override diff --git a/mmpac/src/private/nccloud/pubimpl/mmpac/issue/service/IssuePickmPrintOperator.java b/mmpac/src/private/nccloud/pubimpl/mmpac/issue/service/IssuePickmPrintOperator.java index 71c5b251..bceffaef 100644 --- a/mmpac/src/private/nccloud/pubimpl/mmpac/issue/service/IssuePickmPrintOperator.java +++ b/mmpac/src/private/nccloud/pubimpl/mmpac/issue/service/IssuePickmPrintOperator.java @@ -2,14 +2,14 @@ package nccloud.pubimpl.mmpac.issue.service; import nc.bs.framework.common.NCLocator; import nc.impl.pubapp.pattern.data.bill.BillQuery; +import nc.itf.arap.pub.IArapBillService; +import nc.itf.mmpac.pickm.IPickmQueryService; import nc.md.model.MetaDataException; import nc.md.persist.framework.IMDPersistenceQueryService; import nc.ui.pub.print.IMetaDataDataSource; +import nc.vo.mmpac.pickm.entity.AggPickmVO; import nc.vo.mmpac.reqpickm.consts.ReqPickmLangConsts; -import nc.vo.mmpac.reqpickm.entity.AggReqPickmVO; -import nc.vo.mmpac.reqpickm.entity.ReqPickmItemVO; -import nc.vo.mmpac.reqpickm.entity.ReqPickmSumVO; -import nc.vo.mmpub.util.BillBodySortUtils; +import nc.vo.pub.BusinessException; import nc.vo.pubapp.pattern.exception.ExceptionUtils; import nccloud.pubitf.mmpub.pub.print.BaseMetaPrintService; @@ -24,15 +24,24 @@ public class IssuePickmPrintOperator extends BaseMetaPrintService { @Override public Object[] getDatas(String[] ids) { - BillQuery query = new BillQuery(AggReqPickmVO.class); - String[] uniqueIds = this.removeDuplicates(ids); - AggReqPickmVO[] vos = query.query(uniqueIds); +// BillQuery query = new BillQuery(AggPickmVO.class); +// String[] uniqueIds = this.removeDuplicates(ids); +// AggPickmVO[] vos = query.query(uniqueIds); + IPickmQueryService service = (IPickmQueryService) NCLocator.getInstance().lookup(IPickmQueryService.class); + + + AggPickmVO[] vos = null; + try { + vos = service.queryAggPickmVObyBid(ids); + } catch (BusinessException e) { + throw new RuntimeException(e); + } if (null == vos || vos.length == 0) { ExceptionUtils.wrappBusinessException(ReqPickmLangConsts.getEdit_msg()); } - BillBodySortUtils.sort(vos, "vrowno", ReqPickmItemVO.class); - BillBodySortUtils.sort(vos, "vrowno", ReqPickmSumVO.class); +// BillBodySortUtils.sort(vos, "vrowno", ReqPickmItemVO.class); +// BillBodySortUtils.sort(vos, "vrowno", ReqPickmSumVO.class); return vos; }