yxj
2025-10-24 ae36a4639fff74935c27c8e7bb0ce6b39ad039a5
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -46,7 +46,8 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 组织名称='" + Organization + "'");
                //string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 组织名称='" + Organization + "'");
                string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 1=1 ");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by 部门代码", "h_v_IF_DepartmentList");
@@ -813,7 +814,7 @@
        #region [同步基础资料]
        [Route("Gy_Department/Gy_DepartmentViewApi")]
        [HttpGet]
        public json Gy_DepartmentViewApi(string Number, string Type)
        public json Gy_DepartmentViewApi(string Number, string Type,string HUseOrgID)
        {
            string sql = string.Empty;
            string sReturn = "";
@@ -871,14 +872,23 @@
                {
                    #region [公有云模式,调用WEBAPI的方式进行更新]
                    var json = new
                    //{
                    //    CreateOrgId = 0,
                    //    Number = Number,
                    //    Id = ""
                    //};
                    {
                        CreateOrgId = 0,
                        Number = Number,
                        Id = ""
                        FormId = "BD_Department",
                        FieldKeys= "FMASTERID, FNUMBER, FNAME, FFORBIDSTATUS, 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)
@@ -890,14 +900,22 @@
                        return objJsonResult;
                    }
                    //查看 获取数据                    
                    var _result = InvokeHelper.View("BD_Department", JsonConvert.SerializeObject(json));
                    var _saveObj = JObject.Parse(_result);
                    var _result = InvokeHelper.Query("BD_Department", 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 = "金蝶客户同步失败,使用组织对应的部门代码无对应的部门";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -913,21 +931,37 @@
                    #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"],
                        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[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],
                    };
                    #endregion
                    // 删除主表对应数据