|
|
@@ -139,9 +139,6 @@ public class MonthlySettlementBillTask extends AbstractTask {
|
|
|
// Object departtime = resultMap.get("startTime");
|
|
|
// Object number = resultMap.get("tmcSettlementid");
|
|
|
|
|
|
- //调用发票查询接口
|
|
|
- List<Map<String, Object>> resultInvoiceLists = getInvoiceResult(checkingbillno,rebookingTime);
|
|
|
-
|
|
|
DynamicObject dynamicBillObj = BusinessDataServiceHelper.newDynamicObject("er_checkingbill");
|
|
|
//供应商名称
|
|
|
dynamicBillObj.set("server", service);
|
|
|
@@ -236,6 +233,8 @@ public class MonthlySettlementBillTask extends AbstractTask {
|
|
|
dynamicBillObj.set("formid", "er_traincheckingbill");
|
|
|
break;
|
|
|
}
|
|
|
+ //调用发票查询接口
|
|
|
+ List<Map<String, Object>> resultInvoiceLists = getInvoiceResult(checkingbillno,rebookingTime);
|
|
|
//单据体
|
|
|
DynamicObjectCollection entryEntity = dynamicBillObj.getDynamicObjectCollection("invoiceentry");
|
|
|
if (CollectionUtils.isEmpty(resultInvoiceLists)){
|
|
|
@@ -323,7 +322,7 @@ public class MonthlySettlementBillTask extends AbstractTask {
|
|
|
//增值税普通发票
|
|
|
invoice = "2";
|
|
|
break;
|
|
|
- case "vate_invoice ":
|
|
|
+ case "vate_invoice":
|
|
|
//增值税电子普通发票
|
|
|
invoice = "1";
|
|
|
break;
|