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-09-15 10:15:13 +08:00
parent f69b08c215 912eb13cd7
commit bd16e4e284
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,13 +234,14 @@ public class PublicreimbursebillNoContractPlugin extends AbstractBillPlugIn impl
}
qFilter.add(new QFilter("billstatus", QCP.equals, "C"));
formShowParameter.getListFilterParameter().setQFilters(qFilter);
}else if("zcgj_maintenanceack".equals(propertyName)){
}else if("zcgj_maintenanceack".equals(propertyName)){//维修确认单
DynamicObject billpayerid = (DynamicObject)this.getModel().getValue("billpayerid");
DynamicObject costcompany = (DynamicObject)this.getModel().getValue("costcompany");
List<QFilter> qFilter = new ArrayList<>();
if(billpayerid!=null){
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));
qFilter.add(new QFilter("zcgj_partb", QCP.equals, payerid));//供应商
}
if(costcompany!=null){

3
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java
View File

@ -50,7 +50,8 @@ public class OutContractFromPlugin extends AbstractBillPlugIn implements Plugin
} else if (number.equals("ZCHLX02") ||number.equals("wzcg01")) {
//合同类型-物资采购 或物资采购类（已禁用
comboList1.add(new ComboItem(new LocaleString("综合单价"), "gddj"));
comboList1.add(new ComboItem(new LocaleString("总价包干"), "zjbg"));
//comboList1.add(new ComboItem(new LocaleString("总价包干"), "zjbg"));
comboList1.add(new ComboItem(new LocaleString("不定量不定价"), "bdlbdj"));
comboList.add(new ComboItem(new LocaleString("全面合作"), "A"));
comboList.add(new ComboItem(new LocaleString("局部合作"), "B"));
Object pricetype = this.getModel().getValue("zcgj_pricetype");//计价方式