diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/form/TextFieldDemo.java b/main/java/shjh/jhzj7/fi/fi/plugin/form/TextFieldDemo.java index bfefbc1..057b51a 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/form/TextFieldDemo.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/form/TextFieldDemo.java @@ -31,7 +31,7 @@ public class TextFieldDemo extends AbstractFormPlugin { //携带收款人编码 String payeeformid = ""+this.getView().getModel().getValue("payeeformid");//收款人基础资料标识 Long payee = Long.valueOf(""+this.getView().getModel().getValue("payee"));//收款人ID - if (payee != 0 && payeeformid!= null &&!payeeformid.isEmpty()) { + if (payee != 0 && payeeformid!= null &&!payeeformid.isEmpty() && !"other".equals(payeeformid)) { DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle(payee, payeeformid); if (null != dynamicObject) { Label label1 = this.getView().getControl("shjh_positionbr4"); diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/operate/PaybillPushSapOperation.java b/main/java/shjh/jhzj7/fi/fi/plugin/operate/PaybillPushSapOperation.java index e6eec14..c696f9c 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/operate/PaybillPushSapOperation.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/operate/PaybillPushSapOperation.java @@ -109,7 +109,9 @@ public class PaybillPushSapOperation extends AbstractOperationServicePlugIn impl QFilter q1 = new QFilter("sourcebill", QCP.equals, bill.getPkValue()); QFilter q2 = new QFilter("billstatus",QCP.equals,"C"); DynamicObject gl_voucher = BusinessDataServiceHelper.loadSingle("gl_voucher", - "id,description,shjh_fjz,sourcebill,entries,entries.account,entries.debitlocal,entries.creditlocal,entries.entrydc,entries.edescription,vouchertype,entries.assgrp", + "id,description,shjh_fjz,sourcebill,entries,entries.account,entries.debitlocal," + + "entries.creditlocal,entries.entrydc,entries.edescription,vouchertype,entries.assgrp," + + "entries.debitori,entries.creditori", new QFilter[]{q1, q2}); if (null == gl_voucher) { OperateErrorInfo operateErrorInfo = new OperateErrorInfo(); @@ -364,9 +366,9 @@ public class PaybillPushSapOperation extends AbstractOperationServicePlugIn impl } // 获取借方金额 - BigDecimal debitlocal = (BigDecimal) entry.get("debitlocal");//借方 + BigDecimal debitlocal = (BigDecimal) entry.get("debitori");//借方 // 获取贷方金额 - BigDecimal creditlocal = (BigDecimal) entry.get("creditlocal");//贷方 + BigDecimal creditlocal = (BigDecimal) entry.get("creditori");//贷方 entrydc = (String) entry.get("entrydc");//分录方向(1.借方,-1.贷方) // 进行空值检查 @@ -589,9 +591,9 @@ public class PaybillPushSapOperation extends AbstractOperationServicePlugIn impl } // 获取借方金额 - BigDecimal debitlocal = (BigDecimal) entry.get("debitlocal");//借方 + BigDecimal debitlocal = (BigDecimal) entry.get("debitori");//借方 // 获取贷方金额 - BigDecimal creditlocal = (BigDecimal) entry.get("creditlocal");//贷方 + BigDecimal creditlocal = (BigDecimal) entry.get("creditori");//贷方 entrydc = (String) entry.get("entrydc");//分录方向(1.借方,-1.贷方) // 进行空值检查 @@ -740,9 +742,9 @@ public class PaybillPushSapOperation extends AbstractOperationServicePlugIn impl } // 获取借方金额 - BigDecimal debitlocal = (BigDecimal) entry.get("debitlocal");//借方 + BigDecimal debitlocal = (BigDecimal) entry.get("debitori");//借方 // 获取贷方金额 - BigDecimal creditlocal = (BigDecimal) entry.get("creditlocal");//贷方 + BigDecimal creditlocal = (BigDecimal) entry.get("creditori");//贷方 entrydc = (String) entry.get("entrydc");//分录方向(1.借方,-1.贷方) // 进行空值检查 diff --git a/main/java/shjh/jhzj7/fi/fi/utils/SapUtils.java b/main/java/shjh/jhzj7/fi/fi/utils/SapUtils.java index 30e93de..c17b2b4 100644 --- a/main/java/shjh/jhzj7/fi/fi/utils/SapUtils.java +++ b/main/java/shjh/jhzj7/fi/fi/utils/SapUtils.java @@ -724,9 +724,9 @@ public class SapUtils { accountNumber = account.getString("number");//科目编号 } // 获取借方金额 - BigDecimal debitlocal = (BigDecimal) entry.get("debitlocal");//借方 + BigDecimal debitlocal = (BigDecimal) entry.get("debitori");//借方 // 获取贷方金额 - BigDecimal creditlocal = (BigDecimal) entry.get("creditlocal");//贷方 + BigDecimal creditlocal = (BigDecimal) entry.get("creditori");//贷方 String entrydc = (String) entry.get("entrydc");//分录方向(1.借方,-1.贷方) //贷方(客户编号+金额,行摘要) if ("-1".equals(entrydc)) {