|
@@ -692,6 +692,11 @@ public class SRMSynPayApiPlugin implements Serializable {
|
|
|
String serialNo = jsonData.getString("serialNo");//发票流水号
|
|
|
String taxAmount = jsonData.getString("taxAmount");//税额
|
|
|
|
|
|
+ if(StringUtils.isEmpty(serialNo)){
|
|
|
+ returnMessage = "发票分录的第" + (i + 1) + "行的发票流水号不能为空";
|
|
|
+ return buildReturnData(code, srmBillNo, returnMessage, null, null, null);
|
|
|
+ }
|
|
|
+
|
|
|
Long invoiceEntryId = DB.genLongId("er_publicreimbursebill.invoiceentry");
|
|
|
|
|
|
DynamicObject entry = new DynamicObject(type);
|
|
@@ -781,6 +786,15 @@ public class SRMSynPayApiPlugin implements Serializable {
|
|
|
entry.set("poolreimburseamount", CommonHelperUtils.getBigDecimal(invoiceObj.getBigDecimal("totalAmount")));//本次报销金额
|
|
|
entry.set("transportnote", "0");//运输票据
|
|
|
|
|
|
+ entry.set("ismutilreimburse", true);//多次报销
|
|
|
+ QFilter qFilterSerialNo = new QFilter("serialno", QCP.equals, serialNo);
|
|
|
+ DynamicObject billingPool = BusinessDataServiceHelper.loadSingle("er_billingpool", qFilterSerialNo.toArray());
|
|
|
+ if(billingPool != null){
|
|
|
+ entry.set("billingpoolid", billingPool.getLong("id"));//账单id
|
|
|
+ entry.set("oribalanceamount", billingPool.getBigDecimal("oribalanceamount"));//可用余额
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
String invoiceGoodsName = "";
|
|
|
|
|
|
List<String> invoiceGoodsCode = new ArrayList<>();
|