From 46b44dd6011093bf03c66aab80e3e5543bbfbcd3 Mon Sep 17 00:00:00 2001 From: mzr Date: Mon, 20 Oct 2025 20:47:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=8F=B7=E5=AF=BC=E5=85=A5=E9=80=82=E9=85=8D=E7=AE=B1?= =?UTF-8?q?=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pluginpoint/PmoSerialNoImportProcess.java | 8 +++++++ .../rule/fill/PMOFillSNPkAndCodeRule.java | 21 +++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/pluginpoint/PmoSerialNoImportProcess.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/pluginpoint/PmoSerialNoImportProcess.java index 6c3b2199..c2798e85 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/pluginpoint/PmoSerialNoImportProcess.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/pluginpoint/PmoSerialNoImportProcess.java @@ -23,6 +23,7 @@ import nc.vo.mmpac.pmo.pac0002.entity.PMOSerialNoVO; import nc.vo.mmpac.pmo.parameter.PMOMaterlKey; import nc.vo.pub.BusinessException; import nc.vo.pub.VOStatus; +import nc.vo.pub.lang.UFBoolean; import nc.vo.pub.lang.UFDouble; import nc.vo.pubapp.pattern.exception.ExceptionUtils; import nc.vo.pubapp.pattern.pub.MathTool; @@ -89,6 +90,11 @@ public class PmoSerialNoImportProcess extends AbstractImportProceeWithContext { Set billTypeCodes = Set.of( "55A2-Cxx-01", "55A2-Cxx-18" ); + if ("C030".equals(pk_org)) { + billTypeCodes = Set.of( + "55A2-Cxx-01" + ); + } if (!billTypeCodes.contains(vtrantypecode)) { throw new BusinessException("订单类型不符合要求，请检查数据，单号：" + cpmohid + "，行号：" + cmoid); } @@ -106,6 +112,8 @@ public class PmoSerialNoImportProcess extends AbstractImportProceeWithContext { pmoSerialNoVO1.setNsnnum(nsnastnum); pmoSerialNoVO1.setNsnastnum(nsnastnum); pmoSerialNoVO1.setStatus(VOStatus.NEW); + pmoSerialNoVO1.setBreport(UFBoolean.FALSE);// 已报工 + pmoSerialNoVO1.setFsnsrc(2);// 序列号来源 2=手工录入; pmoSerialNoVO1.setDr(0); this.doAddSave(pmoSerialNoVO1, headVO, pmoItemVO); } diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/rule/fill/PMOFillSNPkAndCodeRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/rule/fill/PMOFillSNPkAndCodeRule.java index b0b98f23..d191c038 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/rule/fill/PMOFillSNPkAndCodeRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/rule/fill/PMOFillSNPkAndCodeRule.java @@ -207,18 +207,31 @@ public class PMOFillSNPkAndCodeRule implements IRule { if (MMValueCheck.isNotEmpty(pkOrg)) { try { String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); - Map configParams = MyHelper.getConfigParams("Dldz-config", null); - if (!MyHelper.checkIfDldzOrg(orgCode, configParams)) { + if ("C030".equals(orgCode)) { // 交易类型编码 String vtrantypecode = headVO.getVtrantypecode(); Set billTypeCodes = Set.of( - "55A2-Cxx-01", "55A2-Cxx-18" + "55A2-Cxx-01" ); - // 电力电子集团下的-期初订单不填充序列号 + // 箱变下的-期初订单不填充序列号 if (billTypeCodes.contains(vtrantypecode)) { return; } + } else { + Map configParams = MyHelper.getConfigParams("Dldz-config", null); + if (!MyHelper.checkIfDldzOrg(orgCode, configParams)) { + // 交易类型编码 + String vtrantypecode = headVO.getVtrantypecode(); + Set billTypeCodes = Set.of( + "55A2-Cxx-01", "55A2-Cxx-18" + ); + // 电力电子集团下的-期初订单不填充序列号 + if (billTypeCodes.contains(vtrantypecode)) { + return; + } + } } + } catch (BusinessException e) { Logger.error("fillPMOGrandSNVoValues-exp = " + e.getMessage()); }