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

'20220909-2'

Browse Source
临时发布20240103
ddlucky 2 years ago
parent aed34ff454
commit 91efefedd5
25 changed files with 441 additions and 199 deletions
Show Stats Download Patch File Download Diff File

2
BookingJieFeng/BookingJieFeng.csproj.user
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>

2
BookingWeb/BookingWeb.csproj.user
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>

4
DSWeb/Areas/Account/Controllers/Chfee_settlementController.cs
Unescape Escape View File

@ -377,6 +377,8 @@ namespace DSWeb.Areas.Account.Controllers
if (headData.ADVANCE_CURRENCY == "" || headData.ADVANCE_CURRENCY == null)
headData.ADVANCE_CURRENCY = headData.CURR;//
var modb = new ModelObjectDB();
DBResult result = modb.Save(headData);
if ((result.Success) &&(prepaychange == "true")) {
@ -385,7 +387,7 @@ namespace DSWeb.Areas.Account.Controllers
if (!updatepayment) { result.Message="已保存成功,但预收付更新时发生错误,请检查预收付单据是否已生成凭证或有其他错误！";}
}
}
if (result.Success == true) { }
else

37
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js
Unescape Escape View File

@ -4212,7 +4212,7 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, {
var Duino = this.formEdit.getForm().findField('BILLNO').getValue();
_this = this;
if ((Duino == '*') || basicForm.isDirty()) {
var _return = false;
var CUSTOMERNAME = this.formEdit.getForm().findField('CUSTOMERNAME').getValue();
var CURR = this.formEdit.getForm().findField('CURR').getValue();
var CUSTBANK = this.formEdit.getForm().findField('CUSTBANK').getValue();
@ -4257,20 +4257,29 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, {
var addsalecorpid = rec.data.SALECORPID;
if ((CUSTOMERNAME == '') || (CUSTOMERNAME == null))
this.formEdit.getForm().findField('CUSTOMERNAME').setValue(cust);
if ((CURR == '') || (CURR == null)) {
if (addcurr2 != '')
this.formEdit.getForm().findField('CURR').setValue(addcurr2);
else {
if (rec.data.BALAMOUNT != 0) {
this.formEdit.getForm().findField('CURR').setValue('RMB');
this.SetBank('RMB');
}
else if (rec.data.USDBALAMOUNT != 0) {
this.formEdit.getForm().findField('CURR').setValue('USD');
this.SetBank('USD');
}
}
//if ((CURR == '') || (CURR == null)) {
// if (addcurr2 != '')
// this.formEdit.getForm().findField('CURR').setValue(addcurr2);
// else {
// if (rec.data.BALAMOUNT != 0) {
// this.formEdit.getForm().findField('CURR').setValue('RMB');
// this.SetBank('RMB');
// }
// else if (rec.data.USDBALAMOUNT != 0) {
// this.formEdit.getForm().findField('CURR').setValue('USD');
// this.SetBank('USD');
// }
// }
//}
if (CURR != curr) {
this.formEdit.getForm().findField('CURR').setValue(curr);
this.LoadDateCurr();
//等待300毫秒后重新执行
_return = true;
setTimeout(this.addDetail(curr), 300);
}
if (_return) return;
if ((CUSTBANK == '') || (CUSTBANK == null))
this.formEdit.getForm().findField('CUSTBANK').setValue(addcustbank);
if ((CUSTACCOUNT == '') || (CUSTACCOUNT == null))

98
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementBLEdit.js
Unescape Escape View File

@ -4518,7 +4518,7 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
var SALECORP = '';
if ((Duino == '*') || basicForm.isDirty()) {
var _return = false;
var CUSTOMERNAME = this.formEdit.getForm().findField('CUSTOMERNAME').getValue();
var CURR = this.formEdit.getForm().findField('CURR').getValue();
if ((CUSTOMERNAME == '') || (CUSTOMERNAME == null) || (CURR == '') || (CURR == null)) {
@ -4530,30 +4530,39 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
SALECORP = rec.data.SALECORP;
if ((CUSTOMERNAME == '') || (CUSTOMERNAME == null))
this.formEdit.getForm().findField('CUSTOMERNAME').setValue(cust);
if ((CURR == '') || (CURR == null)) {
this.formEdit.getForm().findField('CURR').setValue(curr);
if (curr == 'RMB') {
this.formEdit.getForm().findField('RATE').setValue(1);
} else {
var FFrecords = DsStoreQueryBy(this.StoreDateCurr, 'CURR', curr);
if (FFrecords.getCount() > 0) {
var ffdata = FFrecords.getAt(0).data;
var DEFRATE = ffdata.DEFRATE;
this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
} else {
var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', curr);
if (DFrecords.getCount() > 0) {
var dfdata = DFrecords.getAt(0).data;
var DEFRATE = dfdata.DEFRATE;
this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
} else {
this.formEdit.getForm().findField('RATE').setValue(1);
}
}
//if ((CURR == '') || (CURR == null)) {
// this.formEdit.getForm().findField('CURR').setValue(curr);
// if (curr == 'RMB') {
// this.formEdit.getForm().findField('RATE').setValue(1);
// } else {
// var FFrecords = DsStoreQueryBy(this.StoreDateCurr, 'CURR', curr);
// if (FFrecords.getCount() > 0) {
// var ffdata = FFrecords.getAt(0).data;
// var DEFRATE = ffdata.DEFRATE;
// this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
// } else {
// var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', curr);
// if (DFrecords.getCount() > 0) {
// var dfdata = DFrecords.getAt(0).data;
// var DEFRATE = dfdata.DEFRATE;
// this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
// } else {
// this.formEdit.getForm().findField('RATE').setValue(1);
// }
// }
// }
}
//}
if (CURR != curr) {
this.formEdit.getForm().findField('CURR').setValue(curr);
this.LoadDateCurr();
//等待300毫秒后重新执行
_return = true;
setTimeout(this.addDetail(curr), 300);
}
if (_return) return;
var CUST = this.formEdit.getForm().findField('CUSTOMERNAME').getValue();
this.storecustbank.load({ params: { condition: " LINKID=(SELECT TOP 1 GID FROM INFO_CLIENT WHERE SHORTNAME='" + CUST + "')"} });
@ -4923,29 +4932,32 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
if ((CUSTOMERNAME == '') || (CUSTOMERNAME == null))
this.formEdit.getForm().findField('CUSTOMERNAME').setValue(cust);
if ((CURR == '') || (CURR == null)) {
if (CURR != curr) {
this.formEdit.getForm().findField('CURR').setValue(curr);
if (curr == 'RMB') {
this.formEdit.getForm().findField('RATE').setValue(1);
} else {
var FFrecords = DsStoreQueryBy(this.StoreDateCurr, 'CURR', curr);
if (FFrecords.getCount() > 0) {
var ffdata = FFrecords.getAt(0).data;
var DEFRATE = ffdata.DEFRATE;
this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
} else {
var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', curr);
if (DFrecords.getCount() > 0) {
var dfdata = DFrecords.getAt(0).data;
var DEFRATE = dfdata.DEFRATE;
this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
} else {
this.formEdit.getForm().findField('RATE').setValue(1);
}
}
//if (curr == 'RMB') {
// this.formEdit.getForm().findField('RATE').setValue(1);
//} else {
// var FFrecords = DsStoreQueryBy(this.StoreDateCurr, 'CURR', curr);
// if (FFrecords.getCount() > 0) {
// var ffdata = FFrecords.getAt(0).data;
// var DEFRATE = ffdata.DEFRATE;
// this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
// } else {
// var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', curr);
// if (DFrecords.getCount() > 0) {
// var dfdata = DFrecords.getAt(0).data;
// var DEFRATE = dfdata.DEFRATE;
// this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
// } else {
// this.formEdit.getForm().findField('RATE').setValue(1);
// }
// }
}
//}
this.LoadDateCurr();
//等待300毫秒后重新执行
_return = true;
setTimeout(this.addDetail, 300);
}
var CUST = this.formEdit.getForm().findField('CUSTOMERNAME').getValue();
this.storecustbank.load({ params: { condition: " LINKID=(SELECT TOP 1 GID FROM INFO_CLIENT WHERE SHORTNAME='" + CUST + "')"} });

4
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvAppBLsettlementEdit.js
Unescape Escape View File

@ -313,6 +313,10 @@ Ext.extend(Shipping.MsChRecvAppSettlementEdit, Ext.Panel, {
}, {
fieldLabel: 'HXBILLNO',
name: 'HXBILLNO', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: '汇率',
hidden: true,
name: 'RATE'
},
{

4
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvAppsettlementEdit.js
Unescape Escape View File

@ -262,6 +262,10 @@ Ext.extend(Shipping.MsChRecvAppSettlementEdit, Ext.Panel, {
}, this.comboxStlMode, this.comboxBANK, {
fieldLabel: '凭证备注',
name: 'VOUCHERNO'
}, {
fieldLabel: '汇率',
hidden:true,
name: 'RATE'
}]
}, {

105
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvInvsettlementEdit.js
Unescape Escape View File

@ -119,7 +119,7 @@ Ext.extend(Shipping.MsChRecvInvSettlementEdit, Ext.Panel, {
this.StoreCurr.load({ params: { condition: ""} });
this.StoreDateCurr = Ext.create('DsExt.ux.RefTableStore', {
model: 'MsFeeCurr',
proxy: { url: '/MvcShipping/MsChFee/GetFeeNowCurrList' }
proxy: { url: '/MvcShipping/MsChFee/GetDateCurrList' }
});
this.StoreDateCurr.load({ params: { condition: ""} });
@ -147,6 +147,7 @@ Ext.extend(Shipping.MsChRecvInvSettlementEdit, Ext.Panel, {
var curr = this.formADVANCE.getForm().findField('ADVANCE_CURRENCY');
curr.setValue(records[0].data.CURR);
this.LoadDateCurr();
}
}
}
@ -330,7 +331,12 @@ Ext.extend(Shipping.MsChRecvInvSettlementEdit, Ext.Panel, {
fieldLabel: Zi.LAN.SettlementTime,
format: 'Y-m-d H:i:s',
xtype: 'datefield',
name: 'SETTLETIME'
name: 'SETTLETIME',
listeners: {
change: function () {
_this.LoadDateCurr();
}
}
}, {
fieldLabel: Zi.LAN.SettlementUser,
readOnly: true,
@ -3936,7 +3942,7 @@ Ext.extend(Shipping.MsChRecvInvSettlementEdit, Ext.Panel, {
var Duino = this.formEdit.getForm().findField('BILLNO').getValue();
_this = this;
if ((Duino == '*') || basicForm.isDirty()) {
_return = false;
var CUSTOMERNAME = this.formEdit.getForm().findField('CUSTOMERNAME').getValue();
var CURR = this.formEdit.getForm().findField('CURR').getValue();
var SALECORPID = this.formEdit.getForm().findField('SALECORPID').getValue();
@ -3949,29 +3955,36 @@ Ext.extend(Shipping.MsChRecvInvSettlementEdit, Ext.Panel, {
var addsalecorpid = rec.data.SALECORPID;
if ((CUSTOMERNAME == '') || (CUSTOMERNAME == null))
this.formEdit.getForm().findField('CUSTOMERNAME').setValue(cust);
if ((CURR == '') || (CURR == null)) {
if (CURR != curr) {
this.formEdit.getForm().findField('CURR').setValue(curr);
if (curr == 'RMB') {
this.formEdit.getForm().findField('RATE').setValue(1);
} else {
var FFrecords = DsStoreQueryBy(this.StoreDateCurr, 'CURR', curr);
if (FFrecords.getCount() > 0) {
var ffdata = FFrecords.getAt(0).data;
var DEFRATE = ffdata.DEFRATE;
this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
} else {
var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', curr);
if (DFrecords.getCount() > 0) {
var dfdata = DFrecords.getAt(0).data;
var DEFRATE = dfdata.DEFRATE;
this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
} else {
this.formEdit.getForm().findField('RATE').setValue(1);
}
}
//if (curr == 'RMB') {
// this.formEdit.getForm().findField('RATE').setValue(1);
//} else {
// var FFrecords = DsStoreQueryBy(this.StoreDateCurr, 'CURR', curr);
// if (FFrecords.getCount() > 0) {
// var ffdata = FFrecords.getAt(0).data;
// var DEFRATE = ffdata.DEFRATE;
// this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
// } else {
// var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', curr);
// if (DFrecords.getCount() > 0) {
// var dfdata = DFrecords.getAt(0).data;
// var DEFRATE = dfdata.DEFRATE;
// this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
// } else {
// this.formEdit.getForm().findField('RATE').setValue(1);
// }
// }
//}
this.LoadDateCurr();
//等待300毫秒后重新执行
_return = true;
setTimeout(this.addDetail, 300);
}
}
if (_return) return;
if ((SALECORPID == '') || (SALECORPID == null))
this.formEdit.getForm().findField('SALECORPID').setValue(addsalecorpid);
}
@ -6097,6 +6110,52 @@ Ext.extend(Shipping.MsChRecvInvSettlementEdit, Ext.Panel, {
win.show();
}
//#endregion
//#region 载入汇率信息
,
LoadDateCurr() {
_this = this;
var CURR = this.formEdit.getForm().findField('CURR').getValue();
if (CURR == 'RMB') {
this.formEdit.getForm().findField('RATE').setValue(1);
} else {
var DateStr = _this.formEdit.getForm().findField("SETTLETIME").getRawValue();
this.StoreDateCurr.load({
params: {
DateStr: DateStr
},
callback: function (r, options, success) {
if (success) {
if (_this.StoreDateCurr.getCount() > 0) {
for (var i = 0; i < _this.StoreDateCurr.getCount(); i += 1) {
var member = _this.StoreDateCurr.getAt(i);
if (member.data.CURR == CURR) {
this.formEdit.getForm().findField('RATE').setValue(member.data.DEFRATE);
}
}
} else {
var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', CURR);
if (DFrecords.getCount() > 0) {
var dfdata = DFrecords.getAt(0).data;
var DEFRATE = dfdata.DEFRATE;
this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
} else {
this.formEdit.getForm().findField('RATE').setValue(1);
}
}
}
},
scope: this
});
}
}
//#endregion
});

186
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvsettlementBLEdit.js
Unescape Escape View File

@ -156,7 +156,7 @@ Ext.extend(Shipping.MsChRecvSettlementBLEdit, Ext.Panel, {
this.StoreCurr.load({ params: { condition: ""} });
this.StoreDateCurr = Ext.create('DsExt.ux.RefTableStore', {
model: 'MsFeeCurr',
proxy: { url: '/MvcShipping/MsChFee/GetFeeNowCurrList' }
proxy: { url: '/MvcShipping/MsChFee/GetDateCurrList' }
});
this.StoreDateCurr.load({ params: { condition: ""} });
@ -203,27 +203,27 @@ Ext.extend(Shipping.MsChRecvSettlementBLEdit, Ext.Panel, {
curr.setValue(records[0].data.CURR);
var curr = this.formADVANCE.getForm().findField('ADVANCE_CURRENCY');
curr.setValue(records[0].data.CURR);
if (CURR == 'RMB') {
this.formEdit.getForm().findField('RATE').setValue(1);
} else {
var FFrecords = DsStoreQueryBy(this.StoreDateCurr, 'CURR', CURR);
if (FFrecords.getCount() > 0) {
var ffdata = FFrecords.getAt(0).data;
var DEFRATE = ffdata.DEFRATE;
this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
} else {
var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', CURR);
if (DFrecords.getCount() > 0) {
var dfdata = DFrecords.getAt(0).data;
var DEFRATE = dfdata.DEFRATE;
this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
} else {
this.formEdit.getForm().findField('RATE').setValue(1);
}
}
}
//if (CURR == 'RMB') {
// this.formEdit.getForm().findField('RATE').setValue(1);
//} else {
// var FFrecords = DsStoreQueryBy(this.StoreDateCurr, 'CURR', CURR);
// if (FFrecords.getCount() > 0) {
// var ffdata = FFrecords.getAt(0).data;
// var DEFRATE = ffdata.DEFRATE;
// this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
// } else {
// var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', CURR);
// if (DFrecords.getCount() > 0) {
// var dfdata = DFrecords.getAt(0).data;
// var DEFRATE = dfdata.DEFRATE;
// this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
// } else {
// this.formEdit.getForm().findField('RATE').setValue(1);
// }
// }
//}
this.LoadDateCurr();
}
}
}
@ -408,7 +408,12 @@ Ext.extend(Shipping.MsChRecvSettlementBLEdit, Ext.Panel, {
fieldLabel: Zi.LAN.SettlementTime,
format: 'Y-m-d H:i:s',
xtype: 'datefield',
name: 'SETTLETIME'
name: 'SETTLETIME',
listeners: {
change: function () {
_this.LoadDateCurr();
}
}
}, {
fieldLabel: Zi.LAN.SettlementUser,
readOnly: true,
@ -4391,7 +4396,9 @@ Ext.extend(Shipping.MsChRecvSettlementBLEdit, Ext.Panel, {
var SALECORP = '';
var CUSTOMERNAME = this.formEdit.getForm().findField('CUSTOMERNAME').getValue();
var CURR = this.formEdit.getForm().findField('CURR').getValue();
if ((CUSTOMERNAME == '') || (CUSTOMERNAME == null) || (CURR == '') || (CURR == null)) {
var _return = false;
if ((CUSTOMERNAME == '') || (CUSTOMERNAME == null) || (CURR == '') || (CURR == null))
{
var selectedRecords = this.gridAddFeeList.selModel.getSelection();
if (selectedRecords.length > 0) {
var rec = selectedRecords[0];
@ -4400,53 +4407,58 @@ Ext.extend(Shipping.MsChRecvSettlementBLEdit, Ext.Panel, {
SALECORP = rec.data.SALECORP;
if ((CUSTOMERNAME == '') || (CUSTOMERNAME == null))
this.formEdit.getForm().findField('CUSTOMERNAME').setValue(cust);
if ((CURR == '') || (CURR == null)) {
if (CURR != curr) {
this.formEdit.getForm().findField('CURR').setValue(curr);
if (curr == 'RMB') {
this.formEdit.getForm().findField('RATE').setValue(1);
} else {
var FFrecords = DsStoreQueryBy(this.StoreDateCurr, 'CURR', curr);
if (FFrecords.getCount() > 0) {
var ffdata = FFrecords.getAt(0).data;
var DEFRATE = ffdata.DEFRATE;
this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
} else {
var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', curr);
if (DFrecords.getCount() > 0) {
var dfdata = DFrecords.getAt(0).data;
var DEFRATE = dfdata.DEFRATE;
this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
} else {
this.formEdit.getForm().findField('RATE').setValue(1);
}
}
}
//if (curr == 'RMB') {
// this.formEdit.getForm().findField('RATE').setValue(1);
//} else {
// var FFrecords = DsStoreQueryBy(this.StoreDateCurr, 'CURR', curr);
// if (FFrecords.getCount() > 0) {
// var ffdata = FFrecords.getAt(0).data;
// var DEFRATE = ffdata.DEFRATE;
// this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
// } else {
// var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', curr);
// if (DFrecords.getCount() > 0) {
// var dfdata = DFrecords.getAt(0).data;
// var DEFRATE = dfdata.DEFRATE;
// this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
// } else {
// this.formEdit.getForm().findField('RATE').setValue(1);
// }
// }
//}
this.LoadDateCurr();
//等待300毫秒后重新执行
_return = true;
setTimeout(this.addDetail, 300);
}
} else {
var CUST = this.formEdit.getForm().findField('CUSTOMERNAME').getValue();
var recs = DsStoreQueryBy(this.storeCustCode, 'CustName', CUST);
var CUSTBANK = this.formEdit.getForm().findField('CUSTBANK');
var CUSTACCOUNT = this.formEdit.getForm().findField('CUSTACCOUNT');
var CURR = this.formEdit.getForm().findField('CURR').getValue();
if (recs.getCount() > 0) {
var data = recs.getAt(0).data;
if (CURR == 'RMB') {
CUSTBANK.setValue(data.RMBBank);
CUSTACCOUNT.setValue(data.RMBAccount);
} else if (CURR == 'USD') {
CUSTBANK.setValue(data.USDBank);
CUSTACCOUNT.setValue(data.USDAccount);
var CUST = this.formEdit.getForm().findField('CUSTOMERNAME').getValue();
var recs = DsStoreQueryBy(this.storeCustCode, 'CustName', CUST);
var CUSTBANK = this.formEdit.getForm().findField('CUSTBANK');
var CUSTACCOUNT = this.formEdit.getForm().findField('CUSTACCOUNT');
var CURR = this.formEdit.getForm().findField('CURR').getValue();
if (recs.getCount() > 0) {
var data = recs.getAt(0).data;
if (CURR == 'RMB') {
CUSTBANK.setValue(data.RMBBank);
CUSTACCOUNT.setValue(data.RMBAccount);
} else if (CURR == 'USD') {
CUSTBANK.setValue(data.USDBank);
CUSTACCOUNT.setValue(data.USDAccount);
}
} else {
CUSTBANK.setValue('');
CUSTACCOUNT.setValue('');
}
} else {
CUSTBANK.setValue('');
CUSTACCOUNT.setValue('');
}
}
}
if (_return) return;
var SALECORPID = this.formEdit.getForm().findField('SALECORPID').getValue();
if ((SALECORPID == '') || (SALECORPID == null)) {
@ -7163,7 +7175,53 @@ onSelectFee: function (button, event) {
}
sum = sum.toFixed(2);
Ext.getCmp("zongshu").setText(Zi.LAN.SelecteAmount + sum);
}
}
//#region 载入汇率信息
,
LoadDateCurr() {
_this = this;
var CURR = this.formEdit.getForm().findField('CURR').getValue();
if (CURR == 'RMB') {
this.formEdit.getForm().findField('RATE').setValue(1);
} else {
var DateStr = _this.formEdit.getForm().findField("SETTLETIME").getRawValue();
this.StoreDateCurr.load({
params: {
DateStr: DateStr
},
callback: function (r, options, success) {
if (success) {
if (_this.StoreDateCurr.getCount() > 0) {
for (var i = 0; i < _this.StoreDateCurr.getCount(); i += 1) {
var member = _this.StoreDateCurr.getAt(i);
if (member.data.CURR == CURR) {
this.formEdit.getForm().findField('RATE').setValue(member.data.DEFRATE);
}
}
} else {
var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', CURR);
if (DFrecords.getCount() > 0) {
var dfdata = DFrecords.getAt(0).data;
var DEFRATE = dfdata.DEFRATE;
this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
} else {
this.formEdit.getForm().findField('RATE').setValue(1);
}
}
}
},
scope: this
});
}
}
//#endregion
});

6
DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs
Unescape Escape View File

@ -644,7 +644,11 @@ namespace DSWeb.Areas.CommMng.DAL
strSql.Append(" and BLSTATUS=0 ");
}
}
if (IsEnableCustRange == "1")
var cdc = new CommonDataContext();
var userinfo = cdc.VW_user.FirstOrDefault(x => x.USERID == userid);
if (IsEnableCustRange == "1" && userinfo.ISSALEMAN=="true")
//strSql.Append(" and (RANGETYPE='集团' or SHORTNAME in (SELECT SHORTNAME from info_client_range where USERID='" + userid + "' ) or SHORTNAME not in (SELECT SHORTNAME from info_client_range ) ) ");
strSql.Append(" and ((RANGETYPE='个人' and exists (select 1 from info_client_range where info_client_range.SHORTNAME=info_Client.SHORTNAME and USERID='" + userid + "')) or RANGETYPE='集团' ) ");

7
DSWeb/Areas/CommMng/Models/BasicDataModel.cs
Unescape Escape View File

@ -10,6 +10,8 @@ using System.Collections.Generic;
using DSWeb.MvcShipping.DAL.MsSysParamSet;
using DSWeb.MvcShipping.DAL.MsChFeeDAL;
using HcUtility.Comm;
using DSWeb.Common.DB;
using System.Linq;
namespace DSWeb.Areas.CommMng.Models
{
@ -572,7 +574,10 @@ namespace DSWeb.Areas.CommMng.Models
modcondition = USERINFO.BLSTATUSSTR;
}
if (USERINFO.ISENABLECUSTRANGE == "1")
var cdc = new CommonDataContext();
var userinfo = cdc.VW_user.FirstOrDefault(x => x.USERID == USERINFO.USERID);
if (USERINFO.ISENABLECUSTRANGE == "1" && userinfo.ISSALEMAN=="true")
{
if (!string.IsNullOrWhiteSpace(modcondition)) modcondition += " and ";
//modcondition += " (SHORTNAME in (SELECT SHORTNAME from info_client_range where USERID='" + USERINFO.USERID + "' ) or SHORTNAME not in (SELECT SHORTNAME from info_client_range )) ";

17
DSWeb/Areas/MvcShipping/Controllers/MsAireOrderController.cs
Unescape Escape View File

@ -1155,7 +1155,7 @@ namespace DSWeb.MvcShipping.Controllers
//相应产生分单
var cdc = new CommonDataContext();
var fenlist = cdc.crm_seaeorder_fen.Where(x => x.MASTERNO == newrec.BSNO);
var fenlist = cdc.crm_seaeorder_fen.Where(x => x.MASTERNO == newrec.BSNO).ToList();
var _count = 0;
@ -1167,11 +1167,18 @@ namespace DSWeb.MvcShipping.Controllers
newfen.BSNO = headData.BSNO;
newfen.AS_ID = Guid.NewGuid().ToString();
newfen.INPUTBY = Convert.ToString(Session["SHOWNAME"]).ToString().Trim();
newfen.INPUTTIME = DateTime.Now;
newfen.INPUTTIME =Convert.ToDateTime( DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
newfen.ETD= Convert.ToDateTime(((DateTime)headData.ETD).ToString("yyyy-MM-dd"));
newfen.ETA = headData.ETA==null? headData.ETA: Convert.ToDateTime(((DateTime)headData.ETA).ToString("yyyy-MM-dd"));
if (headData.ISSUEDATE == null || headData.ISSUEDATE == "")
newfen.ISSUEDATE = null;
else Convert.ToDateTime(headData.ISSUEDATE);
newfen.MODIFYTIME = null;
if (fenlist.Count() == 1)
newrec.HBLNO = headData.CUSTNO;
newfen.HBLNO = headData.CUSTNO;
else
{
@ -1183,13 +1190,13 @@ namespace DSWeb.MvcShipping.Controllers
_tail += BasicDataRefDAL.chrtostr(65 + _count % 25);
newrec.HBLNO = headData.CUSTNO + _tail;
newfen.HBLNO = headData.CUSTNO + _tail;
_count++;
}
newfen.HBLNO = fen.ORDNO;
//newfen.HBLNO = fen.ORDNO;
cdc.op_aire_bill.Add(newfen);
//var newfen = AutoMapperHelper.MapTo<crm_aireorder_md, MsOpAire>(headData);

11
DSWeb/Areas/MvcShipping/DAL/MsChFeeAutoDui/MsChFeeAutoDuiDAL.cs
Unescape Escape View File

@ -122,9 +122,10 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeAutoDuiDAL
static public List<CH_FEE_AutoDuiDetailmb> GetBodyList ( string strCondition, string sort = null )
{
var strSql = new StringBuilder();
strSql.Append("select dl.*,b.ETD,B.CUSTOMERNAME,B.OP,B.CARRIER,B.TEU,B.SALE,B.CUSTNO from ");
strSql.Append("select dl.*,b.ETD,B.CUSTOMERNAME,B.OP,B.CARRIER,B.TEU,B.SALE,B.CUSTNO,b.DOC,b.SALEDEPT,(select name from company where gid= b.SALECORPID)SALECORP from ");
// strSql.Append("(select GID,BSNO,(select top 1 BSNO from v_op_bill where (MBLNO=D.b_mblno or HBLNO=D.MBLNO) and OPLBNAME in('海运进口','海运出口','空运进口','空运出口')) B_BSNO,MBLNO,B_MBLNO,RMBAMOUNT,USDAMOUNT,L_RMBAMOUNT,L_USDAMOUNT,ISOK,REMARK,REMARK2 ");
strSql.Append("(select GID,BSNO,B_BSNO,MBLNO,B_MBLNO,RMBAMOUNT,USDAMOUNT,L_RMBAMOUNT,L_USDAMOUNT,ISOK,REMARK,REMARK2 ");
strSql.Append(" from CH_FEE_AutoDuiDetail D ");
if (!string.IsNullOrEmpty(strCondition))
{
@ -156,6 +157,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeAutoDuiDAL
// strSql.Append("(select GID,BSNO,(select top 1 BSNO from v_op_bill where (MBLNO=D.b_mblno or HBLNO=D.MBLNO) and OPLBNAME in('海运进口','海运出口','空运进口','空运出口')) B_BSNO,MBLNO,B_MBLNO,RMBAMOUNT,USDAMOUNT,L_RMBAMOUNT,L_USDAMOUNT,ISOK,REMARK,REMARK2 ");
strSql.Append("(select GID,BSNO,B_BSNO,MBLNO,B_MBLNO,RMBAMOUNT,USDAMOUNT,L_RMBAMOUNT,L_USDAMOUNT,ISOK,REMARK,REMARK2 ");
strSql.Append(",isnull(RMBAMOUNT,0)-isnull(L_RMBAMOUNT,0) Y_RMBAMOUNT,isnull(USDAMOUNT,0)-isnull(L_USDAMOUNT,0) Y_USDAMOUNT ");
strSql.Append(" ,b.DOC,b.SALEDEPT,(select name from company where gid= b.SALECORPID)SALECORP ");
strSql.Append(" from CH_FEE_AutoDuiDetail D ");
if (!string.IsNullOrEmpty(strCondition))
{
@ -185,6 +187,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeAutoDuiDAL
var strSql = new StringBuilder();
strSql.Append("select D.GID,D.BSNO,B.BSNO B_BSNO,D.MBLNO,d.B_MBLNO,dbo.trimdate(B.ETD) ETD,B.CUSTOMERNAME,B.OP,B.CARRIER,B.TEU,B.SALE,B.CUSTNO,D.RMBAMOUNT,D.USDAMOUNT,D.L_RMBAMOUNT,D.L_USDAMOUNT,D.ISOK,D.REMARK,D.REMARK2 ");
strSql.Append(" ,b.DOC,b.SALEDEPT,(select name from company where gid= b.SALECORPID)SALECORP ");
strSql.Append(" from CH_FEE_AutoDuiDetail D left join V_op_bill B on B.MBLNO=D.MBLNO ");
if (!string.IsNullOrEmpty(strCondition))
{
@ -232,6 +235,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeAutoDuiDAL
strSql.Append(" isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(AMOUNT-SETTLEMENT,0) ELSE 0 END)ELSE 0 END),0)- ");
strSql.Append(" isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(AMOUNT-SETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS L_USDAMOUNT ");
}
strSql.Append(" ,b.DOC,b.SALEDEPT,(select name from company where gid= b.SALECORPID)SALECORP ");
strSql.Append(" FROM CH_FEE F ");
strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) ");
strSql.Append(" where F.AMOUNT<>F.SETTLEMENT and F.CUSTOMERNAME='" + CUSTOMERNAME + "' and EXISTS (select 1 from CH_FEE_AutoDuiDetail fd where (fd.MBLNO=B.MBLNO OR fd.MBLNO=B.HBLNO) and fd.BSNO='" + AutoDui_GID + "') ");
@ -293,6 +297,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeAutoDuiDAL
strSql.Append(" isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(AMOUNT-SETTLEMENT,0) ELSE 0 END)ELSE 0 END),0)- ");
strSql.Append(" isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(AMOUNT-SETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS L_USDAMOUNT ");
}
strSql.Append(" ,b.DOC,b.SALEDEPT,(select name from company where gid= b.SALECORPID)SALECORP ");
strSql.Append(" FROM CH_FEE F ");
strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) ");
strSql.Append(" where F.AMOUNT<>F.SETTLEMENT and F.CUSTOMERNAME='" + CUSTOMERNAME + "' and EXISTS (select 1 from CH_FEE_AutoDuiDetail fd where (fd.MBLNO=B.MBLNO OR fd.MBLNO=B.HBLNO) and fd.BSNO='" + AutoDui_GID + "') ");
@ -384,6 +389,10 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeAutoDuiDAL
}
data.DOC = Convert.ToString(reader["DOC"]);
data.SALEDEPT = Convert.ToString(reader["SALEDEPT"]);
data.SALECORP = Convert.ToString(reader["SALECORP"]);
#endregion
headList.Add(data);
}

4
DSWeb/Areas/MvcShipping/Models/MsChFeeAutoDui/MsChFeeAutoDui.cs
Unescape Escape View File

@ -319,6 +319,10 @@ namespace DSWeb.MvcShipping.Models.MsChFeeAutoDui
public string TEU { set; get; }
public string SALE{ set; get; }
public string CUSTNO { set; get; }
public string DOC { set; get; }
public string SALEDEPT { set; get; }
public string SALECORP { set; get; }
#endregion
public CH_FEE_AutoDuiDetailmb ( )

20
DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeAutoDui/MsChFeeAutoDuiEdit.js
Unescape Escape View File

@ -674,9 +674,27 @@
dataIndex: 'CUSTNO', //readOnly:true,
text: '委托编号',
width: 60
},
{
sortable: true,
dataIndex: 'DOC', //readOnly:true,
text: '单证',
width: 120
},
{
sortable: true,
dataIndex: 'SALEDEPT', //readOnly:true,
text: '销售部门',
width: 80
},
{
sortable: true,
dataIndex: 'SALECORP', //readOnly:true,
text: '销售公司',
width: 120
}
];
];
this.cellEditingDetail = Ext.create('Ext.grid.plugin.CellEditing', {
clicksToEdit: 1

33
DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeAutoDui/MsChFeeAutoDuiModel.js
Unescape Escape View File

@ -37,26 +37,29 @@ Ext.define('CH_FEE_AutoDuiDetailmb', {
extend: 'Ext.data.Model',
idProperty: 'GID',
fields: [
{ name: 'GID', type: 'string' },
{ name: 'BSNO', type: 'string' },
{ name: 'B_BSNO', type: 'string' },
{ name: 'MBLNO', type: 'string' },
{ name: 'ETD', type: 'string' },
{ name: 'CUSTOMERNAME', type: 'string' },
{ name: 'GID', type: 'string' },
{ name: 'BSNO', type: 'string' },
{ name: 'B_BSNO', type: 'string' },
{ name: 'MBLNO', type: 'string' },
{ name: 'ETD', type: 'string' },
{ name: 'CUSTOMERNAME', type: 'string' },
{ name: 'OP', type: 'string' },
{ name: 'CARRIER', type: 'string' },
{ name: 'TEU', type: 'string' },
{ name: 'CUSTNO', type: 'string' },
{ name: 'SALE', type: 'string' },
{ name: 'RMBAMOUNT', type: 'number' },
{ name: 'USDAMOUNT', type: 'number' },
{ name: 'L_RMBAMOUNT', type: 'number' },
{ name: 'L_USDAMOUNT', type: 'number' },
{ name: 'Y_RMBAMOUNT', type: 'number' },
{ name: 'Y_USDAMOUNT', type: 'number' },
{ name: 'ISOK', type: 'string' },
{ name: 'REMARK', type: 'string' },
{ name: 'REMARK2', type: 'string' }
{ name: 'RMBAMOUNT', type: 'number' },
{ name: 'USDAMOUNT', type: 'number' },
{ name: 'L_RMBAMOUNT', type: 'number' },
{ name: 'L_USDAMOUNT', type: 'number' },
{ name: 'Y_RMBAMOUNT', type: 'number' },
{ name: 'Y_USDAMOUNT', type: 'number' },
{ name: 'ISOK', type: 'string' },
{ name: 'REMARK', type: 'string' },
{ name: 'REMARK2', type: 'string' },
{ name: 'DOC', type: 'string' },
{ name: 'SALEDEPT', type: 'string' },
{ name: 'SALECORP', type: 'string' }
]
});

3
DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpBillEdit.js
Unescape Escape View File

@ -1594,7 +1594,7 @@ Ext.extend(Shipping.MsOpAireBillEdit, Ext.Panel, {
this.LoadInit(this.MainEditRecord.data);
} else {
Ext.Msg.wait('正在查询数据, 请稍侯..');
Ext.Ajax.request({
waitMsg: '正在查询主表数据...',
url: '/MvcShipping/MsOpAire/GetBillData',
@ -1603,6 +1603,7 @@ Ext.extend(Shipping.MsOpAireBillEdit, Ext.Panel, {
condition: condition
},
callback: function (options, success, response) {
Ext.MessageBox.hide();
if (success) {
var result = Ext.JSON.decode(response.responseText);
if (!result.Success) {

9
DSWeb/Areas/MvcShipping/Viewsjs/MsOpBill/MsOpFeeView.js
Unescape Escape View File

@ -225,6 +225,11 @@ Ext.extend(Shipping.MsOpFeeView, Ext.Panel, {
window.open(openUrl, openType, openSet);
},
scope: this
}, '-', {
text: '查看联系方式',
handler: function (menu, event) {
_this.ShowOPUserInfo();
}
}
]
});
@ -666,6 +671,10 @@ Ext.extend(Shipping.MsOpFeeView, Ext.Panel, {
var bstype = this.editRecord.get('OPLBNAME');
this.LoadData(this.bsno, bstype);
},
ShowOPUserInfo() {
//bsno = this.editRecord.get('BSNO');
ShowOPUSERINFO(this.bsno);
}
});

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

@ -1711,7 +1711,10 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
proxy: { url: '/CommMng/BasicDataRef/GetUserLinkRefListRm' }
});
this.storeDoc = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.UserRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetUserLinkRefListRm' }
});
// this.storeOpCode.load({
// callback: function (r, options, success) {
@ -1728,7 +1731,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
store: this.storeCUSTSERVICECode,
forceSelection: true,
queryMode: 'remote',
minChars: 0,
minChars: 2,
queryParam: 'CODENAME',
name: 'CUSTSERVICE',
labelWidth: 45,
@ -1750,7 +1753,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
store: this.storeSaleCode,
forceSelection: true,
queryMode: 'remote',
minChars: 0,
minChars: 2,
queryParam: 'CODENAME',
labelWidth: 45,
name: 'SALE',
@ -1771,7 +1774,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
fieldLabel: Zi.LAN.OP, //'操 作',
store: this.storeOpCode,
queryMode: 'remote',
minChars: 0,
minChars: 2,
queryParam: 'CODENAME',
labelWidth: 30,
forceSelection: true,
@ -1792,6 +1795,10 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
this.comboxINPUTBY = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: Zi.LAN.INPUTBY2, //'录入人',
store: this.storeINPUTBYCode,
queryMode: 'remote',
minChars: 2,
queryParam: 'CODENAME',
forceSelection: true,
name: 'INPUTBY',
valueField: 'UserName',
@ -1806,6 +1813,28 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
}
});
//单证
this.comboxDoc = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: Zi.LAN.DOC, //'单证 单 证',
store: this.storeDoc,
forceSelection: true,
queryMode: 'remote',
minChars: 2,
flex: 0.8,
queryParam: 'CODENAME',
name: 'DOC',
valueField: 'UserName',
displayField: 'CodeAndName',
enableKeyEvents: true,
listeners: {
keyup: function (field, e) {
if (e.getKey() == e.ENTER) {
_this.onRefreshClick();
}
}
}
});
//客户加载_委托单位
this.storeCustCode = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.CustomRefModel',
@ -2217,9 +2246,10 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
this.comboxISEI,
this.comboxPORTLOAD,
this.comboxDoc,
{
xtype: 'hiddenfield',
flex: 2.7,
flex: 1.9,
scope: this
}, {
xtype: 'hidden',
@ -8790,6 +8820,10 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
var SALE = form.findField('SALE').getValue();
sql = sql + getAndConSql(sql, SALE, "B.SALE='" + SALE + "'");
//单证
var DOC = form.findField('DOC').getValue();
sql = sql + getAndConSql(sql, DOC, "B.DOC='" + DOC + "'");
//航线
var LANE = form.findField('LANE').getValue();
sql = sql + getAndConSql(sql, LANE, "B.LANE='" + LANE + "'");
@ -8822,7 +8856,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
var CARRIER = form.findField('CARRIER').getValue();
sql = sql + getAndConSql(sql, CARRIER, "B.CARRIER='" + CARRIER + "'");
//揽货人
//客服
var CUSTSERVICE = form.findField('CUSTSERVICE').getValue();
sql = sql + getAndConSql(sql, CUSTSERVICE, "B.CUSTSERVICE='" + CUSTSERVICE + "'");

2
DSWeb/DSWeb.csproj.user
Unescape Escape View File

@ -4,7 +4,7 @@
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>H:\DS7_CHJY\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

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

@ -915,7 +915,7 @@
<publishTime>08/26/2022 20:26:40</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js">
<publishTime>09/08/2022 18:24:54</publishTime>
<publishTime>09/09/2022 14:21:14</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_settlement/ChPayAppsettlementEdit.js">
<publishTime>08/30/2022 15:42:03</publishTime>
@ -924,7 +924,7 @@
<publishTime>08/26/2022 20:31:11</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementBLEdit.js">
<publishTime>09/08/2022 18:24:59</publishTime>
<publishTime>09/09/2022 14:21:14</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_settlement/ChPaySettlementEdit.js">
<publishTime>08/26/2022 20:31:11</publishTime>
@ -933,16 +933,16 @@
<publishTime>08/26/2022 20:31:11</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_settlement/ChRecvAppBLsettlementEdit.js">
<publishTime>08/26/2022 20:31:11</publishTime>
<publishTime>09/09/2022 16:07:17</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_settlement/ChRecvAppsettlementEdit.js">
<publishTime>08/26/2022 20:31:11</publishTime>
<publishTime>09/09/2022 15:58:48</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_settlement/ChRecvInvsettlementEdit.js">
<publishTime>08/26/2022 20:31:11</publishTime>
<publishTime>09/09/2022 16:17:41</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_settlement/ChRecvsettlementBLEdit.js">
<publishTime>08/26/2022 20:31:11</publishTime>
<publishTime>09/09/2022 14:21:14</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_settlement/ChRecvsettlementEdit.js">
<publishTime>08/26/2022 20:31:11</publishTime>
@ -5685,13 +5685,13 @@
<publishTime>08/26/2022 20:26:42</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsChFeeAutoDui/MsChFeeAutoDuiEdit.js">
<publishTime>08/26/2022 20:26:42</publishTime>
<publishTime>09/09/2022 10:47:02</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsChFeeAutoDui/MsChFeeAutoDuiIndex.js">
<publishTime>08/26/2022 20:26:42</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsChFeeAutoDui/MsChFeeAutoDuiModel.js">
<publishTime>08/26/2022 20:26:42</publishTime>
<publishTime>09/09/2022 10:43:57</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsChFeeYsAutoDui/Edit.js">
<publishTime>08/26/2022 20:26:42</publishTime>
@ -6876,7 +6876,7 @@
<publishTime>08/26/2022 20:31:11</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpAire/MsOpBillEdit.js">
<publishTime>08/26/2022 20:26:43</publishTime>
<publishTime>09/09/2022 12:05:29</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpAire/MsOpBillModel.js">
<publishTime>08/26/2022 20:26:43</publishTime>
@ -7167,7 +7167,7 @@
<publishTime>08/26/2022 20:26:43</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpBill/MsOpFeeView.js">
<publishTime>08/26/2022 20:31:11</publishTime>
<publishTime>09/09/2022 10:52:05</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpBill/MsOpHistryListIndex.js">
<publishTime>08/26/2022 20:26:43</publishTime>
@ -7773,7 +7773,7 @@
<publishTime>08/26/2022 20:26:43</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js">
<publishTime>09/08/2022 14:39:46</publishTime>
<publishTime>09/09/2022 11:05:21</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeModel.js">
<publishTime>08/26/2022 20:31:11</publishTime>
@ -12822,10 +12822,10 @@
<publishTime>08/26/2022 20:26:37</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>09/08/2022 18:27:06</publishTime>
<publishTime>09/09/2022 16:34:18</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>09/08/2022 18:27:06</publishTime>
<publishTime>09/09/2022 16:34:18</publishTime>
</File>
<File Include="bin/AspNetPager.dll">
<publishTime>08/26/2022 20:26:48</publishTime>
@ -12885,19 +12885,19 @@
<publishTime>09/08/2022 18:26:32</publishTime>
</File>
<File Include="bin/DSWeb.dll">
<publishTime>09/08/2022 18:26:44</publishTime>
<publishTime>09/09/2022 16:33:57</publishTime>
</File>
<File Include="bin/DSWeb.Interface.dll">
<publishTime>09/08/2022 18:26:32</publishTime>
<publishTime>09/09/2022 11:07:21</publishTime>
</File>
<File Include="bin/DSWeb.Interface.pdb">
<publishTime>09/08/2022 18:26:32</publishTime>
<publishTime>09/09/2022 11:07:21</publishTime>
</File>
<File Include="bin/DSWeb.pdb">
<publishTime>09/08/2022 18:26:44</publishTime>
<publishTime>09/09/2022 16:33:57</publishTime>
</File>
<File Include="bin/DSWeb.XmlSerializers.dll">
<publishTime>09/08/2022 18:26:45</publishTime>
<publishTime>09/09/2022 16:33:58</publishTime>
</File>
<File Include="bin/DSWebComponent.dll">
<publishTime>08/28/2022 03:33:29</publishTime>
@ -17529,7 +17529,7 @@
<publishTime>08/26/2022 20:26:46</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>09/08/2022 18:26:59</publishTime>
<publishTime>09/09/2022 16:34:12</publishTime>
</File>
<File Include="PriceCarrier/CrmPriceCarrierInfo.aspx">
<publishTime>08/26/2022 20:26:46</publishTime>

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

Binary file not shown.

BIN
DSWeb/sql/update.mdb
View File

Binary file not shown.

BIN
DSWeb/sql/update.rar
View File

Binary file not shown.

2
DispatchWeb/DispatchWeb.csproj.user
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>

Write Preview
Loading…
Cancel
Save