diff --git a/BookingJieFeng/BookingJieFeng.csproj.user b/BookingJieFeng/BookingJieFeng.csproj.user index 28be9c4c..a48b3371 100644 --- a/BookingJieFeng/BookingJieFeng.csproj.user +++ b/BookingJieFeng/BookingJieFeng.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU FolderProfile true diff --git a/BookingWeb/BookingWeb.csproj.user b/BookingWeb/BookingWeb.csproj.user index 4edb5e0f..6bc24ada 100644 --- a/BookingWeb/BookingWeb.csproj.user +++ b/BookingWeb/BookingWeb.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpOther/MsOpOtherDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpOther/MsOpOtherDAL.cs index 31d19006..d0b3cf34 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpOther/MsOpOtherDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpOther/MsOpOtherDAL.cs @@ -402,8 +402,10 @@ namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL data.BSNO = Convert.ToString(reader["BSNO"]); data.OPLB = Convert.ToString(reader["OPLB"]); data.OPLBNAME = Convert.ToString(reader["OPLBNAME"]); - data.BSSTATUS = Convert.ToBoolean(reader["BSSTATUS"]); - data.FEESTATUS = Convert.ToBoolean(reader["FEESTATUS"]); + if (reader["BSSTATUS"] != DBNull.Value) + data.BSSTATUS = Convert.ToBoolean(reader["BSSTATUS"]); + if (reader["FEESTATUS"] != DBNull.Value) + data.FEESTATUS = Convert.ToBoolean(reader["FEESTATUS"]); data.BSSTATUSREF = Convert.ToString(reader["BSSTATUSREF"]); data.FEESTATUSREF = Convert.ToString(reader["FEESTATUSREF"]); data.DRFEESTATUS = getfeestatus(Convert.ToString(reader["DRFEESTATUS"])); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js index 2bf204cf..201bb072 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js @@ -1138,6 +1138,20 @@ Ext.extend(Shipping.MsOpSeaiIndex, Ext.Panel, { dataIndex: 'CUSTSERVICE', header: Zi.LAN.CUSTSERVICE, //'客服', width: 100 + }, + { + sortable: true, + id: '', + dataIndex: 'HGCYDATE', + header: Zi.LAN.HGCYDATE, //'客服', + width: 100 + }, + { + sortable: true, + id: '', + dataIndex: 'HGCYXL', + header: Zi.LAN.HGCYXL, //'客服', + width: 100 } ]; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptNoTotalIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptNoTotalIndex.js index 0f940f28..d2599e91 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptNoTotalIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptNoTotalIndex.js @@ -49,7 +49,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, { this.sqlcontext = '1=2'; this.isquery = false; this.NORPTSTLDATETYPE = 0; - Ext.Ajax.timeout = 120000; + Ext.Ajax.timeout = 1200000; this.storectndisp = Ext.create('DsExt.ux.RefTableStore', { model: 'DsShipping.ux.CtnDispModel', @@ -176,7 +176,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, { proxy: { type: 'ajax', url: '/MvcShipping/MsRptNoTotal/BsListData', - timeout: 120000, + timeout: 1200000, reader: { id: '', root: 'data', @@ -1222,7 +1222,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, { proxy: { type: 'ajax', url: '/MvcShipping/MsRptNoTotal/FeeListData', - timeout: 120000, + timeout: 1200000, reader: { id: '', root: 'data', @@ -1895,7 +1895,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, { proxy: { type: 'ajax', url: '/MvcShipping/MsRptNoTotal/BsListData', - timeout: 120000, + timeout: 1200000, reader: { id: '', root: 'data', @@ -2907,7 +2907,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, { proxy: { type: 'ajax', url: '/MvcShipping/MsRptNoTotal/FeeListData', - timeout: 120000, + timeout: 1200000, reader: { id: '', root: 'data', @@ -3480,7 +3480,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, { proxy: { type: 'ajax', url: '/MvcShipping/MsRptNoTotal/SaleListData', - timeout: 120000, + timeout: 1200000, reader: { id: '', root: 'data', @@ -3742,7 +3742,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, { proxy: { type: 'ajax', url: '/MvcShipping/MsRptNoTotal/CustListData', - timeout: 120000, + timeout: 1200000, reader: { id: '', root: 'data', @@ -4063,7 +4063,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, { proxy: { type: 'ajax', url: '/MvcShipping/MsRptNoTotal/SaleCustListData', - timeout: 120000, + timeout: 1200000, reader: { id: '', root: 'data', @@ -4324,7 +4324,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, { remoteSort: true, proxy: { type: 'ajax', - timeout: 120000, + timeout: 1200000, url: '/MvcShipping/MsRptNoTotal/VesselVoyListData', reader: { id: '', @@ -4586,7 +4586,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, { proxy: { type: 'ajax', url: '/MvcShipping/MsRptNoTotal/DeptListData', - timeout: 120000, + timeout: 1200000, reader: { id: '', root: 'data', @@ -4833,7 +4833,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, { remoteSort: true, proxy: { type: 'ajax', - timeout: 120000, + timeout: 1200000, url: '/MvcShipping/MsRptNoTotal/SumListData', reader: { id: '', diff --git a/DSWeb/DSWeb.csproj.user b/DSWeb/DSWeb.csproj.user index 5d714467..a8615099 100644 --- a/DSWeb/DSWeb.csproj.user +++ b/DSWeb/DSWeb.csproj.user @@ -4,7 +4,7 @@ ShowAllFiles 配置文件1 true - Release|Any CPU + Debug|Any CPU diff --git a/DispatchWeb/DispatchWeb.csproj.user b/DispatchWeb/DispatchWeb.csproj.user index af17a67a..e6a8406a 100644 --- a/DispatchWeb/DispatchWeb.csproj.user +++ b/DispatchWeb/DispatchWeb.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true diff --git a/JobAutoCreateFee/JobHCCreateFee.cs b/JobAutoCreateFee/JobHCCreateFee.cs index cbdb76d4..7fe4591b 100644 --- a/JobAutoCreateFee/JobHCCreateFee.cs +++ b/JobAutoCreateFee/JobHCCreateFee.cs @@ -354,13 +354,14 @@ namespace JobCreateFee { foreach (DataRow row in table.Rows) { - str = str + " AND " + row["条件名称"].ToString(); + str = str + " AND " + row["条件名称"].ToString().Replace("订舱代理","货代").Replace("报检行", "船代").Replace("产地证代理", "航线管理").Replace("运输代理", "其他相关公司"); str = str + "='" + row["条件值"].ToString() + "'"; } } return str; } + static public List GetFeeTemplate(string FA_ID, SqlConnection dbcon) { diff --git a/JobSendAgentMail/JobReceiveMail.cs b/JobSendAgentMail/JobReceiveMail.cs index e6a8c459..d2c6259e 100644 --- a/JobSendAgentMail/JobReceiveMail.cs +++ b/JobSendAgentMail/JobReceiveMail.cs @@ -39,7 +39,10 @@ namespace JobSendAgentMail public string AGENTMAIL { get; set; } public string OPEMAIL { get; set; } - + public string MBLNO { get; set; } + public string HBLNO { get; set; } + public string INVNO { get; set; } + } @@ -61,7 +64,7 @@ namespace JobSendAgentMail string MAILSENDPORT = context.JobDetail.JobDataMap.GetString("MAILSENDPORT"); string MAILISSSL = context.JobDetail.JobDataMap.GetString("MAILISSSL"); string MAILTEMPLATE = context.JobDetail.JobDataMap.GetString("MAILTEMPLATE"); - string MAILTITLEJOB = context.JobDetail.JobDataMap.GetString("MAILTITLE"); + string MAILTITLE = context.JobDetail.JobDataMap.GetString("MAILTITLE"); string basePath = AppDomain.CurrentDomain.BaseDirectory; string savePath = Path.Combine(basePath, $"{DateTime.Now.ToString("yyyyMMdd")}\\{MAILSENDACCOUNT}"); @@ -169,10 +172,12 @@ namespace JobSendAgentMail if (!string.IsNullOrEmpty(AGENTMAIL.AGENTMAIL)) { log.Debug($"生成转发：" + HBLNO + " " + STATUS); - + MAILTITLE = MAILTITLE.Replace("$MBLNO$", AGENTMAIL.MBLNO); + MAILTITLE = MAILTITLE.Replace("$INVNO$",AGENTMAIL.INVNO); + MAILTITLE = MAILTITLE.Replace("$MAILTITLE$", recInfo.Subject); var sendmail = new MailSend(); sendmail.GID = Guid.NewGuid().ToString(); - sendmail.Title = recInfo.Subject; + sendmail.Title = MAILTITLE; sendmail.Body = recInfo.Body; sendmail.SendTo = AGENTMAIL.AGENTMAIL; sendmail.CCTo= AGENTMAIL.OPEMAIL; @@ -232,6 +237,8 @@ namespace JobSendAgentMail result.AGENTMAIL = row["AGENTEMAIL"].ToString(); result.OPEMAIL = row["OPEMAIL"].ToString(); result.BSNO = row["BSNO"].ToString(); + result.INVNO = row["INVNO"].ToString(); + result.MBLNO = row["MBLNO"].ToString(); } }