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

Compare commits

base: zhangzhiguo:e139625fb4228b06b8112d54d2e68ae4f35204a6
Branches Tags
zhangzhiguo:main
zhangzhiguo:dev
..
compare: zhangzhiguo:5f5b6ad36e0ea65d9b529b8bfed08f65a5959073
Branches Tags
zhangzhiguo:dev
zhangzhiguo:main

No commits in common. "e139625fb4228b06b8112d54d2e68ae4f35204a6" and "5f5b6ad36e0ea65d9b529b8bfed08f65a5959073" have entirely different histories.
e139625fb4 ... 5f5b6ad36e

5 changed files with 3 additions and 93 deletions
Show Stats Expand all files Collapse all files

5
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractCostSplitBillPluginExt.java
View File

@ -621,14 +621,13 @@ public class ContractCostSplitBillPluginExt extends AbstractEccoBillPlugin imple
DynamicObject period = (DynamicObject) this.getModel().getValue("period");
QFilter projectFilter = new QFilter("project", "=", project.getPkValue());
QFilter periodFilter = new QFilter("enddate", "<=", this.getLastTimeOfDay(period.getDate("enddate")));
QFilter periodFilter2 = new QFilter("period.enddate", "<=", this.getLastTimeOfDay(period.getDate("enddate")));//二开添加
QFilter typeFilter = new QFilter("contattr.basictype", "!=", "02");
QFilter commonFilter = new QFilter("billstatus", "=", BillStatusEnum.AUDIT.getValue());
QFilter payDirectionFilter = new QFilter("paydirection", "=", PayDirectionEnum.OUT.getValue());
QFilter isInCostFilter = new QFilter("contract.isincost", "=", true);
QFilter splitCompletedFilter = new QFilter("isincost", "=", "0");
Map<String, QFilter> onWayFilter = this.getOnWayFilter();
DynamicObject[] settleBills = BusinessDataServiceHelper.load("ec_out_contract_settle", "id", new QFilter[]{projectFilter, periodFilter, periodFilter2, commonFilter, payDirectionFilter, typeFilter, isInCostFilter, splitCompletedFilter, (QFilter) onWayFilter.get(SplitBillTypeEnum.SETTLE.getValue())});
DynamicObject[] settleBills = BusinessDataServiceHelper.load("ec_out_contract_settle", "id", new QFilter[]{projectFilter, periodFilter, commonFilter, payDirectionFilter, typeFilter, isInCostFilter, splitCompletedFilter, (QFilter) onWayFilter.get(SplitBillTypeEnum.SETTLE.getValue())});
Set<Long> splitMeasureIds = new HashSet(16);
DynamicObjectCollection entries = this.getModel().getEntryEntity("entryentity");
DynamicObjectType entryDT = entries.getDynamicObjectType();
@ -793,7 +792,7 @@ public class ContractCostSplitBillPluginExt extends AbstractEccoBillPlugin imple
HashMap<Long, BigDecimal> measureSplitedAmountMap = this.getHistorySplitAmount(true);
QFilter splitMeasureFilter = new QFilter(OutContractMeasureConstant.ID_ENTITY_PK, "not in", splitMeasureIds);
QFilter[] measureFilters = new QFilter[]{projectFilter, periodFilter,periodFilter2, commonFilter, payDirectionFilter, typeFilter, isInCostFilter, splitMeasureFilter, splitCompletedFilter, (QFilter) onWayFilter.get(SplitBillTypeEnum.MEASURE.getValue())};
QFilter[] measureFilters = new QFilter[]{projectFilter, periodFilter, commonFilter, payDirectionFilter, typeFilter, isInCostFilter, splitMeasureFilter, splitCompletedFilter, (QFilter) onWayFilter.get(SplitBillTypeEnum.MEASURE.getValue())};
DynamicObject[] measureBills = BusinessDataServiceHelper.load("ec_outcontractmeasure", "id", measureFilters);
List<DynamicObject> noSettleMeasureBills = new ArrayList();
Map<String, String> enterpriseCbsMap = this.getEnterpriseCbsMap();

40
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcCoContractCostFormPlugin.java
View File

@ -1,40 +0,0 @@
package zcgj.zcdev.zcdev.pr.plugin.form;
import kd.bos.bill.AbstractBillPlugIn;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.utils.StringUtils;
import kd.bos.form.field.BasedataEdit;
import kd.bos.form.field.events.BeforeF7SelectEvent;
import kd.bos.form.field.events.BeforeF7SelectListener;
import kd.bos.list.ListShowParameter;
import kd.bos.orm.query.QCP;
import kd.bos.orm.query.QFilter;
import java.util.ArrayList;
import java.util.EventObject;
import java.util.List;
/**
* 合同成本核算表单插件
*/
public class EcCoContractCostFormPlugin extends AbstractBillPlugIn implements BeforeF7SelectListener {
@Override
public void registerListener(EventObject e) {
super.registerListener(e);
BasedataEdit project = (BasedataEdit) this.getControl("project");//工程项目
project.addBeforeF7SelectListener(this);
}
public void beforeF7Select(BeforeF7SelectEvent arg0) {
ListShowParameter parameter = (ListShowParameter) arg0.getFormShowParameter();
String name = arg0.getProperty().getName();
if (StringUtils.equals(name, "project")) {
//工程项目
List<QFilter> qFilter = new ArrayList<>();
DynamicObject org = (DynamicObject) this.getModel().getValue("org");//所属组织
qFilter.add(new QFilter("projectorg", QCP.equals, org.getPkValue()));
parameter.getListFilterParameter().setQFilters(qFilter);
}
}
}

40
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcCoMainMatCostFormPlugin.java
View File

@ -1,40 +0,0 @@
package zcgj.zcdev.zcdev.pr.plugin.form;
import kd.bos.bill.AbstractBillPlugIn;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.utils.StringUtils;
import kd.bos.form.field.BasedataEdit;
import kd.bos.form.field.events.BeforeF7SelectEvent;
import kd.bos.form.field.events.BeforeF7SelectListener;
import kd.bos.list.ListShowParameter;
import kd.bos.orm.query.QCP;
import kd.bos.orm.query.QFilter;
import java.util.ArrayList;
import java.util.EventObject;
import java.util.List;
/**
* 材料成本核算表单插件
*/
public class EcCoMainMatCostFormPlugin extends AbstractBillPlugIn implements BeforeF7SelectListener {
@Override
public void registerListener(EventObject e) {
super.registerListener(e);
BasedataEdit project = (BasedataEdit) this.getControl("project");//工程项目
project.addBeforeF7SelectListener(this);
}
public void beforeF7Select(BeforeF7SelectEvent arg0) {
ListShowParameter parameter = (ListShowParameter) arg0.getFormShowParameter();
String name = arg0.getProperty().getName();
if (StringUtils.equals(name, "project")) {
//工程项目
List<QFilter> qFilter = new ArrayList<>();
DynamicObject org = (DynamicObject) this.getModel().getValue("org");//所属组织
qFilter.add(new QFilter("projectorg", QCP.equals, org.getPkValue()));
parameter.getListFilterParameter().setQFilters(qFilter);
}
}
}

9
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcEqCostSplitBillPlugin.java
View File

@ -26,7 +26,6 @@ import java.util.*;
* 说明 1：过滤成本分解结构字段
* 2：期间初始化赋值
* 3：结算单编码超链接跳转
* 4：设备名称、成本分解结构、工程项目、结算明细过滤逻辑
*/
public class EcEqCostSplitBillPlugin extends AbstractBillPlugIn implements BeforeF7SelectListener, HyperLinkClickListener {
@Override
@ -36,8 +35,6 @@ public class EcEqCostSplitBillPlugin extends AbstractBillPlugIn implements Befor
procbs.addBeforeF7SelectListener(this);
BasedataEdit equipment = (BasedataEdit) this.getControl("equipment");//设备名称
equipment.addBeforeF7SelectListener(this);
BasedataEdit project = (BasedataEdit) this.getControl("project");//工程项目
project.addBeforeF7SelectListener(this);
EntryGrid control = this.getControl("settlesplitentity");//结算明细
control.addHyperClickListener(this);
}
@ -111,12 +108,6 @@ public class EcEqCostSplitBillPlugin extends AbstractBillPlugIn implements Befor
qFilter.add(new QFilter("useorg", QCP.equals, org.getPkValue()));
parameter.getListFilterParameter().setQFilters(qFilter);
} else if (StringUtils.equals(name, "project")) {
//工程项目
List<QFilter> qFilter = new ArrayList<>();
DynamicObject org = (DynamicObject) this.getModel().getValue("org");//所属组织
qFilter.add(new QFilter("projectorg", QCP.equals, org.getPkValue()));
parameter.getListFilterParameter().setQFilters(qFilter);
}
}
}

2
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbFinaceConfirmeInvoicePlugin.java
View File

@ -264,7 +264,7 @@ public class MaterialInbFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i
for (DynamicObject newInvoice : newInvoices) {
DynamicObject buyerOrg = newInvoice.getDynamicObject("buyer");
if (buyerOrg != null && buyerOrg.getLong("id") != orgId) {
// this.getView().showTipNotification(ResManager.loadKDString("导入失败：当前发票购买方不为当前财务记账组织，请确认信息。", "PaymentApplyEditUI_20", "ec-contract-formplugin", new Object[0]));
this.getView().showTipNotification(ResManager.loadKDString("导入失败：当前发票购买方不为当前财务记账组织，请确认信息。", "PaymentApplyEditUI_20", "ec-contract-formplugin", new Object[0]));
//this.getView().showErrorNotification(ResManager.loadKDString("导入失败：当前发票购买方不为当前财务记账组织，请确认信息。", "PaymentApplyEditUI_20", "ec-contract-formplugin", new Object[0]));
return;
}