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

Myshipping.Application/Job/HCDataCompareWorker.cs

@@ -71,7 +71,8 @@ namespace Myshipping.Application.Job
                 {
                     x.Id,
                     x.MBLNO,
-                    x.ParentId
+                    x.ParentId,
+                    x.VERSION
                 })
                 .ToList();
 
@@ -82,7 +83,8 @@ namespace Myshipping.Application.Job
                     .Select(x => new HCDataCompareSendSubModel
                     {
                         Id = x.Id,
-                        MBLNO = x.MBLNO
+                        MBLNO = x.MBLNO,
+                        VERSION = x.VERSION
                     })
                     .ToList();
             }
@@ -98,7 +100,8 @@ namespace Myshipping.Application.Job
                     .Select(x => new HCDataCompareSendModel
                     {
                         Id = x.Id,
-                        MBLNO = x.MBLNO
+                        MBLNO = x.MBLNO,
+                        VERSION = x.VERSION
                     })
                     .ToList();
 
@@ -171,6 +174,8 @@ namespace Myshipping.Application.Job
 
         public string MBLNO { get; set; }
 
+        public string VERSION { get; set; }
+
         public List<HCDataCompareSendSubModel> Sub { get; set; }
     }
 
@@ -179,5 +184,7 @@ namespace Myshipping.Application.Job
         public long Id { get; set; }
 
         public string MBLNO { get; set; }
+
+        public string VERSION { get; set; }
     }
 }

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

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Myshipping.Application
+{
+    /// <summary>
+    /// 派车任务台账保存
+    /// </summary>
+    public class TruckPageDto
+    {
+        /// <summary>
+        /// 任务主键
+        /// </summary>
+        public string TaskPKId { get; set; }
+
+        /// <summary>
+        /// 车队ID
+        /// </summary>
+        public Nullable<long> TruckId { get; set; }
+        /// <summary>
+        /// 车队代码
+        /// </summary>
+        public string TruckCode { get; set; }
+        /// <summary>
+        /// 车队代码
+        /// </summary>
+        public string TruckName { get; set; }
+    }
+}

Myshipping.Application/Service/TaskManagePlat/TaskManageTruckService.cs

@@ -1369,5 +1369,57 @@ namespace Myshipping.Application
             return rtn;
         }
 
+        /// <summary>
+        /// 派车任务台账保存
+        /// </summary>
+        /// <param name="model">请求详情</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("/TaskManageTruck/SaveTruckByPage")]
+        public async Task<TaskManageOrderResultDto> SaveTruckByPage([FromBody] TruckPageDto model)
+        {
+            TaskManageOrderResultDto result = new TaskManageOrderResultDto();
+
+            try
+            {
+                var entity = _taskTruckRepository.AsQueryable().First(a => a.TASK_ID == model.TaskPKId);
+
+                if (model == null)
+                    throw Oops.Oh($"派车信息获取失败，派车信息不存在或已作废");
+                
+                //校验
+                ValidateTruck(OperateTypeEnum.Save, new TaskTruckInfo[] { entity });
+
+                entity.TruckId = model.TruckId;
+                entity.TruckCode = model.TruckCode;
+                entity.TruckName = model.TruckName;
+
+                entity.UpdatedTime = DateTime.Now;
+                entity.UpdatedUserId = UserManager.UserId;
+                entity.UpdatedUserName = UserManager.Name;
+
+                //更新
+                await _taskTruckRepository.AsUpdateable(entity).UpdateColumns(it => new
+                {
+                    it.TruckId,
+                    it.TruckCode,
+                    it.TruckName,
+                    it.UpdatedTime,
+                    it.UpdatedUserId,
+                    it.UpdatedUserName
+                }).ExecuteCommandAsync();
+
+                result.succ = true;
+                result.msg = "保存成功";
+                
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"{ex.Message}";
+            }
+
+            return result;
+        }
+
     }
 }

Myshipping.Core/Myshipping.Core.xml

@@ -11111,6 +11111,11 @@
             客服
             </summary>
         </member>
+        <member name="P:Myshipping.Core.Service.DjyCustomerOutput.TIDANINFO">
+            <summary>
+            提单信息
+            </summary>
+        </member>
         <member name="P:Myshipping.Core.Service.DjyCustomerOutput.ServiceItem">
             <summary>
             服务项目

Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerOutput.cs

@@ -156,6 +156,10 @@ namespace Myshipping.Core.Service
         /// </summary>
         public string CUSTSERVICE { get; set; }
         /// <summary>
+        /// 提单信息
+        /// </summary>
+        public string TIDANINFO { get; set; }
+        /// <summary>
         /// 服务项目
         /// </summary>
         public string ServiceItem { get; set; }

Myshipping.Report/Controllers/ReportController.cs

@@ -297,10 +297,10 @@ namespace Myshipping.Report.Controllers
         private string GetBookingJson(long bookingId)
         {
             log.Debug($"准备获取订舱数据：{bookingId}");
-            var order = sqlSugarClient.Queryable<BookingOrder>().First(x => x.Id == bookingId);
+            var order = sqlSugarClient.Queryable<BookingOrder>().First(x => x.Id == bookingId && x.IsDeleted == false);
-            var ctns = sqlSugarClient.Queryable<BookingCtn>().Where(x => x.BILLID == bookingId).ToList();
+            var ctns = sqlSugarClient.Queryable<BookingCtn>().Where(x => x.BILLID == bookingId && x.IsDeleted == false).ToList();
-            var bookingEdi = sqlSugarClient.Queryable<BookingEDIExt>().First(x => x.BookingId == bookingId);
+            var bookingEdi = sqlSugarClient.Queryable<BookingEDIExt>().First(x => x.BookingId == bookingId && x.IsDeleted == false);
-            var letterYard = sqlSugarClient.Queryable<BookingLetteryard>().First(x => x.BookingId == bookingId);
+            var letterYard = sqlSugarClient.Queryable<BookingLetteryard>().First(x => x.BookingId == bookingId && x.IsDeleted == false);
 
             long uid = 0;
             if (!string.IsNullOrEmpty(order.OPID))