Merge branch 'QDHHYT' of http://60.209.125.238:20010/dengyu/DS7 into QDHHYT

DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs

@@ -2214,7 +2214,7 @@ namespace DSWeb.MvcShipping.Controllers
             if (tuioptype == "V")
             {
                 #region 推航次
-                result = MsOpSeaeDAL.SubmitTuiShen(CookieConfig.GetCookie_UserId(Request), headData, tuioptype, reason);
+                result = MsOpSeaeDAL.SubmitTuiShen(CookieConfig.GetCookie_UserId(Request), headData, tuioptype, reason, REASONCMB);
                 #endregion
             }
             else

DSWeb/Areas/MvcShipping/DAL/MsBaseInfo/MsBaseInfoDAL.cs

@@ -246,6 +246,8 @@ namespace DSWeb.MvcShipping.DAL.MsBaseInfoDAL
 
         static public bool GetUserModuleEnable(string modulename, string userid)
         {
+            if (string.IsNullOrEmpty(userid)) return false;
+
             try
             {
                 var result = false;

DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs

@@ -42,6 +42,7 @@ using DSWeb.MvcShipping.DAL.MsOpSeaePreDAL;
 using Ivony.Fluent;
 using DSWeb.MvcShipping.Models.MsOpSeaePre;
 using static java.security.cert.CertPathValidatorException;
+using DSWeb.MvcShipping.DAL.MsSeaeOrderDAL;
 
 
 namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
@@ -5837,21 +5838,23 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
         {
             var result = new DBResult();
             //向：做确认订舱操作的人、该业务的销售、该业务的录入人 发送邮件
+            var msorder = MsSeaeOrderDAL.MsSeaeOrderDAL.GetData("ORDNO='"+ headData.ORDNO + "'");
+
             headData.DbOperationType = DbOperationType.DbotUpd;
-            headData.MBLNO = opSeae.MBLNO;
-            headData.ORDERNO = opSeae.ORDERNO;
-            headData.CARRIER = opSeae.CARRIER;
-            headData.HSCODE = opSeae.HSCODE;
-            headData.GOODSNAME = opSeae.GOODSNAME;
-            headData.CONTRACTNO = opSeae.CONTRACTNO;
-            headData.PORTLOAD = opSeae.PORTLOAD;
-            headData.PORTLOADID = opSeae.PORTLOADID;
-            headData.PORTDISCHARGE = opSeae.PORTDISCHARGE;
-            headData.PORTDISCHARGEID = opSeae.PORTDISCHARGEID;
-            headData.LANE = opSeae.LANE;
-            headData.VESSEL = opSeae.VESSEL;
-            headData.VOYNO = opSeae.VOYNO;
-            headData.FORWARDER = opSeae.FORWARDER;
+            headData.MBLNO = msorder.MBLNO;
+            headData.ORDERNO = msorder.ORDERNO;
+            headData.CARRIER = msorder.CARRIER;
+            headData.HSCODE = msorder.HSCODE;
+            headData.GOODSNAME = msorder.GOODSNAME;
+            headData.CONTRACTNO = msorder.CONTRACTNO;
+            headData.PORTLOAD = msorder.PORTLOAD;
+            headData.PORTLOADID = msorder.PORTLOADID;
+            headData.PORTDISCHARGE = msorder.PORTDISCHARGE;
+            headData.PORTDISCHARGEID = msorder.PORTDISCHARGEID;
+            headData.LANE = msorder.LANE;
+            headData.VESSEL = msorder.VESSEL;
+            headData.VOYNO = msorder.VOYNO;
+            headData.FORWARDER = msorder.FORWARDER;
             var modb = new ModelObjectDB();
             modb.Save(headData);
             var mailtitle = "舱位回收 ";

DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs

@@ -193,7 +193,7 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
         }
 
 
-        static public MsSeaeOrder GetData(string condition,string userid)
+        static public MsSeaeOrder GetData(string condition,string userid="")
         {
             var strSql = new StringBuilder();
             strSql.Append("SELECT ORDNO,BSNO,ORSTATUS,ORREASON,BSDATE,CUSTOMERNAME,ORDTYPE,SHIPPERID,CONSIGNEEID,NOTIFYPARTYID,YARD");