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:
xuhaihui 2025-08-27 16:51:10 +08:00
parent e1fedec632 d5cdc35a62
commit 79a38fedee
2 changed files with 91 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PublicreimbursebillNoContractPlugin.java
View File

@ -100,13 +100,9 @@ public class PublicreimbursebillNoContractPlugin extends AbstractBillPlugIn impl
this.getModel().setValue("zcgj_ec_project", project[0]); this.getModel().setValue("zcgj_ec_project", project[0]);
} }
} }
List<ComboItem> comboList = new ArrayList<>();
comboList.add(new ComboItem(new LocaleString("供应商"), "bd_supplier"));
//comboList.add(new ComboItem(new LocaleString("个人"), "er_payeer"));
ComboEdit comboEdit = getView().getControl("payertype");
comboEdit.setComboItems(comboList);
} }
} }
} }
@Override @Override
@ -156,27 +152,39 @@ public class PublicreimbursebillNoContractPlugin extends AbstractBillPlugIn impl
}else if(name.equals("zcgj_ecpaytype")){ }else if(name.equals("zcgj_ecpaytype")){
ChangeData changeData = e.getChangeSet()[0]; ChangeData changeData = e.getChangeSet()[0];
String ecpaytype = (String)changeData.getNewValue(); String ecpaytype = (String)changeData.getNewValue();
DynamicObjectCollection accountentry = this.getModel().getDataEntity().getDynamicObjectCollection("accountentry");
accountentry.clear();
DynamicObject dynamicObject = accountentry.addNew();
List<ComboItem> comboList = new ArrayList<>(); List<ComboItem> comboList = new ArrayList<>();
if("DG".equals(ecpaytype)){ if("DG".equals(ecpaytype)){
comboList.add(new ComboItem(new LocaleString("供应商"), "bd_supplier")); comboList.add(new ComboItem(new LocaleString("供应商"), "bd_supplier"));
dynamicObject.set("payertype","bd_supplier");
}else if("DS".equals(ecpaytype)){ }else if("DS".equals(ecpaytype)){
comboList.add(new ComboItem(new LocaleString("个人"), "er_payeer")); comboList.add(new ComboItem(new LocaleString("个人"), "er_payeer"));
dynamicObject.set("payertype","er_payeer");
} }
ComboEdit comboEdit = getView().getControl("payertype"); ComboEdit comboEdit = getView().getControl("payertype");
comboEdit.setComboItems(comboList); comboEdit.setComboItems(comboList);
DynamicObjectCollection accountentry = this.getModel().getDataEntity().getDynamicObjectCollection("accountentry");
if(accountentry!=null){
String type= "";
if("DG".equals(ecpaytype)){
type = "bd_supplier";
}else if("DS".equals(ecpaytype)){
type = "er_payeer";
}
for (DynamicObject dynamicObject : accountentry) {
dynamicObject.set("payertype",type);
}
}
this.getView().updateView("accountentry"); this.getView().updateView("accountentry");
} }
} }
} }
protected DynamicObject getCurrency() {
QFilter numberFilter = new QFilter("number", "=", "CNY");
return BusinessDataServiceHelper.loadSingle("bd_currency", "", new QFilter[]{numberFilter});
}
@Override @Override
public void registerListener(EventObject e) { public void registerListener(EventObject e) {
super.registerListener(e); super.registerListener(e);
@ -188,6 +196,9 @@ public class PublicreimbursebillNoContractPlugin extends AbstractBillPlugIn impl
RefBillEdit zcgj_maintenanceack = this.getView().getControl("zcgj_maintenanceack");//设备维修确认单 RefBillEdit zcgj_maintenanceack = this.getView().getControl("zcgj_maintenanceack");//设备维修确认单
zcgj_maintenanceack.addBeforeF7SelectListener(this); zcgj_maintenanceack.addBeforeF7SelectListener(this);
BasedataEdit project = this.getView().getControl("zcgj_ec_project");//设备维修确认单
project.addBeforeF7SelectListener(this);
this.addItemClickListeners("receiveentrytoolbar");//收款信息 增行 this.addItemClickListeners("receiveentrytoolbar");//收款信息 增行
} }
@ -195,63 +206,77 @@ public class PublicreimbursebillNoContractPlugin extends AbstractBillPlugIn impl
@Override @Override
public void beforeF7Select(BeforeF7SelectEvent beforeF7SelectEvent) { public void beforeF7Select(BeforeF7SelectEvent beforeF7SelectEvent) {
ListShowParameter formShowParameter = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter(); boolean isec=(boolean)this.getModel().getValue("zcgj_isec");
IDataEntityProperty property = beforeF7SelectEvent.getProperty();//过滤字段信息 if(isec){
String propertyName = property.getName();//过滤字段标识 ListShowParameter formShowParameter = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter();
IDataEntityProperty property = beforeF7SelectEvent.getProperty();//过滤字段信息
String propertyName = property.getName();//过滤字段标识
if("zcgj_materialinbill".equals(propertyName)){ //费用承担公司过滤 if("zcgj_materialinbill".equals(propertyName)){ //费用承担公司过滤
DynamicObject billpayerid = (DynamicObject)this.getModel().getValue("billpayerid"); DynamicObject billpayerid = (DynamicObject)this.getModel().getValue("billpayerid");
DynamicObject costcompany = (DynamicObject)this.getModel().getValue("costcompany"); DynamicObject costcompany = (DynamicObject)this.getModel().getValue("costcompany");
List<QFilter> qFilter = new ArrayList<>(); List<QFilter> qFilter = new ArrayList<>();
if(billpayerid!=null ){ if(billpayerid!=null ){
Long payerid = billpayerid.getLong("id"); Long payerid = billpayerid.getLong("id");
qFilter.add(new QFilter("supplier", QCP.equals, payerid)); qFilter.add(new QFilter("supplier", QCP.equals, payerid));
} }
if(costcompany!=null){ if(costcompany!=null){
Long companyId = costcompany.getLong("id"); Long companyId = costcompany.getLong("id");
qFilter.add(new QFilter("fiaccountorg", QCP.equals, companyId)); qFilter.add(new QFilter("fiaccountorg", QCP.equals, companyId));
} }
qFilter.add(new QFilter("billstatus", QCP.equals, "C")); qFilter.add(new QFilter("billstatus", QCP.equals, "C"));
formShowParameter.getListFilterParameter().setQFilters(qFilter); formShowParameter.getListFilterParameter().setQFilters(qFilter);
}else if("zcgj_maintenanceack".equals(propertyName)){ }else if("zcgj_maintenanceack".equals(propertyName)){
DynamicObject billpayerid = (DynamicObject)this.getModel().getValue("billpayerid"); DynamicObject billpayerid = (DynamicObject)this.getModel().getValue("billpayerid");
DynamicObject costcompany = (DynamicObject)this.getModel().getValue("costcompany"); DynamicObject costcompany = (DynamicObject)this.getModel().getValue("costcompany");
List<QFilter> qFilter = new ArrayList<>(); List<QFilter> qFilter = new ArrayList<>();
if(billpayerid!=null){ if(billpayerid!=null){
Long payerid = billpayerid.getLong("id"); Long payerid = billpayerid.getLong("id");
qFilter.add(new QFilter("entryentity.zcgj_supplier", QCP.equals, payerid)); qFilter.add(new QFilter("entryentity.zcgj_supplier", QCP.equals, payerid));
} }
if(costcompany!=null){ if(costcompany!=null){
Long companyId = costcompany.getLong("id"); Long companyId = costcompany.getLong("id");
qFilter.add(new QFilter("zcgj_accountorg", QCP.equals, companyId)); qFilter.add(new QFilter("zcgj_accountorg", QCP.equals, companyId));
} }
qFilter.add(new QFilter("zcgj_maintype", QCP.equals, "10")); qFilter.add(new QFilter("zcgj_maintype", QCP.equals, "10"));
qFilter.add(new QFilter("billstatus", QCP.equals, "C")); qFilter.add(new QFilter("billstatus", QCP.equals, "C"));
formShowParameter.getListFilterParameter().setQFilters(qFilter); formShowParameter.getListFilterParameter().setQFilters(qFilter);
}else if("zcgj_ec_project".equals(propertyName)){
DynamicObject costcompany = (DynamicObject)this.getModel().getValue("costcompany");
List<QFilter> qFilter = new ArrayList<>();
if(costcompany!=null){
Long companyId = costcompany.getLong("id");
qFilter.add(new QFilter("fiaccountorg", QCP.equals, companyId));
}
formShowParameter.getListFilterParameter().setQFilters(qFilter);
}
} }
} }
@Override @Override
public void itemClick(ItemClickEvent evt) { public void itemClick(ItemClickEvent evt) {
super.itemClick(evt); super.itemClick(evt);
//付款计划增行 boolean isec=(boolean)this.getModel().getValue("zcgj_isec");
if (evt.getItemKey().equals("addaccount1")) { if(isec){
String zcgjEcpaytype = (String) this.getModel().getValue("zcgj_ecpaytype"); //付款计划增行
String payertype = ""; if (evt.getItemKey().equals("addaccount1")) {
if("DG".equals(zcgjEcpaytype)){ String zcgjEcpaytype = (String) this.getModel().getValue("zcgj_ecpaytype");
payertype = "bd_supplier"; String payertype = "";
}else if("DS".equals(zcgjEcpaytype)){ if("DG".equals(zcgjEcpaytype)){
payertype = "er_payeer"; payertype = "bd_supplier";
} }else if("DS".equals(zcgjEcpaytype)){
//收款人类型设置默认值 payertype = "er_payeer";
DynamicObjectCollection dynamicObjectCollection = this.getModel().getDataEntity(true).getDynamicObjectCollection("accountentry"); }
if(!dynamicObjectCollection.isEmpty()){ //收款人类型设置默认值
DynamicObject dynamicObject = dynamicObjectCollection.get(dynamicObjectCollection.size() - 1); DynamicObjectCollection dynamicObjectCollection = this.getModel().getDataEntity(true).getDynamicObjectCollection("accountentry");
dynamicObject.set("payertype",payertype); if(!dynamicObjectCollection.isEmpty()){
this.getView().updateView("accountentry"); DynamicObject dynamicObject = dynamicObjectCollection.get(dynamicObjectCollection.size() - 1);
dynamicObject.set("payertype",payertype);
this.getView().updateView("accountentry");
}
} }
} }
} }

11
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyPlugin.java
View File

@ -67,6 +67,7 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin
initData(org); initData(org);
} }
} }
this.getView().setEnable(false, 6, "zcgj_cashamt","zcgj_bankamt","zcgj_businessamt","zcgj_supplyamt","zcgj_otheramt","zcgj_totalamt");
} }
/** /**
@ -82,7 +83,7 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin
DynamicObject[] load = BusinessDataServiceHelper.load("zcgj_ec_fundingplanapply", DynamicObject[] load = BusinessDataServiceHelper.load("zcgj_ec_fundingplanapply",
"zcgj_period," + "zcgj_period," +
"zcgj_infundproject_entry.zcgj_in_fundproject,zcgj_infundproject_entry.zcgj_in_custom,zcgj_infundproject_entry.zcgj_iinitialreceivable " + "zcgj_infundproject_entry.zcgj_in_fundproject,zcgj_infundproject_entry.zcgj_in_custom,zcgj_infundproject_entry.zcgj_iinitialreceivable " +
",zcgj_infundproject_entry.zcgj_expectedmonetarycap,zcgj_infundproject_entry.zcgj_expectedmonetaryfund,zcgj_infundproject_entry.zcgj_otheramount,zcgj_infundproject_entry.zcgj_expectedreceivableba,zcgj_infundproject_entry.zcgj_plannedoutputvalue "+ ",zcgj_infundproject_entry.zcgj_expectedmonetarycap,zcgj_infundproject_entry.zcgj_expectedmonetaryfund,zcgj_infundproject_entry.zcgj_otheramount,zcgj_infundproject_entry.zcgj_expectedreceivableba,zcgj_infundproject_entry.zcgj_plannedoutputvalue,zcgj_infundproject_entry.zcgj_expectedtotalcollect "+
",zcgj_outfundproject_entry.zcgj_out_fundproject,zcgj_outfundproject_entry.zcgj_out_supplier,zcgj_outfundproject_entry.zcgj_openingpayable" + ",zcgj_outfundproject_entry.zcgj_out_fundproject,zcgj_outfundproject_entry.zcgj_out_supplier,zcgj_outfundproject_entry.zcgj_openingpayable" +
",createtime", ",createtime",
searchFilterList.toArray(new QFilter[]{}), "createtime desc"); searchFilterList.toArray(new QFilter[]{}), "createtime desc");
@ -98,6 +99,7 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin
BigDecimal lastotheramtall = BigDecimal.ZERO; BigDecimal lastotheramtall = BigDecimal.ZERO;
BigDecimal lastplanarbalanceall = BigDecimal.ZERO; BigDecimal lastplanarbalanceall = BigDecimal.ZERO;
BigDecimal lastplanvalall = BigDecimal.ZERO; BigDecimal lastplanvalall = BigDecimal.ZERO;
BigDecimal lastplanrec = BigDecimal.ZERO;
for (DynamicObject dynamicObject : indataentry) { for (DynamicObject dynamicObject : indataentry) {
DynamicObject newData = inentry.addNew(); DynamicObject newData = inentry.addNew();
newData.set("zcgj_in_fundproject",dynamicObject.get("zcgj_in_fundproject")); newData.set("zcgj_in_fundproject",dynamicObject.get("zcgj_in_fundproject"));
@ -117,6 +119,7 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin
lastotheramtall = lastotheramtall.add(dynamicObject.getBigDecimal("zcgj_otheramount")); lastotheramtall = lastotheramtall.add(dynamicObject.getBigDecimal("zcgj_otheramount"));
lastplanarbalanceall = lastplanarbalanceall.add(dynamicObject.getBigDecimal("zcgj_expectedreceivableba")); lastplanarbalanceall = lastplanarbalanceall.add(dynamicObject.getBigDecimal("zcgj_expectedreceivableba"));
lastplanvalall = lastplanvalall.add(dynamicObject.getBigDecimal("zcgj_plannedoutputvalue")); lastplanvalall = lastplanvalall.add(dynamicObject.getBigDecimal("zcgj_plannedoutputvalue"));
lastplanrec = lastplanrec.add(dynamicObject.getBigDecimal("zcgj_expectedtotalcollect"));
} }
this.getView().updateView("zcgj_infundproject_entry"); this.getView().updateView("zcgj_infundproject_entry");
@ -145,6 +148,8 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin
//本月预计收款（其他） zcgj_otheramount 其中：上月预计收其他 zcgj_lastotheramt //本月预计收款（其他） zcgj_otheramount 其中：上月预计收其他 zcgj_lastotheramt
//本月预计应收余额 zcgj_expectedreceivableba 上月预计应收余额 zcgj_lastplanarbalance //本月预计应收余额 zcgj_expectedreceivableba 上月预计应收余额 zcgj_lastplanarbalance
//本月计划产值 zcgj_plannedoutputvalue 上月计划产值 zcgj_lastplanval //本月计划产值 zcgj_plannedoutputvalue 上月计划产值 zcgj_lastplanval
//本月预计收款（合计） zcgj_expectedtotalcollect 上月预计收款 zcgj_lastplanrec
DynamicObjectCollection infundlastentry = this.getModel().getDataEntity().getDynamicObjectCollection("zcgj_infundlastentry"); DynamicObjectCollection infundlastentry = this.getModel().getDataEntity().getDynamicObjectCollection("zcgj_infundlastentry");
DynamicObject infundlastentryObject = infundlastentry.addNew(); DynamicObject infundlastentryObject = infundlastentry.addNew();
@ -153,6 +158,7 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin
infundlastentryObject.set("zcgj_lastotheramt",lastotheramtall); infundlastentryObject.set("zcgj_lastotheramt",lastotheramtall);
infundlastentryObject.set("zcgj_lastplanarbalance",lastplanarbalanceall); infundlastentryObject.set("zcgj_lastplanarbalance",lastplanarbalanceall);
infundlastentryObject.set("zcgj_lastplanval",lastplanvalall); infundlastentryObject.set("zcgj_lastplanval",lastplanvalall);
infundlastentryObject.set("zcgj_lastplanrec",lastplanrec);
this.getView().updateView("zcgj_infundlastentry"); this.getView().updateView("zcgj_infundlastentry");
} }
@ -224,7 +230,8 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin
.add(fundplyentry.get(6).getBigDecimal("zcgj_supplyamt")) .add(fundplyentry.get(6).getBigDecimal("zcgj_supplyamt"))
.add(fundplyentry.get(6).getBigDecimal("zcgj_otheramt")); .add(fundplyentry.get(6).getBigDecimal("zcgj_otheramt"));
fundplyentry.get(6).set("zcgj_totalamt",allAmt); fundplyentry.get(6).set("zcgj_totalamt",allAmt);
//锁定
this.getView().setEnable(false, 6, "zcgj_cashamt","zcgj_bankamt","zcgj_businessamt","zcgj_supplyamt","zcgj_otheramt","zcgj_totalamt");
this.getView().updateView("zcgj_fundplyentry",rowIndex); this.getView().updateView("zcgj_fundplyentry",rowIndex);
this.getView().updateView("zcgj_fundplyentry",6); this.getView().updateView("zcgj_fundplyentry",6);