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 | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/NewApiController.cs b/WebAPI/Controllers/NewApiController.cs
index fc3e8d0..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;
@@ -69,6 +67,28 @@
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>
/// 杩涚珯鎺ユ敹鍗�
/// </summary>
/// <param name="oMain"></param>
@@ -79,6 +99,7 @@
{
return YqnQbService.SetStationInBill(oMain);
}
+
/// <summary>
/// 鍑虹珯绔欐帴鏀跺崟
/// </summary>
@@ -86,9 +107,10 @@
/// <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