1

DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs

@@ -2204,7 +2204,7 @@ namespace DSWeb.MvcShipping.Controllers
         #region 退舱
 
         #region 退舱推航次申请
-        public ContentResult CreateTuiShen(string data, string reason, string tuioptype)
+        public ContentResult CreateTuiShen(string data, string reason, string tuioptype,string REASONCMB)
         {
             var headData = JsonConvert.Deserialize<List<MsOpSeae>>(data);
 
@@ -2264,7 +2264,7 @@ namespace DSWeb.MvcShipping.Controllers
                     if (errstr != "")
                         errstr = errstr + ",不能申请退舱！";
                     else { 
-                        result = MsOpSeaeDAL.SubmitTuiShen(CookieConfig.GetCookie_UserId(Request), headData, tuioptype, reason);
+                        result = MsOpSeaeDAL.SubmitTuiShen(CookieConfig.GetCookie_UserId(Request), headData, tuioptype, reason, REASONCMB);
 
                         MsOpSeaeEdiPortDAL.SendToDJYDel(headData, Convert.ToString(Session["COMPANYID"]));
                     }

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

@@ -5546,7 +5546,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
 
         #region 退舱或推航次申请
 
-    public static DBResult SubmitTuiShen(String USERID, List<MsOpSeae> billList, string tuioptype,string reason)
+    public static DBResult SubmitTuiShen(String USERID, List<MsOpSeae> billList, string tuioptype,string reason,string REASONCMB)
         {
             var result = new DBResult();
             var WorkFlowName = "OpTuiShenAudit";
@@ -5614,7 +5614,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
                                         {
                                             var cmdUpdateOrder2 = db.GetSqlStringCommand("update op_seae_pre set ISORDER=0,ISUP=0,ORDNO='' where ORDNO='" + OPPRE.ORDNO + "'");
                                             db.ExecuteNonQuery(cmdUpdateOrder2, tran);
-                                            SENDCANCELORDNO(OPPRE, billno,reason);
+                                            SENDCANCELORDNO(OPPRE, billno,reason, REASONCMB);
                                         }
                                         else {
                                             var cmdUpdateOrder2 = db.GetSqlStringCommand("update op_seae_pre set ISTUI=1where ORDNO='" + OPPRE.ORDNO + "'");
@@ -5789,7 +5789,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
                                             if (!string.IsNullOrEmpty(OPPRE.ORDNO)) {
                                               var cmdUpdateOrder2 = db.GetSqlStringCommand("update op_seae_pre set ISORDER=0,ISUP=0,ORDNO='' where ORDNO='" + OPPRE.ORDNO + "'");
                                             db.ExecuteNonQuery(cmdUpdateOrder2, tran);
-                                               SENDCANCELORDNO(OPPRE, enumValue,"");
+                                               SENDCANCELORDNO(OPPRE, enumValue,"","");
                                             }
 
 
@@ -5833,12 +5833,27 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
             return result;
         }
 
-        public static DBResult SENDCANCELORDNO(MsOpSeaePre headData, MsOpSeae opSeae,string reason)
+        public static DBResult SENDCANCELORDNO(MsOpSeaePre headData, MsOpSeae opSeae,string reason,string REASONCMB)
         {
             var result = new DBResult();
             //向：做确认订舱操作的人、该业务的销售、该业务的录入人 发送邮件
-
-
+            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;
+            var modb = new ModelObjectDB();
+            modb.Save(headData);
             var mailtitle = "舱位回收 ";
             if (!string.IsNullOrEmpty(opSeae.CARRIER))
                 mailtitle = mailtitle + "-" + opSeae.CARRIER;
@@ -5871,7 +5886,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
             Body.Append("<br />订舱代理：" + opSeae.FORWARDER);
             Body.Append("<br />订舱号：" + opSeae.ORDERNO);
             Body.Append("<br />退仓客户：" + opSeae.CUSTOMERNAME);
-            Body.Append("<br />退仓原因：" + reason);
+            Body.Append("<br />退仓原因：" + REASONCMB);
+            Body.Append("<br />退仓备注：" + reason);
             Body.Append("</Body></html> ");
             var mailto = "";
             void mailtoAdd(string mail)

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js

@@ -8294,9 +8294,13 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
                             Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.TUIREASONMUSTBE, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); //'操作员为必填!'
                             return;
                         };
+                        var REASONCMB = form.findField('REASONCMB').getValue();
+
+                        
+
                         var TUIOPTYPE = Ext.getCmp('TUIOPTYPE');
                         var TUIOPTYPE = TUIOPTYPE.getValue();
-                        _this2.DoTui(REASON, TUIOPTYPE);
+                        _this2.DoTui(REASON, TUIOPTYPE, REASONCMB);
                     }
                 },
 
@@ -13673,7 +13677,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
 
     //#region 推航次和退舱
 
-    DoTui: function (REASON, TUIOPTYPE) {
+    DoTui: function (REASON, TUIOPTYPE, REASONCMB) {
         var GidStr = '';
         var selections = this.GridCheckBoxModel.selected.items;
         if (selections.length == 0) {
@@ -13708,7 +13712,8 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
                     data: jsonbodyAddDatas,
                     mblno: Mblno,
                     reason: REASON,
-                    tuioptype: TUIOPTYPE
+                    tuioptype: TUIOPTYPE,
+                    REASONCMB: REASONCMB
                 },
                 callback: function (options, success, response) {
                     if (success) {

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeaePre/MsOpSeaePreIndex.js

@@ -1785,7 +1785,7 @@ Ext.extend(Shipping.MsOpSeaePreIndex, Ext.Panel, {
         var sql = '';
         if (crmsale == 1) {
 
-            sql = " ISUP=1 and  NOT EXISTS (select 1 from crm_seaeorder WHERE op_seae_pre.ORDNO=crm_seaeorder.ORDNO AND ORSTATUS in ('8','0')) "  
+            sql = " ISUP=1 and ISNULL(ISTUI,0)<>1 AND NOT EXISTS (select 1 from crm_seaeorder WHERE op_seae_pre.ORDNO=crm_seaeorder.ORDNO AND ORSTATUS in ('8','0')) "  
         }
 
         var MBLNO = form.findField('MBLNO').getValue();