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:
张明 2025-05-29 18:12:04 +08:00
parent 3cad4fdf2d c9016b5d56
commit 789d944833
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveRuleSyncMes.java
View File

@ -339,7 +339,7 @@ public class AfterApproveRuleSyncMes implements IRule<PMOAggVO> {
addProperty(properties, "SXZF18", head.getVtrantypecode());
// SXZF22 - 生产订单交易类型编码
addProperty(properties, "SXZF22", head.getVtrantypecode());
// addProperty(properties, "SXZF22", head.getVtrantypecode());
// SXZF23 - 生产订单主键
addProperty(properties, "SXZF23", head.getCpmohid());

5
so/src/public/nccloud/api/so/saleinvoice/operator/IAPISaleInvMaitainImpl.java
View File

@ -407,10 +407,9 @@ public class IAPISaleInvMaitainImpl {
}
private String getTaxcode(String taxrateStr) throws BusinessException {
UFDouble taxrate = new UFDouble(taxrateStr==null?"0":taxrateStr).multiply(100).setScale(2, UFDouble.ROUND_HALF_UP);
IUAPQueryBS queryBS = NCLocator.getInstance().lookup(IUAPQueryBS.class);
String sql = " select code FROM bd_taxrate tt inner join bd_taxcode tc on tt.pk_taxcode=tc.pk_taxcode where TO_NUMBER(taxrate)='"
+ taxrate.toString() + "' AND ROWNUM = 1 ";
String sql = " select code FROM bd_taxrate tt inner join bd_taxcode tc on tt.pk_taxcode=tc.pk_taxcode where taxrate='"
+ taxrateStr + "' AND ROWNUM = 1 ";
String taxcodeStr = (String) queryBS.executeQuery(sql, new ColumnProcessor());
return taxcodeStr;
}