From 62763910bddd0587000e69f94f37e6d3ba651971 Mon Sep 17 00:00:00 2001
From: ddlucky <ddlucky@sina.com>
Date: Tue, 5 Mar 2024 17:47:19 +0800
Subject: [PATCH 1/2] 1

---
 D7MqClient/D7MqClient/App.config       | 9 +++++----
 D7MqClient/D7MqClient/JFtoDjyBackNo.cs | 9 ++++++---
 D7MqClient/D7MqClient/Program.cs       | 2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/D7MqClient/D7MqClient/App.config b/D7MqClient/D7MqClient/App.config
index 4c245094..51e4c115 100644
--- a/D7MqClient/D7MqClient/App.config
+++ b/D7MqClient/D7MqClient/App.config
@@ -15,16 +15,17 @@
     <add key="FileType" value="提单COPY"/>
 <!--
 	   <add key="DJYMQURL" value="amqp://booking_data_resp:djybookingresp2023@60.209.125.238:33666/booking_data_resp" />
+	   	  <add key="DJYMQURL" value="amqp://djy_paas:123qwe@60.209.125.238:40101/djy_paas" />
 	  -->
 	  <!-- 说明地址 http://60.209.125.238:32222/single/file/PoMFbs9v3szyRznhxgNq9KndIwNEJ9yqUx6qRBjdazq2F3ajYLfbuLFlJmqDzqiD
 	    订舱数据回推消息推送
 		测试 amqp://booking_data_resp:djybookingresp2023@60.209.125.238:33666/booking_data_resp
 		正式 amqp://booking_data_resp:djybookingresp2023@47.104.207.5:12567/booking_data_resp (内网ip：172.31.85.159）
 	  -->
-	  <add key="DJYMQURL" value="amqp://djy_paas:123qwe@60.209.125.238:40101/djy_paas" />
-	  <add key="virtualhost" value="djy_paas" />
-    <add key="MQExchangeName" value="" />
-    <add key="MQQueueName" value="cr_cuttime_etd" />
+	  <add key="DJYMQURL" value="amqp://booking_data_resp:djybookingresp2023@47.104.207.5:12567/booking_data_resp" />
+	  <add key="virtualhost" value="booking_data_resp" />
+    <add key="MQExchangeName" value="djy.booking.feedback" />
+    <add key="MQQueueName" value="" />
     <add key="MAILSENDACCOUNT" value=" " />
     <add key="MAILSENDPASSWORD" value="" />
     <add key="MAILSENDSERVICE" value="" />
diff --git a/D7MqClient/D7MqClient/JFtoDjyBackNo.cs b/D7MqClient/D7MqClient/JFtoDjyBackNo.cs
index c060b371..849fb0e0 100644
--- a/D7MqClient/D7MqClient/JFtoDjyBackNo.cs
+++ b/D7MqClient/D7MqClient/JFtoDjyBackNo.cs
@@ -30,15 +30,18 @@ namespace D7MqClient
         private static string DSVER = ConfigurationManager.AppSettings["DONGSHENGVER"];
         private static string UPDATESUBCOMPANY = ConfigurationManager.AppSettings["UPDATESUBCOMPANY"];
 
-        private const string ExchangeName = "djy_paas";
-        private const string QueueName = "djy_paas.booking_data_resp.";
+        private static string QueueName = "";
+        private static string ExchangeName = ConfigurationManager.AppSettings["MQExchangeName"];
+
+        //private const string ExchangeName = "djy_paas";
+        //private const string QueueName = "djy_paas.booking_data_resp.";
         private static IConnection mqConn;
         private static ILog logger = LogManager.GetLogger("D7MqClient");
        
         public static void DoProcess()
         {
             logger.Debug($"启动接收大简云订舱数据回推_JFtoDjyBackNo");
-            var CompanyQueueName = QueueName + COMPANYID;
+            var CompanyQueueName = ExchangeName+"." + COMPANYID;
             
             logger.Debug($"DJYMQURL:{DJYMQURL}");
             logger.Debug($"ExchangeName:{ExchangeName}");
diff --git a/D7MqClient/D7MqClient/Program.cs b/D7MqClient/D7MqClient/Program.cs
index 38c61fc3..f81e0ce2 100644
--- a/D7MqClient/D7MqClient/Program.cs
+++ b/D7MqClient/D7MqClient/Program.cs
@@ -25,7 +25,7 @@ namespace D7MqClient
             {
                 new DsService()
             };
-            
+
             ServiceBase.Run(ServicesToRun);
             #endregion
 

From 65c058c25029d86d50fa6fbd85ed9b727c23e9f6 Mon Sep 17 00:00:00 2001
From: ddlucky <ddlucky@sina.com>
Date: Wed, 6 Mar 2024 17:08:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=B7=E8=BF=90=E5=87=BA=E5=8F=A3=20?=
 =?UTF-8?q?=E4=B8=80=E8=A1=8C=E5=A4=9A=E4=BD=99=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
index 303d5723..bcf6ffe1 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
@@ -3873,7 +3873,6 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                                         defaultType: 'textfield',
                                         items: [
                                             {
-                                                ISSUETYPE
                                                 xtype: 'container',
                                                 defaultType: 'textfield',
                                                 layout: 'hbox',