1

BookingJieFeng/BookingJieFeng.csproj.user

@@ -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>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />

BookingWeb/BookingWeb.csproj.user

@@ -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>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

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"]));

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
             }
         ];
 

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: '',

DSWeb/DSWeb.csproj.user

@@ -4,7 +4,7 @@
     <ProjectView>ShowAllFiles</ProjectView>
     <NameOfLastUsedPublishProfile>配置文件1</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

DispatchWeb/DispatchWeb.csproj.user

@@ -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>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

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<MsChFee> GetFeeTemplate(string FA_ID, SqlConnection dbcon)
         {
 

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();
 
                     }
                 }