20240522 销售订舱增加显示发货人的约号(往来单位当中联系人[发货人]的约号)

DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js

@@ -843,7 +843,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7	isVehiclesDispatcher	是否派车调度人
         //客户加载_发货人
         this.storeShipper = Ext.create('DsExt.ux.RefTableStore', {
             model: 'OpSeaeShipper',
-            proxy: { url: '/MvcShipping/MsOpSeae/GetShipperList' }
+            proxy: { url: '/MvcShipping/MsOpSeae/GetShipperListRm' }
         });
         //        this.storeShipper.load({ params: { condition: "ISCONTROLLER='1'"} });
 
@@ -2051,7 +2051,20 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7	isVehiclesDispatcher	是否派车调度人
                     layout: 'anchor',
                     flex: 1,
                     defaultType: 'textfield',
-                    items: [this.comboxShipper, {
+                    items: [
+                        {
+                            xtype: 'container',
+                            defaultType: 'textfield',
+                            layout: 'hbox',
+                            items: [this.comboxShipper, {
+                                xtype: 'textfield',
+                                readOnly: true,
+                                fieldLabel: '发货人约号',
+                                name: 'SERVICECONTRACTNO_SHIPPER'
+                            }]
+                        }
+
+                        , {
                         xtype: 'textareafield',
                         grow: true,
                         labelWidth: 0,
@@ -3292,7 +3305,29 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7	isVehiclesDispatcher	是否派车调度人
                     this.panelFee.storeDrChFee.load({ params: { billno: data.BSNO, type: 1, optype: "op_Seae"} });
                     this.panelFee.storeCrChFee.load({ params: { billno: data.BSNO, type: 2, optype: "op_Seae"} });
 
-                    this.panelFee.storeBodySum.load({ params: { bsno: data.BSNO} });
+                    this.panelFee.storeBodySum.load({ params: { bsno: data.BSNO } });
+
+                    _this = this;
+                    this.storeShipper.load({
+                        params: { condition: "shortname='" + data.SHIPPERID + "'" },
+                        callback: function (r, options, success) {
+                            if (success) {
+                                if (_this.storeShipper.getCount() > 0) {
+                                    for (var j = 0; j < _this.storeShipper.getCount(); j += 1) {
+
+                                        var memberbody = _this.storeShipper.getAt(j).data;
+                                        if (memberbody.SERVICECONTRACTNO != '') {
+
+                                            _this.formBill.getForm().findField('SERVICECONTRACTNO_SHIPPER').setValue(memberbody.SERVICECONTRACTNO);
+                                        }
+                                    }
+                                } else {
+
+                                }
+
+                            }
+                        },
+                    });
 
                 } else {
                     Ext.MessageBox.alert('请求出现错误,请重试', response.responseText);

DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderModel.js

@@ -302,22 +302,27 @@ Ext.define('MsSeaeOrderCtn', {
 
 
 Ext.define('OpSeaeShipper', {
-    extend: 'Ext.data.Model',
-    idProperty: 'SHIPPERID',
-    fields: [
-				{ name: 'SHIPPERID', type: 'string' },
-				{ name: 'CODENAME', type: 'string' },
-				{ name: 'SHORTNAME', type: 'string' },
-				{ name: 'CodeAndName', type: 'string' },
-				{ name: 'SHIPPERDETAIL', type: 'string' },
-				{ name: 'SHIPPERTYPE', type: 'int' },
-				{ name: 'LOADADDRESS', type: 'string' },
-				{ name: 'DELIVERADDRESS', type: 'string' },
-				{ name: 'ISPUBLIC', type: 'bool' }
-            ]
+	extend: 'Ext.data.Model',
+	idProperty: 'SHIPPERID',
+	fields: [
+		{ name: 'SHIPPERID', type: 'string' },
+		{ name: 'CODENAME', type: 'string' },
+		{ name: 'SHORTNAME', type: 'string' },
+		{ name: 'CodeAndName', type: 'string' },
+		{ name: 'SHIPPERDETAIL', type: 'string' },
+		{ name: 'SHIPPERTYPE', type: 'int' },
+		{ name: 'LOADADDRESS', type: 'string' },
+		{ name: 'COUNTRY', type: 'string' },
+		{ name: 'ATTN', type: 'string' },
+		{ name: 'TEL', type: 'string' },
+		{ name: 'EMAIL', type: 'string' },
+		{ name: 'CORPID', type: 'string' },
+		{ name: 'DELIVERADDRESS', type: 'string' },
+		{ name: 'ISPUBLIC', type: 'bool' },
+		{ name: 'SERVICECONTRACTNO', type: 'string' }
+	]
 });
 
-
 Ext.define('MsOpSeaeDetail', {
     extend: 'Ext.data.Model',
     fields: [