From d3b2b4ed9036646d58dc1e998e2a30c9383db6ed Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 27 八月 2021 16:52:23 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs |   45 ++++++++++++---------------------------------
 1 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index a82414a..5310ecf 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -20,12 +20,7 @@
         DataSet ds;
         DataSet ds1;
 
-
-        /// <summary>
-        /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
-        ///鍙傛暟锛歴tring sql銆�
-        ///杩斿洖鍊硷細object銆�
-        /// </summary>
+        #region 鏂板鍗曟嵁-淇濆瓨鎸夐挳
         [Route("Cj_StationInBill/AddBill")]
         [HttpPost]
         public object AddBill([FromBody] JObject oMain)
@@ -149,8 +144,6 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-
-
                 //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
                 oCN.BeginTran();
 
@@ -235,10 +228,6 @@
                     return objJsonResult;
                 }
                 
-
-
-                
-
                 ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
                 if (ds == null)
                 {
@@ -306,12 +295,9 @@
             }
             return false;
         }
+        #endregion
 
-        /// <summary>
-        /// 宸ュ簭杩涚珯鎺ユ敹鍗曟祦姘村彿鍥炶溅鑾峰彇宸ュ簭淇℃伅
-        ///鍙傛暟锛歴tring sql銆�
-        ///杩斿洖鍊硷細object銆�
-        /// </summary>
+        #region 宸ュ簭杩涚珯鎺ユ敹鍗曟祦姘村彿鍥炶溅鑾峰彇宸ュ簭淇℃伅
         [Route("Cj_StationInBill/txtHProcNo_KeyDown")]
         [HttpGet]
         public object txtHProcNo_KeyDown(string sBillNo,string sProcNo)
@@ -354,12 +340,9 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
-        /// <summary>
-        /// 杩斿洖濮斿宸ュ簭鎺ユ敹鍗曞垪琛�
-        ///鍙傛暟锛歴tring sql銆�
-        ///杩斿洖鍊硷細object銆�
-        /// </summary>
+        #region 杩斿洖濮斿宸ュ簭鎺ユ敹鍗曞垪琛�
         [Route("Cj_StationInBill/get_Display")]
         [HttpGet]
         public object get_Display(string sWhere)
@@ -368,7 +351,7 @@
             {
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_MES_StationInBillList " + sWhere, "h_v_MES_StationInBillList");
+                    ds = oCN.RunProcReturn("select * from h_v_MES_StationInBillList " + sWhere+ " order by 杩涚珯鏃堕棿 desc", "h_v_MES_StationInBillList");
                 }
                 else
                 {
@@ -402,11 +385,9 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
-
-        /// <summary>
-        /// 缂栬緫鍓嶅垽鏂�
-        /// </summary>
+        #region 缂栬緫鍓嶅垽鏂�
         [Route("Cj_StationInBill/set_ShowBillJudge")]
         [HttpGet]
         public object set_ShowBillJudge(string HBillNo)
@@ -448,12 +429,9 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
-        /// <summary>
-        /// 缂栬緫椤甸潰鏍规嵁id鑾峰彇宸ュ簭杩涚珯鎺ユ敹鍗曚俊鎭�
-        ///鍙傛暟锛歴tring sql銆�
-        ///杩斿洖鍊硷細object銆�
-        /// </summary>
+        #region 缂栬緫椤甸潰鏍规嵁id鑾峰彇宸ュ簭杩涚珯鎺ユ敹鍗曚俊鎭�
         [Route("Cj_StationInBill/GetStationInBill")]
         [HttpGet]
         public object GetStationOutBill(int HInterID)
@@ -487,8 +465,9 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
-        #region [瀹℃牳]
+        #region 瀹℃牳
         [Route("Cj_StationInBill/set_CheckBill")]
         [HttpGet]
         public object set_CheckBill(int HInterID,string CurUserName)

--
Gitblit v1.9.1