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 | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/NewApiController.cs b/WebAPI/Controllers/NewApiController.cs
index 970c4f4..eff6c61 100644
--- a/WebAPI/Controllers/NewApiController.cs
+++ b/WebAPI/Controllers/NewApiController.cs
@@ -67,6 +67,17 @@
return YqnQbService.GetWorkCenterList(sWhere);
}
/// <summary>
+ /// 杩涚珯鎺ユ敹鍗�
+ /// </summary>
+ /// <param name="oMain"></param>
+ /// <returns></returns>
+ [Route("api/newBill/setStationInBill")]
+ [HttpPost]
+ public ApiResult SetStationInBill(ClsSc_StationInBillMain oMain)
+ {
+ return YqnQbService.SetStationInBill(oMain);
+ }
+ /// <summary>
/// 鑾峰彇杩涚珯鍗曞垪琛�
/// </summary>
/// <param name="sWhere"></param>
@@ -89,25 +100,13 @@
return YqnQbService.GetStationOutBillList(sWhere);
}
/// <summary>
- /// 杩涚珯鎺ユ敹鍗�
- /// </summary>
- /// <param name="oMain"></param>
- /// <returns></returns>
- [Route("api/newBill/setStationInBill")]
- [HttpPost]
- public ApiResult SetStationInBill(ClsSc_StationInBillMain oMain)
- {
- return YqnQbService.SetStationInBill(oMain);
- }
-
- /// <summary>
/// 鍑虹珯绔欐帴鏀跺崟
/// </summary>
/// <param name="oMain"></param>
/// <returns></returns>
[Route("api/newBill/setStationOutBill")]
[HttpPost]
- public ApiResult SetStationOutBill(Model.ClsSc_StationOutBillMain oMain)
+ public ApiResult SetStationOutBill(StationOutBillView oMain)
{
return YqnQbService.SetStationOutBill(oMain);
}
--
Gitblit v1.9.1