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

This commit is contained in:
zhangzhiguo 2026-01-05 15:38:21 +08:00
commit a93881d4d1
1 changed files with 24 additions and 0 deletions

View File

@ -107,6 +107,30 @@ public class OutContractFinaceConfirmePlugin extends AbstractBillPlugIn impleme
item.set("zcgj_ljwcxamt",amt); item.set("zcgj_ljwcxamt",amt);
} }
this.getView().updateView("zcgj_itementry"); this.getView().updateView("zcgj_itementry");
DynamicObjectCollection expenseItemEntryCollection = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_expenseitementry");//费用项目分录
expenseItemEntryCollection.clear();
DynamicObject zcgj_contract = (DynamicObject) this.getModel().getValue("zcgj_contract");//合同名称
if (zcgj_contract != null) {
String priceType = zcgj_contract.getString("zcgj_pricetype");//计价方式
if (StringUtils.equals(priceType, "zjbg") || StringUtils.equals(priceType, "bdlbdj")) {
//计价方式为总价包干 不定量不定价时
for (DynamicObject dynamicObject : itementry) {
BigDecimal ofTaxAmount = dynamicObject.getBigDecimal("oftaxamount");
if (ofTaxAmount.compareTo(BigDecimal.ZERO) == 0) {
continue;
}
DynamicObject expenseItemEntry = expenseItemEntryCollection.addNew();
expenseItemEntry.set("zcgj_amountsum", ofTaxAmount);//价税合计
expenseItemEntry.set("zcgj_expenseitemamt", dynamicObject.getBigDecimal("amount"));//费用不含税金额
expenseItemEntry.set("zcgj_rateval", dynamicObject.getBigDecimal("rate"));//税率%
expenseItemEntry.set("zcgj_taxamount", dynamicObject.getBigDecimal("taxamt"));//税额
expenseItemEntry.set("zcgj_expenseitemrem", dynamicObject.getString("remark"));//费用说明
expenseItemEntry.set("zcgj_cbs", dynamicObject.getDynamicObject("itemcbs"));//工序
}
this.getView().updateView("zcgj_expenseitementry");
}
}
} }
public void propertyChanged(PropertyChangedArgs e) { public void propertyChanged(PropertyChangedArgs e) {