diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/operate/PaybillOperation.java b/main/java/shjh/jhzj7/fi/fi/plugin/operate/PaybillOperation.java index 8b2366d..06eb828 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/operate/PaybillOperation.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/operate/PaybillOperation.java @@ -12,6 +12,7 @@ import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.operation.SaveServiceHelper; +import kd.bos.util.StringUtils; import kd.sdk.plugin.Plugin; import java.time.LocalDate; @@ -128,14 +129,14 @@ public class PaybillOperation extends AbstractOperationServicePlugIn implements QFilter q1 = new QFilter("shjh_biztype", QCP.equals, "fk");//业务类型为付款单 QFilter q2 = new QFilter("shjh_org.number", QCP.equals, FM_CompanyCode);//组织 QFilter q3 = new QFilter("shjh_bizsmalltype.number", QCP.equals, FM_ExpenseItemCode);//业务小类 - DynamicObject[] load = BusinessDataServiceHelper.load("shjh_fksqr", "id", new QFilter[]{q1, q2, q3}); + DynamicObject[] load = BusinessDataServiceHelper.load("shjh_fksqr", "id,shjh_sqr,shjh_sqr.createusercode", new QFilter[]{q1, q2, q3}); if (load.length > 0) { DynamicObject fksqr = load[0]; if (null != fksqr) { DynamicObject dynamicObject = fksqr.getDynamicObject("shjh_sqr"); if (null != dynamicObject) { FM_UserCode = dynamicObject.getString("number");// 员工工号_费控单据申请人映射表_人员 - FM_CreateUserCode = dynamicObject.getString("createusercode");// 创建人工号_费控单据申请人映射表_人员 + FM_CreateUserCode = dynamicObject.getString("number");// 创建人工号_费控单据申请人映射表_人员 } } } @@ -149,7 +150,7 @@ public class PaybillOperation extends AbstractOperationServicePlugIn implements FM_ExpenseTypeCode = bill.getDynamicObject("shjh_bizbig").getString("number");// 业务大类编码(EQ49,EQ44,EQ1101) } // header.put("FM_ExpenseTypeCode", FM_ExpenseTypeCode);// 业务大类编码(EQ49,EQ44,EQ1101) - header.put("FM_ExpenseTypeCode", "EQ44");// 业务大类编码(EQ49,EQ44,EQ1101) + header.put("FM_ExpenseTypeCode", FM_ExpenseTypeCode);// 业务大类编码(EQ49,EQ44,EQ1101) // EQ1101 -- QT0401,QT0402 // EQ44 -- ZZ1001 // EQ49 -- ZZ1301、ZZ1302、ZZ1303、ZZ1304 @@ -195,10 +196,13 @@ public class PaybillOperation extends AbstractOperationServicePlugIn implements if ("bd_supplier".equals(payeetype)) { String payeeformid = bill.getString("payeeformid");//收款人基础资料标识 String payee = bill.getString("payee");//收款人ID - DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle(payee, payeeformid); - if (null != dynamicObject) { - FM_SupplierCode = dynamicObject.getString("number");// 供应商编码_收款人类型为供应商,取收款人编码 + if (StringUtils.isNotEmpty(payeeformid) ) { + DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle(payee, payeeformid); + if (null != dynamicObject) { + FM_SupplierCode = dynamicObject.getString("number");// 供应商编码_收款人类型为供应商,取收款人编码 + } } + } jsonObject.put("FM_SupplierCode", FM_SupplierCode);// 供应商编码_收款人类型为供应商,取收款人编码 @@ -218,8 +222,8 @@ public class PaybillOperation extends AbstractOperationServicePlugIn implements if (null!= bill.getDynamicObject("shjh_bizsmall")) { FM_ExpenseItemCode = bill.getDynamicObject("shjh_bizsmall").getString("number");// 业务小类编码 } -// jsonObject.put("FM_ExpenseItemCode", FM_ExpenseItemCode);// 业务小类编码 - jsonObject.put("FM_ExpenseItemCode", "ZZ1001");// todo:业务小类编码 + jsonObject.put("FM_ExpenseItemCode", FM_ExpenseItemCode);// 业务小类编码 +// jsonObject.put("FM_ExpenseItemCode", "ZZ1001");//业务小类编码 // 税率编码(传J0时,发票类型选INVOICE003),参考附表 @余学良 根据业务类型来默认吧, // 我们到时候会增加一个 代付款(专票)这样的大类,,这个大类传 专票。其他大类 默认 其他发票类型,税率0