2123

GZ_KD_Parino/Common/CommonHelper.cs

@@ -650,6 +650,7 @@ namespace GZ_KD_Parino.Common
             String getUserBinding_url = "";
             try
             {
+                //Logger.Error("PMSLogin1", "1234567", null);
                 //写入日志
                 idkey = SQL.SqlManage.SetDockingPLMLog(ctx, "调用PMS接口", FID, "");
 
@@ -664,7 +665,24 @@ namespace GZ_KD_Parino.Common
                 string result = "";
                 try
                 {
+                    //Logger.Error("PMSLogin2", "1234567", null);
                     result = client.UploadString(getUserBinding_url, "");
+
+                    JObject jo = (JObject)JsonConvert.DeserializeObject(result);//获取binding
+                    userBinding = jo["binding"] == null ? "" : jo["binding"].ToString();
+                    //增加验证token的逻辑
+                    string url_str2 = "http://portal.pmac.com.cn/distributor.action?serviceName=";
+                    var getUserBinding_url2 = url_str2 + "isValidWithBinding&binding=" + userBinding;
+                    //Logger.Error("PMSLogin3", "1234567", null);
+                    var result2 = client.UploadString(getUserBinding_url2, "");
+                    //Logger.Error("PMSLogin4", "1234567", null);
+                    Logger.Error("BPM登录", result2, null);
+                    if (!result2.Contains("\"result\":true,"))
+                    {
+                        result = client.UploadString(getUserBinding_url, "");
+                        jo = (JObject)JsonConvert.DeserializeObject(result);//获取binding
+                        userBinding = jo["binding"] == null ? "" : jo["binding"].ToString();
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -676,11 +694,9 @@ namespace GZ_KD_Parino.Common
                 SaveTxt(getUserBinding_url,
                     string.Format(@"D:\Api日志\{2}\创建待分配项目\{0}\{3}\登录\{1}.txt",
                                            Convert.ToString(data[0]["单据编号"]), DateTime.Now.ToString("yyyyMMddHHmmssfff"), ctx.DataCenterName, FType), result);
-                JObject jo = (JObject)JsonConvert.DeserializeObject(result);//获取binding
+                //JObject jo = (JObject)JsonConvert.DeserializeObject(result);//获取binding
-                userBinding = jo["binding"] == null ? "" : jo["binding"].ToString();
+                //userBinding = jo["binding"] == null ? "" : jo["binding"].ToString();
-                //增加验证token的逻辑
+                
-
-
                 //修改日志为成功
                 SQL.SqlManage.UpdateDockingPLMLog(ctx, idkey, "100", "", result, getUserBinding_url, "PMS登录", "接口日志");
             }

GZ_KD_Parino/Sal_Order/AuditF_BOM.cs

@@ -1,6 +1,8 @@
 using GZ_KD_Parino.SQL;
+using Kingdee.BOS;
 using Kingdee.BOS.Core.DynamicForm.PlugIn;
 using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
+using Kingdee.BOS.Log;
 using Kingdee.BOS.Orm.DataEntity;
 using Kingdee.BOS.Util;
 using Newtonsoft.Json;
@@ -23,7 +25,7 @@ namespace GZ_KD_Parino.Sal_Order
                 var Billobj = rows.DataEntity;
                 //获取单据FID
                 var SaleOrgId = Billobj["saleOrgId"] as DynamicObject;
-
+                //Logger.Error("改变商机PMS阶段进来了", "1234567", null);
                 //获取纸质合同号#
                 string F_contractnumber = Convert.ToString(Billobj["F_contractnumber"]); //DocumentStatus
                 string DocumentStatus = Convert.ToString(Billobj["DocumentStatus"]);
@@ -40,7 +42,7 @@ namespace GZ_KD_Parino.Sal_Order
                 //根据销售订单的FID，获取商机字段CRMID
                 var data = SQL.SqlManage.GetF_BOMCRMID(this.Context, Convert.ToString(Billobj["Id"]));
                 string Token = "";
-
+                //Logger.Error("改变商机PMS阶段进来了2", "1234567", null);
                 var key = SqlManage.SetDockingPLMLog(this.Context, "销售订单--审核发送URL改变商机PMS阶段", Convert.ToInt32(Billobj["Id"]), "GZ_KD_Parino.Sal_Order.AuditF_BOM");
                 try
                 {
@@ -54,7 +56,7 @@ namespace GZ_KD_Parino.Sal_Order
                          * jdnew='5-商机赢单' 
                          */
 
-                        if (data[0]["F_CRMID"].ToString() == "")
+                        if (data[0]["F_CRMID"].ToString().Trim() == ""|| data[0]["F_CRMID"]==null|| data[0]["F_CRMID"].ToString() == " ")
                         {
                             throw new Exception("没有ID的商机，不需要对接");
                         }
@@ -72,12 +74,13 @@ namespace GZ_KD_Parino.Sal_Order
                             Resultstring = Common.CommonHelper.UpdateF_BOM(data, this.Context, JsonConvert.SerializeObject(json), "Opportunity", Token, Convert.ToInt32(Billobj["Id"]));
                             SQL.SqlManage.UpdateAuditF_VRYF_CheckBox_apv(this.Context, Convert.ToString(Billobj["Id"]));
                             //修改日志为成功
-                            SqlManage.UpdateDockingPLMLog(this.Context, key, "100", "", Resultstring, Convert.ToString(Billobj["Id"]), "更改PMS商机阶段", "插件日志");
+                          var ok=  SqlManage.UpdateDockingPLMLog(this.Context, key, "100", "", Resultstring, Convert.ToString(Billobj["Id"]), "更改PMS商机阶段", "插件日志");  
                         }
                         else
                         {
                             //修改日志为成功
                             SqlManage.UpdateDockingPLMLog(this.Context, key, "4", "", Token, Convert.ToString(Billobj["Id"]), "更改PMS商机阶段", "插件日志");
+                          
                         }
                     }
                     else
@@ -89,8 +92,10 @@ namespace GZ_KD_Parino.Sal_Order
                 }
                 catch (Exception ex)
                 {
+                    //Logger.Error("改变商机PMS阶段进来了6", ex.Message, null);
                     //修改日志为异常
                     SqlManage.UpdateDockingPLMLog(this.Context, key, "4", ex.Message, "", Convert.ToString(Billobj["Id"]), "更改PMS商机阶段", "插件日志");
+              
                 }
                 
             }