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-07-18 17:15:18 +08:00
parent 582d0ca002 95dce05fef
commit 006298e711
2 changed files with 116 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyReimbursSubOp.java
View File

@ -21,6 +21,7 @@ public class DailyReimbursSubOp extends AbstractOperationServicePlugIn {
e.getFieldKeys().add("zcgj_invoiceremark");
e.getFieldKeys().add("accountentry");
e.getFieldKeys().add("payertype");
e.getFieldKeys().add("payer");
}
@Override

205
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcContractFromPlugin.java
View File

@ -25,122 +25,129 @@ public class EcContractFromPlugin extends AbstractBillPlugIn implements Plugin {
super.propertyChanged(e);
String name = e.getProperty().getName();
ChangeData changeData = e.getChangeSet()[0];
if (name.equals("contracttype")){
if (name.equals("contracttype")) {
Object contracttype = this.getModel().getValue("contracttype");
if (contracttype!=null){
if (contracttype != null) {
DynamicObject type = (DynamicObject) contracttype;
String number = type.getString("number");
if (number.equals("sbzssr")){
this.getView().setVisible(true,"zcgj_equipment");
this.getView().setVisible(false,"zcgj_administer");
if (number.equals("sbzssr")) {
this.getView().setVisible(true, "zcgj_equipment");
this.getView().setVisible(false, "zcgj_administer");
} else if (number.equals("hfzl")) {
this.getView().setVisible(true,"zcgj_administer");
this.getView().setVisible(false,"zcgj_equipment");
}else {
this.getView().setVisible(false,"zcgj_administer");
this.getView().setVisible(false,"zcgj_equipment");
this.getView().setVisible(true, "zcgj_administer");
this.getView().setVisible(false, "zcgj_equipment");
} else {
this.getView().setVisible(false, "zcgj_administer");
this.getView().setVisible(false, "zcgj_equipment");
}
}
}
Object taxrate = this.getModel().getValue("taxrate");
if (taxrate != null) {
DynamicObject taxrateInfo = (DynamicObject) taxrate;
BigDecimal trate = taxrateInfo.getBigDecimal("taxrate");
BigDecimal pRate = trate.divide(new BigDecimal(100)).add(new BigDecimal(1));
BigDecimal amount = new BigDecimal(0);
BigDecimal ofamount = new BigDecimal(0);
BigDecimal rate = new BigDecimal(0);
DynamicObject dataEntity = this.getModel().getDataEntity(true);
if (name.equals("zcgj_pjnhhshte")) {
Object zcgjPjnhbhshte = this.getModel().getValue("zcgj_pjnhhshte");
if (zcgjPjnhbhshte != null) {
ofamount = new BigDecimal(zcgjPjnhbhshte.toString());
}
amount = ofamount.divide(pRate, 6, BigDecimal.ROUND_HALF_UP);
rate = ofamount.subtract(amount);
dataEntity.set("zcgj_pjnhbhshte", amount);
dataEntity.set("zcgj_pjnhse", rate);
// this.getModel().setValue("zcgj_pjnhbhshte", amount);
// this.getModel().setValue("zcgj_pjnhse", rate);
this.getView().updateView();
} else if (name.equals("zcgj_pjnhbhshte")) {
// Object zcgjPjnhhshte = this.getModel().getValue("zcgj_pjnhbhshte");
// Object zcgjPjnhhshte = changeData.getNewValue();
// if (zcgjPjnhhshte != null) {
// amount = new BigDecimal(zcgjPjnhhshte.toString());
// Object taxrate = this.getModel().getValue("taxrate");//税率
// BigDecimal avgtaxrate = (BigDecimal) this.getModel().getValue("avgtaxrate");//综合税率
// boolean ismultirate = (boolean) this.getModel().getValue("ismultirate");//多税率
// BigDecimal pRate = new BigDecimal(0);
// if (ismultirate) {
// pRate = avgtaxrate;
// } else {
// if (taxrate != null) {
// DynamicObject taxrateInfo = (DynamicObject) taxrate;
// BigDecimal trate = taxrateInfo.getBigDecimal("taxrate");
// pRate = trate.divide(new BigDecimal(100)).add(new BigDecimal(1));
// }
// ofamount = amount.multiply(pRate);
// }
// BigDecimal amount = new BigDecimal(0);
// BigDecimal ofamount = new BigDecimal(0);
// BigDecimal rate = new BigDecimal(0);
// DynamicObject dataEntity = this.getModel().getDataEntity(true);
// if (name.equals("zcgj_pjnhhshte")) {
// Object zcgjPjnhbhshte = this.getModel().getValue("zcgj_pjnhhshte");
// if (zcgjPjnhbhshte != null) {
// ofamount = new BigDecimal(zcgjPjnhbhshte.toString());
// }
// amount = ofamount.divide(pRate, 6, BigDecimal.ROUND_HALF_UP);
// rate = ofamount.subtract(amount);
//// this.getModel().setValue("zcgj_pjnhhshte", ofamount);
//// this.getModel().setValue("zcgj_pjnhse", rate);
// dataEntity.set("zcgj_pjnhbhshte", amount);
// dataEntity.set("zcgj_pjnhhshte", ofamount);
// dataEntity.set("zcgj_pjnhse", rate);
//// this.getModel().setValue("zcgj_pjnhbhshte", amount);
//// this.getModel().setValue("zcgj_pjnhse", rate);
// this.getView().updateView();
}else if (name.equals("zcgj_yjhshtsr")) {
Object zcgjyjhshtsr = this.getModel().getValue("zcgj_yjhshtsr");
if (zcgjyjhshtsr != null) {
ofamount = new BigDecimal(zcgjyjhshtsr.toString());
}
amount = ofamount.divide(pRate, 6, BigDecimal.ROUND_HALF_UP);
rate = ofamount.subtract(amount);
// this.getModel().setValue("zcgj_yjbhshtsr", amount);
// this.getModel().setValue("zcgj_yjzse", rate);
dataEntity.set("zcgj_yjbhshtsr", amount);
dataEntity.set("zcgj_yjzse", rate);
this.getView().updateView();
} else if (name.equals("zcgj_yjbhshtsr")) {
Object zcgjyjbhshtsr = this.getModel().getValue("zcgj_yjbhshtsr");
if (zcgjyjbhshtsr != null) {
amount = new BigDecimal(zcgjyjbhshtsr.toString());
}
ofamount = amount.multiply(pRate);
rate = ofamount.subtract(amount);
// this.getModel().setValue("zcgj_yjhshtsr", ofamount);
// this.getModel().setValue("zcgj_yjzse", rate);
dataEntity.set("zcgj_yjhshtsr", ofamount);
dataEntity.set("zcgj_yjzse", rate);
this.getView().updateView();
}else if (name.equals("zcgj_hshtdj")) {
Object zcgjhshtdj = this.getModel().getValue("zcgj_hshtdj");
if (zcgjhshtdj != null) {
ofamount = new BigDecimal(zcgjhshtdj.toString());
}
amount = ofamount.divide(pRate,6, BigDecimal.ROUND_HALF_UP);
dataEntity.set("zcgj_bhshtdj", amount);
// this.getModel().setValue("zcgj_bhshtdj", ofamount);
this.getView().updateView();
}else if (name.equals("zcgj_bhshtdj")) {
Object zcgjbhshtdj = this.getModel().getValue("zcgj_bhshtdj");
if (zcgjbhshtdj != null) {
amount = new BigDecimal(zcgjbhshtdj.toString());
}
ofamount = amount.multiply(pRate);
dataEntity.set("zcgj_hshtdj", ofamount);
// this.getModel().setValue("zcgj_hshtdj", ofamount);
this.getView().updateView();
} else if (name.equals("zcgj_bnyjhshte")) {
Object zcgjbnyjbhshte = this.getModel().getValue("zcgj_bnyjhshte");
if (zcgjbnyjbhshte != null) {
ofamount = new BigDecimal(zcgjbnyjbhshte.toString());
}
amount = ofamount.divide(pRate, 6, BigDecimal.ROUND_HALF_UP);
rate = ofamount.subtract(amount);
dataEntity.set("zcgj_bnyjbhshte", amount);
dataEntity.set("zcgj_bnyjse", rate);
this.getView().updateView();
} else if (name.equals("zcgj_bnyjbhshte")) {
// Object zcgjbnyjhshte = this.getModel().getValue("zcgj_bnyjbhshte");
// if (zcgjbnyjhshte != null) {
// amount = new BigDecimal(zcgjbnyjhshte.toString());
// } else if (name.equals("zcgj_pjnhbhshte")) {
//// Object zcgjPjnhhshte = this.getModel().getValue("zcgj_pjnhbhshte");
//// Object zcgjPjnhhshte = changeData.getNewValue();
//// if (zcgjPjnhhshte != null) {
//// amount = new BigDecimal(zcgjPjnhhshte.toString());
//// }
//// ofamount = amount.multiply(pRate);
//// rate = ofamount.subtract(amount);
////// this.getModel().setValue("zcgj_pjnhhshte", ofamount);
////// this.getModel().setValue("zcgj_pjnhse", rate);
//// dataEntity.set("zcgj_pjnhbhshte", amount);
//// dataEntity.set("zcgj_pjnhhshte", ofamount);
//// dataEntity.set("zcgj_pjnhse", rate);
//// this.getView().updateView();
// } else if (name.equals("zcgj_yjhshtsr")) {
// Object zcgjyjhshtsr = this.getModel().getValue("zcgj_yjhshtsr");
// if (zcgjyjhshtsr != null) {
// ofamount = new BigDecimal(zcgjyjhshtsr.toString());
// }
// amount = ofamount.divide(pRate, 6, BigDecimal.ROUND_HALF_UP);
// rate = ofamount.subtract(amount);
//// this.getModel().setValue("zcgj_yjbhshtsr", amount);
//// this.getModel().setValue("zcgj_yjzse", rate);
// dataEntity.set("zcgj_yjbhshtsr", amount);
// dataEntity.set("zcgj_yjzse", rate);
// this.getView().updateView();
// } else if (name.equals("zcgj_yjbhshtsr")) {
// Object zcgjyjbhshtsr = this.getModel().getValue("zcgj_yjbhshtsr");
// if (zcgjyjbhshtsr != null) {
// amount = new BigDecimal(zcgjyjbhshtsr.toString());
// }
// ofamount = amount.multiply(pRate);
// rate = ofamount.subtract(amount);
// dataEntity.set("zcgj_bnyjhshte", ofamount);
//// this.getModel().setValue("zcgj_yjhshtsr", ofamount);
//// this.getModel().setValue("zcgj_yjzse", rate);
// dataEntity.set("zcgj_yjhshtsr", ofamount);
// dataEntity.set("zcgj_yjzse", rate);
// this.getView().updateView();
// } else if (name.equals("zcgj_hshtdj")) {
// Object zcgjhshtdj = this.getModel().getValue("zcgj_hshtdj");
// if (zcgjhshtdj != null) {
// ofamount = new BigDecimal(zcgjhshtdj.toString());
// }
// amount = ofamount.divide(pRate, 6, BigDecimal.ROUND_HALF_UP);
// dataEntity.set("zcgj_bhshtdj", amount);
//// this.getModel().setValue("zcgj_bhshtdj", ofamount);
// this.getView().updateView();
// } else if (name.equals("zcgj_bhshtdj")) {
// Object zcgjbhshtdj = this.getModel().getValue("zcgj_bhshtdj");
// if (zcgjbhshtdj != null) {
// amount = new BigDecimal(zcgjbhshtdj.toString());
// }
// ofamount = amount.multiply(pRate);
// dataEntity.set("zcgj_hshtdj", ofamount);
//// this.getModel().setValue("zcgj_hshtdj", ofamount);
// this.getView().updateView();
// } else if (name.equals("zcgj_bnyjhshte")) {
// Object zcgjbnyjbhshte = this.getModel().getValue("zcgj_bnyjhshte");
// if (zcgjbnyjbhshte != null) {
// ofamount = new BigDecimal(zcgjbnyjbhshte.toString());
// }
// amount = ofamount.divide(pRate, 6, BigDecimal.ROUND_HALF_UP);
// rate = ofamount.subtract(amount);
// dataEntity.set("zcgj_bnyjbhshte", amount);
// dataEntity.set("zcgj_bnyjse", rate);
// this.getView().updateView();
}
// } else if (name.equals("zcgj_bnyjbhshte")) {
//// Object zcgjbnyjhshte = this.getModel().getValue("zcgj_bnyjbhshte");
//// if (zcgjbnyjhshte != null) {
//// amount = new BigDecimal(zcgjbnyjhshte.toString());
//// }
//// ofamount = amount.multiply(pRate);
//// rate = ofamount.subtract(amount);
//// dataEntity.set("zcgj_bnyjhshte", ofamount);
//// dataEntity.set("zcgj_bnyjse", rate);
//// this.getView().updateView();
// }
}
}
}