From ce634e1c1193b2e36df65d91acf8b969629e8c8b Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 18 十一月 2021 17:55:30 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
index 1bcf03f..990976b 100644
--- a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -63,12 +63,12 @@
         {
             if (sWhere == null || sWhere.Equals(""))
             {
-                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairWorkBillList "+sWhere, "h_v_Sb_EquipRepairWorkBillList");
+                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairWorkBillList "+sWhere+ "order by hmainid desc", "h_v_Sb_EquipRepairWorkBillList");
             }
             else
             {
                 string sql1 = "select * from h_v_Sb_EquipRepairWorkBillList where 1 = 1 ";
-                string sql = sql1 + sWhere;
+                string sql = sql1 + sWhere+ "order by hmainid desc";
                 return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipRepairWorkBillList");
             }
             
@@ -113,12 +113,12 @@
         {
             if (sWhere == null || sWhere.Equals(""))
             {
-                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairCheckBillList" + sWhere, "h_v_Sb_EquipRepairCheckBillList");
+                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairCheckBillList" + sWhere+ "order by hmainid desc", "h_v_Sb_EquipRepairCheckBillList");
             }
             else
             {
                 string sql1 = "select * from h_v_Sb_EquipRepairCheckBillList where 1 = 1 ";
-                string sql = sql1 + sWhere;
+                string sql = sql1 + sWhere+ "order by hmainid desc";
                 return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipRepairCheckBillList");
             }
             
@@ -163,12 +163,12 @@
         {
             if (sWhere == null || sWhere.Equals(""))
             {
-                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipConkBookBillList" + sWhere, "h_v_Sb_EquipConkBookBillList");
+                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipConkBookBillList order by hmainid desc" + sWhere, "h_v_Sb_EquipConkBookBillList");
             }
             else
             {
                 string sql1 = "select * from h_v_Sb_EquipConkBookBillList where 1 = 1 ";
-                string sql = sql1 + sWhere;
+                string sql = sql1 + sWhere+ "order by hmainid desc";
                 return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipConkBookBillList");
             }
         }
@@ -184,9 +184,9 @@
         /// </summary>
         /// <param name="msg"></param>
         /// <returns></returns>
-        [Route("Sb_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList")]
+        [Route("Sb_EqpRepairWorkBill/SaveGetEqpRepairWorkBillWebList")]
         [HttpPost]
-        public object SaveGetMouldRepairWorkBillList([FromBody] JObject msg)
+        public object SaveGetEqpRepairWorkBillWebList([FromBody] JObject msg)
         {
             var _value = msg["msg"].ToString();
             string msg1 = _value.ToString();
@@ -879,7 +879,7 @@
         }
         #endregion
 
-        #region[璁惧缁翠慨楠屾敹鍒楄〃缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
+        #region[璁惧鏁呴殰鐧昏鍒楄〃缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
         [Route("Sb_EqpRepairWorkBill/Sb_EqpConkBookBillListCheckDetai")]
         [HttpGet]
         public ApiResult<DataSet> Sb_EqpConkBookBillListCheckDetai(string HID)
@@ -894,7 +894,7 @@
         }
         #endregion
 
-        #region[璁惧缁翠慨鍒楄〃缂栬緫鏃惰幏鍙栬〃浣撴暟鎹甝
+        #region[璁惧鏁呴殰鐧昏鍒楄〃缂栬緫鏃惰幏鍙栬〃浣撴暟鎹甝
         [Route("Sb_EqpRepairWorkBill/Sb_EqpConkBookBillListProjectDetai")]
         [HttpGet]
         public object Sb_EqpConkBookBillListProjectDetai(string sqlWhere)
@@ -935,9 +935,9 @@
         }
         #endregion
 
-        #region [璁惧缁翠慨鍗曞垹闄ゅ姛鑳絔
+        #region [璁惧鏁呴殰鐧昏鍗曞垹闄ゅ姛鑳絔
         /// <summary>
-        /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+        /// 璁惧鏁呴殰鐧昏鍗曞垹闄ゅ姛鑳�
         /// </summary>
         /// <returns></returns>
         [Route("Sb_EqpRepairWorkBill/DeltetEqpConkBookBill")]

--
Gitblit v1.9.1