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

1

Browse Source
DS7_JinGang
hanxuntao 1 year ago
parent 64d3f83222
commit 4028f618c5
10 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File

2
DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs
Unescape Escape View File

@ -354,7 +354,7 @@ namespace DSWeb.MvcShipping.Controllers
return new ContentResult() { Content = json };
}
public ContentResult GetGainData(string bsno,string USERID, string SHOWNAME, string COMPANYID, string bltype = "", string optype = "")
public ContentResult GetGainData2(string bsno,string USERID, string SHOWNAME, string COMPANYID, string bltype = "", string optype = "")
{
var dataList = new List<MsChFeeGain>();

6
DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs
Unescape Escape View File

@ -3726,7 +3726,7 @@ namespace DSWeb.MvcShipping.Controllers
error = MsOpSeaeEdiPortDAL.IsCreateINTTR(headList, filetype, filerole, isbill, "YML", 0, "", "");
}
else if (type == "EVERGREENEDI") {
else if (type == "EVERGREEN") {
error = MsOpSeaeEdiPortDAL.IsCreateEVERGREEN(headList, filetype, filerole, isbill);
}
@ -3856,7 +3856,7 @@ namespace DSWeb.MvcShipping.Controllers
error = MsOpSeaeEdiPortDAL.IsCreateINTTR(headList, filetype, filerole, isbill, "YML", 0, "", "");
}
else if (type == "EVERGREENEDI")
else if (type == "EVERGREEN")
{
error = MsOpSeaeEdiPortDAL.IsCreateEVERGREEN(headList, filetype, filerole, isbill);
@ -3879,7 +3879,7 @@ namespace DSWeb.MvcShipping.Controllers
filename = MsOpSeaeEdiPortDAL.CreateEdiYMSI(headEdiList, Convert.ToString(Session["USERCODE"]), path, mblno, filerole, ftpset, isbill, filetype);
}
else if (type == "EVERGREENEDI")
else if (type == "EVERGREEN")
{
if (filetype == "B")
filename = MsOpSeaeEdiPortDAL.CreateEdiEVERGREEN(headList, Convert.ToString(Session["USERCODE"]), path, mblno, filerole, ftpset, isbill, filetype);

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

@ -7638,7 +7638,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
return;
}
Ext.MessageBox.confirm(Zi.LAN.FEE.TiShi, '确定要删除选中的(' + selectedRecords.length+'条)费用吗？', function (btn) {
Ext.MessageBox.confirm(Zi.LAN.FEE.TiShi, Zi.LAN.QueshiYaoShanChu1 + selectedRecords.length + Zi.LAN.QueshiYaoShanChu2 , function (btn) {
if (btn == 'yes') {

2
DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_en-us.js
Unescape Escape View File

@ -286,6 +286,8 @@ Zi.LAN.ZHENGPIAOTIJIAO = "整票提交";
Zi.LAN.SHENHETONGGUO = "审核通过";
Zi.LAN.ZHENGPIAOBOHUI = "整票驳回";
Zi.LAN.DELETECHENGGONG = '删除成功！';
Zi.LAN.QueshiYaoShanChu1 = '确定要删除选中的(！';
Zi.LAN.QueshiYaoShanChu2 = '条)费用吗？';
//#endregion
//Zi.LAN.FEE. = "";

3
DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_zh-cn.js
Unescape Escape View File

@ -291,7 +291,8 @@ Zi.LAN.SHENHETONGGUO = "审核通过";
Zi.LAN.ZHENGPIAOBOHUI = "整票驳回";
Zi.LAN.YES = "是";
Zi.LAN.DELETECHENGGONG = '删除成功！';
Zi.LAN.QueshiYaoShanChu1 = '确定要删除选中的(！';
Zi.LAN.QueshiYaoShanChu2 = '条)费用吗？';
//#endregion
//Zi.LAN.FEE. = "";

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

@ -4969,7 +4969,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
id: 'EDI-EVERGREENEDI',
hidden: true,
handler: function (menu, event) {
_this.onCreateEDIClick(menu, event, 'EVERGREENEDI');
_this.onCreateEDIClick(menu, event, 'EVERGREEN');
}
}, {
text: Zi.LAN.NBPORTEDI, //"宁波电子口岸",

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

@ -2546,7 +2546,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
id: 'EDI-EVERGREENEDI',
hidden: true,
handler: function (menu, event) {
_this.onCreateEDIClick(menu, event, 'EVERGREENEDI');
_this.onCreateEDIClick(menu, event, 'EVERGREEN');
}
}, {
text: Zi.LAN.NBPORTEDI, //"宁波电子口岸",
@ -8978,7 +8978,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
Ext.MessageBox.confirm(Zi.LAN.TiShi, "确实要删除选中的【" + icount.toString() + "】票业务吗？", function (btn) {
Ext.MessageBox.confirm(Zi.LAN.TiShi, Zi.LAN.QueshiYaoShanChu1 + icount.toString() + Zi.LAN.QueshiYaoShanChu2, function (btn) {
if (btn == 'yes') {
var jsonbodyAddDatas = ConvertRecordsToJsonAll(bodyAddDatas);

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

@ -795,3 +795,5 @@ Zi.LAN.YINRUEVERGREENBC = "引入长荣BC";
Zi.LAN.YINRUMSKBC = "引入马士基BC";
Zi.LAN.LOCK = "锁定";
Zi.LAN.UNLOCK = "未锁定";
Zi.LAN.QueshiYaoShanChu1 = "确实要删除选中的【";
Zi.LAN.QueshiYaoShanChu2 = "】票业务吗？";

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

@ -823,6 +823,8 @@ Zi.LAN.YINRUEVERGREENBC = "引入长荣BC";
Zi.LAN.YINRUMSKBC = "引入马士基BC";
Zi.LAN.LOCK = "锁定";
Zi.LAN.UNLOCK = "未锁定";
Zi.LAN.QueshiYaoShanChu1 = "确实要删除选中的【";
Zi.LAN.QueshiYaoShanChu2 = "】票业务吗？";
//Zi.LAN. = "";

2
DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfitZou/MsRptOpProfitZouIndex.js
Unescape Escape View File

@ -746,7 +746,7 @@ Ext.extend(Shipping.MsRptOpProfitZouIndex, Ext.Panel, {
var OBJTYPE = rdOBJTYPE.getValue();
var form = this.formSearch.getForm();
if (OBJTYPE.OBJTYPE == Zi.LAN.OPDATE) {
if (OBJTYPE.OBJTYPE =='业务日期') {
var expDate_Min = form.findField('PS_EXPDATEBGN').getRawValue();
var expDate_Max = form.findField('PS_EXPDATEEND').getRawValue();
if (expDate_Min == '' || expDate_Min == null || expDate_Min == undefined) {

Write Preview
Loading…
Cancel
Save