dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

2024-724

Browse Source
ShenZhenCHJY
dengyu 4 months ago
parent ccf4691678
commit b9bbc80f38
4 changed files with 159 additions and 63 deletions
Show Stats Download Patch File Download Diff File

45
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
Unescape Escape View File

@ -7033,8 +7033,17 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
var billams = GetAmsData("BSNO='" + bill.BSNO + "'");
r.WriteLine("RFF+CT2:" + bill.ORDER_CUSTCODE + "'");
icount = icount + 1;
if (carrier == "ZIM")
{
r.WriteLine("RFF+CT2:CNSNHRARNL'");
icount = icount + 1;
}
else
{
r.WriteLine("RFF+CT2:" + bill.ORDER_CUSTCODE + "'");
icount = icount + 1;
}
if (carrier == "ZIM") {
r.WriteLine("RFF+CUCC:CNSNHRARNL'");
@ -7043,7 +7052,9 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
if (carrier == "PIL")
{
r.WriteLine("RFF+SLS:" + billams.SalesRepCode + "'");
//r.WriteLine("RFF+SLS:" + billams.SalesRepCode + "'");
//20240724 PIL固定为RFF+SLS:CN002
r.WriteLine("RFF+SLS:CN002'");
icount = icount + 1;
}
else {
@ -7976,11 +7987,31 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
r.WriteLine("RFF+CT:" + bill.CONTRACTNO + "'");
icount = icount + 2;
r.WriteLine("RFF+CT2:" + bill.ORDER_CUSTCODE + "'");
icount = icount + 1;
if (carrier == "ZIM")
{
r.WriteLine("RFF+CT2:CNSNHRARNL'");
icount = icount + 1;
}
else
{
r.WriteLine("RFF+SLS:" + billams.SalesRepCode + "'");
icount = icount + 1;
r.WriteLine("RFF+CT2:" + bill.ORDER_CUSTCODE + "'");
icount = icount + 1;
}
if (carrier == "PIL")
{
//r.WriteLine("RFF+SLS:" + billams.SalesRepCode + "'");
//20240724 PIL固定为RFF+SLS:CN002
r.WriteLine("RFF+SLS:CN002'");
icount = icount + 1;
}
else
{
r.WriteLine("RFF+SLS:" + billams.SalesRepCode + "'");
icount = icount + 1;
}
if (carrier == "UASC")
{

31
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
Unescape Escape View File

@ -1586,7 +1586,15 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
height: 60,
name: 'OPERATORFAX',
anchor: '100%'
},{
}, {
xtype: 'textareafield',
grow: true,
flex: 1,
fieldLabel: Zi.LAN.EDIREMARK, //'EDI备注',
height: 60,
name: 'EDIREMARK',
anchor: '100%'
}, {
xtype: 'textareafield',
grow: true,
flex: 1,
@ -5880,14 +5888,19 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
layout: 'anchor',
flex: 2,
defaultType: 'textfield',
items: [{
xtype: 'textareafield',
grow: true,
fieldLabel: Zi.LAN.EDIREMARK, //'EDI备注',
height: 45,
name: 'EDIREMARK',
anchor: '100%'
}, {
items: [
//{
// xtype: 'textareafield',
// grow: true,
// flex: 1,
// fieldLabel: Zi.LAN.EDIREMARK, //'EDI备注',
// height: 60,
// name: 'EDIREMARK',
// anchor: '100%'
//},
{ xtype: 'hiddenfield', height: 45},
{
xtype: 'container',
layout: 'hbox',
flex: 1,

5
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/formDjyOrder_EMC.js
Unescape Escape View File

@ -459,7 +459,8 @@ Ext.extend(Shipping.formDjyOrder_EMC, Ext.Panel, {
this.StoresignType.add({ "ID": "Notify Party", "NAME": "Notify Party" });
this.comboxSignType = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel:"签约方",
fieldLabel: "签约方",
allowBlank: false,
store: this.StoresignType,
forceSelection: true,
name: 'signType',
@ -799,6 +800,7 @@ Ext.extend(Shipping.formDjyOrder_EMC, Ext.Panel, {
flex: 1,
fieldLabel: '订舱网点',
//hidden: true,
allowBlank: false,
store: this.storeBillAddr,
forceSelection: true,
emptyText: '订舱网点',
@ -813,6 +815,7 @@ Ext.extend(Shipping.formDjyOrder_EMC, Ext.Panel, {
flex: 1,
fieldLabel: '提单签发地',
//hidden: true,
allowBlank: false,
store: this.storeBillAddr,
forceSelection: true,
emptyText: '提单签发地',

141
DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js
Unescape Escape View File

@ -1821,9 +1821,9 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
var selectrecords = DsStoreQueryBy(this.storeCodeLoadport, 'PORT', combo.value);
if (selectrecords.getCount() > 0) {
var selectdata = selectrecords.getAt(0).data;
this.formBill.getForm().findField('PORTLOADID').setValue(selectdata.EDICODE);
this.formEdit.getForm().findField('PORTLOADID').setValue(selectdata.EDICODE);
} else {
this.formBill.getForm().findField('PORTLOADID').setValue('');
this.formEdit.getForm().findField('PORTLOADID').setValue('');
}
}
}
@ -1853,22 +1853,22 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
var selectrecords = DsStoreQueryBy(this.storeCodeDisport, 'PORT', combo.value);
if (selectrecords.getCount() > 0) {
var selectdata = selectrecords.getAt(0).data;
this.formBill.getForm().findField('PORTDISCHARGEID').setValue(selectdata.EDICODE);
var DESTINATION = this.formBill.getForm().findField('DESTINATIONID').getValue();
this.formEdit.getForm().findField('PORTDISCHARGEID').setValue(selectdata.EDICODE);
var DESTINATION = this.formEdit.getForm().findField('DESTINATIONID').getValue();
if (DESTINATION == null || DESTINATION == '') {
this.formEdit.getForm().findField('DESTINATION').setValue(combo.value);
this.formBill.getForm().findField('DESTINATIONID').setValue(selectdata.EDICODE);
this.formEdit.getForm().findField('DESTINATIONID').setValue(selectdata.EDICODE);
}
var PLACEDELIVERY = this.formBill.getForm().findField('PLACEDELIVERYID').getValue();
if (PLACEDELIVERY == null || PLACEDELIVERY == '') {
//var PLACEDELIVERY = this.formBill.getForm().findField('PLACEDELIVERYID').getValue();
//if (PLACEDELIVERY == null || PLACEDELIVERY == '') {
//this.formEdit.getForm().findField('PLACEDELIVERY').setValue(combo.value);
this.formBill.getForm().findField('PLACEDELIVERYID').setValue(selectdata.EDICODE);
}
this.formEdit.getForm().findField('PLACEDELIVERYID').setValue(selectdata.EDICODE);
//}
this.formEdit.getForm().findField('LANE').setValue(records[0].data.LANE);
} else {
this.formBill.getForm().findField('PORTDISCHARGEID').setValue('');
this.formEdit.getForm().findField('PORTDISCHARGEID').setValue('');
}
}
},
@ -1901,20 +1901,20 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
var selectrecords = DsStoreQueryBy(this.storeCodeDisport2, 'PORT', combo.value);
if (selectrecords.getCount() > 0) {
var selectdata = selectrecords.getAt(0).data;
this.formBill.getForm().findField('DESTINATIONID').setValue(selectdata.EDICODE);
var PLACEDELIVERY = this.formBill.getForm().findField('PLACEDELIVERYID').getValue();
this.formEdit.getForm().findField('DESTINATIONID').setValue(selectdata.EDICODE);
var PLACEDELIVERY = this.formEdit.getForm().findField('PLACEDELIVERYID').getValue();
if (PLACEDELIVERY == null || PLACEDELIVERY == '') {
this.formEdit.getForm().findField('PLACEDELIVERY').setValue(combo.value);
this.formBill.getForm().findField('PLACEDELIVERYID').setValue(selectdata.EDICODE);
this.formEdit.getForm().findField('PLACEDELIVERYID').setValue(selectdata.EDICODE);
}
} else {
this.formBill.getForm().findField('DESTINATIONID').setValue('');
this.formEdit.getForm().findField('DESTINATIONID').setValue('');
}
}
},
change: function (field, newValue, oldValue, eOpts) {
if (newValue == null || newValue == '') {
this.formBill.getForm().findField('DESTINATIONID').setValue('');
this.formEdit.getForm().findField('DESTINATIONID').setValue('');
}
}
}
@ -2103,7 +2103,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
region: 'north',
frame: true,
bodyPadding: 5,
height: 250,
height: 270,
layout: 'anchor',
trackResetOnLoad: true,
fieldDefaults: {
@ -2138,9 +2138,11 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
this.comboxVoyVeg,
this.comboxPORTLOAD,
this.comboxTRANSPORT,
//
{
fieldLabel: '装港代码',
readOnly:true,
name: 'PORTLOADID'
},
{
fieldLabel: Zi.LAN.ORDERETD,
@ -2175,7 +2177,12 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
name: 'VOYNO'
},
this.comboxPORTDISCHARGE,
this.comboxDESTINATION,
{
fieldLabel: '卸港代码',
readOnly: true,
name: 'PORTDISCHARGEID'
},
{
fieldLabel: '驳船ETD',
@ -2199,14 +2206,14 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
name: "ORDER_CUSTCODE"
},
this.comboxLANE,
this.comboxDESTINATION,
{
fieldLabel: '目的地免箱天数',
labelWidth: 100,
// flex: 0.8,
name: 'DESTFBP'
fieldLabel: '目的代码',
readOnly: true,
name: 'DESTINATIONID'
},
this.comboxSERVICE
this.comboxTRANSPORT,
// , this.comboxPKGTYPE,
// {
@ -2233,16 +2240,39 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
//, this.comboxAgent
//, this.comboxYARD
]
}, {
}
, {
xtype: 'container',
defaultType: 'textfield',
layout: 'hbox',
items: [
{
fieldLabel: Zi.LAN.ORDER_CUSTNAME,
labelWidth: 70,
// flex: 0.8,
name: "ORDER_CUSTNAME"
},
{ xtype: 'hiddenfield' },
this.comboxLANE,
{
fieldLabel: '目的地免箱天数',
labelWidth: 100,
// flex: 0.8,
name: 'DESTFBP'
},
this.comboxSERVICE
//{ xtype: 'hiddenfield' },
//{ xtype: 'hiddenfield' }
]
}
, {
xtype: 'container',
defaultType: 'textfield',
layout: 'hbox',
items: [ {
fieldLabel: Zi.LAN.ORDER_CUSTNAME,
labelWidth: 70,
// flex: 0.8,
name: "ORDER_CUSTNAME"
},{
items: [
{xtype:'hiddenfield'},
{
xtype: 'textareafield',
grow: true,
flex: 2,
@ -2491,35 +2521,54 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
layout: 'hbox',
items: [this.comboxPLACERECEIPT, {
fieldLabel: '收货地代码',
//readOnly: true,
name: 'PLACERECEIPTID'
}]
}, {
xtype: 'container',
defaultType: 'textfield',
layout: 'hbox',
items: [{
items: [
this.comboxPLACEDELIVERY,
{
fieldLabel: '交货代码',
//readOnly: true,
name: 'PLACEDELIVERYID'
}, { xtype: 'hiddenfield' }]
}//, { xtype: 'hiddenfield' }
]
}, {
xtype: 'container',
defaultType: 'textfield',
layout: 'hbox',
items: [{
fieldLabel: '装港代码',
name: 'PORTLOADID'
}, {
fieldLabel: '卸港代码',
name: 'PORTDISCHARGEID'
}]
items: [
// {
// fieldLabel: '装港代码',
// readOnly:true,
// name: 'PORTLOADID'
//}, {
// fieldLabel: '卸港代码',
// readOnly: true,
// name: 'PORTDISCHARGEID'
// },
//{
//fieldLabel: '目的代码',
//readOnly: true,
//name: 'DESTINATIONID'
//},
]
}, {
xtype: 'container',
defaultType: 'textfield',
layout: 'hbox',
items: [{
fieldLabel: '目的代码',
name: 'DESTINATIONID'
}]
items: [
//{
//fieldLabel: '目的代码',
//readOnly: true,
//name: 'DESTINATIONID'
//}, { xtype: 'hiddenfield' }
]
}, {
xtype: 'container',
defaultType: 'textfield',

Write Preview
Loading…
Cancel
Save