From 6bed6363d097e27073657e65fefe5c5a306680be Mon Sep 17 00:00:00 2001
From: ouyangqing <ouyangqing@DESKTOP-B85SG1D>
Date: 星期一, 18 一月 2021 22:37:42 +0800
Subject: [PATCH] 进站单 出战单列表

---
 WebAPI/Service/YqnQbService.cs          |   42 +++++++++++++++++++++
 WebAPI/Web References/WebS/Reference.cs |   10 ++--
 WebAPI/Controllers/NewApiController.cs  |   22 +++++++++++
 3 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/WebAPI/Controllers/NewApiController.cs b/WebAPI/Controllers/NewApiController.cs
index f3a9a3d..d272d15 100644
--- a/WebAPI/Controllers/NewApiController.cs
+++ b/WebAPI/Controllers/NewApiController.cs
@@ -69,6 +69,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>
diff --git a/WebAPI/Service/YqnQbService.cs b/WebAPI/Service/YqnQbService.cs
index 087f849..1d50ed2 100644
--- a/WebAPI/Service/YqnQbService.cs
+++ b/WebAPI/Service/YqnQbService.cs
@@ -91,6 +91,8 @@
         {
             WebS.WebService1 oWebs = new WebS.WebService1();
             string sErrMsg = string.Empty;
+            oMain.HYear = 2021;
+            oMain.HPeriod = 1;
             var result = oWebs.set_SaveStationInBill(oMain, ref  sErrMsg);
             if (!result)
             {
@@ -104,11 +106,51 @@
         public static ApiResult SetStationOutBill(Model.ClsSc_StationOutBillMain omodel)
         {
             WebS.WebService1 oWebs = new WebS.WebService1();
+            omodel.HYear = 2021;
+            omodel.HPeriod = 1;
             string sErrMsg = string.Empty;
             var result = SetOutBill(omodel);
             return result;
         }
+        /// <summary>
+        /// 鑾峰彇杩涚珯鍗曞垪琛�
+        /// </summary>
+        /// <param name="sWhere"></param>
+        /// <returns></returns>
+        public static ApiResult<DataSet> GetStationInBillList(string sWhere)
+        {
+            var dataSet = GetStationInBill(sWhere);
+            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+                return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌鏁版嵁" };
+            return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+        }
+        /// <summary>
+        /// 鑾峰彇鍑虹珯鍗曞垪琛�
+        /// </summary>
+        /// <param name="sWhere"></param>
+        /// <returns></returns>
+        public static ApiResult<DataSet> GetStationOutBillList(string sWhere)
+        {
+            var dataSet = GetStationOutBill(sWhere);
+            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+                return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌鏁版嵁" };
+            return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+        }
         #region sql璇彞
+        public static DataSet GetStationOutBill(string strWhere)
+        {
+            var sql = "Select top 5000 * from h_v_MES_StationOutBillList Where 1=1 " + strWhere;
+            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+            var dataSet = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList");
+            return dataSet;
+        }
+        public static DataSet GetStationInBill(string strWhere)
+        {
+            var sql = "Select top 5000 * from h_v_MES_StationInBillList Where 1=1 " + strWhere;
+            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+            var dataSet= oCN.RunProcReturn(sql, "h_v_MES_StationInBillList");
+            return dataSet;
+        }
         public static DataSet GetBarCodeDb(string billBarCode)
         {
             SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
diff --git a/WebAPI/Web References/WebS/Reference.cs b/WebAPI/Web References/WebS/Reference.cs
index 68a8737..88cfa37 100644
--- a/WebAPI/Web References/WebS/Reference.cs
+++ b/WebAPI/Web References/WebS/Reference.cs
@@ -30059,11 +30059,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    //[System.SerializableAttribute()]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
     public partial class ClsSc_StationInBillMain : ClsXt_BaseBillMain {
         
         private long hPrintQtyField;

--
Gitblit v1.9.1