|
|
@@ -204,7 +204,7 @@ public class SettlebillFormPlugin extends AbstractFormPlugin implements Plugin {
|
|
|
this.getModel().getEntryEntity(mainEntry).clear();
|
|
|
this.getModel().getEntryEntity(assistEntry).clear();
|
|
|
|
|
|
- String selectField1 = "id,billno,fiperiod,company.name,expenseentryentity.id,expenseentryentity.expenseamount,expenseentryentity.orgiexpebalanceamount";
|
|
|
+ String selectField1 = "id,billno,fiperiod,company.name,expenseentryentity.id,expenseentryentity.entrywlunit.name,expenseentryentity.expenseamount,expenseentryentity.orgiexpebalanceamount";
|
|
|
QFilter qFilter1 = new QFilter("expenseentryentity.expenseamount", QCP.large_equals, 0); // 启用
|
|
|
|
|
|
DynamicObjectCollection mainDyns = QueryServiceHelper.query(main, selectField1,new QFilter[]{qFilter1},"fiperiod");
|
|
|
@@ -217,6 +217,7 @@ public class SettlebillFormPlugin extends AbstractFormPlugin implements Plugin {
|
|
|
newEntry.set("nckd_fentryid", maintDyn.getLong("expenseentryentity.id"));
|
|
|
newEntry.set("nckd_billtype", "费用预提单");
|
|
|
newEntry.set("nckd_billno", maintDyn.getString("billno"));
|
|
|
+ newEntry.set("nckd_supp", maintDyn.getString("expenseentryentity.entrywlunit.name"));
|
|
|
newEntry.set("nckd_date", maintDyn.getDate("fiperiod"));
|
|
|
newEntry.set("nckd_amount", maintDyn.getBigDecimal("expenseentryentity.expenseamount"));
|
|
|
newEntry.set("nckd_writeamount", maintDyn.getBigDecimal("expenseentryentity.expenseamount"));
|
|
|
@@ -250,7 +251,7 @@ public class SettlebillFormPlugin extends AbstractFormPlugin implements Plugin {
|
|
|
newEntry.set("nckd_billno1", assistDyn.getString("billno"));
|
|
|
newEntry.set("nckd_date1", assistDyn.getDate("bizdate"));
|
|
|
//logger.info("SettlebillFormPlugin: "+assistDyn.getString("billpayerid.name"));
|
|
|
- newEntry.set("nckd_supp", assistDyn.getString("billpayerid.name"));
|
|
|
+ newEntry.set("nckd_supp1", assistDyn.getString("billpayerid.name"));
|
|
|
newEntry.set("nckd_amount1", assistDyn.getBigDecimal("expenseentryentity.expenseamount"));
|
|
|
newEntry.set("nckd_writeoffamount", assistDyn.getBigDecimal("expenseentryentity.expenseamount"));
|
|
|
descEntries1.add(newEntry);
|