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

Myshipping.Application/Entity/BookingTruck.cs

@@ -62,9 +62,9 @@ namespace Myshipping.Application.Entity
         [Description("FROM")]
         public string FromName { get; set; }
         /// <summary>
-        /// FROM电话
+        /// FROM座机
         /// </summary>
-        [Description("FROM电话")]
+        [Description("FROM座机")]
         public string FromTel { get; set; }
         /// <summary>
         /// FROM邮箱
@@ -72,6 +72,11 @@ namespace Myshipping.Application.Entity
         [Description("FROM邮箱")]
         public string FromMail { get; set; }
         /// <summary>
+        /// FROM手机号
+        /// </summary>
+        [Description("FROM手机号")]
+        public string FromMobile { get; set; }
+        /// <summary>
         /// FROM传真
         /// </summary>
         [Description("FROM传真")]

Myshipping.Application/Entity/TaskManagePlat/TaskTruckInfo.cs

@@ -73,9 +73,9 @@ namespace Myshipping.Application.Entity
         [Description("FROM")]
         public string FromName { get; set; }
         /// <summary>
-        /// FROM电话
+        /// FROM座机
         /// </summary>
-        [Description("FROM电话")]
+        [Description("FROM座机")]
         public string FromTel { get; set; }
         /// <summary>
         /// FROM邮箱
@@ -83,6 +83,11 @@ namespace Myshipping.Application.Entity
         [Description("FROM邮箱")]
         public string FromMail { get; set; }
         /// <summary>
+        /// FROM手机号
+        /// </summary>
+        [Description("FROM手机号")]
+        public string FromMobile { get; set; }
+        /// <summary>
         /// FROM传真
         /// </summary>
         [Description("FROM传真")]

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -345,6 +345,7 @@ namespace Myshipping.Application
                  .WhereIF(!string.IsNullOrWhiteSpace(input.FREIGHTPAYER), u => u.FREIGHTPAYER.Contains(input.FREIGHTPAYER))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.DZRemark), u => u.DZRemark.Contains(input.DZRemark))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.CZRemark), u => u.CZRemark.Contains(input.CZRemark))
+                 .WhereIF(!string.IsNullOrWhiteSpace(input.ZhanCangFlag), u => u.ZhanCangFlag==input.ZhanCangFlag)
                  .WhereIF(userlist != null && userlist.Count() > 0, u => userlist.Contains((long)u.CreatedUserId) || UserManager.UserId.ToString() == u.ROUTEID || UserManager.Name.ToString() == u.ROUTE || UserManager.UserId.ToString() == u.SALEID || UserManager.Name.ToString() == u.SALE || UserManager.UserId.ToString() == u.OPID || UserManager.Name.ToString() == u.OP || UserManager.UserId.ToString() == u.DOCID || UserManager.Name.ToString() == u.DOC || UserManager.UserId.ToString() == u.CUSTSERVICEID || UserManager.Name.ToString() == u.CUSTSERVICE)
                  .OrderBy(PageInputOrder.OrderBuilder(input.SortField, input.DescSort))
                  .ToPagedListAsync(input.PageNo, input.PageSize);

Myshipping.Application/Service/BookingOrder/BookingValueAddedService.cs

@@ -0,0 +1,89 @@
+using Furion.DependencyInjection;
+using Furion.DynamicApiController;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Myshipping.Application.Entity;
+using Myshipping.Core;
+using Myshipping.Core.Service;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Myshipping.Application
+{
+    /// <summary>
+    /// 订舱增值类服务
+    /// </summary>
+    [ApiDescriptionSettings("Application", Name = "BookingValueAdded", Order = 9)]
+    public class BookingValueAddedService : IBookingValueAddedService, IDynamicApiController, ITransient
+    {
+        private readonly ISysCacheService _cache;
+        private readonly ILogger<BookingTruckService> _logger;
+        private readonly SqlSugarRepository<BookingOrder> _bookingOrderRepository;
+
+        public BookingValueAddedService(ISysCacheService cache, ILogger<BookingTruckService> logger, 
+            SqlSugarRepository<BookingOrder> bookingOrderRepository)
+        {
+            _cache = cache;
+            _logger = logger;
+
+            _bookingOrderRepository = bookingOrderRepository;
+        }
+
+
+        /// <summary>
+        /// 批量下载BC
+        /// </summary>
+        /// <param name="bookingIds">订舱主键数组</param>
+        /// <returns></returns>
+        public async Task<TaskManageOrderResultDto> DownloadBookingConfirm(long[] bookingIds)
+        {
+            TaskManageOrderResultDto result = new TaskManageOrderResultDto();
+
+            try
+            {
+                //var id = await InnerSave(info);
+
+                result.succ = true;
+                result.msg = "批量下载BC成功";
+                //result.ext = id;
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"批量下载BC异常，原因：{ex.Message}";
+            }
+
+            return result;
+        }
+
+
+        /// <summary>
+        /// 批量下载Draft
+        /// </summary>
+        /// <param name="bookingIds">订舱主键数组</param>
+        /// <returns></returns>
+        public async Task<TaskManageOrderResultDto> DownloadDraft(long[] bookingIds)
+        {
+            TaskManageOrderResultDto result = new TaskManageOrderResultDto();
+
+            try
+            {
+                //var id = await InnerSave(info);
+
+                result.succ = true;
+                result.msg = "批量下载Draft成功";
+                //result.ext = id;
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"批量下载Draft异常，原因：{ex.Message}";
+            }
+
+            return result;
+        }
+    }
+}

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

@@ -818,6 +818,11 @@ namespace Myshipping.Application
         /// 操作备注
         /// </summary>
         public string CZRemark { get; set; }
+
+        /// <summary>
+        /// 是否占舱
+        /// </summary>
+        public string ZhanCangFlag { get; set; }
     }
 
     public class AddBookingOrderInput : BookingOrderDto

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

@@ -837,8 +837,19 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
         /// 最后下货纸比对方式 MANUAL-手动 AUTO-自动
         /// </summary>
         public string LstShipOrderCompareMode { get; set; }
- 
+        /// <summary>
+        /// 业务来源代码
+        /// </summary>
+        public string SourceCode { get; set; }
 
+        /// <summary>
+        /// 业务来源名称
+        /// </summary>
+        public string SourceName { get; set; }
+        /// <summary>
+        /// 是否占舱
+        /// </summary>
+        public string ZhanCangFlag { get; set; }
 
         #region 船舶日期相关
         /// <summary>

Myshipping.Application/Service/BookingOrder/IBookingValueAddedService.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Myshipping.Application
+{
+    /// <summary>
+    /// 订舱增值类服务
+    /// </summary>
+    public interface IBookingValueAddedService
+    {
+        /// <summary>
+        /// 批量下载BC
+        /// </summary>
+        /// <param name="bookingIds">订舱主键数组</param>
+        /// <returns></returns>
+        Task<TaskManageOrderResultDto> DownloadBookingConfirm(long[] bookingIds);
+
+
+        /// <summary>
+        /// 批量下载Draft
+        /// </summary>
+        /// <param name="bookingIds">订舱主键数组</param>
+        /// <returns></returns>
+        Task<TaskManageOrderResultDto> DownloadDraft(long[] bookingIds);
+    }
+}

Myshipping.Application/Service/BookingTruck/BookingTruckService.cs

@@ -517,6 +517,7 @@ namespace Myshipping.Application
             model.FromName = UserManager.Name;
             model.FromTel = UserManager.TEl;
             model.FromMail = UserManager.Email;
+            model.FromMobile = UserManager.Phone;
 
             //这里岗位是调度的信息，如果默认只有一条记录，取第一条，其他情况不返回默认值
             var userPosInfo = await _sysUserService.QueryUserByPos("", "PCDD");

Myshipping.Application/Service/BookingTruck/Dtos/BookingTruckDto.cs

@@ -57,10 +57,14 @@ namespace Myshipping.Application
         /// </summary>
         public string FromName { get; set; }
         /// <summary>
-        /// FROM电话
+        /// FROM座机
         /// </summary>
         public string FromTel { get; set; }
         /// <summary>
+        /// FROM手机号
+        /// </summary>
+        public string FromMobile { get; set; }
+        /// <summary>
         /// FROM邮箱
         /// </summary>
         public string FromMail { get; set; }

Myshipping.Application/Service/BookingTruck/Dtos/BookingTruckPrintDto.cs

@@ -38,7 +38,7 @@ namespace Myshipping.Application
         /// </summary>
         public string Attn { get; set; }
         /// <summary>
-        /// ATTN电话
+        /// ATTN座机
         /// </summary>
         public string AttnTel { get; set; }
         /// <summary>
@@ -50,6 +50,10 @@ namespace Myshipping.Application
         /// </summary>
         public string AttnFax { get; set; }
         /// <summary>
+        /// FROM手机号
+        /// </summary>
+        public string FromMobile { get; set; }
+        /// <summary>
         /// FROM
         /// </summary>
         public string FromName { get; set; }

Myshipping.Application/Service/BookingTruck/Dtos/BookingTruckShowBaseDto.cs

@@ -53,10 +53,14 @@ namespace Myshipping.Application
         /// </summary>
         public string FromName { get; set; }
         /// <summary>
-        /// FROM电话
+        /// FROM座机
         /// </summary>
         public string FromTel { get; set; }
         /// <summary>
+        /// FROM手机号
+        /// </summary>
+        public string FromMobile { get; set; }
+        /// <summary>
         /// FROM邮箱
         /// </summary>
         public string FromMail { get; set; }

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -1748,7 +1748,7 @@ namespace Myshipping.Application
                             });
                             it.ATD = item.ATD;
                         }
-                        if (item.ATA != it.StartATA)
+                        if (it.StartATA != item.ATA)
                         {
                             ////添加booking日志
                             var bid = await _bookinglog.InsertReturnSnowflakeIdAsync(new BookingLog
@@ -1767,7 +1767,7 @@ namespace Myshipping.Application
                                 OldValue = it.StartATA == null ? "" : it.StartATA.ToString(),
                                 NewValue = item.ATA == null ? "" : item.ATA.ToString(),
                             });
-                            it.StartATA = item.ATD;
+                            it.StartATA = item.ATA;
                         }
                         await _rep.AsUpdateable(it).IgnoreColumns().ExecuteCommandAsync();
 

Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageOrderTruckInfo.cs

@@ -52,10 +52,14 @@ namespace Myshipping.Application
         /// </summary>
         public string FromName { get; set; }
         /// <summary>
-        /// FROM电话
+        /// FROM座机
         /// </summary>
         public string FromTel { get; set; }
         /// <summary>
+        /// FROM手机号
+        /// </summary>
+        public string FromMobile { get; set; }
+        /// <summary>
         /// FROM邮箱
         /// </summary>
         public string FromMail { get; set; }

Myshipping.Application/Service/TaskManagePlat/Dtos/Truck/TaskTruckDto.cs

@@ -56,10 +56,14 @@ namespace Myshipping.Application
         /// </summary>
         public string FromName { get; set; }
         /// <summary>
-        /// FROM电话
+        /// FROM座机
         /// </summary>
         public string FromTel { get; set; }
         /// <summary>
+        /// FROM手机号
+        /// </summary>
+        public string FromMobile { get; set; }
+        /// <summary>
         /// FROM邮箱
         /// </summary>
         public string FromMail { get; set; }

Myshipping.Application/Service/TaskManagePlat/Dtos/Truck/TaskTruckShowBaseDto.cs

@@ -49,10 +49,14 @@ namespace Myshipping.Application
         /// </summary>
         public string FromName { get; set; }
         /// <summary>
-        /// FROM电话
+        /// FROM座机
         /// </summary>
         public string FromTel { get; set; }
         /// <summary>
+        /// FROM手机号
+        /// </summary>
+        public string FromMobile { get; set; }
+        /// <summary>
         /// FROM邮箱
         /// </summary>
         public string FromMail { get; set; }

Myshipping.Core/Entity/DJY/DjyTenantConfig.cs

@@ -21,5 +21,7 @@ namespace Myshipping.Core.Entity
         /// 配置数据json
         /// </summary>
         public string ConfigJson { get; set; }
+
+
     }
 }