From 5d262687f828d0548577c20f364725af5d8f9ec4 Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期三, 27 十二月 2023 17:33:21 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/BLL/Xt_UserController.cs | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 54 insertions(+), 1 deletions(-) diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs index 3945919..c312d86 100644 --- a/WebAPI/Controllers/BLL/Xt_UserController.cs +++ b/WebAPI/Controllers/BLL/Xt_UserController.cs @@ -1168,7 +1168,60 @@ objJsonResult.data = null; return objJsonResult; } - ds = oCN.RunProcReturn("select HCusID,瀹㈡埛浠g爜 HCustomerNumber,瀹㈡埛鍚嶇О HCustomerName from h_v_Gy_UserCustomerList where HUserID='" + HUserID + "' ", "h_v_Gy_UserCustomerList"); + ds = oCN.RunProcReturn("select HCusID,瀹㈡埛浠g爜 HCustomerNumber,瀹㈡埛鍚嶇О HCustomerName from h_v_Gy_UserCustomerList where HUserID='" + HUserID + "' order by HCusID", "h_v_Gy_UserCustomerList"); + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲鎴蜂俊鎭紒"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + #region 鏌ヨ鎸囧畾鐢ㄦ埛鎵�鍏宠仈瀹㈡埛涓殑瀹㈡埛 + [Route("Xt_User/CustomerPlaylistFromUserCustomerList")] + [HttpGet] + public object CustomerPlaylistFromUserCustomerList(string HUserID, string HCusNumber, string HCusName, string CurUserName) + { + try + { + //鏌ヨ鏉冮檺 + if (!DBUtility.ClsPub.Security_Log_second("Gy_UserRelationCustomer_Query", 1, false, CurUserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡璇㈡潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + string sql = "select HCusID,瀹㈡埛浠g爜 HCustomerNumber,瀹㈡埛鍚嶇О HCustomerName " + + "from h_v_Gy_UserCustomerList " + + "where HUserID='" + HUserID + "' " + + "and 瀹㈡埛浠g爜 like '%" + HCusNumber + "%' " + + "and 瀹㈡埛鍚嶇О like '%" + HCusName + "%' " + + " order by 瀹㈡埛浠g爜"; + + + ds = oCN.RunProcReturn(sql, "h_v_Gy_UserCustomerList"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; -- Gitblit v1.9.1