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_CustomerController.cs |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index 9e8b539..3db4fde 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -31,12 +31,12 @@
             {
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_Gy_CustomerList " + sWhere, "h_v_Gy_CustomerList");
+                    ds = oCN.RunProcReturn("select * from h_v_Gy_CustomerList " + sWhere + " order by HItemID desc", "h_v_Gy_CustomerList");
                 }
                 else
                 {
                     string sql1 = "select * from h_v_Gy_CustomerList where 1 = 1 ";
-                    string sql = sql1 + sWhere;
+                    string sql = sql1 + sWhere + " order by HItemID desc";
                     ds = oCN.RunProcReturn(sql, "h_v_Gy_CustomerList");
                 }
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -77,8 +77,17 @@
         {
             try
             {
-                ds = oCN.RunProcReturn("select * from Gy_Customer where HItemID=" + HInterID, "Gy_Customer");
-
+                string sql = string.Format(@"select  c.HItemID,c.HNumber 瀹㈡埛浠g爜,c.HName 瀹㈡埛鍚嶇О,c.HHelpCode  鍔╄鐮�,c.HShortName 绠�绉�,c.HAddress 鍦板潃,c.HLinkMan 鑱旂郴浜�,c.HLinkPhone 鑱旂郴鐢佃瘽
+                                            ,c.HMobilePhone 鎵嬫満,c.HFax 浼犵湡,c.HPostalCode 閭紪,c.HEmail 鐢靛瓙閭欢,c.HCorMan 娉曚汉浠h〃,c.HBank 寮�鎴烽摱琛�,c.HBankAccount 閾惰璐﹀彿,
+                                            c.HTaxNum 绋庡姟鐧昏鍙�,c.HTaxRate 澧炲�肩◣鐜�,c.HEnglishName 鑻辨枃鍚嶇О,c.HEngLishAddress 鑻辨枃鍦板潃,c.HCountry 鍥藉,c.HCusStatus 瀹㈡埛鐘舵��
+                                            ,c.HStopflag 绂佺敤鏍囧織,c.HRemark 澶囨敞,c.HAreaID 鍦板尯ID,a.HName 鍦板尯鍚嶇О,c.HCurID 榛樿璐у竵ID,r.HName 榛樿璐у竵,
+                                            c.HSSID 缁撶畻鏂瑰紡ID,s.HName 缁撶畻鏂瑰紡,c.HCusTypeID 瀹㈡埛鍒嗙被ID,t.HName 瀹㈡埛鍒嗙被 from Gy_Customer c
+                                            left join Gy_AreaSet a on c.HAreaID=a.HItemID
+                                            left join Gy_Currency r on c.HCurID=r.HItemID 
+                                            left  join Gy_SettleStyle s on c.HSSID=s.HItemID
+                                            left  join Gy_CusType t on c.HCusTypeID=t.HItemID 
+                                            where c.HItemID='" + HInterID + "'");
+                ds = oCN.RunProcReturn(sql, "Gy_Customer");
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
                 objJsonResult.Message = "";
@@ -255,7 +264,7 @@
                     ",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
                     ",HCusTypeID) " +
                     " 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 + "'" +
@@ -381,7 +390,7 @@
                     return objJsonResult;
                 }
 
-              
+
 
                 //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
                 oCN.BeginTran();
@@ -390,8 +399,8 @@
                     " HNumber='" + HNumber + "'" +
                     ",HName='" + HName + "'" +
                     ",HShortNumber='" + HShortNumber + "'" +
-                    ",HLevel ='"+ HLevel + "'" +
-                    ",HEndFlag  ='" + HEndFlag  + "'" +
+                    ",HLevel ='" + HLevel + "'" +
+                    ",HEndFlag  ='" + HEndFlag + "'" +
                     ",HParentID='" + HParentID + "'" +
                     ",HStopflag ='" + HStopflag + "'" +
                     ",HHelpCode ='" + HHelpCode + "'" +

--
Gitblit v1.9.1