From 40f839253f2a9a9a8771064f4fb9a29f4e6be19e Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 31 八月 2021 17:49:01 +0800
Subject: [PATCH] 客户列表+供应商+不良原因最终完善整合

---
 WebAPI/Controllers/BaseSet/Gy_SupplierController.cs |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index e133101..696f98c 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -31,12 +31,12 @@
             {
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList " + sWhere, "h_v_Gy_SupplierList");
+                    ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList " + sWhere + " order by HItemID desc", "h_v_Gy_SupplierList");
                 }
                 else
                 {
                     string sql1 = "select * from h_v_Gy_SupplierList where 1 = 1 ";
-                    string sql = sql1 + sWhere;
+                    string sql = sql1 + sWhere + " order by HItemID desc";
                     ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierList");
                 }
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -109,7 +109,16 @@
         {
             try
             {
-                ds = oCN.RunProcReturn("select * from Gy_Supplier where HItemID=" + HInterID, "Gy_Supplier");
+                string sql = string.Format(@"select  s.HItemID,s.HNumber 缂栫爜,s.HName 鍚嶇О,s.HHelpCode  鍔╄鐮�,s.HShortName 绠�绉�,s.HAddress 鍦板潃,s.HLinkMan 鑱旂郴浜�,s.HLinkPhone 鑱旂郴鐢佃瘽
+                                            ,s.HMobilePhone 鎵嬫満,s.HFax 浼犵湡,s.HPostalCode 閭紪,s.HEmail 鐢靛瓙閭欢,s.HCorMan 娉曚汉浠h〃,s.HBank 寮�鎴烽摱琛�,s.HBankAccount 閾惰璐﹀彿,
+                                           s.HTaxNum 绋庡姟鐧昏鍙�,s.HEnglishName 鑻辨枃鍚嶇О,s.HEngLishAddress 鑻辨枃鍦板潃,s.HCountry 鍥藉,s.HStopflag 绂佺敤鏍囧織
+                                           ,s.HRemark 澶囨敞,s.HAreaID 鍦板尯ID,a.HName 鍦板尯鍚嶇О,s.HTaxRate 澧炲�肩◣鐜�,s.HCurID 榛樿璐у竵ID,r.HName 榛樿璐у竵,
+                                           s.HSSID 缁撶畻鏂瑰紡ID,e.HName 缁撶畻鏂瑰紡 from Gy_Supplier s
+                                           left join Gy_AreaSet a on s.HAreaID=a.HItemID
+                                           left join Gy_Currency r on s.HCurID=r.HItemID 
+                                           left  join Gy_SettleStyle e on s.HSSID=e.HItemID
+                                           where s.HItemID='" + HInterID + "'");
+                ds = oCN.RunProcReturn(sql, "Gy_Supplier");
 
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
@@ -209,7 +218,7 @@
                     ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
                     ",HEnglishAddress,HCurID,HSSID,HAreaID) " +
                 " values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID + "'" +
-                "," + HLevel + ",'0','0','" + HRemark + "'" +
+                "," + HLevel + ",0,'" + HStopflag + "','" + HRemark + "'" +
                 ",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
                 ",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" +
                 ",'" + HTaxNum + "','" + HTaxRate + "','" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" +

--
Gitblit v1.9.1