diff --git a/arap/src/public/nc/bs/arap/busireg/ArapBillUpdateChecker.java b/arap/src/public/nc/bs/arap/busireg/ArapBillUpdateChecker.java index 3630976..0b3139c 100644 --- a/arap/src/public/nc/bs/arap/busireg/ArapBillUpdateChecker.java +++ b/arap/src/public/nc/bs/arap/busireg/ArapBillUpdateChecker.java @@ -129,9 +129,9 @@ public class ArapBillUpdateChecker implements BillUpdateChecker { ++m; if (vo.getObjtype() == s) { Object[] values = valuechangeMap.get(s3[m]); -// if(vo.getMetaData().getEntityName().equals("arap.gatheritem") && vo.getSrc_billtype().equals("30") && s3[m].equals("customer")){ -// break; -// } + if(vo.getMetaData().getEntityName().equals("arap.gatheritem") && vo.getSrc_billtype().equals("30") && s3[m].equals("customer")){ + break; + } if (values != null) { Object oldvalue = values[1]; if (oldvalue != null && oldvalue.toString().length() == 20) { diff --git a/so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringAddAfterListenerAction.java b/so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringAddAfterListenerAction.java index 955365b..626fbf4 100644 --- a/so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringAddAfterListenerAction.java +++ b/so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringAddAfterListenerAction.java @@ -128,11 +128,15 @@ public class GatheringAddAfterListenerAction { for(IDataFromF2ForM30 data : datas) { if (!ccustomerid.equals(data.getPayBillOrderCust())) { - throw new BusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("4006011_0", "04006011-0193", (String)null, new String[]{head.getVbillcode()})); + if(!data.getFirstBillType().equals("30") ){ + throw new BusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("4006011_0", "04006011-0193", (String)null, new String[]{head.getVbillcode()})); + } } if (!cinvoicecustid.equals(data.getPayBillCustomer())) { + if(!data.getFirstBillType().equals("30") ){ throw new BusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("4006011_0", "04006011-0194", (String)null, new String[]{head.getVbillcode()})); + } } if (!corigcurrencyid.equals(data.getPayBillCurID())) { diff --git a/so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringUpdateBeforeListener.java b/so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringUpdateBeforeListener.java index ab99e67..24651b9 100644 --- a/so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringUpdateBeforeListener.java +++ b/so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringUpdateBeforeListener.java @@ -155,11 +155,15 @@ public class GatheringUpdateBeforeListener implements IBusinessListener { if (SoBalanceType.SOBALANCE_ORDERBAL.getIntValue() == fibaltype) { if (!ccustomerid.equals(data.getPayBillOrderCust())) { - throw new BusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("4006011_0", "04006011-0193", (String)null, new String[]{(String)map.get(head.getCsobalanceid())})); + if(!(data.getFirstBillType().equals("30")&&head.getMetaData().getEntityName().equals("so.so_balance")) ) { + throw new BusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("4006011_0", "04006011-0193", (String) null, new String[]{(String) map.get(head.getCsobalanceid())})); + } } if (!cinvoicecustid.equals(data.getPayBillCustomer())) { + if(!(data.getFirstBillType().equals("30")&&head.getMetaData().getEntityName().equals("so.so_balance"))) { throw new BusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("4006011_0", "04006011-0194", (String)null, new String[]{(String)map.get(head.getCsobalanceid())})); + } } if (!corigcurrencyid.equals(data.getPayBillCurID())) {