From ae3c361a3f387e9d6963ff4d0a514ebb88ae3e32 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 25 三月 2026 10:39:46 +0800
Subject: [PATCH] 增加获取金蝶基础资料二开方法,工序流转卡派工时候,如果同意机台模具已派工,不允许二次派工

---
 WebAPI/Controllers/BaseSet/Gy_SupplierController.cs |  122 ++++++++++++++++++++++++++++++++--------
 1 files changed, 96 insertions(+), 26 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index decee1e..78a9073 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -1114,14 +1114,23 @@
                 {
                     #region [鍏湁浜戞ā寮忥紝璋冪敤WEBAPI鐨勬柟寮忚繘琛屾洿鏂癩
                     var json = new
+                    // {
+                    //     CreateOrgId = HUseOrgID,
+                    //     Number = Number,
+                    //     Id = ""
+                    // };
                     {
-                        CreateOrgId = HUseOrgID,
-                        Number = Number,
-                        Id = ""
+                        FormId= "BD_Supplier",
+                        FieldKeys= "FMASTERID,FNUMBER,FNAME,FFORBIDERID,FCREATEDATE,FCREATEORGID,FUSEORGID,FPAYCONDITION",
+                        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)
@@ -1132,15 +1141,23 @@
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
-                    //鏌ョ湅 鑾峰彇鏁版嵁                    
-                    var _result = InvokeHelper.View("BD_Supplier", JsonConvert.SerializeObject(json));
-                    var _saveObj = JObject.Parse(_result);
+                    //鏌ョ湅 鑾峰彇鏁版嵁
+                    var _result = InvokeHelper.Query("BD_Supplier", 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 = "閲戣澏渚涘簲鍟嗗悓姝ュけ璐sonRoot锛�" + _result;
+                    //     objJsonResult.data = null;
+                    //     return objJsonResult;
+                    // }
+                    if (_saveObj.Count == 0)
                     {
                         objJsonResult.code = "0";
                         objJsonResult.count = 0;
-                        objJsonResult.Message = "閲戣澏渚涘簲鍟嗗悓姝ュけ璐sonRoot锛�" + _result;
+                        objJsonResult.Message = "閲戣澏瀹㈡埛鍚屾澶辫触锛屼娇鐢ㄧ粍缁囧搴旂殑渚涘簲鍟嗕唬鐮佷笉瀛樺湪";
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
@@ -1156,22 +1173,40 @@
 
                     #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"],
+                    //     HPAYCONDITION = _saveObj["Result"]["Result"]["SupplierFinance"][0]["PayCondition_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"],
-                        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"],
-                        HPAYCONDITION = _saveObj["Result"]["Result"]["SupplierFinance"][0]["PayCondition_Id"]
+                        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[0][3].ToString() == "A" ? 0 : 1,
+                        HRemark = "CLD-ERP瀵煎叆",
+                        HUseFlag = "宸蹭娇鐢�",
+                        HMakeTime = _saveObj[0][4],
+                        HCREATEORGID = _saveObj[0][5],
+                        HUSEORGID = _saveObj[0][6],
+                        HPAYCONDITION = _saveObj[0][7]
                     };
                     #endregion
                     // 鍒犻櫎涓昏〃瀵瑰簲鏁版嵁
@@ -1778,5 +1813,40 @@
         #endregion
         #endregion
 
+
+        [Route("Gy_Supplier/JD_GysupperList")]
+        [HttpGet]
+        public object JD_GysupperList(string sWhere)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+
+                ds = oCN.RunProcReturn(sWhere, "h_v_Gy_SupplierList");
+                //娣诲姞鍒楀悕
+                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鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1