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

Compare commits

base: zhangzhiguo:08ad13751a0f4277d213339bb9cee2ec7a6a8d8e
Branches Tags
zhangzhiguo:main
zhangzhiguo:dev
...
compare: zhangzhiguo:30715b4dc3bc1daf11b53f77449053b397278eef
Branches Tags
zhangzhiguo:dev
zhangzhiguo:main

2 Commits
08ad13751a ... 30715b4dc3

Author SHA1 Message Date
xiaoshi 30715b4dc3 Merge remote-tracking branch 'origin/dev' into dev 2024-12-06 15:54:39 +08:00
xiaoshi 5385dc37d4 收入与支出合同计量清单代码优化 2024-12-06 15:54:22 +08:00
2 changed files with 93 additions and 19 deletions
Show Stats Expand all files Collapse all files

102
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractMeasurementBillEditPlugin.java
View File

@ -3,6 +3,7 @@ package zcgj.zcdev.zcdev.pr.plugin.form;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.utils.StringUtils;
import kd.bos.entity.datamodel.events.ChangeData;
import kd.bos.entity.datamodel.events.PropertyChangedArgs;
import kd.bos.form.CloseCallBack;
import kd.bos.form.ShowFormHelper;
import kd.bos.list.ListShowParameter;
@ -20,25 +21,20 @@ public class InContractMeasurementBillEditPlugin extends InContractMeasureBillEd
@Override
protected void onThisQtyChanged(ChangeData changeData) {
BigDecimal qty = this.defaultZeroBigDecimal((BigDecimal)changeData.getNewValue());
BigDecimal qty = this.defaultZeroBigDecimal((BigDecimal) changeData.getNewValue());
int rowIndex = changeData.getRowIndex();
int parentRowIndex = changeData.getParentRowIndex();
BigDecimal totalqty = (BigDecimal)this.getModel().getValue("totalqty", rowIndex, parentRowIndex);
BigDecimal preQty = (BigDecimal)this.getModel().getValue("preqty", rowIndex, parentRowIndex);
BigDecimal totalqty = (BigDecimal) this.getModel().getValue("totalqty", rowIndex, parentRowIndex);
BigDecimal preQty = (BigDecimal) this.getModel().getValue("preqty", rowIndex, parentRowIndex);
BigDecimal balanceQty = totalqty.subtract(preQty);
if (qty.compareTo(balanceQty) > 0) {
// this.getView().showMessage(String.format(ResManager.loadKDString("本期计量数量不能超过%s（总数量-期初累计计量数量）。", "ContractMeasureBillEditPlugin_4", "ec-contract-formplugin", new Object[0]), balanceQty.intValue()));
// this.getModel().setValue("thisqty", BigDecimal.ZERO, rowIndex, parentRowIndex);
} else {
this.getModel().setValue("lstqty", preQty.add(qty), rowIndex, parentRowIndex);
BigDecimal taxPrice = (BigDecimal)this.getModel().getValue("curtaxprice", rowIndex, parentRowIndex);
BigDecimal amount = taxPrice.multiply(qty);
this.getModel().setValue("thisoftaxmount", amount, rowIndex, parentRowIndex);
if (this.isInContract()) {
this.countPercent(rowIndex, parentRowIndex);
}
this.getModel().setValue("lstqty", preQty.add(qty), rowIndex, parentRowIndex);
BigDecimal taxPrice = (BigDecimal) this.getModel().getValue("curtaxprice", rowIndex, parentRowIndex);
BigDecimal amount = taxPrice.multiply(qty);
this.getModel().setValue("thisoftaxmount", amount, rowIndex, parentRowIndex);
if (this.isInContract()) {
this.countPercent(rowIndex, parentRowIndex);
}
}
@Override
@ -52,8 +48,8 @@ public class InContractMeasurementBillEditPlugin extends InContractMeasureBillEd
List<Object> listingIds = new ArrayList();
int rowIndex;
for(rowIndex = 0; rowIndex < rowCount; ++rowIndex) {
DynamicObject listing = (DynamicObject)this.getModel().getValue("listing", rowIndex);
for (rowIndex = 0; rowIndex < rowCount; ++rowIndex) {
DynamicObject listing = (DynamicObject) this.getModel().getValue("listing", rowIndex);
if (listing != null) {
// listingIds.add(listing.getPkValue());
}
@ -61,9 +57,9 @@ public class InContractMeasurementBillEditPlugin extends InContractMeasureBillEd
qFilters.add(new QFilter("id", "not in", listingIds));
rowIndex = this.getModel().getEntryCurrentRowIndex("listmodelentry");
String listModelId = (String)this.getModel().getValue("listmodelid", rowIndex);
String listModelId = (String) this.getModel().getValue("listmodelid", rowIndex);
qFilters.add(new QFilter("listingmodel", "=", StringUtils.isNotBlank(listModelId) ? Long.parseLong(listModelId) : 0L));
DynamicObject contract = (DynamicObject)this.getModel().getValue("contract");
DynamicObject contract = (DynamicObject) this.getModel().getValue("contract");
if (contract != null) {
qFilters.add(new QFilter("contractid", "=", contract.getLong("id")));
}
@ -101,6 +97,7 @@ public class InContractMeasurementBillEditPlugin extends InContractMeasureBillEd
this.getView().showForm(param);
}
}
private List<Long> getUnitprojectIds(DynamicObject project) {
List<Long> result = null;
DynamicObject orgObj = this.getModel().getDataEntity().getDynamicObject("org");
@ -118,4 +115,71 @@ public class InContractMeasurementBillEditPlugin extends InContractMeasureBillEd
}).collect(Collectors.toList());
return result;
}
@Override
public void propertyChanged(PropertyChangedArgs e) {
super.propertyChanged(e);
String name = e.getProperty().getName();
ChangeData changeData = e.getChangeSet()[0];
int rowIndex = changeData.getRowIndex();
int parentRowIndex = changeData.getParentRowIndex();
BigDecimal curtaxprice = BigDecimal.ZERO;//当前含税单价
BigDecimal currentprice = BigDecimal.ZERO;//当前单价
BigDecimal qty = BigDecimal.ZERO;//数量
BigDecimal entrytaxrate = BigDecimal.ZERO;//税率
BigDecimal taxrate = entrytaxrate.divide(new BigDecimal(100));
if (parentRowIndex+rowIndex>=0){
Object curtaxpriceobj = this.getModel().getValue("curtaxprice", rowIndex, parentRowIndex);
if (curtaxpriceobj != null) {
curtaxprice = (BigDecimal) curtaxpriceobj;
}
Object currentpriceobj = this.getModel().getValue("currentprice", rowIndex, parentRowIndex);
if (currentpriceobj != null) {
currentprice = (BigDecimal) currentpriceobj;
;
}
Object totalqtyibj = this.getModel().getValue("totalqty", rowIndex, parentRowIndex);
if (totalqtyibj != null) {
qty = (BigDecimal) totalqtyibj;
}
Object entrytaxrateobj = this.getModel().getValue("entrytaxrate", rowIndex, parentRowIndex);
if (entrytaxrateobj != null) {
entrytaxrate = (BigDecimal) entrytaxrateobj;
}
if (name.equals("curtaxprice") && curtaxprice.compareTo(new BigDecimal(0))>0) {
BigDecimal divide = currentprice.divide(taxrate.add(new BigDecimal(1)));//当前单价
BigDecimal multiply = divide.multiply(qty);//当前金额
BigDecimal multiply1 = curtaxprice.multiply(qty);//当前价税合计
BigDecimal subtract = multiply1.subtract(multiply);//当前税额
this.getModel().setValue("currentprice",divide, rowIndex, parentRowIndex);//当前单价
this.getModel().setValue("currentamt", multiply,rowIndex, parentRowIndex);//当前金额
this.getModel().setValue("currenttaxamt", subtract,rowIndex, parentRowIndex);//当前税额
this.getModel().setValue("currentoftax", multiply1,rowIndex, parentRowIndex);//当前价税合计
} else if (name.equals("currentprice")&&currentprice.compareTo(new BigDecimal(0))>0) {
BigDecimal divide = curtaxprice.multiply(taxrate.add(new BigDecimal(1)));//当前含税单价
BigDecimal multiply = curtaxprice.multiply(qty);//当前金额
BigDecimal multiply1 = divide.multiply(qty);//当前价税合计
BigDecimal subtract = multiply1.subtract(multiply);//当前税额
this.getModel().setValue("curtaxprice",divide, rowIndex, parentRowIndex);//当前含税单价
this.getModel().setValue("currentamt", multiply,rowIndex, parentRowIndex);//当前金额
this.getModel().setValue("currenttaxamt",multiply1, rowIndex, parentRowIndex);//当前税额
this.getModel().setValue("currentoftax",subtract, rowIndex, parentRowIndex);//当前价税合计
}
}
}
protected void updateAmount(ChangeData changeData) {
// int rowIndex = changeData.getRowIndex();
// int parentRowIndex = changeData.getParentRowIndex();
// BigDecimal curtaxrate = (BigDecimal)this.getModel().getValue("curtaxprice", rowIndex,parentRowIndex);//当前含税单价
// BigDecimal curtaxprice = (BigDecimal)this.getModel().getValue("currentprice", rowIndex,parentRowIndex);//当前单价
// BigDecimal qty = (BigDecimal)this.getModel().getValue("totalqty", rowIndex,parentRowIndex);//数量
//
// this.getModel().setValue("curtaxprice", rowIndex,parentRowIndex);//当前金额
// this.getModel().setValue("currentprice", rowIndex,parentRowIndex);//当前税额
// this.getModel().setValue("currentamt", rowIndex,parentRowIndex);//当前金额
// this.getModel().setValue("currenttaxamt", rowIndex,parentRowIndex);//当前税额
// this.getModel().setValue("currentoftax", rowIndex,parentRowIndex);//当前价税合计
}
}

10
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractSettlementOp.java
View File

@ -1,12 +1,22 @@
package zcgj.zcdev.zcdev.pr.plugin.operate;
import kd.bos.entity.plugin.AddValidatorsEventArgs;
import kd.bos.entity.validate.AbstractValidator;
import kd.ec.contract.opplugin.OutContractSettleOp;
import kd.ec.contract.opplugin.validator.OutContractSettleValidator;
import java.util.List;
public class OutContractSettlementOp extends OutContractSettleOp {
@Override
public void onAddValidators(AddValidatorsEventArgs e) {
super.onAddValidators(e);
List<AbstractValidator> validators = e.getValidators();
// 删除标品校验器
validators.removeIf(validator -> validator instanceof OutContractSettleValidator);
// 添加定制二开的校验器（位置放第一位，优先执行）
validators.add(0, new OutContractSettlementValidator());
}
}