Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev

DSWeb/Areas/CommMng/DAL/PublicPortHelper.cs

@@ -37,7 +37,7 @@ namespace DSWeb.Areas.CommMng.DAL
             try
             {
                 var strSendObj = JsonConvert.Serialize(sendobj);
-                BasicDataRefDAL.SaveLog(strSendObj, "", logname, "发送");
+                BasicDataRefDAL.SaveLog("URL:"+ URL+";"+strSendObj, "", logname, "发送");
                 var rtn = WebRequestHelper.DoPost(URL, strSendObj, timeout: 50000);
                 BasicDataRefDAL.SaveLog(rtn, "", logname, "返回");
                 result.OK("", rtn); 
@@ -500,17 +500,17 @@ namespace DSWeb.Areas.CommMng.DAL
         override public DBResult DoDeal(string rtn)
         {
             var result = new DBResult();
-
+            result.OK();
             var _r = JsonConvert.Deserialize<ESLPortResult_GetMblnoBySO>(rtn);
             try
             {
-                if (_r.status == 1 && !string.IsNullOrWhiteSpace( _r.data.esl_no))
+                if (_r.status == 1 && !string.IsNullOrWhiteSpace(_r.data.esl_no))
                 {
                     //更新so号
 
                     //如ref_no=当前mblno， 将当前的mblno移动至申请放箱号APPLYNO，并将esl_no写入mblno；
 
-                    if(head.MBLNO== _r.data.ref_no)
+                    if (head.MBLNO == _r.data.ref_no)
 
                     {
 
@@ -519,11 +519,18 @@ namespace DSWeb.Areas.CommMng.DAL
                         var sqlstr = $" update op_seae set MBLNO='{_r.data.esl_no}',APPLYNO='{_r.data.ref_no}' where bsno =({bsnostr})";
 
                         BasicDataRefDAL.ExecSql(sqlstr);
-
+                        result.OK($"舱位号获取成功:[{_r.data.esl_no}]");
+                    }
+                    else
+                    {
+                        result.OK($"未能取得ESL号，可能业务属于其他账号；");
                     }
 
                 }
-                result.OK($"舱位号获取成功:[{_r.data.esl_no}]");
+                else {
+                    result.OK($"未能取得ESL号，可能业务属于其他账号；");
+                }
+               
             }
             catch (Exception e)
             {