yuxueliang0813
/
shjh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- 测试问题优化 

--s
This commit is contained in:
weiyunlong 2025-04-23 17:56:14 +08:00
parent c513180ca5
commit 1223517501
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/java/shjh/jhzj7/fi/fi/plugin/form/ClearBillFormPlugin.java
View File

@ -106,8 +106,8 @@ public class ClearBillFormPlugin extends AbstractBillPlugIn implements Plugin {
//上述两句应该可以跳过权限验证 //上述两句应该可以跳过权限验证
//如下代码设置目标界面打开时的高度和宽度 //如下代码设置目标界面打开时的高度和宽度
StyleCss styleCss = new StyleCss(); StyleCss styleCss = new StyleCss();
styleCss.setWidth("700"); styleCss.setWidth("1400");
styleCss.setHeight("600"); styleCss.setHeight("800");
showParameter.getOpenStyle().setInlineStyleCss(styleCss); showParameter.getOpenStyle().setInlineStyleCss(styleCss);
//设置页面ID //设置页面ID

41
main/java/shjh/jhzj7/fi/fi/plugin/operate/PaybillPushSapOperation.java
View File

@ -107,6 +107,7 @@ public class PaybillPushSapOperation extends AbstractOperationServicePlugIn impl
operateErrorInfo.setErrorLevel(ErrorLevel.Error.name()); operateErrorInfo.setErrorLevel(ErrorLevel.Error.name());
operateErrorInfo.setPkValue(bill.getPkValue()); operateErrorInfo.setPkValue(bill.getPkValue());
this.operationResult.addErrorInfo(operateErrorInfo); this.operationResult.addErrorInfo(operateErrorInfo);
return;
} }
//一次性供应商或客户信息（仅需要填写） //一次性供应商或客户信息（仅需要填写）
String type = bill.getString("payeetype"); String type = bill.getString("payeetype");
@ -158,7 +159,8 @@ public class PaybillPushSapOperation extends AbstractOperationServicePlugIn impl
if (null != acttradedate) { if (null != acttradedate) {
acttradedate1 = format.format(acttradedate); acttradedate1 = format.format(acttradedate);
} }
IS_HEADER.put("BUDAT", acttradedate1);//过账日期_实际交易日期(付款单acttradedate) // IS_HEADER.put("BUDAT", acttradedate1);//todo:过账日期_实际交易日期(付款单acttradedate)
IS_HEADER.put("BUDAT", bizdate1);//过账日期_业务日期(付款单bizdate)
String isoCode = bill.getDynamicObject("currency").getString("number"); String isoCode = bill.getDynamicObject("currency").getString("number");
IS_HEADER.put("WAERS", JhzjUtils.getCurrencyCode(isoCode));//币种_付款币种(付款单currency) IS_HEADER.put("WAERS", JhzjUtils.getCurrencyCode(isoCode));//币种_付款币种(付款单currency)
IS_HEADER.put("XBLNR", bill.getString("billno"));//参考凭证号_单据编号(付款单billno) IS_HEADER.put("XBLNR", bill.getString("billno"));//参考凭证号_单据编号(付款单billno)
@ -213,7 +215,7 @@ public class PaybillPushSapOperation extends AbstractOperationServicePlugIn impl
if (null != gl_voucher) { if (null != gl_voucher) {
DynamicObjectCollection entries = gl_voucher.getDynamicObjectCollection("entries"); DynamicObjectCollection entries = gl_voucher.getDynamicObjectCollection("entries");
if (!entries.isEmpty()) { if (!entries.isEmpty()) {
entries.forEach(entry -> { for (DynamicObject entry : entries) {
JSONObject IT_ITEMS = new JSONObject(); JSONObject IT_ITEMS = new JSONObject();
switch (payeetype) { switch (payeetype) {
case "bd_customer": case "bd_customer":
@ -227,7 +229,14 @@ public class PaybillPushSapOperation extends AbstractOperationServicePlugIn impl
} }
DynamicObject account = entry.getDynamicObject("account");//科目 DynamicObject account = entry.getDynamicObject("account");//科目
if (null != account) { if (null != account) {
//isbank
boolean isbank = account.getBoolean("isbank");
if (!isbank) {
continue;//非银行科目
}
IT_ITEMS.put("HKONT", account.getString("number")); // 总账科目_科目(凭证分录account) IT_ITEMS.put("HKONT", account.getString("number")); // 总账科目_科目(凭证分录account)
}else {
continue;
} }
IT_ITEMS.put("RSTGR", RSTGR);//原因代码_原因码(付款明细shjh_yym)_必填 IT_ITEMS.put("RSTGR", RSTGR);//原因代码_原因码(付款明细shjh_yym)_必填
IT_ITEMS.put("SGTXT", SGTXT);//行项目文本_SAP会计科目行项目号(付款明细shjh_voucherentrynum) IT_ITEMS.put("SGTXT", SGTXT);//行项目文本_SAP会计科目行项目号(付款明细shjh_voucherentrynum)
@ -248,20 +257,28 @@ public class PaybillPushSapOperation extends AbstractOperationServicePlugIn impl
boolean isSourceSystemA = "A".equals(shjhSourcesystem); boolean isSourceSystemA = "A".equals(shjhSourcesystem);
boolean isEntryDC1 = "1".equals(entrydc); boolean isEntryDC1 = "1".equals(entrydc);
boolean isEntryDCNegative1 = "-1".equals(entrydc); boolean isEntryDCNegative1 = "-1".equals(entrydc);
if (isEntryDC1) {
if (isSourceSystemA && isEntryDC1) {
amountToPut = debitlocal; amountToPut = debitlocal;
} else if (!isSourceSystemA) { } else if (isEntryDCNegative1) {
if (isEntryDC1) { amountToPut = creditlocal.negate();//相反
amountToPut = debitlocal;
} else if (isEntryDCNegative1) {
amountToPut = creditlocal.negate();//相反
}
} }
// if (isSourceSystemA && isEntryDC1) {
// amountToPut = debitlocal;
// } else if (!isSourceSystemA) {
//
// }else if (!isSourceSystemA) {
// if (isEntryDC1) {
// amountToPut = debitlocal;
// } else if (isEntryDCNegative1) {
// amountToPut = creditlocal.negate();//相反
// }
IT_ITEMS.put("DMBTR", String.valueOf(amountToPut)); IT_ITEMS.put("DMBTR", String.valueOf(amountToPut));
} }
IT_ITEM.add(IT_ITEMS); IT_ITEM.add(IT_ITEMS);
}); }
// entries.forEach(entry -> {
// });
} }
} }
return IT_ITEM; return IT_ITEM;
@ -300,7 +317,7 @@ public class PaybillPushSapOperation extends AbstractOperationServicePlugIn impl
} }
jsonObject.put("HKONT", HKONT);//总账科目 jsonObject.put("HKONT", HKONT);//总账科目
jsonObject.put("UMSKZ", "");//todo:特殊总账标识 jsonObject.put("UMSKZ", "");//todo:特殊总账标识
jsonObject.put("DMBTR", entry.getBigDecimal("e_actamt"));//未清金额_实付金额 jsonObject.put("DMBTR1", entry.getBigDecimal("e_actamt"));//清账金额_实付金额
IT_CLEAR.add(jsonObject); IT_CLEAR.add(jsonObject);
}); });