Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Entity/BookingOrder.cs

@@ -821,35 +821,41 @@ namespace Myshipping.Application.Entity
         /// <summary>
         /// ep号
         /// </summary>
-
+        [Description("ep号")]
         public string EPCode { get; set; }
 
         /// <summary>
         /// 航线
         /// </summary>
+        [Description("航线")]
         public string LineName { get; set; }
         /// <summary>
         /// 单证备注
         /// </summary>
+        [Description("单证备注")]
         public string DZRemark { get; set; }
         /// <summary>
         /// 操作备注
         /// </summary>
+        [Description("操作备注")]
         public string CZRemark { get; set; }
 
         /// <summary>
         /// 真提单号
         /// </summary>
+        [Description("真提单号")]
         public string TMBLNO { get; set; }
 
         /// <summary>
-        /// 装运方式  整箱/拼箱
+        /// 装运方式
         /// </summary>
+        [Description("装运方式")]
         public string ShippingMethod { get; set; }
 
         /// <summary>
         /// 航线管理
         /// </summary>
+        [Description("航线管理")]
         public string LineManage { get; set; }
 
         /// <summary>
@@ -895,5 +901,13 @@ namespace Myshipping.Application.Entity
         /// 业务来源名称
         /// </summary>
         public string SourceName { get; set; }
+
+
+        /// <summary>
+        /// ETD
+        /// </summary>
+        [Description("ETD")]
+        public DateTime? YgtETD { get; set; }
+
     }
 }

Myshipping.Application/Entity/BookingOrderSeaeEdi.cs

@@ -182,5 +182,11 @@ namespace Myshipping.Application.Entity
         /// 场站
         /// </summary>
         public string YARD { get; set; }
+
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string State { get; set; }
     }
 }

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -533,6 +533,7 @@ namespace Myshipping.Application
                     it.TenantName,
                     it.IsDeleted,
                     it.BOOKINGNO,
+                    it.YgtETD,
                     it.LstShipOrderCompareId,
                     it.LstShipOrderCompareDate,
                     it.LstShipOrderCompareRlt,

Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs

@@ -721,5 +721,11 @@ namespace Myshipping.Application
         /// 业务来源名称
         /// </summary>
         public string SourceName { get; set; }
+
+
+        /// <summary>
+        /// 运港通ETD
+        /// </summary>
+        public DateTime? YgtETD { get; set; }
     }
 }

Myshipping.Application/Service/BookingOrder/Dto/PageBookingOrder.cs

@@ -850,5 +850,9 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
         /// 最后下货纸比对方式 MANUAL-手动 AUTO-自动
         /// </summary>
         public string LstShipOrderCompareMode { get; set; }
+        /// <summary>
+        /// 运港通ETD
+        /// </summary>
+        public DateTime? YgtETD { get; set; }
     }
 }

Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs

@@ -106,6 +106,7 @@ namespace Myshipping.Application
                 }
             }
             var entity = input.Adapt<BookingOrderSeaeEdi>();
+            entity.State = "已录入";
             if (input.Id == 0)
             {
 
@@ -165,17 +166,24 @@ namespace Myshipping.Application
         /// <summary>
         /// 删除舱单
         /// </summary>
-        /// <param name="Id"></param>
+        /// <param name="Ids"></param>
         /// <returns></returns>
         [SqlSugarUnitOfWork]
         [HttpPost("/BookingOrderSeaeEdi/Delete")]
-        public async Task Delete(long Id)
+        public async Task Delete(string Ids)
         {
+            var arr = Ids.Split(",");
+            if (arr.Count() > 0)
+            {
+                foreach (var ar in arr)
+                {
+                    long Id = Convert.ToInt64(ar);
+                    await _seaeedi.UpdateAsync(x => x.Id == Id, x => new BookingOrderSeaeEdi { IsDeleted = true });
 
-            await _seaeedi.UpdateAsync(x => x.Id == Id, x => new BookingOrderSeaeEdi { IsDeleted = true });
-
-            await _seaeedictn.UpdateAsync(x => x.PId == Id, x => new BookingOrderSeaeEdiCtn { IsDeleted = true });
-            _logger.LogInformation(Id + "删除成功！");
+                    await _seaeedictn.UpdateAsync(x => x.PId == Id, x => new BookingOrderSeaeEdiCtn { IsDeleted = true });
+                    _logger.LogInformation(Id + "删除成功！");
+                }
+            }
         }
 
 
@@ -251,7 +259,7 @@ namespace Myshipping.Application
             bsl.Category = "ship";
             bsl.MBLNO = order.MBLNO;
             await _repStatuslog.InsertAsync(bsl);
-
+            await _seaeedi.UpdateAsync(x => x.Id == bookingId, x => new BookingOrderSeaeEdi { State = "已发送" });
         }
 
 

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -345,6 +345,9 @@ namespace Myshipping.Application
                         {
                             it.ATD = item.ATD;
                         }
+                        if (it.YgtETD!=item.YgtETD) {
+                            it.YgtETD = item.YgtETD;
+                        }
                         await _rep.AsUpdateable(it).IgnoreColumns(it => new
                         {
                             it.ParentId,
@@ -398,7 +401,16 @@ namespace Myshipping.Application
                                 NewValue = item.ATD != null ? item.ATD.ToSqlValue() : null,
                             });
                         }
-
+                        if (it.YgtETD != item.YgtETD)
+                        {
+                            await _bookinglogdetail.InsertReturnSnowflakeIdAsync(new BookingLogDetail
+                            {
+                                PId = bid,
+                                Field = "ETD",
+                                OldValue = it.YgtETD != null ? it.YgtETD.ToSqlValue() : null,
+                                NewValue = item.YgtETD != null ? item.YgtETD.ToSqlValue() : null,
+                            });
+                        }
                     }
 
                 }
@@ -985,6 +997,7 @@ namespace Myshipping.Application
                         it.ParentId,
                         it.TenantId,
                         it.TenantName,
+                        it.YgtETD,
                         it.CreatedTime,
                         it.CreatedUserId,
                         it.CreatedUserName,
@@ -1308,6 +1321,7 @@ namespace Myshipping.Application
                                     it.TenantName,
                                     it.CreatedTime,
                                     it.CreatedUserId,
+                                    it.YgtETD,
                                     it.CreatedUserName,
                                     it.LstShipOrderCompareId,
                                     it.LstShipOrderCompareDate,

Myshipping.Core/Entity/DJY/DjyVesselInfo.cs

@@ -127,7 +127,7 @@ namespace Myshipping.Application.Entity
         /// </summary>
         public string PortLoadingId { get; set; }
         /// <summary>
-        /// 装货港ID
+        /// 中转港ID
         /// </summary>
         public string PortTransitId { get; set; }
         /// <summary>
@@ -178,6 +178,9 @@ namespace Myshipping.Application.Entity
         public string CreatedUserName { get; set; }
 
 
-
+        /// <summary>
+        /// 运港通ETD
+        /// </summary>
+        public DateTime? YgtETD { get; set; }
     }
 }