From c0111407b29aed0229f0a5a695a9ebb2896c9e65 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 24 十月 2025 13:38:18 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/BaseSet/Gy_CustomerController.cs |  458 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 422 insertions(+), 36 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index f507d8a..5ddbc7e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -8,6 +8,13 @@
 using System.Data.SqlClient;
 using System.Web.Http;
 using WebAPI.Models;
+using System.Text.RegularExpressions;
+using SyntacticSugar.constant;
+using System.Web;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+//using WebAPI.WebBLL.JCJM.GYZL;
+//using WebAPI.WebBLL.JCJM.IMPL;
+using System.IO;
 namespace WebAPI.Controllers
 {
     public class Gy_CustomerController : ApiController
@@ -18,9 +25,10 @@
 
         private json objJsonResult = new json();
         SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+        //private Gy_CustomerService customerService = new Gy_CustomerImpl();
         DataSet ds;
 
-
+        #region 杩斿洖瀹㈡埛鍒楄〃
         /// <summary>
         /// 杩斿洖瀹㈡埛鍒楄〃
         ///鍙傛暟锛歴tring sql銆�
@@ -92,6 +100,74 @@
                 return objJsonResult;
             }
         }
+        #endregion
+
+        #region 瀹㈡埛鍒嗛〉鍒楄〃
+        [Route("Gy_Customer/page")]
+        [HttpGet]
+        public json Gy_CustomerPage(string sWhere, string user, int page, int size, string Organization)
+        {
+            DataSet ds;
+            json res = new json();
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //鍒ゆ柇鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second("Crm_CustomerFileList", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                //瀹㈡埛鍒跺畾
+                string sErr = "";
+                if (oSystemParameter.ShowBill(ref sErr))
+                {
+                    if (oSystemParameter.omodel.WMS_CampanyName != "涔斾竴")
+                    { 
+                        sWhere += ("and 缁勭粐鍚嶇О = '" + Organization + "'");
+                    }
+                }
+
+
+                sWhere = sWhere.Replace("'", "''");
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    ds = oCN.RunProcReturn("exec h_p_Gy_CustomerList " + page + "," + size + ",''", "h_p_Gy_CustomerList");
+                }
+                else
+                {
+                    ds = oCN.RunProcReturn("exec h_p_Gy_CustomerList " + page + "," + size + ",'" + sWhere + "'", "h_p_Gy_CustomerList");
+                }
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                res.code = CodeConstant.SUCCEED;
+                res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+                res.Message = "Sucess锛�";
+                res.list = columnNameList;
+                res.data = ds.Tables[0];
+                return res;
+            }
+            catch (Exception e)
+            {
+                res.code = CodeConstant.FAIL;
+                res.count = CountConstant.FAIL;
+                res.Message = "Exception锛�" + e.ToString();
+                res.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
 
         #region 瀹㈡埛瀛愯〃[鍏宠仈鐢ㄦ埛] 鏌ヨ
         /// <summary>
@@ -136,6 +212,7 @@
         }
         #endregion
 
+        #region 瀹㈡埛鍒楄〃淇敼鎸夐挳鏂规硶
         /// <summary>
         /// 瀹㈡埛鍒楄〃淇敼鎸夐挳鏂规硶
         ///鍙傛暟锛歴tring sql銆�
@@ -173,7 +250,47 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
+        #region 瀹㈡埛鍒楄〃淇敼鎸夐挳鏂规硶娣诲姞瀹℃牳浜�
+        /// <summary>
+        /// 瀹㈡埛鍒楄〃淇敼鎸夐挳鏂规硶
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Gy_Customer/xg_extendCheckEmp")]
+        [HttpGet]
+        public object xg_extendCheckEmp(long HInterID)
+        {
+            try
+            {
+                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.HMateOutEmp 棰嗙敤浜�,
+                                            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 瀹㈡埛鍒嗙被, c.HCheckEmp 瀹℃牳浜� 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 = "";
+                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 鑾峰彇褰撳墠鏈�澶х殑瀹㈡埛浠g爜
         [Route("Gy_Customer/getMaxCusNumber")]
@@ -213,6 +330,7 @@
         }
         #endregion
 
+        #region 鑾峰彇鏈�澶ц祫鏂橧D鍙傛暟
         /// <summary>
         /// 鑾峰彇鏈�澶у熀纭�璧勬枡ID
         ///鍙傛暟锛歴tring sql銆�
@@ -241,8 +359,86 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
+        #region 瀹㈡埛鏍规嵁鍒嗙被鑾峰彇鏈�澶у鎴风紪鐮�
+        [Route("Gy_Customer/getMaxNum")]
+        [HttpGet]
+        public object getMaxNum(int HCusTypeID, string user, string Organization)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //缂栬緫鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second("Gy_Customer", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                if (HCusTypeID == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娌℃湁閫夋嫨鍏蜂綋鍒嗙被锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    ds = oCN.RunProcReturn(@"select * from h_v_Gy_CustomerList where 缁勭粐鍚嶇О='" + Organization + "'" + "and HCusTypeID = '" + HCusTypeID + "'" + " order by 瀹㈡埛浠g爜 desc", "h_v_Gy_CustomerList");
+                    if (ds == null || ds.Tables[0].Rows.Count == 0)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "娌℃湁鎵惧埌璇ュ垎绫荤殑瀹㈡埛缂栫爜璇蜂娇鐢ㄦ櫘閫氭柊澧�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    string HNumber = ds.Tables[0].Rows[0]["瀹㈡埛浠g爜"].ToString();
+                    // 浣跨敤姝e垯琛ㄨ揪寮忔壘鍒版暟瀛楅儴鍒�  (?<=\D)鏄竴涓浂瀹芥柇瑷�锛岃〃绀哄墠闈㈢殑瀛楃涓嶆槸鏁板瓧 (\d+)$琛ㄧず鍚庨潰璺熺潃涓�杩炰覆瀛楃涓茬煡閬撴湯灏�
+                    Match match = Regex.Match(HNumber, @"(\d+)$");
+                    if (match.Success)
+                    {
+                        string prefix = HNumber.Substring(0, HNumber.Length - match.Length); // 鎻愬彇鍓嶇紑  
+                        int number = int.Parse(match.Value); // 瑙f瀽鏁板瓧  
+                        // 鏁板瓧+1  
+                        number++;
+                        // 鏍煎紡鍖栨暟瀛楋紝淇濇寔鍘熼暱搴�  
+                        string formattedNumber = number.ToString().PadLeft(match.Length, '0');
+                        // 閲嶆柊缁勫悎瀛楃涓�  
+                        string result = prefix + formattedNumber;
 
+                        objJsonResult.code = "1";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "success";
+                        objJsonResult.data = result;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "姝ゅ垎绫诲鎴风紪鐮佹牸寮忔湁璇�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 瀹㈡埛鍒楄〃鏍戝舰缁撴瀯
         /// <summary>
         /// 瀹㈡埛鍒楄〃鏍戝舰缁撴瀯
         ///鍙傛暟锛歴tring sql銆�
@@ -272,7 +468,9 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
+        #region 鏂板鍗曟嵁
         /// <summary>
         /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
         ///鍙傛暟锛歴tring sql銆�
@@ -428,9 +626,14 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
-
-
+        #region 淇濆瓨瀹㈡埛鍒楄〃
+        /// <summary>
+        /// 淇濆瓨瀹㈡埛鍒楄〃
+        /// </summary>
+        /// <param name="oMain"></param>
+        /// <returns></returns>
         [Route("Gy_Customer/SaveGy_CustomerListApi")]
         [HttpPost]
         public object SaveGy_CustomerListApi([FromBody] JObject oMain)
@@ -463,7 +666,7 @@
                     ",HEmpID,HCreditDate,HCreditRatingDate,HMaxCreditRatingDate" +
                     ",HMonthUseQty,HForecastCreditRating,HCreditLevelID,HCountAccrualRating" +
                     ",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
-                    ",HCusTypeID) " +
+                    ",HCusTypeID,HERPItemID,HUseOrgID,HCreateOrgID) " +
                     " Values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "'," + lsmain[0].HParentID +
                     ", " + lsmain[0].HLevel + ",0,'" + lsmain[0].HStopFlag + "','" + lsmain[0].HRemark + "'" +
                     ",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
@@ -473,7 +676,7 @@
                     "," + lsmain[0].HEmpID + "," + lsmain[0].HCreditDate + "," + lsmain[0].HCreditRatingDate + "," + lsmain[0].HMaxCreditRatingDate +
                     "," + lsmain[0].HMonthUseQty + "," + lsmain[0].HForecastCreditRating + "," + lsmain[0].HCreditLevelID + "," + lsmain[0].HCountAccrualRating +
                     "," + lsmain[0].HSubsidyAccrualRating + "," + lsmain[0].HCreditRating + "," + lsmain[0].HMaxCreditRating +
-                    ", " + lsmain[0].HCusTypeID + ")");
+                    ", " + lsmain[0].HCusTypeID + "," + lsmain[0].HItemID + ",'" + lsmain[0].HUSEORGID + "','" + lsmain[0].HCREATEORGID + "')");
                 //涓昏〃_瀹㈡埛
                 oCN.RunProc("Insert into Gy_Customer " +
                     " (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
@@ -485,7 +688,7 @@
                     ",HEmpID,HCreditDate,HCreditRatingDate,HMaxCreditRatingDate" +
                     ",HMonthUseQty,HForecastCreditRating,HCreditLevelID,HCountAccrualRating" +
                     ",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
-                    ",HCusTypeID,HERPItemID) " +
+                    ",HCusTypeID,HERPItemID,HUseOrgID,HCreateOrgID) " +
                     " Values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "'," + lsmain[0].HParentID +
                     ", " + lsmain[0].HLevel + ",0,'" + lsmain[0].HStopFlag + "','" + lsmain[0].HRemark + "'" +
                     ",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
@@ -495,7 +698,7 @@
                     "," + lsmain[0].HEmpID + "," + lsmain[0].HCreditDate + "," + lsmain[0].HCreditRatingDate + "," + lsmain[0].HMaxCreditRatingDate +
                     "," + lsmain[0].HMonthUseQty + "," + lsmain[0].HForecastCreditRating + "," + lsmain[0].HCreditLevelID + "," + lsmain[0].HCountAccrualRating +
                     "," + lsmain[0].HSubsidyAccrualRating + "," + lsmain[0].HCreditRating + "," + lsmain[0].HMaxCreditRating +
-                    ", " + lsmain[0].HCusTypeID + "," + lsmain[0].HItemID + ")");
+                    ", " + lsmain[0].HCusTypeID + "," + lsmain[0].HItemID + ",'" + lsmain[0].HUSEORGID + "','" + lsmain[0].HCREATEORGID + "')");
                 sql = "set identity_insert gy_Customer off";
                 oCN.RunProc(sql);
                 //瀹㈡埛_浜よ揣鍦扮偣
@@ -554,9 +757,9 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
-
-
+        #region 淇敼鍗曟嵁-淇濆瓨鎸夐挳
         /// <summary>
         /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
         ///鍙傛暟锛歴tring sql銆�
@@ -727,9 +930,9 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
-
-
+        # region 瀹㈡埛鍒楄〃鍒犻櫎鎸夐挳
         /// <summary>
         /// 瀹㈡埛鍒楄〃鍒犻櫎鎸夐挳
         ///鍙傛暟锛歴tring sql銆�
@@ -820,7 +1023,7 @@
                 return objJsonResult;
             }
         }
-
+        #endregion
 
         #region 瀹㈡埛瀹℃牳銆佸弽瀹℃牳
         /// <summary>
@@ -1012,11 +1215,10 @@
         }
         #endregion
 
-
         #region [鍚屾鍩虹璧勬枡]
         [Route("Gy_Customer/Gy_CustomerViewApi")]
         [HttpGet]
-        public json Gy_CustomerViewApi(string Number, string Type)
+        public json Gy_CustomerViewApi(string Number, string Type, string HUseOrgID)
         {
             string sql = string.Empty;
             string sReturn = "";
@@ -1073,15 +1275,26 @@
                 else
                 {
                     #region [鍏湁浜戞ā寮忥紝璋冪敤WEBAPI鐨勬柟寮忚繘琛屾洿鏂癩
+                    // 浣跨敤鏌ヨ鐨刉EBAPI 鏃犳硶婊¤冻鎸夌収 浣跨敤缁勭粐鏇存柊鏁版嵁鐨勮姹傦紝鏀逛负浣跨敤鍗曟嵁鏌ヨ
                     var json = new
+                    // {
+                    //     CreateOrgId = HUseOrgID,
+                    //     Number = Number,
+                    //     Id = ""
+                    // };
                     {
-                        CreateOrgId = 0,
-                        Number = Number,
-                        Id = ""
+                        FormId = "BD_Customer",
+                        FieldKeys = "FMASTERID,FNUMBER,FNAME,FFORBIDDERID,FCREATEDATE,FCREATEORGID,FUSEORGID",
+                        FilterString = $@"FNumber='{Number}' AND FUseOrgID={HUseOrgID}",
+                        OrderString = "",
+                        TopRowCount = 0,
+                        StartRow = 0,
+                        Limit = 0
                     };
-                    #region [閲戣澏閮ㄥ垎]
-                    //鐧诲綍閲戣澏
-                    var loginRet = InvokeHelper.Login();
+
+                #region [閲戣澏閮ㄥ垎]
+                //鐧诲綍閲戣澏
+                var loginRet = InvokeHelper.Login();
                     var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                     //鍒ゆ柇鏄惁鐧诲綍鎴愬姛
                     if (isSuccess < 0)
@@ -1093,14 +1306,23 @@
                         return objJsonResult;
                     }
                     //鏌ョ湅 鑾峰彇鏁版嵁                    
-                    var _result = InvokeHelper.View("BD_Customer", JsonConvert.SerializeObject(json));
-                    var _saveObj = JObject.Parse(_result);
+                    // var _result = InvokeHelper.View("BD_Customer", JsonConvert.SerializeObject(json));
+                    var _result = InvokeHelper.Query("BD_Customer", JsonConvert.SerializeObject(json));
+                    var _saveObj = JArray.Parse(_result);
                     //鍒ゆ柇鏁版嵁鏄惁鑾峰彇鎴愬姛
-                    if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+                    // if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+                    // {
+                    //     objJsonResult.code = "0";
+                    //     objJsonResult.count = 0;
+                    //     objJsonResult.Message = "閲戣澏瀹㈡埛鍚屾澶辫触jsonRoot锛�" + _result;
+                    //     objJsonResult.data = null;
+                    //     return objJsonResult;
+                    // }
+                    if (_saveObj.Count == 0)
                     {
                         objJsonResult.code = "0";
                         objJsonResult.count = 0;
-                        objJsonResult.Message = "閲戣澏瀹㈡埛鍚屾澶辫触jsonRoot锛�" + _result;
+                        objJsonResult.Message = "閲戣澏瀹㈡埛鍚屾澶辫触锛屼娇鐢ㄧ粍缁囧搴旂殑瀹㈡埛浠g爜涓嶅瓨鍦�";
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
@@ -1116,23 +1338,41 @@
 
                     #region [琛ㄦ暟鎹祴鍊糫
                     var jsonData = new
+                    // {
+                    //     HItemID = _saveObj["Result"]["Result"]["Id"],
+                    //     HERPItemID = _saveObj["Result"]["Result"]["Id"],
+                    //     HNumber = _saveObj["Result"]["Result"]["Number"],
+                    //     HName         = _saveObj["Result"]["Result"]["Name"][0]["Value"],
+                    //     HShortNumber  = _saveObj["Result"]["Result"]["Number"],
+                    //     HParentID     = 0,
+                    //     HLevel        = 1,
+                    //     HEndFlag      = 1,
+                    //     HStopflag     = _saveObj["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1,
+                    //     HRemark       = "CLD-ERP瀵煎叆",
+                    //     HUseFlag      = "宸蹭娇鐢�",
+                    //     HMakeTime     = _saveObj["Result"]["Result"]["CreateDate"],
+                    //     HCREATEORGID  = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
+                    //     HUSEORGID = _saveObj["Result"]["Result"]["UseOrgId_Id"],
+                    // };
                     {
-                        HItemID = _saveObj["Result"]["Result"]["Id"],
-                        HERPItemID = _saveObj["Result"]["Result"]["Id"],
-                        HNumber = _saveObj["Result"]["Result"]["Number"],
-                        HName         = _saveObj["Result"]["Result"]["Name"][0]["Value"],
-                        HShortNumber  = _saveObj["Result"]["Result"]["Number"],
+                        HItemID = _saveObj[0][0],
+                        HERPItemID = _saveObj[0][0],
+                        HNumber = _saveObj[0][1],
+                        HName         = _saveObj[0][2],
+                        HShortNumber  = _saveObj[0][1],
                         HParentID     = 0,
                         HLevel        = 1,
                         HEndFlag      = 1,
-                        HStopflag     = _saveObj["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1,
+                        HStopflag     = _saveObj[0][3].ToString() == "A" ? 0 : 1,
                         HRemark       = "CLD-ERP瀵煎叆",
                         HUseFlag      = "宸蹭娇鐢�",
-                        HMakeTime     = _saveObj["Result"]["Result"]["CreateDate"],
-                        HCREATEORGID  = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
-                        HUSEORGID = _saveObj["Result"]["Result"]["UseOrgId_Id"],
+                        HMakeTime     = _saveObj[0][4],
+                        HCREATEORGID  = _saveObj[0][5],
+                        HUSEORGID = _saveObj[0][6],
                     };
                     #endregion
+
+                    LogService.Write("jsonData: " + jsonData);
                     // 鍒犻櫎涓昏〃瀵瑰簲鏁版嵁
                     sql = $"delete from Gy_Customer where HItemID = " + jsonData.HItemID + " and HNumber = '" + Number + "'";
                     oCN.RunProc(sql);
@@ -1175,7 +1415,7 @@
         }
         #endregion
 
-         #region 瀹㈡埛鍒嗙被 鏍戝舰鍥�(鏍规嵁浠g爜灞曞紑鏍戠姸鍥�)
+        #region 瀹㈡埛鍒嗙被 鏍戝舰鍥�(鏍规嵁浠g爜灞曞紑鏍戠姸鍥�)
 
         [Route("Gy_BadReason/Gy_CusrTypeTreeList")]
         [HttpGet]
@@ -1223,6 +1463,56 @@
         }
         #endregion
 
+
+        // #region 瀹㈡埛鍒嗙被灞炴�х粨鏋� 鏍规嵁缁勭粐鍒嗙被
+        [Route("Gy_BadReason/Gy_CusTypeTreeListByOrganization")]
+        [HttpGet]
+        public object Gy_CusTypeTreeListByOrganization()
+        {   
+            try
+            {
+                string sql1 = string.Format("select hitemid,hnumber,hname,hparentid from Xt_ORGANIZATIONS where hstopflag != 1 order by hnumber");
+
+                ds = oCN.RunProcReturn(sql1, "Xt_ORGANIZATIONS");
+
+                List <TreeModel> treeModels = new List<TreeModel>();
+                TreeModel first = new TreeModel();
+                first.title = "浣跨敤缁勭粐";
+                first.id = "0";
+                treeModels.Add(first);
+
+                foreach (DataRow row in ds.Tables[0].Rows)
+                {
+                    int HParentID = (int)row["hparentid"];
+                    int HItemID = (int)row["hitemid"];
+                    //if(HParentID == 0 || HItemID == HParentID) // 鐖惰妭鐐逛负0鎴栬�呰嚜寮曠敤鐨勮缃负涓�绾у嚑鐐�
+                    //{
+                        TreeModel tree = new TreeModel();
+                        tree.id = row["hitemid"].ToString();
+                        tree.title = row["hname"].ToString();
+                        treeModels[0].children.Add(tree);
+                       
+                    //}
+                }
+                //getTreeByHItemID(ds.Tables[0], treeModels);
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels);
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        // #endregion
+
         #region 鏍规嵁鐖秈d鍜岀瓑绾ц幏寰楁爲鐘跺浘閫掑綊
 
         [Route("Gy_BadReason/Gy_CusTypeTreeListByLevel")]
@@ -1231,7 +1521,7 @@
         {
             try
             {
-                string sql1 = string.Format("select hitemid,hnumber,hname,hparentid,hlevel from Gy_CusType order by hnumber");
+                string sql1 = string.Format("select hitemid,hnumber,hname,hparentid,hlevel from Gy_CusType order by hnumber ");
 
                 ds = oCN.RunProcReturn(sql1, "Gy_CusType");
 
@@ -1271,7 +1561,77 @@
         }
         #endregion
 
+        #region 瀹㈡埛鍒楄〃 鏂囦欢涓婁紶
+        //[Route("Gy_Customer/Gy_Process_Excel")]
+        //[HttpPost]
+        //public json Gy_Department_Excel()
+        //{
+        //    json res = new json();
+        //    try
+        //    {
+        //        //鑾峰彇鏂囦欢鍚嶇О
+        //        var file = HttpContext.Current.Request.Files[0];
+        //        //鑾峰彇鏂囦欢鐗╃悊璺緞
+        //        string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+        //        //淇濆瓨鏂囦欢
+        //        file.SaveAs(ExcelPath);
 
+        //        NpoiHelper np = new NpoiHelper();
+        //        DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+        //        //鍒犻櫎鏂囦欢
+        //        File.Delete(ExcelPath);
+        //        DataTable provisional = customerService.UploadExcel(ExcelDs);             
+                
+        //        res.code = CodeConstant.SUCCEED;
+        //        res.count = CountConstant.SUCCEED;
+        //        res.Message = "涓婁紶鎴愬姛";
+        //        res.data = provisional;
+        //        return res;
+        //    }
+        //    catch (Exception e)
+        //    {
+        //        res.code = "0";
+        //        res.count = 0;
+        //        res.Message = "Exception锛�" + e.ToString();
+        //        res.data = null;
+        //        return res;
+        //    }
+        //}
+
+        /// <summary>
+        /// 鍒ゆ柇褰撳墠鑱屽憳鏄惁瀛樺湪
+        /// </summary>
+        /// <param name="HEmpNumber"></param>
+        /// <param name="HEmpName"></param>
+        /// <returns></returns>
+        //private bool JudgeEmp(string HEmpNumber, string HEmpName)
+        //{
+        //    if (!String.IsNullOrEmpty(HEmpNumber) && !String.IsNullOrEmpty(HEmpName))
+        //    {
+        //        DataSet emp = oCN.RunProcReturn("select * from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
+        //        return emp.Tables[0].Rows.Count <= EmptyConstant.EMPTY ? true : false;
+        //    }
+        //    return false;
+        //}
+
+        /// <summary>
+        /// 鍒ゆ柇鍒�
+        /// </summary>
+        /// <param name="provisional"></param>
+        /// <returns></returns>
+        private static string JudgmentColumns(DataTable provisional)
+        {
+            var error = "";
+
+            //鏌ヨ娌℃湁鐨勫垪
+            if (!provisional.Columns.Contains("閮ㄩ棬浠g爜"))
+                error += "娌℃湁鎵惧埌銆愰儴闂ㄤ唬鐮併�戠殑鏍囬,";
+
+            if (!provisional.Columns.Contains("閮ㄩ棬鍚嶇О"))
+                error += "娌℃湁鎵惧埌銆愰儴闂ㄥ悕绉般�戠殑鏍囬,";
+            return error;
+        }
+        #endregion
 
         #region 鐗╂枡鍒嗙被 鏍戝舰鍥�(鏍规嵁浠g爜灞曞紑鏍戠姸鍥�)
 
@@ -1297,7 +1657,6 @@
                     getTreeByLevel(dt, tree[m].children, num + 1);//鍐嶆鐢ㄥ瓙闆嗗幓寰幆锛屾嬁鍑哄瓙闆嗙殑瀛愰泦
                 }
             }
-
         }
         public class TreeModel
         {
@@ -1308,6 +1667,32 @@
 
         #endregion
 
+        public void getTreeByHItemID(DataTable dt, List<TreeModel> tree)
+        {
+            for (int m = 0; m < tree.Count; m++)
+            {
+                tree[m].children = new List<TreeModel>();
+                for (int i = 0; i < dt.Rows.Count; i++)//绗竴娆″惊鐜紝寰楀埌鎵�鏈夋牴鑺傜偣鐨勫瓙闆�
+                {
+                    var HParentID = dt.Rows[i]["hparentid"].ToString();
+                    var HItemID = dt.Rows[i]["hitemid"].ToString();
+                    if (HParentID == tree[m].id && HParentID != HItemID)
+                    {
+                        TreeModel tbjson = new TreeModel();
+                        tbjson.id = dt.Rows[i]["hitemid"].ToString();
+                        tbjson.title = dt.Rows[i]["hname"].ToString();
+                        tree[m].children.Add(tbjson);
+                    }
+                }
+
+                for (int i = 0; i < tree[m].children.Count; i++)
+                {
+                    getTreeByHItemID(dt, tree[m].children);//鍐嶆鐢ㄥ瓙闆嗗幓寰幆锛屾嬁鍑哄瓙闆嗙殑瀛愰泦
+                }
+            }
+        }
+
+        #region 閫掑綊鍑芥暟
         /// <summary>
         /// 閫掑綊鍑芥暟
         /// </summary>
@@ -1337,4 +1722,5 @@
         }
 
     }
+    #endregion
 }
\ No newline at end of file

--
Gitblit v1.9.1