yonyou
/
taikai2312
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yonyou:e19258381e129b58711e8861b791bed688339602
Branches Tags
yonyou:main
yonyou:dev
..
compare: yonyou:9aba447f085676b9bf32c2daa4d5bcf413c72b73
Branches Tags
yonyou:main
yonyou:dev

No commits in common. "e19258381e129b58711e8861b791bed688339602" and "9aba447f085676b9bf32c2daa4d5bcf413c72b73" have entirely different histories.
e19258381e ... 9aba447f08

2 changed files with 4 additions and 25 deletions
Show Stats Expand all files Collapse all files

8
mmpac/src/private/nc/bs/mmpac/pmo/pac0002/pluginpoint/PmoSerialNoImportProcess.java
View File

@ -23,7 +23,6 @@ import nc.vo.mmpac.pmo.pac0002.entity.PMOSerialNoVO;
import nc.vo.mmpac.pmo.parameter.PMOMaterlKey; import nc.vo.mmpac.pmo.parameter.PMOMaterlKey;
import nc.vo.pub.BusinessException; import nc.vo.pub.BusinessException;
import nc.vo.pub.VOStatus; import nc.vo.pub.VOStatus;
import nc.vo.pub.lang.UFBoolean;
import nc.vo.pub.lang.UFDouble; import nc.vo.pub.lang.UFDouble;
import nc.vo.pubapp.pattern.exception.ExceptionUtils; import nc.vo.pubapp.pattern.exception.ExceptionUtils;
import nc.vo.pubapp.pattern.pub.MathTool; import nc.vo.pubapp.pattern.pub.MathTool;
@ -90,11 +89,6 @@ public class PmoSerialNoImportProcess extends AbstractImportProceeWithContext {
Set<String> billTypeCodes = Set.of( Set<String> billTypeCodes = Set.of(
"55A2-Cxx-01", "55A2-Cxx-18" "55A2-Cxx-01", "55A2-Cxx-18"
); );
if ("C030".equals(pk_org)) {
billTypeCodes = Set.of(
"55A2-Cxx-01"
);
}
if (!billTypeCodes.contains(vtrantypecode)) { if (!billTypeCodes.contains(vtrantypecode)) {
throw new BusinessException("订单类型不符合要求，请检查数据，单号：" + cpmohid + "，行号：" + cmoid); throw new BusinessException("订单类型不符合要求，请检查数据，单号：" + cpmohid + "，行号：" + cmoid);
} }
@ -112,8 +106,6 @@ public class PmoSerialNoImportProcess extends AbstractImportProceeWithContext {
pmoSerialNoVO1.setNsnnum(nsnastnum); pmoSerialNoVO1.setNsnnum(nsnastnum);
pmoSerialNoVO1.setNsnastnum(nsnastnum); pmoSerialNoVO1.setNsnastnum(nsnastnum);
pmoSerialNoVO1.setStatus(VOStatus.NEW); pmoSerialNoVO1.setStatus(VOStatus.NEW);
pmoSerialNoVO1.setBreport(UFBoolean.FALSE);// 已报工
pmoSerialNoVO1.setFsnsrc(2);// 序列号来源 2=手工录入;
pmoSerialNoVO1.setDr(0); pmoSerialNoVO1.setDr(0);
this.doAddSave(pmoSerialNoVO1, headVO, pmoItemVO); this.doAddSave(pmoSerialNoVO1, headVO, pmoItemVO);
} }

21
mmpac/src/private/nc/bs/mmpac/pmo/pac0002/rule/fill/PMOFillSNPkAndCodeRule.java
View File

@ -207,31 +207,18 @@ public class PMOFillSNPkAndCodeRule implements IRule<PMOAggVO> {
if (MMValueCheck.isNotEmpty(pkOrg)) { if (MMValueCheck.isNotEmpty(pkOrg)) {
try { try {
String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg);
if ("C030".equals(orgCode)) { Map<String, String> configParams = MyHelper.getConfigParams("Dldz-config", null);
if (!MyHelper.checkIfDldzOrg(orgCode, configParams)) {
// ½»Ò×ÀàÐͱàÂë // ½»Ò×ÀàÐͱàÂë
String vtrantypecode = headVO.getVtrantypecode(); String vtrantypecode = headVO.getVtrantypecode();
Set<String> billTypeCodes = Set.of( Set<String> billTypeCodes = Set.of(
"55A2-Cxx-01" "55A2-Cxx-01", "55A2-Cxx-18"
); );
// 箱变下的-期初订单不填充序列号 // 电力电子集团下的-期初订单不填充序列号
if (billTypeCodes.contains(vtrantypecode)) { if (billTypeCodes.contains(vtrantypecode)) {
return; return;
} }
} else {
Map<String, String> configParams = MyHelper.getConfigParams("Dldz-config", null);
if (!MyHelper.checkIfDldzOrg(orgCode, configParams)) {
// 交易类型编码
String vtrantypecode = headVO.getVtrantypecode();
Set<String> billTypeCodes = Set.of(
"55A2-Cxx-01", "55A2-Cxx-18"
);
// 电力电子集团下的-期初订单不填充序列号
if (billTypeCodes.contains(vtrantypecode)) {
return;
}
}
} }
} catch (BusinessException e) { } catch (BusinessException e) {
Logger.error("fillPMOGrandSNVoValues-exp = " + e.getMessage()); Logger.error("fillPMOGrandSNVoValues-exp = " + e.getMessage());
} }