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

Compare commits

base: zhangzhiguo:fd6033a32a45aa6d1f1aef26f20c84cfe0a8c10c
Branches Tags
zhangzhiguo:main
zhangzhiguo:dev
..
compare: zhangzhiguo:605eecdcb3cbdca0ea17495df071995a11942ea3
Branches Tags
zhangzhiguo:dev
zhangzhiguo:main

No commits in common. "fd6033a32a45aa6d1f1aef26f20c84cfe0a8c10c" and "605eecdcb3cbdca0ea17495df071995a11942ea3" have entirely different histories.
fd6033a32a ... 605eecdcb3

3 changed files with 4 additions and 26 deletions
Show Stats Expand all files Collapse all files

14
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractPublicBillPlugin.java
View File

@ -1,7 +1,6 @@
package zcgj.zcdev.zcdev.pr.plugin.form; package zcgj.zcdev.zcdev.pr.plugin.form;
import kd.bos.bill.AbstractBillPlugIn; import kd.bos.bill.AbstractBillPlugIn;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.LocaleString; import kd.bos.dataentity.entity.LocaleString;
import kd.bos.entity.datamodel.events.PropertyChangedArgs; import kd.bos.entity.datamodel.events.PropertyChangedArgs;
import kd.bos.form.field.ComboEdit; import kd.bos.form.field.ComboEdit;
@ -65,19 +64,6 @@ public class ContractPublicBillPlugin extends AbstractBillPlugIn implements Plug
ComboEdit comboEdit = getView().getControl("zcgj_belongingsector"); ComboEdit comboEdit = getView().getControl("zcgj_belongingsector");
comboEdit.setComboItems(comboList); comboEdit.setComboItems(comboList);
} }
}else if (name.equals("contracttype")){
// Object contracttype = this.getModel().getValue("contracttype");
// if(contracttype!=null && contracttype!=""){
// DynamicObject contracttypeInfo = (DynamicObject)contracttype;
// String number = contracttypeInfo.getString("number");
// if(number.equals("jjfb")||number.equals("hfzl")||number.equals("jjbc")||number.equals("jjzb")){
// this.getView().setVisible(true,"zcgj_xmtz");
// }else{
// this.getView().setVisible(false,"zcgj_xmtz");
//
// }
// this.getView().updateView("treelistentry");
// }
} }
} }
} }

8
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/InContractSettlementValidator.java
View File

@ -31,12 +31,8 @@ public class InContractSettlementValidator extends InContractSettleValidator {
if (itementry.size() == 0) { if (itementry.size() == 0) {
this.addErrorMessage(dataEntity, ResManager.loadKDString("支付合同项不能为空", "InContractSettleValidator_0", "ec-contract-opplugin", new Object[0])); this.addErrorMessage(dataEntity, ResManager.loadKDString("支付合同项不能为空", "InContractSettleValidator_0", "ec-contract-opplugin", new Object[0]));
} }
BigDecimal amount = new BigDecimal(0); BigDecimal oftaxamount = itementry.get(0).getBigDecimal("oftaxamount");
for (DynamicObject object : itementry) { if (oftaxamount.compareTo(new BigDecimal(0)) > 0) {
BigDecimal oftaxamount = object.getBigDecimal("oftaxamount");
amount = amount.add(oftaxamount);
}
if (amount.compareTo(new BigDecimal(0)) <= 0) {
this.addErrorMessage(dataEntity, ResManager.loadKDString("支付合同项分录中的金额不能为空！", "InContractSettleValidator_0", "ec-contract-opplugin", new Object[0])); this.addErrorMessage(dataEntity, ResManager.loadKDString("支付合同项分录中的金额不能为空！", "InContractSettleValidator_0", "ec-contract-opplugin", new Object[0]));
} }
DynamicObject contract = BusinessDataServiceHelper.loadSingle(dataEntity.getDataEntity().getDynamicObject("contract").getPkValue(), "ec_in_contract"); DynamicObject contract = BusinessDataServiceHelper.loadSingle(dataEntity.getDataEntity().getDynamicObject("contract").getPkValue(), "ec_in_contract");

8
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractSettlementValidator.java
View File

@ -22,12 +22,8 @@ public class OutContractSettlementValidator extends OutContractSettleValidator {
if (itementry.isEmpty()) { if (itementry.isEmpty()) {
this.addErrorMessage(dataEntity, ResManager.loadKDString("支付合同项不能为空", "InContractSettleValidator_0", "ec-contract-opplugin", new Object[0])); this.addErrorMessage(dataEntity, ResManager.loadKDString("支付合同项不能为空", "InContractSettleValidator_0", "ec-contract-opplugin", new Object[0]));
} }
BigDecimal amount = new BigDecimal(0); BigDecimal oftaxamount = itementry.get(0).getBigDecimal("oftaxamount");
for (DynamicObject object : itementry) { if (oftaxamount.compareTo(new BigDecimal(0)) > 0) {
BigDecimal oftaxamount = object.getBigDecimal("oftaxamount");
amount = amount.add(oftaxamount);
}
if (amount.compareTo(new BigDecimal(0)) <= 0) {
this.addErrorMessage(dataEntity, ResManager.loadKDString("支付合同项分录中的金额不能为空！", "InContractSettleValidator_0", "ec-contract-opplugin", new Object[0])); this.addErrorMessage(dataEntity, ResManager.loadKDString("支付合同项分录中的金额不能为空！", "InContractSettleValidator_0", "ec-contract-opplugin", new Object[0]));
} }
if (contractTemp == null) { if (contractTemp == null) {