diff --git a/DSWeb/Areas/Account/Models/Chfee_invoice_HangXin/Chfee_Invoice.cs b/DSWeb/Areas/Account/Models/Chfee_invoice_HangXin/Chfee_Invoice.cs index 7e8c5e36..d6681abc 100644 --- a/DSWeb/Areas/Account/Models/Chfee_invoice_HangXin/Chfee_Invoice.cs +++ b/DSWeb/Areas/Account/Models/Chfee_invoice_HangXin/Chfee_Invoice.cs @@ -2165,7 +2165,7 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin result.Message += ":" + info.failCause; //此处调用一次重推 - var hx = getHelper(head.TAXCODE); + var hx = getHelper(head.TAXCODE,head.COMPANYID); hx.重推(head); } else diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs index 45fc60c6..ad157394 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs @@ -111,6 +111,7 @@ namespace DSWeb.MvcShipping.Controllers head.CUSTSERVICE = Convert.ToString(Session["SHOWNAME"]); head.SALE = Convert.ToString(Session["SHOWNAME"]); head.SALEDEPT = Convert.ToString(Session["DEPTNAME"]); + head.BSNO = "topseae" + Guid.NewGuid().ToString(); } if (handle == "copyadd") { head.INPUTBY = Convert.ToString(Session["SHOWNAME"]); @@ -137,6 +138,12 @@ namespace DSWeb.MvcShipping.Controllers public ContentResult Save(string opstatus, string data, string data2, string data3, string body) { + if (Convert.ToString(Session["COMPANYID"]).ToString().Trim() == "" || Convert.ToString(Session["USERID"]).ToString().Trim() == "" || Convert.ToString(Session["CODENAME"]).ToString().Trim() == "" || Convert.ToString(Session["SHOWNAME"]).ToString().Trim() == "" || Convert.ToString(Session["DEPTNAME"]).ToString().Trim() == "") + { + var jsonRespose2 = new JsonResponse { Success = false, Message = "登录超时,请退出系统重新登录!" }; + return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) }; + } + var headData = JsonConvert.Deserialize(data.Replace("}", ",") + data2.Replace("{", "").Replace("}", ",") + data3.Replace("{", "")); var bodyList = JsonConvert.Deserialize>(body); var isPost = true; @@ -152,7 +159,10 @@ namespace DSWeb.MvcShipping.Controllers errorstr = "主提单号重复"; } } - + + if (string.IsNullOrWhiteSpace(headData.BSNO)) { + headData.BSNO = "topseae" + System.Guid.NewGuid().ToString(); + } if (opstatus == "add")