付费申请增加的部分目前不影响正常业务

DSWeb/Areas/Account/Controllers/Chfee_payapplicationController.cs

@@ -518,32 +518,7 @@ namespace DSWeb.Areas.Account.Controllers
 
             var headdata = ChpayapplicationDAL.GetData(" BILLNO='" + bill + "'", Convert.ToString(Session["USERID"]), CookieConfig.GetCookie_UserCode(Request), Convert.ToString(Session["COMPANYID"]));
 
-            //看是否有系统参数 泛微Appid
-            //如有且有值 方可执行
-            try
-            {
-                if (ConfigurationManager.AppSettings["FanWeiOAAPI"] == "true")
-                {
-                    var 泛微Appid = MsSysParamSetDAL.GetSysParamValue("FanWei_appid");
-                    if (!string.IsNullOrWhiteSpace(泛微Appid))
-                    {
-                        //泛微OAHelper.GetToken();
-
-                        var userid = Convert.ToString(Session["USERID"]);
-                        var usercode = Convert.ToString(Session["CODENAME"]);
-                        var companyid = Convert.ToString(Session["COMPANYID"]);
-
-                        泛微OAHelper.PostApplication(headdata, userid, usercode, companyid);
-                    }
-                }
-            }
-            catch (Exception e)
-            {
             
-            }
-            var testresult = new DBResult();
-            var json2 = JsonConvert.Serialize(testresult);
-            return new ContentResult() { Content = json2 };
 
 
             if (headdata.BILLSTATUS == 1||headdata.BILLSTATUS == 6)
@@ -598,22 +573,7 @@ namespace DSWeb.Areas.Account.Controllers
                             bool bl = T_ALL_DA.GetExecuteSqlCommand(blUpSQL);
 
                             if (bl) {
-                                //看是否有系统参数 泛微Appid
+                                ChpayapplicationDAL.FanWeiOA_Submit(bill, Convert.ToString(Session["USERID"]), Convert.ToString(Session["CODENAME"]), Convert.ToString(Session["COMPANYID"]));
-                                //如有且有值 方可执行
-                                try
-                                {
-                                    if (ConfigurationManager.AppSettings["FanWeiOAAPI"] == "true")
-                                    {
-                                        var 泛微Appid = MsSysParamSetDAL.GetSysParamValue("泛微Appid");
-                                        if (!string.IsNullOrWhiteSpace(泛微Appid))
-                                        {
-                                            泛微OAHelper.GetSecret();
-                                        }
-                                    }
-                                }
-                                catch (Exception e) { 
-                                
-                                }
                             }
                         }
                     }
@@ -648,7 +608,7 @@ namespace DSWeb.Areas.Account.Controllers
          public ContentResult SubmitAuditList(string bills)
          {
 
-             DBResult result = ChpayapplicationDAL.SubmitAuditList("FeeSettleAudit", Convert.ToString(Session["USERID"]), bills, Convert.ToString(Session["COMPANYID"]));
+             DBResult result = ChpayapplicationDAL.SubmitAuditList("FeeSettleAudit", bills, Convert.ToString(Session["USERID"]), Convert.ToString(Session["CODENAME"]), Convert.ToString(Session["COMPANYID"]));
             if (result.Message2 == "1") {
                 var PAYAUDITAUTOCLOSEDR = MsSysParamSetDAL.GetData("PARAMNAME='PAYAUDITAUTOCLOSEDR'");
                 if (PAYAUDITAUTOCLOSEDR.PARAMVALUE == "1")
@@ -707,6 +667,8 @@ namespace DSWeb.Areas.Account.Controllers
             var json = JsonConvert.Serialize(result);
             return new ContentResult() { Content = json };
         }
+
+        
         public ContentResult AuditList(string data)
          {
 

DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs

@@ -22,6 +22,8 @@ using DSWeb.MvcShipping.DAL.MsBaseInfoDAL;
 using DSWeb.Areas.Account.Models.TruckChfee_do_detail;
 using System.Data.SqlClient;
 using DSWeb.Areas.Account.Models.BSNOLB;
+using static DSWeb.Areas.CommMng.DAL.PublicAPIDAL;
+using System.Configuration;
 
 namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication
 {
@@ -2474,7 +2476,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication
         }
 
 
-        public static DBResult SubmitAuditList(String WorkFlowName, String USERID, String bills,string companyid)
+        public static DBResult SubmitAuditList(String WorkFlowName, String bills, String USERID,string usercode, string companyid)
         {
 
             var FEECLOSEPAYAUTOAUDIT = MsSysParamSetDAL.GetData("PARAMNAME='FEECLOSEPAYAUTOAUDIT'");
@@ -2579,6 +2581,10 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication
 
                                 result.Success = true;
                                 result.Message = "提交审核成功";
+
+                                
+                                FanWeiOA_Submit(bill, USERID, usercode, companyid);
+                                
                             }
                             else
                             {
@@ -2589,6 +2595,8 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication
                         }
                     }
                     tran.Commit();
+
+                    
                 }
                 catch (Exception)
                 {
@@ -2894,6 +2902,40 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication
             return result;
         }
 
+        public static DBResult FanWeiOA_Submit(string bill, string userid, string usercode, string companyid)
+        {
+
+            var result = new DBResult();
+
+            //看是否有系统参数 泛微Appid
+            //如有且有值 方可执行
+            try
+            {
+                if (ConfigurationManager.AppSettings["FanWeiOAAPI"] == "true")
+                {
+                    var 泛微Appid = MsSysParamSetDAL.GetSysParamValue("FanWei_appid");
+                    if (!string.IsNullOrWhiteSpace(泛微Appid))
+                    {
+                        //泛微OAHelper.GetToken();
+
+                        var headdata = ChpayapplicationDAL.GetData(" BILLNO='" + bill + "'", userid, usercode, companyid);
+
+                        //var userid = Convert.ToString(Session["USERID"]);
+                        //var usercode = Convert.ToString(Session["CODENAME"]);
+                        //var companyid = Convert.ToString(Session["COMPANYID"]);
+
+                        泛微OAHelper.PostApplication(headdata, userid, usercode, companyid);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+
+            }
+            finally { }
+            return result;
+        }
+
         #endregion
 
         #region 审核或驳回

DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs

@@ -1203,7 +1203,7 @@ namespace DSWeb.Areas.CommMng.DAL
                         return _res;
                     }
                     finally {  }
-                    return _res;
+                    //return _res;
                 }
             }