From abe6630fe280b96b246170adcd6a2f666c77c520 Mon Sep 17 00:00:00 2001
From: ouyangqing <ouyangqing@DESKTOP-B85SG1D>
Date: 星期四, 21 一月 2021 13:17:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/~ouyangqing/YqnApi
---
WebAPI/Controllers/NewApiController.cs | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/NewApiController.cs b/WebAPI/Controllers/NewApiController.cs
index fc3e8d0..eff6c61 100644
--- a/WebAPI/Controllers/NewApiController.cs
+++ b/WebAPI/Controllers/NewApiController.cs
@@ -2,8 +2,6 @@
using System.Collections.Generic;
using System.Data;
using System.Linq;
-using System.Net;
-using System.Net.Http;
using System.Web.Http;
using WebAPI.Models;
using WebAPI.Service;
@@ -80,15 +78,37 @@
return YqnQbService.SetStationInBill(oMain);
}
/// <summary>
+ /// 鑾峰彇杩涚珯鍗曞垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getStationInBillList")]
+ [HttpGet]
+ public ApiResult<DataSet> GetStationInBillList(string sWhere)
+ {
+ return YqnQbService.GetStationInBillList(sWhere);
+ }
+ /// <summary>
+ /// 鑾峰彇鍑虹珯鍗曞垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getStationOutBillList")]
+ [HttpGet]
+ public ApiResult<DataSet> GetStationOutBillList(string sWhere)
+ {
+ return YqnQbService.GetStationOutBillList(sWhere);
+ }
+ /// <summary>
/// 鍑虹珯绔欐帴鏀跺崟
/// </summary>
/// <param name="oMain"></param>
/// <returns></returns>
[Route("api/newBill/setStationOutBill")]
[HttpPost]
- public ApiResult SetStationOutBill(ClsSc_StationInBillMain oMain)
+ public ApiResult SetStationOutBill(StationOutBillView oMain)
{
- return YqnQbService.SetStationInBill(oMain);
+ return YqnQbService.SetStationOutBill(oMain);
}
}
}
--
Gitblit v1.9.1