1

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

@@ -13931,8 +13931,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
             foreach (var bill in headData)
             {
                 //if (filetype != "B")
-                if (bill.MBLNO == null || bill.MBLNO == "")
+
-                { error = error + "<br />主提单号不能为空"; }
 
                 if (bill.ORDERNO== null || bill.ORDERNO == "")
                 { error = error + "<br />订舱编号不能为空"; }

DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js

@@ -153,13 +153,19 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
             store: this.storeFeeNameRef,
             minChars: 1,
             matchFieldWidth: false,
-            //queryParam: 'Name',
+            queryMode: 'remote',
+            queryParam: 'Name',
             forceSelection: true,
             lazyRender: false,
             name: 'FeeName', 
             valueField: 'Name',
             displayField: 'CodeAndName',
             listeners: {
+                beforequery: function (e) {
+                    var port = _thisfee.comboxFeeNameRef.rawValue;
+                    if (port != '')
+                        e.query = port;
+                },
                 'focus': function (_this, eOpts) {
                     //var selections = _thisfee.gridDrChFee.getSelectionModel().getSelection(); //获得选中的项
                     //var strCustomerName = selections[0].get('FeeName');
@@ -200,14 +206,19 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
         this.comboxFeeNameRefCr = Ext.create('DsExt.ux.RefTableCombox', {
             store: this.storeFeeNameRefCr,
             forceSelection: true,
-            queryMode: 'local',
+            queryMode: 'remote',
             minChars: 1,
-            //queryParam: 'Name',
+            queryParam: 'Name',
             lazyRender: false,
             name: 'FeeName', matchFieldWidth: false,
             valueField: 'Name',
             displayField: 'CodeAndName',
             listeners: {
+                beforequery: function (e) {
+                    var port = _thisfee.comboxFeeNameRefCr.rawValue;
+                    if (port != '')
+                        e.query = port;
+                },
                 //beforequery: function (e) {
                 //    return FilterCombox(e);
                 //},

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

@@ -5224,14 +5224,14 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                     }],
                 scope: this
                 }, '-', {
-                    text: '订舱报文', //"打印",
+                    text: 'EDI', //"打印",
                     iconCls: "btnexportexcel",
                     handler: function (button, event) {
                         this.onCreateEDIClick('B');
                     },
                     scope: this
                 }, '-', {
-                    text: '截单报文', //"打印",
+                    text: 'ESI', //"打印",
                     iconCls: "btnexportexcel",
                     handler: function (button, event) {
                         this.onCreateEDIClick('E');