diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java index 72164cf..7cf1ead 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java @@ -1,7 +1,6 @@ package zcgj.zcdev.zcdev.pr.task; import kd.bos.algo.DataSet; -import kd.bos.algo.Row; import kd.bos.coderule.api.CodeRuleInfo; import kd.bos.coderule.service.cache.CodeRuleCache; import kd.bos.context.RequestContext; @@ -20,7 +19,6 @@ import kd.bos.servicehelper.QueryServiceHelper; import kd.bos.servicehelper.coderule.CodeRuleServiceHelper; import kd.bos.servicehelper.operation.OperationServiceHelper; import kd.bos.servicehelper.operation.SaveServiceHelper; -import zcgj.zcdev.zcdev.pr.plugin.form.AdjustAmountOftaxBillPlugin; import java.math.BigDecimal; import java.text.SimpleDateFormat; @@ -159,7 +157,7 @@ public class EquipmentCardTaskPlugin extends AbstractTask { // DynamicObjectCollection depresplitdetails = QueryServiceHelper.query("fa_depresplitdetail", "billno,period,splitdept,assentry.costcentrer,assentry.splitamount", new QFilter[]{qf}); // DynamicObject[] depresplitdetails = BusinessDataServiceHelper.load("fa_depresplitdetail", "billno,period,splitdept,assentry.costcentrer,assentry.splitamount", new QFilter[]{qf}); - DataSet rows = QueryServiceHelper.queryDataSet(this.getClass().getName(), "fa_depresplitdetail", "billno,period,splitdept,assentry.costcentrer,assentry.splitamount", qFilter.toArray(), "period.number DESC", 1); + DataSet rows = QueryServiceHelper.queryDataSet(this.getClass().getName(), "fa_depresplitdetail", "billno,period,splitdept,assentry,assentry.costcentrer,assentry.splitamount", qFilter.toArray(), "period.number DESC", 1); DynamicObjectCollection depresplitdetails = ORM.create().toPlainDynamicObjectCollection(rows.copy()); // // 增强版比较器(自动适配多种日期格式) // for (int i = 0; i < depresplitdetails.size(); i++) { @@ -209,10 +207,13 @@ public class EquipmentCardTaskPlugin extends AbstractTask { // }); for (DynamicObject depresplitdetail : depresplitdetails) { String billno = depresplitdetail.getString("billno"); - DynamicObject period = depresplitdetail.getDynamicObject("period");//折旧区间 - DynamicObject splitdept = depresplitdetail.getDynamicObject("splitdept");//使用部门 + Long periodid = depresplitdetail.getLong("period");//折旧区间 + DynamicObject period = BusinessDataServiceHelper.loadSingle("bd_period", new QFilter[]{new QFilter("id", QCP.equals, periodid)}); + Long splitdeptid = depresplitdetail.getLong("splitdept");//使用部门 + DynamicObject splitdept = BusinessDataServiceHelper.loadSingle("bos_adminorg", new QFilter[]{new QFilter("id", QCP.equals, splitdeptid)}); DynamicObjectCollection assentry = depresplitdetail.getDynamicObjectCollection("assentry"); - DynamicObject costcentrer = assentry.get(0).getDynamicObject("costcentrer");//成本中心 + Long costcentrerid = assentry.get(0).getLong("costcentrer");//成本中心 + DynamicObject costcentrer = BusinessDataServiceHelper.loadSingle("bos_costcenter", new QFilter[]{new QFilter("id", QCP.equals, costcentrerid)}); BigDecimal splitamount = assentry.get(0).getBigDecimal("splitamount");//分摊金额 DynamicObject addNew = entrys.addNew(); addNew.set("zcgj_debillno", billno);