1

Myshipping.Application/Entity/BookingOrder.cs

@@ -24,7 +24,7 @@ namespace Myshipping.Application.Entity
         /// <summary>
         /// 业务状态名称
         /// </summary>
-        //[Description("业务状态名称")]
+        //[Description("业务状态")]
         public string BSSTATUSNAME { get; set; }
         /// <summary>
         /// 业务日期
@@ -154,7 +154,7 @@ namespace Myshipping.Application.Entity
         /// <summary>
         /// 起运港
         /// </summary>
-        [Description("起运港")]
+        [Description("装货港")]
         public string PORTLOAD { get; set; }
         /// <summary>
         /// 卸货港代码
@@ -266,7 +266,7 @@ namespace Myshipping.Application.Entity
         /// <summary>
         /// 毛重
         /// </summary>
-        [Description("毛重")]
+        [Description("重量")]
         public decimal? KGS { get; set; }
         /// <summary>
         /// 尺码
@@ -279,9 +279,9 @@ namespace Myshipping.Application.Entity
         [Description("件数大写")]
         public string TOTALNO { get; set; }
         /// <summary>
-        /// 集装箱
+        /// 箱型箱量
         /// </summary>
-        [Description("集装箱")]
+        [Description("箱型箱量")]
         public string CNTRTOTAL { get; set; }
         /// <summary>
         /// 船公司代号
@@ -584,9 +584,9 @@ namespace Myshipping.Application.Entity
         [Description("客服")]
         public string CUSTSERVICE { get; set; }
         /// <summary>
-        /// 客户
+        /// 委托单位
         /// </summary>
-        [Description("客户")]
+        [Description("委托单位")]
         public string CUSTOMERNAME { get; set; }
         /// <summary>
         /// 订舱代理
@@ -726,7 +726,7 @@ namespace Myshipping.Application.Entity
         /// <summary>
         /// 航线名称（船公司）
         /// </summary>
-        [Description("航线名称")]
+        [Description("船司航线")]
         public string LANENAME { get; set; }
         /// <summary>
         /// 付款方
@@ -856,6 +856,7 @@ namespace Myshipping.Application.Entity
         /// <summary>
         /// 最后下货纸比对状态 NO_DIFF-无异常;DIFF-有差异;NO_YARD-无场站数据;EXPT-异常
         /// </summary>
+        [Description("下货纸比对")]
         public string LstShipOrderCompareRlt { get; set; }
 
         /// <summary>
@@ -880,6 +881,7 @@ namespace Myshipping.Application.Entity
         /// <summary>
         /// 是否占舱
         /// </summary>
+        [Description("是否占舱")]
         public string ZhanCangFlag { get; set;  }
 
         /// <summary>
@@ -911,7 +913,7 @@ namespace Myshipping.Application.Entity
         /// <summary>
         /// 预计到港日期（目的港）
         /// </summary>
-        [Description("预计到港日期")]
+        [Description("目的港ETA")]
         public DateTime? ETA { get; set; }
 
 
@@ -963,6 +965,7 @@ namespace Myshipping.Application.Entity
         /// <summary>
         /// 申请箱使
         /// </summary>
+        [Description("申请箱使")]
         public string ShenQingXiangShi { get; set; }
 
         /// <summary>

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -829,55 +829,7 @@ namespace Myshipping.Application
                         }).ExecuteCommandAsync();
                     }
                 }
-
-
-                bool flag = true;
-                long bid = 0;
-                foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(entity))
-                {
-                    string name = descriptor.Name;
-                    if (name == "TenantId" || name == "CreatedTime" || name == "UpdatedTime" || name == "CreatedUserId" || name == "CreatedUserName")
-                    {
-                        continue;
-                    }
-                    object value = descriptor.GetValue(entity);
-                    var oldvalue = mlist.GetType().GetProperty(name).GetValue(mlist, null);
-
-                    if (name == "KGS" || name == "CBM")
-                    {
-                        if (Convert.ToDecimal(value) == Convert.ToDecimal(oldvalue))
-                        {
-                            continue;
-                        }
-                    }
-                    string _oldvalue = oldvalue != null ? oldvalue.ToString() : "";
-                    string _value = value != null ? value.ToString() : "";
-                    if (_oldvalue != _value && !string.IsNullOrWhiteSpace(descriptor.Description))
-                    {
-                        if (flag)
-                        {
-                            ////添加booking日志
-                            bid = await _bookinglog.InsertReturnSnowflakeIdAsync(new BookingLog
-                            {
-                                Type = "Edit",
-                                BookingId = entity.Id,
-                                TenantId = Convert.ToInt64(UserManager.TENANT_ID),
-                                CreatedTime = DateTime.Now,
-                                CreatedUserId = UserManager.UserId,
-                                CreatedUserName = UserManager.Name
-                            });
-                            flag = false;
-                        }
-                        await _bookinglogdetail.InsertReturnSnowflakeIdAsync(new BookingLogDetail
-                        {
-                            PId = bid,
-                            Field = descriptor.Description,
-                            OldValue = _oldvalue,
-                            NewValue = _value,
-                        });
-                    }
-                }
-
+                await SaveLog(entity, mlist);
             }
 
             var Id = entity.Id;
@@ -991,11 +943,11 @@ namespace Myshipping.Application
             await SendBookingOrder(new long[] { main.ParentId == 0 ? Id : (long)main.ParentId });
             //推送订舱数据到客户订舱系统
             CustomerBookingSyncHelper.SendCustomerBookingSync(Id);
-
-
             return ordOut;
         }
 
+      
+
         /// <summary>
         /// 在订舱台账保存单证备注、操作备注等功能
         /// </summary>
@@ -7580,7 +7532,6 @@ namespace Myshipping.Application
             }
         }
 
-
         /// <summary>
         /// 下拉获取字段名称
         /// </summary>
@@ -7657,8 +7608,6 @@ namespace Myshipping.Application
             return dynamic;
         }
 
-
-
         /// <summary>
         /// 获取订舱数据接口 备注 、 文件 、日志、服务项目、状态日志
         /// </summary>
@@ -7932,7 +7881,7 @@ namespace Myshipping.Application
                     }
                     var json = dto.ToJsonString();
                     _logger.LogInformation("订舱数据回推：" + json);
-                  
+                    _logger.LogInformation("订舱数据回推地址：" + _cache.GetAllDictData().Result.Where(x => x.Code == "BookingOrderMQUri").Select(x => x.Value).FirstOrDefault());
                     try
                     {
                         const string MqActionExchangeName = "djy.output.dingcang.ds6";
@@ -7945,7 +7894,7 @@ namespace Myshipping.Application
                             IModel mqModel = conn.CreateModel();
                             mqModel.ExchangeDeclare(MqActionExchangeName, ExchangeType.Direct);
                             var queueName = $"{MqActionQueueName}.{UserManager.TENANT_ID}";
-                            mqModel.QueueDeclare(queueName, false, false, false, null);
+                            mqModel.QueueDeclare(queueName, true, false, false, null);
                             mqModel.QueueBind(queueName, MqActionExchangeName, queueName, null);
                             byte[] messageBodyBytes = Encoding.UTF8.GetBytes(SharpZipLib.Compress(json));
                             IBasicProperties props = mqModel.CreateBasicProperties();
@@ -8171,6 +8120,64 @@ namespace Myshipping.Application
                 }).ExecuteCommandAsync();
             }
         }
+
+        /// <summary>
+        /// 记录日志 
+        /// </summary>
+        /// <returns></returns>
+        [NonAction]
+        public async Task SaveLog(BookingOrder newOrder, BookingOrder oldOrder)
+        {
+
+            bool flag = true;
+            long bid = 0;
+            foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(newOrder))
+            {
+                string name = descriptor.Name;
+                if (name == "TenantId" || name == "CreatedTime" || name == "UpdatedTime" || name == "CreatedUserId" || name == "CreatedUserName")
+                {
+                    continue;
+                }
+                object value = descriptor.GetValue(newOrder);
+                var oldvalue = oldOrder.GetType().GetProperty(name).GetValue(oldOrder, null);
+
+                if (name == "KGS" || name == "CBM")
+                {
+                    if (Convert.ToDecimal(value) == Convert.ToDecimal(oldvalue))
+                    {
+                        continue;
+                    }
+                }
+                string _oldvalue = oldvalue != null ? oldvalue.ToString() : "";
+                string _value = value != null ? value.ToString() : "";
+                if (_oldvalue != _value && !string.IsNullOrWhiteSpace(descriptor.Description))
+                {
+                    if (flag)
+                    {
+                        ////添加booking日志
+                        bid = await _bookinglog.InsertReturnSnowflakeIdAsync(new BookingLog
+                        {
+                            Type = "Edit",
+                            BookingId = newOrder.Id,
+                            TenantId = Convert.ToInt64(UserManager.TENANT_ID),
+                            CreatedTime = DateTime.Now,
+                            CreatedUserId = UserManager.UserId,
+                            CreatedUserName = UserManager.Name
+                        });
+                        flag = false;
+                    }
+                    await _bookinglogdetail.InsertReturnSnowflakeIdAsync(new BookingLogDetail
+                    {
+                        PId = bid,
+                        Field = descriptor.Description,
+                        OldValue = _oldvalue,
+                        NewValue = _value,
+                    });
+                }
+            }
+
+        }
+
         #endregion
 
         #region 临时测试使用

Myshipping.Core/Myshipping.Core.xml

@@ -5501,6 +5501,20 @@
             <param name="d"></param>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Core.Extension.SharpZipLib.Compress(System.String)">
+            <summary>
+            数据压缩
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Myshipping.Core.Extension.SharpZipLib.Decompress(System.String)">
+            <summary>
+            数据解压缩
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="T:Myshipping.Core.PagedQueryableExtensions">
             <summary>
             分页拓展类