From 73bea97b49c4c41a954addddddbdec30f040d5b0 Mon Sep 17 00:00:00 2001 From: mzr Date: Mon, 4 Aug 2025 18:54:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=89=A9=E6=96=99PLM?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/action/InvoiceDownloadAction.java | 38 +++++++++++++------ .../action/MaterialPlmDownloadAction.java | 26 +++++++++++++ .../material/config/action/material_file.xml | 8 ++++ .../config/authorize/file_authorize.xml | 8 ++++ 4 files changed, 68 insertions(+), 12 deletions(-) create mode 100644 uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPlmDownloadAction.java create mode 100644 uapbd/src/client/yyconfig/modules/uapbd/material/config/action/material_file.xml create mode 100644 uapbd/src/client/yyconfig/modules/uapbd/material/config/authorize/file_authorize.xml diff --git a/sscivm/src/client/nccloud/web/sscivm/ivsale/sale/action/InvoiceDownloadAction.java b/sscivm/src/client/nccloud/web/sscivm/ivsale/sale/action/InvoiceDownloadAction.java index ffb77b1..2cf4837 100644 --- a/sscivm/src/client/nccloud/web/sscivm/ivsale/sale/action/InvoiceDownloadAction.java +++ b/sscivm/src/client/nccloud/web/sscivm/ivsale/sale/action/InvoiceDownloadAction.java @@ -127,28 +127,42 @@ public class InvoiceDownloadAction implements ICommonAction { } String ctcode = ""; - HYSuperDMO dmo = new HYSuperDMO(); - IVApplogVO[] ivApplogVO = (IVApplogVO[]) dmo.queryByWhereClause(IVApplogVO.class, "fphm='" + headVO.getFphm() + "' and dr=0 "); - if (ivApplogVO != null && ivApplogVO.length > 0) { - IVApplicationHeadVO ivApplicationHeadVO = (IVApplicationHeadVO) dmo.queryByPrimaryKey(IVApplicationHeadVO.class, ivApplogVO[0].getLyid()); -// ctcode = ivApplicationHeadVO.getDef2(); // 合同号 + String codeSql="select DISTINCT sscivm_ivapplication.DEF2 from sscivm_ivapplog, sscivm_ivapplication where sscivm_ivapplication.dr = 0 and ( sscivm_ivapplication.pk_ivapplication = sscivm_ivapplog.lyid or sscivm_ivapplication.pk_ivapplication in ( select ron.pk_ivapplication from sscivm_inv_ina_relation ron where ron.fpqqlsh = sscivm_ivapplog.lyid ) ) and sscivm_ivapplog.fphm = '" + headVO.getFphm() + "' and sscivm_ivapplog.dr = 0"; + Map val = (Map) getQueryService().executeQuery(codeSql, new MapProcessor()); + if(!val.isEmpty()){ String operationSql = "SELECT bd.NAME name from bd_defdoc bd LEFT join bd_defdoclist bdl ON bd.pk_defdoclist=bdl.pk_defdoclist WHERE bdl.code ='zdy-001'\n" + - "AND bd.pk_defdoc = '" + ivApplicationHeadVO.getDef2().toString() + "' "; + "AND bd.pk_defdoc = '" + val.get("def2") + "' "; // List> operationresult = (List>) getQueryService().executeQuery(operationSql, new ArrayListProcessor()); Map valList = (Map) getQueryService().executeQuery(operationSql, new MapProcessor()); - if(!valList.isEmpty()){ + if(null!=valList && !valList.isEmpty()){ ctcode = (String) valList.get("name"); // 合同号 }else{ - ctcode =ivApplicationHeadVO.getDef2(); + ctcode = (String) val.get("def2"); } } + +// HYSuperDMO dmo = new HYSuperDMO(); +// IVApplogVO[] ivApplogVO = (IVApplogVO[]) dmo.queryByWhereClause(IVApplogVO.class, "fphm='" + headVO.getFphm() + "' and dr=0 "); +// if (ivApplogVO != null && ivApplogVO.length > 0) { +// IVApplicationHeadVO ivApplicationHeadVO = (IVApplicationHeadVO) dmo.queryByPrimaryKey(IVApplicationHeadVO.class, ivApplogVO[0].getLyid()); +// ctcode = ivApplicationHeadVO.getDef2(); // 合同号 +// String operationSql = "SELECT bd.NAME name from bd_defdoc bd LEFT join bd_defdoclist bdl ON bd.pk_defdoclist=bdl.pk_defdoclist WHERE bdl.code ='zdy-001'\n" + +// "AND bd.pk_defdoc = '" + ivApplicationHeadVO.getDef2().toString() + "' "; +// List> operationresult = (List>) getQueryService().executeQuery(operationSql, new ArrayListProcessor()); +// Map valList = (Map) getQueryService().executeQuery(operationSql, new MapProcessor()); +// if(!valList.isEmpty()){ +// ctcode = (String) valList.get("name"); // 合同号 +// }else{ +// ctcode =ivApplicationHeadVO.getDef2(); +// } +// } if(!ctcode.equals("") && !ctcode.equals("/") ){ ctcode=ctcode+"_"; } // 添加 PDF if (!MMValueCheck.isEmpty(pdfData)) { byte[] pdfBytes = DatatypeConverter.parseBase64Binary(pdfData); - zipStream.putNextEntry(new ZipEntry(ctcode + headVO.getGmfmc() + "_" + headVO.getFphm() + "_" + String.valueOf(headVO.getJshj().toDouble()) + ".pdf")); + zipStream.putNextEntry(new ZipEntry(ctcode + headVO.getGmfmc() + "_" + headVO.getFphm() + "_" + String.valueOf(headVO.getJshj().toBigDecimal().toPlainString()) + ".pdf")); zipStream.write(pdfBytes); zipStream.closeEntry(); } @@ -156,7 +170,7 @@ public class InvoiceDownloadAction implements ICommonAction { // 添加 XML if (!MMValueCheck.isEmpty(xmlData)) { byte[] xmlBytes = DatatypeConverter.parseBase64Binary(xmlData); - zipStream.putNextEntry(new ZipEntry(ctcode + headVO.getGmfmc() + "_" + headVO.getFphm() + "_" + String.valueOf(headVO.getJshj().toDouble()) + ".xml")); + zipStream.putNextEntry(new ZipEntry(ctcode + headVO.getGmfmc() + "_" + headVO.getFphm() + "_" + String.valueOf(headVO.getJshj().toBigDecimal().toPlainString()) + ".xml")); zipStream.write(xmlBytes); zipStream.closeEntry(); } @@ -164,11 +178,11 @@ public class InvoiceDownloadAction implements ICommonAction { // 添加 OFD if (!MMValueCheck.isEmpty(ofdData)) { byte[] ofdBytes = DatatypeConverter.parseBase64Binary(ofdData); - zipStream.putNextEntry(new ZipEntry(ctcode + headVO.getGmfmc() + "_" + headVO.getFphm() + "_" + String.valueOf(headVO.getJshj().toDouble()) + ".ofd")); + zipStream.putNextEntry(new ZipEntry(ctcode + headVO.getGmfmc() + "_" + headVO.getFphm() + "_" + String.valueOf(headVO.getJshj().toBigDecimal().toPlainString()) + ".ofd")); zipStream.write(ofdBytes); zipStream.closeEntry(); } - zipName=ctcode + headVO.getGmfmc() + "_" + headVO.getFphm() + "_" + String.valueOf(headVO.getJshj().toDouble()); + zipName=ctcode + headVO.getGmfmc() + "_" + headVO.getFphm() + "_" + String.valueOf(headVO.getJshj().toBigDecimal().toPlainString()); } else { throw new Exception("获取发票信息失败"); } diff --git a/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPlmDownloadAction.java b/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPlmDownloadAction.java new file mode 100644 index 0000000..2c1dd29 --- /dev/null +++ b/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPlmDownloadAction.java @@ -0,0 +1,26 @@ +package nccloud.web.uapbd.material.action; + +import nc.bs.uapbd.util.GetPlmFileUtil; +import nccloud.framework.core.io.WebFile; +import nccloud.framework.web.container.IRequest; +import nccloud.web.action.NCCAction; +import nccloud.web.uapbd.commons.web.ParamUtils; + +/** + * 获取物料PLM文件 + * + * @author mzr + * @date 2025/8/4 + */ +public class MaterialPlmDownloadAction extends NCCAction { + @Override + public Object execute(IRequest request, T para) throws Exception { + ParamUtils param = new ParamUtils(request); + String materialCode = param.getString("materialCode", null); + materialCode = "101092250323"; + String[] materialCodeArr = materialCode.split(",", -1); + GetPlmFileUtil fileUtil = new GetPlmFileUtil(); + WebFile files = fileUtil.getPlmFiles(materialCodeArr); + return files; + } +} diff --git a/uapbd/src/client/yyconfig/modules/uapbd/material/config/action/material_file.xml b/uapbd/src/client/yyconfig/modules/uapbd/material/config/action/material_file.xml new file mode 100644 index 0000000..1c51a1c --- /dev/null +++ b/uapbd/src/client/yyconfig/modules/uapbd/material/config/action/material_file.xml @@ -0,0 +1,8 @@ + + + + uapbd.material.downloadPlmFile + + nccloud.web.uapbd.material.action.MaterialPlmDownloadAction + + diff --git a/uapbd/src/client/yyconfig/modules/uapbd/material/config/authorize/file_authorize.xml b/uapbd/src/client/yyconfig/modules/uapbd/material/config/authorize/file_authorize.xml new file mode 100644 index 0000000..9683508 --- /dev/null +++ b/uapbd/src/client/yyconfig/modules/uapbd/material/config/authorize/file_authorize.xml @@ -0,0 +1,8 @@ + + + * + + uapbd.material.downloadPlmFile + + +