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

This commit is contained in:
zhangzhiguo 2025-12-30 18:54:31 +08:00
commit 961bbe7fd2
3 changed files with 187 additions and 17 deletions

View File

@ -14,6 +14,8 @@ import kd.bos.form.FormShowParameter;
import kd.bos.form.IPageCache;
import kd.bos.form.ShowType;
import kd.bos.form.control.EntryGrid;
import kd.bos.form.control.events.BeforeItemClickEvent;
import kd.bos.form.control.events.ItemClickEvent;
import kd.bos.form.events.HyperLinkClickEvent;
import kd.bos.form.events.HyperLinkClickListener;
import kd.bos.form.field.RefBillEdit;
@ -24,6 +26,7 @@ import kd.bos.orm.query.QCP;
import kd.bos.orm.query.QFilter;
import kd.bos.permission.api.HasPermOrgResult;
import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.bos.servicehelper.QueryServiceHelper;
import kd.bos.servicehelper.permission.PermissionServiceHelper;
import kd.ec.contract.common.enums.DirectionEnum;
import kd.sdk.plugin.Plugin;
@ -151,8 +154,48 @@ public class InContractFinaceConfirmePlugin extends AbstractBillPlugIn implement
}else if(StringUtils.equals(name, "zcgj_ec_in_contract_sett")){
DynamicObject newValue = (DynamicObject)changeData.getNewValue();
initData(newValue.getLong("id"));
} else if (StringUtils.equals(name, "zcgj_bolttype")) {
//冲销类型
Object newValue = changeData.getNewValue();//新值
DynamicObjectCollection zcgj_expensereversal = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_expensereversal");//冲销支出结算分录
DynamicObjectCollection zcgj_performrec = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_performrec");//冲销履约记录分录
if (newValue == null || newValue.equals("30")) {
zcgj_expensereversal.clear();
zcgj_performrec.clear();
} else if (newValue.equals("10")) {
zcgj_expensereversal.clear();
} else if (newValue.equals("20")) {
zcgj_performrec.clear();
}
this.getView().updateView("zcgj_expensereversal");
this.getView().updateView("zcgj_performrec");
} else if (StringUtils.equals(name, "zcgj_contract")) {
//合同名称
DynamicObjectCollection zcgj_expensereversal = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_expensereversal");//冲销支出结算分录
DynamicObjectCollection zcgj_performrec = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_performrec");//冲销履约记录分录
zcgj_expensereversal.clear();
zcgj_performrec.clear();
this.getView().updateView("zcgj_expensereversal");
this.getView().updateView("zcgj_performrec");
}
}
@Override
public void itemClick(ItemClickEvent evt) {
super.itemClick(evt);
}
@Override
public void beforeItemClick(BeforeItemClickEvent evt) {
super.beforeItemClick(evt);
if (StringUtils.equals("zcgj_drawzcht", evt.getItemKey()) || StringUtils.equals("zcgj_drawlyjl", evt.getItemKey())) {
//冲销支出结算和冲销履约记录分录的增行按钮
Object zcgj_contract = this.getModel().getValue("zcgj_contract");//合同名称
if (zcgj_contract == null) {
this.getView().showErrorNotification("请先选择合同名称");
evt.setCancel(true);
}
}
}
protected void ofTaxAmountChanged(ChangeData changeData) {
@ -195,30 +238,54 @@ public class InContractFinaceConfirmePlugin extends AbstractBillPlugIn implement
if(outContractSett != null) {
outContractSett.addBeforeF7SelectListener(this);
}
this.addItemClickListeners("zcgj_entrytoolbar111");
this.addItemClickListeners("zcgj_entrytoolbar1111");
EntryGrid entryGrid = this.getView().getControl("zcgj_performrec");//冲销履约记录
entryGrid.addHyperClickListener(this);
}
@Override
public void hyperLinkClick(HyperLinkClickEvent hyperLinkClickEvent) {
String fieldName = hyperLinkClickEvent.getFieldName();
EntryGrid entryGrid = getView().getControl("zcgj_entryentity");
int[] selectRows = entryGrid.getSelectRows();
if(selectRows != null && selectRows.length == 1){
DynamicObjectCollection dynamicObjectCollection = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_entryentity");
DynamicObject dynamicObject = dynamicObjectCollection.get(selectRows[0]);
DynamicObject zcgjInvoice = dynamicObject.getDynamicObject("zcgj_invoice");
long invoiceId = zcgjInvoice.getLong("id");
if(invoiceId != 0){
//弹出发票详情
BillShowParameter showParameter = new BillShowParameter();
showParameter.setPkId(invoiceId);
showParameter.setFormId("ec_out_invoice");
showParameter.getOpenStyle().setShowType(ShowType.MainNewTabPage); //打开方式
getView().showForm(showParameter);
if (StringUtils.equals(fieldName, "zcgj_invoice")) {
EntryGrid entryGrid = getView().getControl("zcgj_entryentity");
int[] selectRows = entryGrid.getSelectRows();
if (selectRows != null && selectRows.length == 1) {
DynamicObjectCollection dynamicObjectCollection = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_entryentity");
DynamicObject dynamicObject = dynamicObjectCollection.get(selectRows[0]);
DynamicObject zcgjInvoice = dynamicObject.getDynamicObject("zcgj_invoice");
long invoiceId = zcgjInvoice.getLong("id");
if (invoiceId != 0) {
//弹出发票详情
BillShowParameter showParameter = new BillShowParameter();
showParameter.setPkId(invoiceId);
showParameter.setFormId("ec_out_invoice");
showParameter.getOpenStyle().setShowType(ShowType.MainNewTabPage); //打开方式
getView().showForm(showParameter);
}
} else {
this.getView().showTipNotification("请选择一条发票数据。");
}
}else{
this.getView().showTipNotification("请选择一条发票数据。");
} else if (StringUtils.equals(fieldName, "zcgj_reversedamount")) {
//冲销履约记录-已冲销金额
List<Long> dailyLoanBillDataIds = new ArrayList<>();
int rowIndex = hyperLinkClickEvent.getRowIndex();
DynamicObjectCollection perFormRecCollection = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_performrec");//冲销履约记录
DynamicObject perFormRec = perFormRecCollection.get(rowIndex);
long zcgj_performrecid = perFormRec.getLong("zcgj_performrecid");
QFilter filter = new QFilter("zcgj_performrec.zcgj_performrecid", QCP.equals, zcgj_performrecid);
filter.and(new QFilter("billstatus", QCP.equals, "C"));
DynamicObjectCollection zcgj_ec_in_finaceconfirms = QueryServiceHelper.query("zcgj_ec_in_finaceconfirm", "id", new QFilter[]{filter});
for (DynamicObject zcgj_ec_in_finaceconfirm : zcgj_ec_in_finaceconfirms) {
dailyLoanBillDataIds.add((Long) zcgj_ec_in_finaceconfirm.get("id"));
}
ListShowParameter listShowParameter = new ListShowParameter();
listShowParameter.setFormId("bos_list"); //列表界面
listShowParameter.setBillFormId("zcgj_ec_in_finaceconfirm"); //单据的标识
listShowParameter.getOpenStyle().setShowType(ShowType.MainNewTabPage);
dailyLoanBillDataIds.forEach(listShowParameter::addLinkQueryPkId);
this.getView().showForm(listShowParameter);
}
}
@Override

View File

@ -0,0 +1,69 @@
package zcgj.zcdev.zcdev.pr.plugin.operate;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
import kd.bos.entity.plugin.PreparePropertysEventArgs;
import kd.bos.entity.plugin.args.EndOperationTransactionArgs;
import kd.bos.orm.query.QCP;
import kd.bos.orm.query.QFilter;
import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.bos.servicehelper.operation.SaveServiceHelper;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
/**
* 收入财务确认单反写收入合同履约记录已冲销金额
*/
public class FinaceConfirmRevWriteAmtOp extends AbstractOperationServicePlugIn {
public void onPreparePropertys(PreparePropertysEventArgs e) {
e.getFieldKeys().add("zcgj_performrec");//冲销履约记录分录
e.getFieldKeys().add("zcgj_performrec.zcgj_thisreversalamount");//本次冲销金额
e.getFieldKeys().add("zcgj_performrec.zcgj_performrecid");//来源单据id-收入合同履约记录id
e.getFieldKeys().add("zcgj_bolttype");//冲销类型
}
@Override
public void endOperationTransaction(EndOperationTransactionArgs e) {
String operationKey = e.getOperationKey();
DynamicObject[] dataEntities = e.getDataEntities();
switch (operationKey) {
case "audit"://审核
updateInApplyReversaAmt(dataEntities, true);
break;
case "unaudit"://反审核
updateInApplyReversaAmt(dataEntities, false);
break;
}
}
protected void updateInApplyReversaAmt(DynamicObject[] dataEntities, boolean isAudit) {
for (DynamicObject dataEntity : dataEntities) {
String zcgj_bolttype = dataEntity.getString("zcgj_bolttype");//冲销类型
if ("10".equals(zcgj_bolttype)) {
//冲销合同履约记录
DynamicObjectCollection PerFormRecCollection = dataEntity.getDynamicObjectCollection("zcgj_performrec");//冲销履约记录分录
for (DynamicObject perFormRec : PerFormRecCollection) {
BigDecimal zcgj_thisreversalamount = perFormRec.getBigDecimal("zcgj_thisreversalamount");//本次冲销金额
long zcgj_performrecid = perFormRec.getLong("zcgj_performrecid");//来源单据id-收入合同履约记录id
QFilter[] qFilters = new QFilter[]{new QFilter("id", QCP.equals, zcgj_performrecid)};
DynamicObject ec_in_perFormRecords = BusinessDataServiceHelper.loadSingle("ec_in_performrecords", "id,zcgj_taxperformflot", qFilters);//收入合同履约记录
BigDecimal zcgj_taxperformflot = ec_in_perFormRecords.getBigDecimal("zcgj_taxperformflot");//含税履约金额已冲销
if (isAudit) {
zcgj_taxperformflot = zcgj_taxperformflot.add(zcgj_thisreversalamount);
} else {
zcgj_taxperformflot = zcgj_taxperformflot.subtract(zcgj_thisreversalamount);
}
ec_in_perFormRecords.set("zcgj_taxperformflot", zcgj_taxperformflot);//含税履约金额已冲销
SaveServiceHelper.save(new DynamicObject[]{ec_in_perFormRecords});
}
} else if ("20".equals(zcgj_bolttype)) {
//冲销业主支出结算
}
}
}
}

View File

@ -0,0 +1,34 @@
package zcgj.zcdev.zcdev.pr.plugin.other;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.entity.botp.plugin.AbstractConvertPlugIn;
import kd.bos.entity.botp.plugin.args.AfterBuildDrawFilterEventArgs;
import kd.bos.orm.query.QCP;
import kd.bos.orm.query.QFilter;
import java.util.ArrayList;
import java.util.List;
/**
* 收入财务确认上拉收入合同履约记录botp插件
*/
public class FinanceConfirmPerfRecordsPlugin extends AbstractConvertPlugIn {
@Override
public void afterBuildDrawFilter(AfterBuildDrawFilterEventArgs e) {
//选单过滤
super.afterBuildDrawFilter(e);
DynamicObject targetDataEntity = e.getTargetDataEntity();//当前数据包
DynamicObjectCollection perFormRecCollection = targetDataEntity.getDynamicObjectCollection("zcgj_performrec");//冲销履约记录分录
List<Long> ids = new ArrayList<>();
for (DynamicObject perFormRec : perFormRecCollection) {
long zcgj_performrecid = perFormRec.getLong("zcgj_performrecid");
ids.add(zcgj_performrecid);
}
QFilter filter = new QFilter("id", QCP.not_in, ids);
DynamicObject zcgj_contract = targetDataEntity.getDynamicObject("zcgj_contract");//合同名称
long contractId = zcgj_contract.getLong("id");
filter = filter.and(new QFilter("contract", QCP.equals, contractId));
e.setPlugFilter(filter);
}
}