From 9debd57fc94b380ec7f24722c7506119b0779937 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期五, 24 十月 2025 09:49:59 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/BaseSet/Gy_CustomerController.cs |   78 +++++++++++++++++++++++++++++----------
 1 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index 4b4d523..5ddbc7e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -1218,7 +1218,7 @@
         #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 = "";
@@ -1275,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)
@@ -1295,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;
                     }
@@ -1318,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);

--
Gitblit v1.9.1