From 16137b0a857264c8e23f5f16188de3ae87898298 Mon Sep 17 00:00:00 2001
From: dengyu <ddlucky@sina.com>
Date: Tue, 7 Nov 2023 15:06:42 +0800
Subject: [PATCH] 1

---
 D7MqClient/D7MqClient/App.config                       | 10 +++++-----
 D7MqClient/D7MqClient/D7MqClient.csproj                |  5 ++---
 DSWeb.DJYMQ/DS7Service.cs                              |  3 +++
 .../Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/D7MqClient/D7MqClient/App.config b/D7MqClient/D7MqClient/App.config
index edaedf18..e14c54ea 100644
--- a/D7MqClient/D7MqClient/App.config
+++ b/D7MqClient/D7MqClient/App.config
@@ -19,23 +19,23 @@
 		<add key="MQURL" value="amqp://djy_output:123qwe@47.104.207.5:12567/djy.output" />
   
 -->
-    <!-- invtoD7
+    <!-- invtoD7	-->
     <add key="MQURL" value="amqp://djy_dev:dev123@60.209.125.238:33666" />
     <add key="virtualhost" value="inv_customer" />
 
     <add key="ConnectionStringFile" value="Data Source=.;Initial Catalog=dongshengdata_jf;User ID=sa;Password=ds20040201" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
-	-->
+
 	  <!--
 	  <add key="DJYUSERID:9f3b3526-4dd4-4997-b974-1f2adb2793c7" value="Server=47.104.102.13,3433;Database=SHIPPINGWEB_ds;User ID=sa;Password=Ds2019*20040201;Connect Timeout=120000;" />
         -->
-	  <!--DJYtoD7_OPSTATUS 大简云向DS7发布业务状态-->
-	  <add key="MQURL" value="amqp://status_resp:djystatusresp2022@60.209.125.238:33666/status_resp" />
+	  <!--DJYtoD7_OPSTATUS 大简云向DS7发布业务状态
+	    <add key="MQURL" value="amqp://status_resp:djystatusresp2022@60.209.125.238:33666/status_resp" />
     <add key="DJYMQURL" value="amqp://booking_data_resp:djybookingresp2023@47.104.207.5:12567/booking_data_resp" />
     <add key="DGMQURL" value="amqp://djy_booking_new:123qwe@60.209.125.238:12567/djy_booking_new" />
 
     <add key="DJYCORPID:662145ea-ab74-44e0-9d31-d27369121c3c" value="Server=60.209.125.238,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" />
-	  
+	  -->
     <!--
 		<add key="DJYUSERID:9f3b3526-4dd4-4997-b974-1f2adb2793c7" value="Server=123.234.225.158,26600;Database=DSWMS_Dev;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" />
 		<add key="DJYUSERID:a4464cee-7c15-41c2-80b1-1003bcc34350" value="Server=123.234.225.158,26600;Database=DSWMS_Dev;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" />
diff --git a/D7MqClient/D7MqClient/D7MqClient.csproj b/D7MqClient/D7MqClient/D7MqClient.csproj
index b4213150..7db80c79 100644
--- a/D7MqClient/D7MqClient/D7MqClient.csproj
+++ b/D7MqClient/D7MqClient/D7MqClient.csproj
@@ -16,7 +16,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <PublishUrl>F:\D7mq\</PublishUrl>
+    <PublishUrl>D:\D7MqClient\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
@@ -26,8 +26,7 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <AutorunEnabled>true</AutorunEnabled>
-    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationRevision>2</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/DSWeb.DJYMQ/DS7Service.cs b/DSWeb.DJYMQ/DS7Service.cs
index 41287162..ca3a0d31 100644
--- a/DSWeb.DJYMQ/DS7Service.cs
+++ b/DSWeb.DJYMQ/DS7Service.cs
@@ -36,6 +36,9 @@ using static System.Data.Entity.Infrastructure.Design.Executor;
 
 namespace DSWeb.Service.Output.DS7
 {
+    /// <summary>
+    /// 和川用 同步DS6和大简云订舱平台的服务程序
+    /// </summary>
     public class DS7Service : ServiceControl
     {
         private const string ExchangeName = "output";
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js
index 7f49d99b..d53ff19d 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js
@@ -6217,7 +6217,7 @@ GetFeeCustNoStatus:function(){
                     var 箱数 = 1;
 
                     var 进口海关报关单放行 = result.res[7].data;
-                    if (进口海关报关单放行 != null) {
+                    if (进口海关报关单放行 != null && 进口海关报关单放行.length>0) {
                         总毛重 = parseFloat(进口海关报关单放行[0].GROS_WT);
                         //总净重 = parseFloat(进口海关报关单放行.NET_WT);
                         总件数 = parseFloat(进口海关报关单放行[0].PASS_PACK_NO);