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-06-10 08:49:50 +08:00
parent f5ed9588d5 de66410ddc
commit a27d073012
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -530,11 +530,6 @@ public class IAPISaleInvMaitainImpl {
newInvBVO.setNtaxmny(new UFDouble(bipBvoJson.getString("ntaxmny"))); // 本币价税合计
newInvBVO.setNcaltaxmny(new UFDouble(bipBvoJson.getString("nmny"))); // 计税金额=本币无税金额
newInvBVO.setCopposesrcbid(bipBvoJson.getString("vbdef15")); // 对冲来源子表id
newInvBVO.setCunitid(bipBvoJson.getString("castunitid"));// 主单位
newInvBVO.setCqtunitid(bipBvoJson.getString("castunitid"));// 报价单位
// 通过 ntaxrate 获取 taxcode
String taxcodeStr = getTaxcode(bipBvoJson.getString("ntaxrate"));
newInvBVO.setCtaxcodeid(taxcodeStr);// 税码
newInvBVO.setCsaleinvoiceid(null); // 发票关联主表id
newInvBVO.setNtotalcostnum(null); // 累计成本结算数量

4
uapbd/src/private/nc/bs/uapbd/bip/workplugin/ErpSaleOrderToBIPBackgroupWorkPlugin.java
View File

@ -207,13 +207,13 @@ public class ErpSaleOrderToBIPBackgroupWorkPlugin implements IBackgroundWorkPlug
String updateSql = "";
if (StringUtils.equals("200", updateMap.get("code").toString())) {// 保存更新成功后需要更新日志表
if("1".equals(flag)){
updateSql = "update so_saleinvoice_b set vbdef10='Y' where csaleinvoiceid='" + map.get("csaleinvoicebid") + "'";
updateSql = "update so_saleinvoice_b set vbdef10='Y' where csaleinvoicebid='" + map.get("csaleinvoicebid") + "'";
} else {
updateSql = "update ic_saleout_b set vbdef4='Y' where cgeneralbid='" + map.get("csaleinvoicebid") + "'";
}
} else {
if("1".equals(flag)) {
updateSql = "update so_saleinvoice_b set vbdef10='N' where csaleinvoiceid='" + map.get("csaleinvoicebid") + "'";
updateSql = "update so_saleinvoice_b set vbdef10='N' where csaleinvoicebid='" + map.get("csaleinvoicebid") + "'";
}else{
updateSql = "update ic_saleout_b set vbdef4='N' where cgeneralbid='" + map.get("csaleinvoicebid") + "'";
}