yxj
9 天以前 ae36a4639fff74935c27c8e7bb0ce6b39ad039a5
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -666,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 + "'" +
@@ -676,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" +
@@ -688,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 + "'" +
@@ -698,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);
                //客户_交货地点
@@ -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的方式进行更新]
                    // 使用查询的WEBAPI 无法满足按照 使用组织更新数据的要求,改为使用单据查询
                    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 = "金蝶客户同步失败,使用组织对应的客户代码不存在";
                        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);