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

Merge remote-tracking branch 'origin/main'

This commit is contained in:
mzr 2025-04-16 15:04:50 +08:00
parent 7c1ff840c9 7c7792fe52
commit d637692789
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arap/src/public/nc/bs/arap/busireg/ArapBillUpdateChecker.java
View File

@ -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) {

6
so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringAddAfterListenerAction.java
View File

@ -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())) {

6
so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringUpdateBeforeListener.java
View File

@ -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())) {