Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev

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="" />

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

D7MqClient/D7MqClient/Program.cs

@@ -25,7 +25,7 @@ namespace D7MqClient
             {
                 new DsService()
             };
-            
+
             ServiceBase.Run(ServicesToRun);
             #endregion
 

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