Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev

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

@@ -7704,8 +7704,11 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
                 {
                     return result.SetErrorInfo($"直发VGM错误：{jobjRtn.message}");
                 }
+                else {
+                    result.OK($"发送完成");//:[{ jobjRtn.message}]
+                }
+
                 
-                result.OK("发送完成");
             }
             catch (Exception ex)
             {

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

@@ -1657,10 +1657,10 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, {
                 handler: function (button, event) {
                     var basicForm = this.formEdit.getForm();
                     this.opStatus = 'add';
-                    basicForm.findField('AS_ID').setDisabled(false);
+                    //basicForm.findField('AS_ID').setDisabled(false);
                     var field = basicForm.findField('AS_ID');
                     field.setValue('*');
-                    basicForm.findField('AS_ID').setDisabled(true);
+                    //basicForm.findField('AS_ID').setDisabled(true);
                     field = basicForm.findField('INPUTBY');
                     field.setValue(SHOWNAME);
                     for (var j = 0; j < this.storeBodyList.getCount(); j += 1) {
@@ -3771,9 +3771,9 @@ this.storeConsignee.on('beforeload', function (store) {
         //this.formEdit.getForm().findField('NOTIFYPARTYNAME').setValue(this.formcd.getForm().findField('NOTIFYPARTYNAME').getValue());
         //this.formEdit.getForm().findField('NOTIFYPARTYADDR1').setValue(this.formcd.getForm().findField('NOTIFYPARTYADDR1').getValue());
         //this.formEdit.getForm().findField('SCACCODE').setValue(this.formcd.getForm().findField('SCACCODE').getValue());
-        this.formEdit.getForm().findField('AS_ID').setDisabled(false);
+        //this.formEdit.getForm().findField('AS_ID').setDisabled(false);
         var data = this.formEdit.getForm().getValues(false, false, false);
-        this.formEdit.getForm().findField('AS_ID').setDisabled(true);
+        //this.formEdit.getForm().findField('AS_ID').setDisabled(true);
         var data2 = this.formcd.getForm().getValues(false, false, false);
         data.BSNO = this.MainEditRecord.data.BSNO;
         Object.assign(data, data2);
@@ -3809,6 +3809,14 @@ this.storeConsignee.on('beforeload', function (store) {
                         if (this.opStatus == 'add') {
                             var arrNewRecords = this.storeList.insert(0, returnData);
                             this.editRecord = this.storeList.getAt(0);
+
+                            //此时应根据returnData.data.AS_ID来决定选中哪行
+                            for (i = 0; i < this.storeList.getCount(); i += 1) {
+                                var rec = this.storeList.getAt(i).data;
+                                if (rec.AS_ID == returnData.AS_ID) {
+                                    this.gridListLS.getSelectionModel().select(i);
+                                }
+                            }
                         }
                         else if (this.opStatus == 'edit') {
                             var editp = Ext.create('MsOpBillModel', returnData);
@@ -3822,6 +3830,14 @@ this.storeConsignee.on('beforeload', function (store) {
                             this.editRecord.commit();
 
                             this.LoadInit(returnData);
+
+                            //此时应根据returnData.data.AS_ID来决定选中哪行
+                            for (i = 0; i < this.storeList.getCount(); i += 1) {
+                                var rec = this.storeList.getAt(i).data;
+                                if (rec.AS_ID == returnData.AS_ID) {
+                                    this.gridListLS.getSelectionModel().select(i);
+                                }
+                            }
                         }
                         if (type == '0') {
                             this.opStatus = 'edit';