zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
zhangzhiguo 2025-11-14 15:24:56 +08:00
parent 0b0568f108 a3fed09676
commit 88f9b51673
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java
View File

@ -408,7 +408,7 @@ public class MaterialInbPurchaseApplyPlugin extends AbstractBillPlugIn implement
String invoiceTypeIdName = invoiceTypeId.getString("name"); String invoiceTypeIdName = invoiceTypeId.getString("name");
if (!invoiceTypeIdName.contains("专")) { if (!invoiceTypeIdName.contains("专")) {
this.getModel().setValue("zcgj_invoicetax", BigDecimal.ZERO, rowIndex); this.getModel().setValue("zcgj_invoicetax", BigDecimal.ZERO, rowIndex);
this.getModel().setValue("zcgj_oftaxinvoiceamount", dataEntity.get("zcgj_invoiceamount"), rowIndex); this.getModel().setValue("zcgj_invoiceamount", dataEntity.get("zcgj_oftaxinvoiceamount"), rowIndex);
} }
} }
} }

4
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractSettleEditPluginExt.java
View File

@ -596,10 +596,10 @@ public class OutContractSettleEditPluginExt extends AbstractBillPlugIn implement
this.getModel().setValue("oftaxamount", BigDecimal.ZERO, 1);//合同支付项-价税合计 this.getModel().setValue("oftaxamount", BigDecimal.ZERO, 1);//合同支付项-价税合计
this.getModel().setValue("amount", BigDecimal.ZERO, 1);//合同支付项-金额 this.getModel().setValue("amount", BigDecimal.ZERO, 1);//合同支付项-金额
this.getModel().deleteEntryRow("itementry", 1); this.getModel().deleteEntryRow("itementry", 1);
}
}
return; return;
} }
}
}
this.autoFetch(); this.autoFetch();
this.sumMaterialInAmountToItemEntry(); this.sumMaterialInAmountToItemEntry();
SettleUpdateAmtUtils.calAllTypeAmount(this.getModel()); SettleUpdateAmtUtils.calAllTypeAmount(this.getModel());