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

'20220804下班前'

Browse Source
临时发布20240103
ddlucky 2 years ago
parent ebf95caf1c
commit 74a2b54866
21 changed files with 325 additions and 139 deletions
Show Stats Download Patch File Download Diff File

15
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
Unescape Escape View File

@ -105,6 +105,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append(",STUFF((SELECT ',' + SEALNO FROM op_ctn ctn WHERE ctn.BSNO = op_seae.BSNO FOR xml path('')),1, 1, '') AS SEALNOALL ");
strSql.Append(",dbo.F_STATUS_BULIAO(bsno) STATUS_BULIAO,dbo.F_STATUS_VGM(bsno) STATUS_VGM,dbo.F_STATUS_EDI(bsno) STATUS_EDI ");
strSql.Append(",(select ORDNO from crm_seaeorder where bsno=OP_SEAE.BSNO ) ORDNO");
strSql.Append(" from OP_SEAE ");
strSql.Append(" LEFT JOIN v_op_gain_dr_INV I ON (I.BSNO=OP_SEAE.BSNO) ");
@ -247,6 +248,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append(",STUFF((SELECT ',' + CNTRNO FROM op_ctn ctn WHERE ctn.BSNO = op_seae.BSNO FOR xml path('')),1, 1, '') AS CNTRNOALL ");
strSql.Append(", STUFF((SELECT ',' + SEALNO FROM op_ctn ctn WHERE ctn.BSNO = op_seae.BSNO FOR xml path('')),1, 1, '') AS SEALNOALL ");
strSql.Append(",dbo.F_STATUS_BULIAO(OP_SEAE.bsno) STATUS_BULIAO,dbo.F_STATUS_VGM(OP_SEAE.bsno) STATUS_VGM,dbo.F_STATUS_EDI(OP_SEAE.bsno) STATUS_EDI ");
strSql.Append(",(select ORDNO from crm_seaeorder where bsno=OP_SEAE.BSNO ) ORDNO");
strSql.Append(" from OP_SEAE ");
strSql.Append(" LEFT JOIN v_op_gain_dr_INV I ON (I.BSNO=OP_SEAE.BSNO) ");
@ -357,7 +359,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append(",CASE WHEN len(DESTINATIONID)<>5 THEN '' ELSE (select top 1 c_country_name from t_sys_country_code where c_country_code=LEFT(DESTINATIONID,2)) END as COUNTRY,EDI_TIME,VGM_TIME ");
strSql.Append(",STUFF((SELECT ',' + CNTRNO FROM op_ctn ctn WHERE ctn.BSNO = B.BSNO FOR xml path('')),1, 1, '') AS CNTRNOALL ");
strSql.Append(",STUFF((SELECT ',' + SEALNO FROM op_ctn ctn WHERE ctn.BSNO = B.BSNO FOR xml path('')),1, 1, '') AS SEALNOALL ");
strSql.Append(",(select ORDNO from crm_seaeorder where bsno=B.BSNO ) ORDNO");
strSql.Append(" from OP_SEAE B");
strSql.Append(" LEFT JOIN v_op_gain_dr_INV I ON (I.BSNO=B.BSNO) ");
strSql.Append(" left join (select bsno, sum(case when[status] = '海关放行' then 1 else 0 end) CUSTOMSSTATUS, sum(case when [status] = '运抵报告' then 1 else 0 end) HGYDSTATUS , sum(case when[status] = '码头放行' then 1 else 0 end) PORTSTATUS");
@ -499,7 +501,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append(",STUFF((SELECT ',' + CNTRNO FROM op_ctn ctn WHERE ctn.BSNO = op_seae.BSNO FOR xml path('')),1, 1, '') AS CNTRNOALL ");
strSql.Append(",STUFF((SELECT ',' + SEALNO FROM op_ctn ctn WHERE ctn.BSNO = op_seae.BSNO FOR xml path('')),1, 1, '') AS SEALNOALL ");
strSql.Append(",(select ORDNO from crm_seaeorder where bsno=OP_SEAE.BSNO ) ORDNO");
strSql.Append(" from OP_SEAE ");
strSql.Append(" LEFT JOIN v_op_gain_dr_INV I ON (I.BSNO=OP_SEAE.BSNO) ");
@ -592,7 +594,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append(",0 CUSTOMSSTATUS,0 PORTSTATUS,0 EXPSTATUS,0 TRUCKCTNSTATUS,0 CTNRETURNSTATUS,0 HGYDSTATUS ,B.TRUCKSTATUS,0 ATASTATUS,0 STCSSTATUS,0 RCVESTATUS,'' COUNTRY,EDI_TIME,VGM_TIME ");
strSql.Append(",STUFF((SELECT ',' + CNTRNO FROM op_ctn ctn WHERE ctn.BSNO = B.BSNO FOR xml path('')),1, 1, '') AS CNTRNOALL ");
strSql.Append(",STUFF((SELECT ',' + SEALNO FROM op_ctn ctn WHERE ctn.BSNO = B.BSNO FOR xml path('')),1, 1, '') AS SEALNOALL ");
strSql.Append(",(select ORDNO from crm_seaeorder where bsno=B.BSNO ) ORDNO");
strSql.Append(" from OP_AMEND A ");
strSql.Append(" LEFT JOIN OP_SEAE B ON (B.BSNO=A.PARENTID)");
strSql.Append(" LEFT JOIN v_op_gain_dr_INV I ON (I.BSNO=A.BSNO) ");
@ -865,7 +867,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append(",CASE WHEN len(DESTINATIONID)<>5 THEN '' ELSE (select top 1 c_country_name from t_sys_country_code where c_country_code=LEFT(DESTINATIONID,2)) END as COUNTRY,EDI_TIME,VGM_TIME ");
strSql.Append(",STUFF((SELECT ',' + CNTRNO FROM op_ctn ctn WHERE ctn.BSNO = B.BSNO FOR xml path('')),1, 1, '') AS CNTRNOALL ");
strSql.Append(",STUFF((SELECT ',' + SEALNO FROM op_ctn ctn WHERE ctn.BSNO = B.BSNO FOR xml path('')),1, 1, '') AS SEALNOALL ");
strSql.Append(",(select ORDNO from crm_seaeorder where bsno=B.BSNO ) ORDNO");
strSql.Append(" from OP_SEAE B");
if (!string.IsNullOrEmpty(condition))
@ -931,7 +933,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append(",0 CUSTOMSSTATUS,0 PORTSTATUS,0 EXPSTATUS,0 TRUCKCTNSTATUS,0 CTNRETURNSTATUS,0 HGYDSTATUS,TRUCKSTATUS,0 ATASTATUS,0 STCSSTATUS,0 RCVESTATUS,'' COUNTRY,EDI_TIME,VGM_TIME ");
strSql.Append(",STUFF((SELECT ',' + CNTRNO FROM op_ctn ctn WHERE ctn.BSNO = B.BSNO FOR xml path('')),1, 1, '') AS CNTRNOALL ");
strSql.Append(",STUFF((SELECT ',' + SEALNO FROM op_ctn ctn WHERE ctn.BSNO = B.BSNO FOR xml path('')),1, 1, '') AS SEALNOALL ");
strSql.Append(",(select ORDNO from crm_seaeorder where bsno=B.BSNO ) ORDNO");
strSql.Append(" from OP_SEAE B");
// strSql.Append(" left join V_OP_STATUS S ON (S.BSNO=B.BSNO) ");
@ -1408,6 +1410,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
data.STATUS_EDI = Convert.ToString(reader["STATUS_EDI"]);
}
data.ORDNO = Convert.ToString(reader["ORDNO"]);
#endregion
headList.Add(data);
}
@ -1508,7 +1511,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append(",STUFF((SELECT ',' + CNTRNO FROM op_ctn ctn WHERE ctn.BSNO = op_seae.BSNO FOR xml path('')),1, 1, '') AS CNTRNOALL ");
strSql.Append(",STUFF((SELECT ',' + SEALNO FROM op_ctn ctn WHERE ctn.BSNO = op_seae.BSNO FOR xml path('')),1, 1, '') AS SEALNOALL ");
strSql.Append(",(select ORDNO from crm_seaeorder where bsno=OP_SEAE.BSNO ) ORDNO");
strSql.Append(" from OP_SEAE ");
strSql.Append(" LEFT JOIN v_op_gain_bs I ON (I.BSNO=OP_SEAE.BSNO) ");

2
DSWeb/Areas/MvcShipping/Models/MsOpSeae/MsOpSeae.cs
Unescape Escape View File

@ -2164,6 +2164,8 @@ namespace DSWeb.MvcShipping.Models.MsOpSeae
public string STATUS_BULIAO { get; set; }
public string STATUS_VGM { get; set; }
public string STATUS_EDI { get; set; }
public string ORDNO { get; set; }
#endregion
public MsOpSeae()

18
DSWeb/Areas/MvcShipping/Viewsjs/Comm/BasicDataRefModel.js
Unescape Escape View File

@ -308,10 +308,26 @@ Ext.define('DsShipping.ux.FeeTypeRefModel', {
{ name: 'FEEFRT', type: 'string' },
{ name: 'TAXRATE', type: 'number' },
{ name: 'ISADVANCEDPAY', type: 'string' }
]
});
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' }
]
});
//配料参照 Model
Ext.define('DsShipping.ux.PluRefModel', {
extend: 'Ext.data.Model',

74
DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js
Unescape Escape View File

@ -839,12 +839,12 @@ Ext.extend(Shipping.MainForm, Ext.Panel, {
//委托单位
this.PubStore_InfoClient_ISCONTROLLER = Ext.create('DsExt.ux.RefTableStore', {
model: modname,
proxy: { url: modurl }
model: 'DsShipping.ux.CustomRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetCustomRefListController' }
});
this.PubStore_InfoClient_ISCONTROLLER_BEFORE = Ext.create('DsExt.ux.RefTableStore', {
model: modname,
proxy: { url: modurl }
model: 'DsShipping.ux.CustomRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetCustomRefListController' }
});
this.PubStore_CustomerAll = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.CustomRefModel',
@ -970,6 +970,30 @@ Ext.extend(Shipping.MainForm, Ext.Panel, {
_this.LoadPubStore("PubStore_CustomerAll");
this.PubStore_FORWARDER = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.CustomRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetCustomRefListFORWARDER' }
});
_this.LoadPubStore("FORWARDER");
this.PubStore_SeaFee = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.FeeTypeRefModel',
proxy: { url: '/MvcShipping/MsChFee/GetFeeTypeRefList' }
});
_this.LoadPubStore("PubStore_SeaFee");
this.PubStore_Shipper = Ext.create('DsExt.ux.RefTableStore', {
model: 'OpSeaeShipper',
proxy: { url: '/MvcShipping/MsOpSeae/GetShipperList' }
});
_this.LoadPubStore("PubStore_Shipper");
_this.LoadPubStore("INFOCLIENT_ISCONTROLLER");
//window.storeCustomerAll = Ext.create('DsExt.ux.RefTableStore', {
// model: 'DsShipping.ux.CustomRefModel',
// proxy: { url: '/CommMng/BasicDataRef/GetCustomSimpleList' }
@ -1048,6 +1072,36 @@ Ext.extend(Shipping.MainForm, Ext.Panel, {
}
});
}
if (STORENAME == "FORWARDER") {
this.PubStore_FORWARDER.load({
params: { condition: "ISBOOKING='1'" },
callback: function (options, success, response) {
//_this.PubStore_InfoClient_ISCONTROLLER.loadData(_this.PubStore_InfoClient_ISCONTROLLER_BEFORE.data.items);
}
});
}
if (STORENAME == "PubStore_SeaFee") {
this.PubStore_SeaFee.load({
params: { condition: " ISSEA='1' " },
callback: function (options, success, response) {
//_this.PubStore_InfoClient_ISCONTROLLER.loadData(_this.PubStore_InfoClient_ISCONTROLLER_BEFORE.data.items);
}
});
}
if (STORENAME == "PubStore_Shipper") {
this.PubStore_Shipper.load({
params: { condition: " shippertype=2 " },
callback: function (options, success, response) {
//_this.PubStore_InfoClient_ISCONTROLLER.loadData(_this.PubStore_InfoClient_ISCONTROLLER_BEFORE.data.items);
}
});
}
if (STORENAME == "INFOCLIENT_ISCONTROLLER") {
this.PubStore_InfoClient_ISCONTROLLER_BEFORE.load({
params: { STORENAME: STORENAME },
@ -1166,6 +1220,18 @@ Ext.extend(Shipping.MainForm, Ext.Panel, {
if (STORENAME == "PubStore_CustomerAll") {
result = this.PubStore_CustomerAll;
}
if (STORENAME == "FORWARDER") {
result = this.PubStore_FORWARDER;
}
if (STORENAME == "PubStore_SeaFee") {
result = this.PubStore_SeaFee;
}
if (STORENAME == "PubStore_Shipper") {
result = this.PubStore_Shipper;
}
if (STORENAME == "INFOCLIENT_ISCONTROLLER") {
result = this.PubStore_InfoClient_ISCONTROLLER;
}

40
DSWeb/Areas/MvcShipping/Viewsjs/MsAireOrder/MsAireOrderEdit.js
Unescape Escape View File

@ -213,12 +213,12 @@ Ext.extend(Shipping.MsAireOrderEdit, Ext.Panel, {
if (this.storeInfoClientContact.getCount() > 0) {
var member = this.storeInfoClientContact.getAt(0);
this.comboxInfoClientContact.setValue(member.data.SHOWNAME);
// this.getFormField('OPERATOREMAIL').setValue(member.data.EMAIL);
this.getFormField('OPERATOREMAIL').setValue(member.data.EMAIL);
this.getFormField('OPERATORTEL').setValue(member.data.TEL);
// this.getFormField('OPERATORFAX').setValue(member.data.FAX);
} else {
this.comboxInfoClientContact.setValue('');
// this.getFormField('OPERATOREMAIL').setValue('');
this.getFormField('OPERATOREMAIL').setValue('');
this.getFormField('OPERATORTEL').setValue('');
// this.getFormField('OPERATORFAX').setValue('');
@ -296,11 +296,11 @@ Ext.extend(Shipping.MsAireOrderEdit, Ext.Panel, {
var Cargoinforecords = DsStoreQueryBy(this.storeInfoClientContact, 'GID', records[0].data.GID);
if (Cargoinforecords.getCount() > 0) {
var Cargoinfodata = Cargoinforecords.getAt(0).data;
// this.getFormField('OPERATOREMAIL').setValue(Cargoinfodata.EMAIL);
this.getFormField('OPERATOREMAIL').setValue(Cargoinfodata.EMAIL);
this.getFormField('OPERATORTEL').setValue(Cargoinfodata.TEL);
// this.getFormField('OPERATORFAX').setValue(Cargoinfodata.FAX);
} else {
// this.getFormField('OPERATOREMAIL').setValue('');
this.getFormField('OPERATOREMAIL').setValue('');
this.getFormField('OPERATORTEL').setValue('');
// this.getFormField('OPERATORFAX').setValue('');
}
@ -1868,14 +1868,18 @@ Ext.extend(Shipping.MsAireOrderEdit, Ext.Panel, {
defaultType: 'textfield',
items: [this.comboxCustCode
, {
fieldLabel: '客户单号',
fieldLabel: '参考号',
flex: 1,
name: 'STLNAMESERVICECONTRACTNO'
name: 'SERVICECONTRACTNO'//SERVICECONTRACTNO
}
, this.comboxInfoClientContact, {
fieldLabel: 'TEL',
name: 'OPERATORTEL'
}, {
fieldLabel: 'Email',
flex:3,
name: 'OPERATOREMAIL'
}
@ -1885,9 +1889,10 @@ Ext.extend(Shipping.MsAireOrderEdit, Ext.Panel, {
}
, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
xtype: 'container',
layout: 'hbox',
hidden:true,
defaultType: 'textfield',
items: [{
xtype: 'container',
layout: 'hbox',
@ -1937,6 +1942,7 @@ Ext.extend(Shipping.MsAireOrderEdit, Ext.Panel, {
, {
xtype: 'container',
layout: 'hbox',
hidden:true,
defaultType: 'textfield',
items: [
@ -1962,13 +1968,14 @@ Ext.extend(Shipping.MsAireOrderEdit, Ext.Panel, {
, this.myCheckboxService,
{
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [ {
fieldLabel: '发票号', //'发票号',
name: 'INVNO'
}, this.comboxClientFCContact, {
xtype: 'container',
layout: 'hbox',
hidden: true,
defaultType: 'textfield',
items: [ {
fieldLabel: '发票号', //'发票号',
name: 'INVNO'
}, this.comboxClientFCContact, {
fieldLabel: 'TEL',
name: 'FINANCIALSTAFFTEL'
}]
@ -1978,6 +1985,7 @@ Ext.extend(Shipping.MsAireOrderEdit, Ext.Panel, {
, {
xtype: 'container',
layout: 'hbox',
hidden: true,
flex: 3,
defaultType: 'textfield',
items: [

18
DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeAmendDrCrGrid.js
Unescape Escape View File

@ -140,17 +140,31 @@ Ext.extend(Shipping.FeeAmendEditGrid, Ext.Panel, {
this.comboxFeeNameRef = Ext.create('DsExt.ux.RefTableCombox', {
store: this.storeFeeNameRef,
forceSelection: true,
matchFieldWidth: false,
name: 'FeeName',
valueField: 'Name',
displayField: 'CodeAndName'
displayField: 'CodeAndName',
listeners: {
scope: this,
'beforequery': function (e) {
return FilterCombox(e, 1);//在beforequery使用此方法
}
}
});
this.comboxFeeNameRefCr = Ext.create('DsExt.ux.RefTableCombox', {
store: this.storeFeeNameRefCr,
forceSelection: true,
matchFieldWidth: false,
name: 'FeeName',
valueField: 'Name',
displayField: 'CodeAndName'
displayField: 'CodeAndName',
listeners: {
scope: this,
'beforequery': function (e) {
return FilterCombox(e, 1);//在beforequery使用此方法
}
}
});

10
DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js
Unescape Escape View File

@ -156,7 +156,13 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
lazyRender: false,
name: 'FeeName',
valueField: 'Name',
displayField: 'CodeAndName'
displayField: 'CodeAndName',
listeners: {
scope: this,
'beforequery': function (e) {
return FilterCombox(e, 1);//在beforequery使用此方法
}
}
});
this.comboxFeeENameRef = Ext.create('DsExt.ux.RefTableCombox', {
@ -194,7 +200,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
displayField: 'CodeAndName',
listeners: {
beforequery: function (e) {
return FilterCombox(e);
return FilterCombox(e,1);
},
specialkey: function (field, e) {
//将回车13转义成tab9

22
DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/OrderFeeGrid.js
Unescape Escape View File

@ -88,9 +88,16 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
this.comboxFeeNameRef = Ext.create('DsExt.ux.RefTableCombox', {
store: this.storeFeeNameRef,
forceSelection: true,
matchFieldWidth: false, //下拉款自适应宽度
name: 'FeeName',
valueField: 'Name',
displayField: 'CodeAndName'
displayField: 'CodeAndName',
listeners: {
scope: this,
'beforequery': function (e) {
return FilterCombox(e,1);//在beforequery使用此方法
}
}
});
this.storeFeeNameRefCr = Ext.create('DsExt.ux.RefTableStore', {
@ -101,9 +108,16 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
this.comboxFeeNameRefCr = Ext.create('DsExt.ux.RefTableCombox', {
store: this.storeFeeNameRefCr,
forceSelection: true,
matchFieldWidth: false, //下拉款自适应宽度
name: 'FeeName',
valueField: 'Name',
displayField: 'CodeAndName'
displayField: 'CodeAndName',
listeners: {
scope: this,
'beforequery': function (e) {
return FilterCombox(e, 1);//在beforequery使用此方法
}
}
});
@ -111,7 +125,7 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
model: 'DsShipping.ux.CustomRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
});
this.storeCustomerNameRef.load({ params: { condition: ""} });
//this.storeCustomerNameRef.load({ params: { condition: ""} });
this.comboxCustomerNameRef = Ext.create('DsExt.ux.RefTableCombox', {
@ -126,7 +140,7 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
model: 'DsShipping.ux.CustomRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
});
this.storeCustomerNameRefCr.load({ params: { condition: ""} });
//this.storeCustomerNameRefCr.load({ params: { condition: ""} });
this.comboxCustomerNameRefCr = Ext.create('DsExt.ux.RefTableCombox', {

12
DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientEdit.js
Unescape Escape View File

@ -2581,7 +2581,13 @@ Ext.extend(Shipping.MsInfoClientEdit, Ext.Panel, {
if (drmodify.length != 0){
modifystr = Zi.LAN.YinHangXinXiWeiBaoCun;//'银行信息未保存,如果离开此页，将丢失未保存的更改 ！！！';
}
if (panelEdit.formEdit.getForm().isDirty() == true || panelEdit.formACC.getForm().isDirty() == true || drmodify.length != 0) {
if (
panelEdit.formEdit.getForm().isDirty() == true
|| panelEdit.formACC.getForm().isDirty() == true
||
drmodify.length != 0
)
{
modifystr = Zi.LAN.JiBenXinXiWeiBaoCun;//'基本信息未保存,如果离开此页，将丢失未保存的更改 ！！！';
}
if (modifystr != "") {
@ -2601,7 +2607,7 @@ Ext.extend(Shipping.MsInfoClientEdit, Ext.Panel, {
}
var children = this.tabSeaeWTpanel.items;
var children = this.tabSeaepanel.items;
if (children) {
for (var i = children.length - 1, len = 0; i >= len; i--) {
if (children.items[i].id) {
@ -2646,7 +2652,7 @@ Ext.extend(Shipping.MsInfoClientEdit, Ext.Panel, {
return;
}
var children = this.tabSeaeWTpanel.items;
var children = this.tabSeaepanel.items;
if (children) {
for (var i = children.length - 1, len = 0; i >= len; i--) {
if (children.items[i].id) {

33
DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientRang.js
Unescape Escape View File

@ -237,18 +237,7 @@ Ext.extend(Shipping.MsInfoClientRang, Ext.Panel, {
////////////////////////////////////////////////
this.gridList.addListener('itemclick', function (dataview, record, item, index, e, b) {
this.SelectedRecord = record;
this.OprationStatus = 'edit';
this.sqlCustcontext = " ((TYPE='2' AND GID IN (SELECT USERID FROM info_client_range WHERE SHORTNAME='" + record.data.SHORTNAME + "')) OR (TYPE='1' AND GID IN (SELECT deptgid FROM VW_user WHERE USERID IN (SELECT USERID FROM info_client_range WHERE SHORTNAME='" + record.data.SHORTNAME + "'))) "
+ " OR (TYPE='0' AND GID IN (SELECT COMPANYID FROM VW_user WHERE USERID IN (SELECT USERID FROM info_client_range WHERE SHORTNAME='" + record.data.SHORTNAME + "'))) )";
// this.treestoreCustRange.load
this.treestoreCustRange.load({
params: {
PARENTID: '-1', condition: _this.sqlCustcontext
},
waitMsg: "正在查询数据...",
scope: this
});
this.ClientClick(dataview, record, item, index, e, b);
}, this);
this.gridList.addListener('sortchange', function (ct, column, direction, eOpts) {
@ -764,6 +753,9 @@ Ext.extend(Shipping.MsInfoClientRang, Ext.Panel, {
var seletdata = this.tabtree.getChecked();
// var seletdata = selectops[0].store.data;
var _rec = selections[0];
_this = this;
var seltype = '';
if (seletdata.length> 0) {
for (var j = 0; j < seletdata.length ; j++) {
@ -801,7 +793,8 @@ Ext.extend(Shipping.MsInfoClientRang, Ext.Panel, {
if (success) {
var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) {
this.treestoreCustRange.reload();
//this.treestoreCustRange.reload();
_this.ClientClick('', _rec);
Ext.Msg.hide();
}
else {
@ -1290,6 +1283,20 @@ Ext.extend(Shipping.MsInfoClientRang, Ext.Panel, {
}); //end Ext.Ajax.request
}
, ClientClick(dataview, record, item, index, e, b) {
this.SelectedRecord = record;
this.OprationStatus = 'edit';
this.sqlCustcontext = " ((TYPE='2' AND GID IN (SELECT USERID FROM info_client_range WHERE SHORTNAME='" + record.data.SHORTNAME + "')) OR (TYPE='1' AND GID IN (SELECT deptgid FROM VW_user WHERE USERID IN (SELECT USERID FROM info_client_range WHERE SHORTNAME='" + record.data.SHORTNAME + "'))) "
+ " OR (TYPE='0' AND GID IN (SELECT COMPANYID FROM VW_user WHERE USERID IN (SELECT USERID FROM info_client_range WHERE SHORTNAME='" + record.data.SHORTNAME + "'))) )";
// this.treestoreCustRange.load
this.treestoreCustRange.load({
params: {
PARENTID: '-1', condition: _this.sqlCustcontext
},
waitMsg: "正在查询数据...",
scope: this
});
}
});

19
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
Unescape Escape View File

@ -196,9 +196,24 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
sortable: true,
id: '',
dataIndex: 'ORDERNO',
header: Zi.LAN.ORDERNO, //'订舱编号',
header: Zi.LAN.ORDERNO, //'BC',
width: 120,
filter: true
}, {
sortable: true,
id: '',
dataIndex: 'ORDNO',
header: Zi.LAN.ORDNO, //'ORDNO',
width: 120,
filter: true,
renderer: function (value, meta) {
meta.tdCls = 'mblno';
btnurl = getGridCopyButton(value);
return btnurl + value;
}
}, {
sortable: true,
id: '',
@ -8651,7 +8666,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
var MblNo = form.findField('MblNo').getValue();
MblNo = MblNo.trim();
sql = sql + getAndConSql(sql, MblNo, "(B.MblNo like '%" + MblNo + "%' or B.CONTRACTNO like '%" + MblNo + "%' or B.CUSTNO like '%" + MblNo + "%' or B.HBLNO like '%"
+ MblNo + "%' or B.ORDERNO like '%" + MblNo + "%' or B.APPLYNO like '%" + MblNo + "%' or B.SERVICECONTRACTNO like '%" + MblNo + "%' )");
+ MblNo + "%' or B.ORDERNO like '%" + MblNo + "%' or B.APPLYNO like '%" + MblNo + "%' or B.SERVICECONTRACTNO like '%" + MblNo + "%' or exists (select 1 from crm_seaeorder where ORDNO like '%" + MblNo +"%' and BSNO= OP_SEAE.BSNO) )");
var HblNo = form.findField('HblNo').getValue();

3
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeModel.js
Unescape Escape View File

@ -232,7 +232,8 @@
{ name: 'SEALNOALL', type: 'string' },
{ name: 'STATUS_BULIAO', type: 'string' },
{ name: 'STATUS_VGM', type: 'string' },
{ name: 'STATUS_EDI', type: 'string' }
{ name: 'STATUS_EDI', type: 'string' },
{ name: 'ORDNO', type: 'string' }
]
});

1
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js
Unescape Escape View File

@ -323,6 +323,7 @@ Zi.LAN.OPERATOR2 = "Customer Contact"; //"委托单位联系人";
Zi.LAN.OPERATORTEL = "TEL"; //"TEL";
Zi.LAN.OPSTATUS = "Satus"; //"业务状态";
Zi.LAN.ORDERNO = "BookingNO"; //"订舱编号";
Zi.LAN.ORDNO = "ORDNO"; //"订单号";
Zi.LAN.ORDERREMARK = "订舱人说明";
Zi.LAN.ORDERTYPE = "Booking Type"; //"订舱方式";
Zi.LAN.OTCNTR = "Ohter Cont"; //"其他箱型";

1
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js
Unescape Escape View File

@ -242,6 +242,7 @@ Zi.LAN.OPERATOR2 = "委托单位联系人";
Zi.LAN.OPERATORTEL = "TEL";
Zi.LAN.OPSTATUS = "业务状态";
Zi.LAN.ORDERNO = "BC";
Zi.LAN.ORDNO = "订单号"; //"订单号";
Zi.LAN.ORDERREMARK = "订舱人说明";
Zi.LAN.ORDERTYPE = "订舱方式";
Zi.LAN.OTCNTR = "其他箱型";

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

@ -24,6 +24,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
AUDITDATA3: {},
AuditDuino: "",
copyfee: false,
mainWin: {},
initUIComponents: function () {
this.serialNo = 0;
@ -35,6 +36,9 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
this.SaleOrderAuditSelf = 0;
this.ISMUSTBECNTR = '0';
parentWin = window.parent.opener;
this.mainWin = getMainForm(parentWin);
//#region 信息加载
@ -115,6 +119,12 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
}
});
this.PubStore_CustomerAll = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.CustomRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetCustomSimpleList' }
});
this.PubStore_CustomerAll.loadData(this.mainWin.GetPubStore("PubStore_CustomerAll").data.items);
//所属部门
this.storeDept = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.DeptModel',
@ -421,15 +431,21 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
if (!currFORWARDER || currFORWARDER == "")
{
this.storeFORWARDER.load({
params: { condition: "ISBOOKING='1'" },
var forward = this.storeFORWARDER.findRecord('CustName', combo.value);
callback: function (r, options, success) {
if (success) {
_this.formEdit.getForm().findField('FORWARDER').setValue(combo.value);
}
},
});
if (forward) {
_this.formEdit.getForm().findField('FORWARDER').setValue(combo.value);
}
//this.storeFORWARDER.load({
// params: { condition: "ISBOOKING='1'" },
// callback: function (r, options, success) {
// if (success) {
// _this.formEdit.getForm().findField('FORWARDER').setValue(combo.value);
// }
// },
//});
}
@ -531,11 +547,12 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
proxy: { url: '/CommMng/BasicDataRef/GetCustomRefListFORWARDER' }
});
// this.storeFORWARDER.load({ params: { condition: "ISBOOKING='1'"} });
this.storeFORWARDER.loadData(this.mainWin.GetPubStore("FORWARDER").data.items);
//船公司
this.comboxFORWARDER = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '订舱代理',
store: this.storeFORWARDER,
queryMode: 'remote',
//queryMode: 'remote',
forceSelection: true,
matchFieldWidth: false,
minChars: 1,
@ -3011,7 +3028,8 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
model: 'DsShipping.ux.CustomRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
});
this.storeFORWARDER2.load({ params: { condition: "ISBOOKING='1'"} });
//this.storeFORWARDER2.load({ params: { condition: "ISBOOKING='1'"} });
this.storeFORWARDER2.loadData(this.mainWin.GetPubStore("FORWARDER").data.items);
//船公司
this.comboxFORWARDER2 = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '订舱代理',
@ -3215,10 +3233,14 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
this.panelFee.StoreDrOpRange.load({ params: { optype: "modSeaeOrderList"} });
this.panelFee.StoreCrOpRange.load({ params: { optype: "modSeaeOrderList"} });
this.panelFee.storeFeeNameRef.load({ params: { condition: "ISSEA='1' "} });
this.panelFee.storeFeeNameRefCr.load({ params: { condition: "ISSEA='1' "} });
//this.panelFee.storeFeeNameRef.load({ params: { condition: "ISSEA='1' "} });
//this.panelFee.storeFeeNameRefCr.load({ params: { condition: "ISSEA='1' "} });
this.panelFee.storeFeeNameRef.loadData(this.mainWin.GetPubStore("PubStore_SeaFee").data.items);
this.panelFee.storeFeeNameRefCr.loadData(this.mainWin.GetPubStore("PubStore_SeaFee").data.items);
this.panelFee.storeCustomerNameRef.loadData(this.mainWin.GetPubStore("PubStore_CustomerAll").data.items);
this.panelFee.storeCustomerNameRefCr.loadData(this.mainWin.GetPubStore("PubStore_CustomerAll").data.items);
//#endregion
@ -4318,25 +4340,27 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
// },
// scope: this
//});
this.storeShipper.load({
params: { condition: " shippertype=2 " },
callback: function (r, options, success) {
if (success) {
this.formBill.getForm().findField('SHIPPERID').setValue(data.SHIPPERID);
}
},
scope: this
});
this.storeShipper_fen.load({
params: { condition: " shippertype=2 " },
callback: function (r, options, success) {
if (success) {
//this.formBill.getForm().findField('SHIPPERID').setValue(data.SHIPPERID);
}
},
scope: this
});
this.storeShipper.loadData(this.mainWin.GetPubStore("PubStore_Shipper").data.items);
//this.storeShipper.load({
// params: { condition: " shippertype=2 " },
// callback: function (r, options, success) {
// if (success) {
// this.formBill.getForm().findField('SHIPPERID').setValue(data.SHIPPERID);
// }
// },
// scope: this
//});
this.storeShipper_fen.loadData(this.mainWin.GetPubStore("PubStore_Shipper").data.items);
//this.storeShipper_fen.load({
// params: { condition: " shippertype=2 " },
// callback: function (r, options, success) {
// if (success) {
// //this.formBill.getForm().findField('SHIPPERID').setValue(data.SHIPPERID);
// }
// },
// scope: this
//});
this.storeConsignee.load({ params: { condition: "shippertype=1 AND (ISPUBLIC=1 OR CODENAME IN (SELECT CODENAME FROM info_client WHERE SHORTNAME='" + CUSTOMERNAME + "') )" },
callback: function (r, options, success) {
@ -4346,6 +4370,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
},
scope: this
});
this.storenotifyparty.load({ params: { condition: "shippertype=3 AND (ISPUBLIC=1 OR CODENAME IN (SELECT CODENAME FROM info_client WHERE SHORTNAME='" + CUSTOMERNAME + "') )" },
callback: function (r, options, success) {
if (success) {

19
DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderIndex.js
Unescape Escape View File

@ -18,6 +18,10 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
initUIComponents: function () {
this.formname = "formMsSeaeOrderIndex"; //页面名称
parentWin = window.parent;
mainWin = getMainForm(parentWin);
this.PluginCover = new Shipping.OpSeaCover({ region: "center" }, 1);
this.bsno = '11111';
//定义数据集
@ -137,13 +141,13 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
{
sortable: true,
dataIndex: 'CUSTOMERNAME',
header: '委托单位',
header: '下单客户',
width: 120
},
{
sortable: true,
dataIndex: 'CUSTOMERFULLNAME',
header: '委托单位全称',
header: '下单客户全称',
width: 120
}, {
sortable: true,
@ -555,19 +559,22 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
model: 'DsShipping.ux.CustomRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetCustomRefListController' }
});
this.storeCustCode.loadData(mainWin.GetPubStore("INFOCLIENT_ISCONTROLLER").data.items);
//委托单位
this.comboxCustCode = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '委托单位',
fieldLabel: '下单客户',
store: this.storeCustCode,
queryMode: 'remote',
minChars: 1,
//queryMode: 'remote',
//minChars: 2,
queryParam: 'CODENAME',
name: 'CUSTOMERNAME',
valueField: 'CustName',
displayField: 'CodeAndName',
enableKeyEvents: true,
listeners: {
beforequery: function (e) {
return FilterCombox(e); //在beforequery使用此方法
},
specialkey: function (field, e) {
if (e.getKey() == e.ENTER) {
_this.onRefreshClick();

15
DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderModel.js
Unescape Escape View File

@ -308,21 +308,6 @@ 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' }
]
});
Ext.define('MsOpSeaeDetail', {

51
DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
Unescape Escape View File

@ -1034,7 +1034,7 @@
<publishTime>04/22/2022 16:55:29</publishTime>
</File>
<File Include="Areas/CommMng/Viewsjs/Comm/PubFunction.js">
<publishTime>04/22/2022 16:55:29</publishTime>
<publishTime>08/02/2022 18:10:58</publishTime>
</File>
<File Include="Areas/CommMng/Viewsjs/Cookie/Cookies.js">
<publishTime>04/22/2022 16:55:29</publishTime>
@ -3608,7 +3608,7 @@
<publishTime>08/02/2022 16:54:36</publishTime>
</File>
<File Include="Areas/MvcShipping/Views/MsAireOrder/Edit.aspx">
<publishTime>08/02/2022 17:48:25</publishTime>
<publishTime>08/03/2022 17:31:49</publishTime>
</File>
<File Include="Areas/MvcShipping/Views/MsAireOrder/Index.aspx">
<publishTime>08/02/2022 17:48:25</publishTime>
@ -5554,6 +5554,15 @@
<File Include="Areas/MvcShipping/Viewsjs/MsAireOrder/Index.js">
<publishTime>08/02/2022 17:08:47</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsAireOrder/MsAireOrderEdit.js">
<publishTime>08/04/2022 11:12:23</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsAireOrder/MsAireOrderEditView.js">
<publishTime>08/02/2022 17:00:53</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsAireOrder/MsAireOrderIndex.js">
<publishTime>08/03/2022 15:35:15</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsAireOrder/MsOpAireEdit.js">
<publishTime>08/02/2022 17:00:53</publishTime>
</File>
@ -5612,7 +5621,7 @@
<publishTime>04/29/2022 10:34:06</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsChFee/FeeAmendDrCrGrid.js">
<publishTime>07/29/2022 15:28:51</publishTime>
<publishTime>08/04/2022 10:51:23</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsChFee/FeeAudit.js">
<publishTime>04/22/2022 16:55:10</publishTime>
@ -5621,7 +5630,7 @@
<publishTime>04/22/2022 16:55:10</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js">
<publishTime>07/29/2022 15:28:51</publishTime>
<publishTime>08/04/2022 10:52:00</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGridCtnTk.js">
<publishTime>04/22/2022 16:55:10</publishTime>
@ -5642,7 +5651,7 @@
<publishTime>04/22/2022 16:55:10</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsChFee/OrderFeeGrid.js">
<publishTime>07/29/2022 15:28:51</publishTime>
<publishTime>08/04/2022 10:45:31</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsChFee/QuotationList.js">
<publishTime>04/22/2022 16:55:10</publishTime>
@ -6710,7 +6719,7 @@
<publishTime>04/22/2022 16:55:10</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientRang.js">
<publishTime>04/22/2022 16:55:10</publishTime>
<publishTime>08/04/2022 11:04:35</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientSaleIndex.js">
<publishTime>04/22/2022 16:55:10</publishTime>
@ -6857,7 +6866,7 @@
<publishTime>07/29/2022 15:28:51</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireModel.js">
<publishTime>07/26/2022 12:37:11</publishTime>
<publishTime>08/03/2022 18:06:31</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireSaleEdit.js">
<publishTime>07/29/2022 15:28:51</publishTime>
@ -7763,10 +7772,10 @@
<publishTime>07/26/2022 12:37:12</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js">
<publishTime>07/29/2022 15:45:53</publishTime>
<publishTime>08/04/2022 12:07:08</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeModel.js">
<publishTime>07/29/2022 15:45:10</publishTime>
<publishTime>08/04/2022 12:07:18</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeModify.js">
<publishTime>04/22/2022 16:55:10</publishTime>
@ -7832,10 +7841,10 @@
<publishTime>07/26/2022 12:37:12</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js">
<publishTime>07/29/2022 15:28:52</publishTime>
<publishTime>08/04/2022 12:05:12</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js">
<publishTime>07/29/2022 15:45:10</publishTime>
<publishTime>08/04/2022 12:05:12</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeaeEdi/CustomEdit.js">
<publishTime>04/22/2022 16:55:12</publishTime>
@ -8510,7 +8519,7 @@
<publishTime>08/02/2022 14:47:23</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js">
<publishTime>08/02/2022 11:20:55</publishTime>
<publishTime>08/03/2022 15:56:42</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderIndex.js">
<publishTime>08/01/2022 16:56:00</publishTime>
@ -12806,10 +12815,10 @@
<publishTime>07/01/2022 11:51:45</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>08/02/2022 17:49:39</publishTime>
<publishTime>08/04/2022 12:08:21</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>08/02/2022 17:49:39</publishTime>
<publishTime>08/04/2022 12:08:21</publishTime>
</File>
<File Include="bin/AspNetPager.dll">
<publishTime>07/29/2022 15:28:52</publishTime>
@ -12869,19 +12878,19 @@
<publishTime>08/02/2022 17:48:26</publishTime>
</File>
<File Include="bin/DSWeb.dll">
<publishTime>08/02/2022 17:49:14</publishTime>
<publishTime>08/04/2022 12:07:52</publishTime>
</File>
<File Include="bin/DSWeb.Interface.dll">
<publishTime>08/02/2022 17:48:26</publishTime>
<publishTime>08/04/2022 12:07:37</publishTime>
</File>
<File Include="bin/DSWeb.Interface.pdb">
<publishTime>08/02/2022 17:48:26</publishTime>
<publishTime>08/04/2022 12:07:37</publishTime>
</File>
<File Include="bin/DSWeb.pdb">
<publishTime>08/02/2022 17:49:14</publishTime>
<publishTime>08/04/2022 12:07:52</publishTime>
</File>
<File Include="bin/DSWeb.XmlSerializers.dll">
<publishTime>08/02/2022 17:49:15</publishTime>
<publishTime>08/04/2022 12:07:53</publishTime>
</File>
<File Include="bin/DSWebComponent.dll">
<publishTime>07/29/2022 15:28:54</publishTime>
@ -17513,7 +17522,7 @@
<publishTime>07/01/2022 11:51:55</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>08/02/2022 17:49:32</publishTime>
<publishTime>08/04/2022 12:08:14</publishTime>
</File>
<File Include="PriceCarrier/CrmPriceCarrierInfo.aspx">
<publishTime>07/01/2022 11:51:55</publishTime>
@ -24062,7 +24071,7 @@
<publishTime>07/01/2022 11:51:57</publishTime>
</File>
<File Include="Web.config">
<publishTime>08/02/2022 15:31:01</publishTime>
<publishTime>08/03/2022 11:20:43</publishTime>
</File>
<File Include="WebSearchEngine/SearchEngineAdapter.aspx">
<publishTime>07/01/2022 11:51:57</publishTime>

12
DSWeb/Web.config
Unescape Escape View File

@ -97,20 +97,20 @@
<add name="sydevzsh" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 深圳彩虹捷运 正式库 LYGJX admin 123456
<!-- 深圳彩虹捷运 正式库 LYGJX admin 123456 -->
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 深圳彩虹捷运 测试库 CHJY admin 123456
<!-- 深圳彩虹捷运 测试库 CHJY admin 123456
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=CHCSK;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=CHCSK;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 深圳彩虹捷运 测试库0 CHJY admin 123456 -->
<!-- 深圳彩虹捷运 测试库0 CHJY admin 123456
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=20220629;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=20220629;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
</connectionStrings>

BIN
DSWeb/bin/DSWeb.XmlSerializers.dll
View File

Binary file not shown.

12
DSWeb/bin/DSWeb.dll.config
Unescape Escape View File

@ -97,20 +97,20 @@
<add name="sydevzsh" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 深圳彩虹捷运 正式库 LYGJX admin 123456
<!-- 深圳彩虹捷运 正式库 LYGJX admin 123456 -->
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 深圳彩虹捷运 测试库 CHJY admin 123456
<!-- 深圳彩虹捷运 测试库 CHJY admin 123456
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=CHCSK;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=CHCSK;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 深圳彩虹捷运 测试库0 CHJY admin 123456 -->
<!-- 深圳彩虹捷运 测试库0 CHJY admin 123456
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=20220629;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=20220629;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
</connectionStrings>

Write Preview
Loading…
Cancel
Save