From 0d4c1c24ecdcf17d1485274c1a1d64728c072af2 Mon Sep 17 00:00:00 2001 From: zgq <519541279@qq.com> Date: 星期二, 19 一月 2021 23:53:02 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/~ouyangqing/YqnApi --- WebAPI/Controllers/NewApiController.cs | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 deletions(-) diff --git a/WebAPI/Controllers/NewApiController.cs b/WebAPI/Controllers/NewApiController.cs index 3bc5b04..4bf5ce5 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; @@ -62,11 +60,33 @@ /// </summary> /// <param name="sWhere"></param> /// <returns></returns> - [Route("api/newBill/getSourceList")] + [Route("api/newBill/getWorkCenterList")] [HttpGet] public ApiResult<DataSet> GetWorkCenterList(string sWhere) { return YqnQbService.GetWorkCenterList(sWhere); + } + /// <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> /// 杩涚珯鎺ユ敹鍗� @@ -79,5 +99,18 @@ { return YqnQbService.SetStationInBill(oMain); } + + /// <summary> + /// 鍑虹珯绔欐帴鏀跺崟 + /// </summary> + /// <param name="oMain"></param> + /// <returns></returns> + [Route("api/newBill/setStationOutBill")] + [HttpPost] + public ApiResult SetStationOutBill(StationOutBillView oMain) + { + + return YqnQbService.SetStationOutBill(oMain); + } } } -- Gitblit v1.9.1