20240319

DSWeb/Areas/MvcShipping/Controllers/BookingConfirmController.cs

@@ -38,6 +38,7 @@ using DSWeb.Areas.SysMng.DAL.SysUser;
 using DSWeb.Common.DB;
 using System.Web.UI.WebControls;
 using System.Windows.Forms;
+using DSWeb.Areas.MvcShipping.Helper;
 //using DSWeb.Areas.Dispatch.DB;
 
 namespace DSWeb.MvcShipping.Controllers
@@ -861,8 +862,10 @@ namespace DSWeb.MvcShipping.Controllers
                 return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
             }
 
+            var _savingCtn = AutoMapperHelper.MapToList<MsOpSeaeDetail, MsOpSeaeDetail_SISave>(CtnList);
+
             result = modb.SaveComm("BSNO", ctnParentIDValue
-                , ModelObjectConvert<MsOpSeaeDetail>.ToModelObjectList(CtnList)
+                , ModelObjectConvert<MsOpSeaeDetail_SISave>.ToModelObjectList(_savingCtn)
                 , null);
             if (!result.Success)
             {

DSWeb/Areas/MvcShipping/Models/MsOpSeae/MsOpSeaeDetail.cs

@@ -1,5 +1,6 @@
 using System;
 using AutoMapper;
+using DSWeb.MvcShipping.Models.MsOpCtnStatus;
 using HcUtility.Core;
 using Newtonsoft.Json;
 
@@ -550,6 +551,11 @@ namespace DSWeb.MvcShipping.Models.MsOpSeae
         //}
     }
 
+    public class MsOpSeaeDetail_SISave : MsOpSeaeDetail
+    {
+        [ModelDB]
+        public string CTNSTATUS { get; set; }
+    }
     public class MsOpSeaeFenCtn : ModelObjectBillBody
     {
         #region 读写属性

DSWeb/Areas/MvcShipping/Viewsjs/BookingConfirm/BookingConfirmIndex.js

@@ -479,6 +479,18 @@ Ext.extend(Shipping.BookingConfirmIndex, Ext.Panel, {
                                     }
                                 }
                             },
+                            {
+                                fieldLabel: Zi.LAN.CONTRACTNO,
+                                //labelWidth: 110,
+                                name: 'CONTRACTNO',
+                                listeners: {
+                                    specialkey: function (field, e) {
+                                        if (e.getKey() == e.ENTER) {
+                                            _this.onRefreshClick();
+                                        }
+                                    }
+                                }
+                            },
                             this.comboxCustCode,
                             this.comboxBSSTATUS,
                             {
@@ -805,6 +817,10 @@ Ext.extend(Shipping.BookingConfirmIndex, Ext.Panel, {
         var ORDERNO = form.findField('ORDERNO').getValue();
         sql = sql + getAndConSql(sql, ORDERNO, " ORDERNO like '%" + ORDERNO + "%' ");
 
+        var CONTRACTNO = form.findField('CONTRACTNO').getValue();
+        sql = sql + getAndConSql(sql, CONTRACTNO, " CONTRACTNO like '%" + CONTRACTNO + "%' ");
+
+
         return sql;
     },
 

DSWeb/Areas/MvcShipping/Viewsjs/BookingConfirm/Booking_SIEdit.js

@@ -1435,6 +1435,16 @@ Ext.extend(Shipping.Booking_SIEdit, Ext.Panel, {
                 return result;
             }
         },
+        {
+            dataIndex: 'CTNSTATUS',
+            header: Zi.LAN.CTNSTATUS,
+            //'封号',
+            width: 80,
+            renderer: function (value, meta, record, a, b, parentstore, c) {
+                result = _this.gridCellrenderer(value, meta, record, a, b, parentstore, c);
+                return result;
+            }
+        },
         {
             sortable: true,
             dataIndex: 'PKGS',

DSWeb/Areas/MvcShipping/Viewsjs/BookingConfirm/Booking_SIIndex.js

@@ -474,6 +474,18 @@ Ext.extend(Shipping.Booking_SIIndex, Ext.Panel, {
                                     }
                                 }
                             },
+                            {
+                                fieldLabel: Zi.LAN.CONTRACTNO,
+                                //labelWidth: 110,
+                                name: 'CONTRACTNO',
+                                listeners: {
+                                    specialkey: function (field, e) {
+                                        if (e.getKey() == e.ENTER) {
+                                            _this.onRefreshClick();
+                                        }
+                                    }
+                                }
+                            },
                             this.comboxCustCode,
                             this.comboxBSSTATUS,
                             {
@@ -770,6 +782,10 @@ Ext.extend(Shipping.Booking_SIIndex, Ext.Panel, {
         var ORDERNO = form.findField('ORDERNO').getValue();
         sql = sql + getAndConSql(sql, ORDERNO, " ORDERNO like '%" + ORDERNO + "%' ");
 
+        var CONTRACTNO = form.findField('CONTRACTNO').getValue();
+        sql = sql + getAndConSql(sql, CONTRACTNO, " CONTRACTNO like '%" + CONTRACTNO + "%' ");
+
+
         var BSSTATUS = form.findField('BSSTATUS').getValue();
         sql = sql + getAndConSql(sql, BSSTATUS, " BSSTATUS = '" + BSSTATUS + "'  ");