From 5d24e2bf9a96d09f97dbc28c2ed76d4dc2c90abe Mon Sep 17 00:00:00 2001 From: lihao Date: Mon, 9 Jun 2025 10:15:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=87=AA=E5=8A=A8=E5=BC=80?= =?UTF-8?q?=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApplicationSplitMergeMakeInvoiceAction.java | 16 ++++++++-------- .../splitmerge/processor/CommonProcessor.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sscivm/src/client/nccloud/web/sscivm/ivsale/application/invoice/action/ApplicationSplitMergeMakeInvoiceAction.java b/sscivm/src/client/nccloud/web/sscivm/ivsale/application/invoice/action/ApplicationSplitMergeMakeInvoiceAction.java index 04c8a96..7c554cf 100644 --- a/sscivm/src/client/nccloud/web/sscivm/ivsale/application/invoice/action/ApplicationSplitMergeMakeInvoiceAction.java +++ b/sscivm/src/client/nccloud/web/sscivm/ivsale/application/invoice/action/ApplicationSplitMergeMakeInvoiceAction.java @@ -117,13 +117,13 @@ public class ApplicationSplitMergeMakeInvoiceAction implements ICommonAction { for(IVApplicationAggVO appVo : appVos) { IVApplicationBodyVO[] bodyVos = appVo.getBodyVOs(); - if (appVo.getParentVO().getKpfs() != null && appVo.getParentVO().getKpfs() != IVAplocationKPFS.ZLKP.toIntValue() && bodyVos[0].getPk_ivappdetail().length() > 20) { - Map failMap = new HashMap(); - failMap.put("billNo", appVo.getParentVO().getBillno()); - failMap.put("msg", NCLangRes4VoTransl.getNCLangRes().getStrByID("1058sal_0", "01058sal-0106")); - failMapList.add(failMap); - ++failNum; - } else { +// if (appVo.getParentVO().getKpfs() != null && appVo.getParentVO().getKpfs() != IVAplocationKPFS.ZLKP.toIntValue() && bodyVos[0].getPk_ivappdetail().length() > 20) { +// Map failMap = new HashMap(); +// failMap.put("billNo", appVo.getParentVO().getBillno()); +// failMap.put("msg", NCLangRes4VoTransl.getNCLangRes().getStrByID("1058sal_0", "01058sal-0106")); +// failMapList.add(failMap); +// ++failNum; +// } else { if (bodyVos[0].getPk_ivappdetail().length() > 20) { for(IVApplicationBodyVO bodyVo : bodyVos) { String detailpk = bodyVo.getPk_ivappdetail(); @@ -140,7 +140,7 @@ public class ApplicationSplitMergeMakeInvoiceAction implements ICommonAction { newAppVos.add(appVo); } - } +// } if (appIds.size() == 0) { return (IVApplicationAggVO[])newAppVos.toArray(new IVApplicationAggVO[0]); diff --git a/sscivm/src/private/nccloud/itf/sscivm/ivsale/splitmerge/processor/CommonProcessor.java b/sscivm/src/private/nccloud/itf/sscivm/ivsale/splitmerge/processor/CommonProcessor.java index 64f0b3f..fd0f403 100644 --- a/sscivm/src/private/nccloud/itf/sscivm/ivsale/splitmerge/processor/CommonProcessor.java +++ b/sscivm/src/private/nccloud/itf/sscivm/ivsale/splitmerge/processor/CommonProcessor.java @@ -282,7 +282,7 @@ public abstract class CommonProcessor { //ÐéÄâÖ÷¼ü headVo.setPk_ivapplication(new SequenceGenerator().generate()); //ĬÈÏÖ±Áª - headVo.setKpfs(IVAplocationKPFS.ZLKP.toIntValue()); +// headVo.setKpfs(IVAplocationKPFS.ZLKP.toIntValue()); } return appVos;