1

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

@@ -5788,10 +5788,35 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
                                             db.ExecuteNonQuery(cmdUpdateOrder, tran);
                                             var OPPRE = MsOpSeaePreDAL.MsOpSeaePreDAL.GetData(" ORDNO IN (SELECT ORDNO FROM crm_seaeorder WHERE BSNO='"+ enumValue.BSNO + "')");
                                             if (!string.IsNullOrEmpty(OPPRE.ORDNO)) {
-                                              var cmdUpdateOrder2 = db.GetSqlStringCommand("update op_seae_pre set ISORDER=0,ISUP=0,ORDNO='' where ORDNO='" + OPPRE.ORDNO + "'");
+                                              var cmdUpdateOrder2 = db.GetSqlStringCommand("update op_seae_pre set ISORDER=0,ISUP=0,ORDNO='',MBLNO=o.MBLNO,PORTLOADID=o.PORTLOADID,CARRIER=o.CARRIER,HSCODE=o.HSCODE,GOODSNAME=o.GOODSNAME," +
+                                                  "CONTRACTNO=o.CONTRACTNO,PORTLOAD=o.PORTLOAD,PORTDISCHARGE=o.PORTDISCHARGE,PORTDISCHARGEID=o.PORTDISCHARGEID,LANE=o.LANE,VESSEL=o.VESSEL,VOYNO=o.VOYNO,FORWARDER=o.FORWARDER" +
+                                                  " from op_seae_pre p left join crm_seaeorder o on (o.ORDNO=p.ORDNO) where p.ORDNO='" + OPPRE.ORDNO + "'");
                                             db.ExecuteNonQuery(cmdUpdateOrder2, tran);
                                                SENDCANCELORDNO(OPPRE, enumValue,"","");
-                                            }
+
+
+                                            //var msorder = MsSeaeOrderDAL.MsSeaeOrderDAL.GetData("ORDNO='" + headData.ORDNO + "'");
+
+                                            //headData.DbOperationType = DbOperationType.DbotUpd;
+                                            //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);
+
+
+                                        }
 
 
 
@@ -5838,25 +5863,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
         {
             var result = new DBResult();
             //向：做确认订舱操作的人、该业务的销售、该业务的录入人 发送邮件
-            var msorder = MsSeaeOrderDAL.MsSeaeOrderDAL.GetData("ORDNO='"+ headData.ORDNO + "'");
-
-            headData.DbOperationType = DbOperationType.DbotUpd;
-            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 = "舱位回收 ";
             if (!string.IsNullOrEmpty(opSeae.CARRIER))
                 mailtitle = mailtitle + "-" + opSeae.CARRIER;