利润核算单修改字段取值

ds-wms-service/DS.WMS.Core/Fee/Dtos/Report/ProfitAccounting.cs

@@ -11,7 +11,7 @@ namespace DS.WMS.Core.Fee.Dtos.Report
         /// <summary>
         /// 客户编号
         /// </summary>
-        public string CustomerCode { get; set; }
+        public string CustomerNum { get; set; }
 
         /// <summary>
         /// 业务编号

ds-wms-service/DS.WMS.Core/Fee/Method/ReportProviders/ProfitAccountingReport.cs

@@ -3,11 +3,9 @@ using DS.WMS.Core.Fee.Dtos;
 using DS.WMS.Core.Fee.Dtos.Report;
 using DS.WMS.Core.Fee.Entity;
 using DS.WMS.Core.Fee.Interface;
-using DS.WMS.Core.Info.Entity;
 using DS.WMS.Core.Op.Entity;
 using DS.WMS.Core.TaskInteraction.Dtos;
 using Masuit.Tools.Systems;
-using SqlSugar;
 
 namespace DS.WMS.Core.Fee.Method.ReportProviders
 {
@@ -25,12 +23,9 @@ namespace DS.WMS.Core.Fee.Method.ReportProviders
             {
                 case BusinessType.OceanShippingExport:
                     form = await context.TenantDb.Queryable<SeaExport>().Where(s => s.Id == context.BusinessId)
-                        .LeftJoin<InfoClient>((s, c) => s.CustomerId == c.Id)
+                        .Select(s => new ProfitAccounting
-                        .Select((s, c) => new ProfitAccounting
                         {
-                            CustomerCode = c.CodeName,
                             ETDValue = s.ETD,
-                            Sale = s.Sale,
                             Operator = s.OperatorName,
                             CustomerService = s.CustomerServiceName,
                             Doc = s.DocName,

ds-wms-service/DS.WMS.Core/TaskInteraction/Method/TaskService.cs

@@ -594,7 +594,7 @@ namespace DS.WMS.Core.TaskInteraction.Method
                 DataResult result;
                 if (!FeeTypes.Contains(request.TaskType))
                 {
-                    result = await ManagerService.SetTaskStatusWithBsno(request.BusinessId, request.TaskType, request.TaskStatus, DateTime.Now, request.TaskDesc);
+                    result = await ManagerService.SetTaskStatusWithBsno(request.BusinessId, request.TaskType, request.TaskStatus, DateTime.Now, false, request.TaskDesc);
                     if (!result.Succeeded)
                         return DataResult.Failed(result.Message, result.MultiCode);
 
@@ -970,7 +970,7 @@ namespace DS.WMS.Core.TaskInteraction.Method
                 }
                 else
                 {
-                    result = await ManagerService.SetTaskStatusWithBsno(request.BusinessId, request.TaskType, TaskStatusEnum.Cancel, dt);
+                    result = await ManagerService.SetTaskStatusWithBsno(request.BusinessId, request.TaskType, TaskStatusEnum.Cancel, dt, false);
                     if (!result.Succeeded)
                         return result;
                 }
@@ -1106,7 +1106,7 @@ namespace DS.WMS.Core.TaskInteraction.Method
                         if (relativeTasks.All(x => x.TaskStatus == TaskStatusEnum.Complete))
                         {
                             var userIdList = tasks.Where(x => relativeFeeIds.Contains(x.BusinessId)).SelectMany(x => x.RecvUserIdArray).Distinct().ToList();
-                            result = await ManagerService.SetTaskStatusWithBsno(biz.Key.BusinessId, request.TaskType, TaskStatusEnum.Complete, DateTime.Now, userIdList: userIdList);
+                            result = await ManagerService.SetTaskStatusWithBsno(biz.Key.BusinessId, request.TaskType, TaskStatusEnum.Complete, DateTime.Now, false, userIdList: userIdList);
                             if (!result.Succeeded)
                                 return result;
                         }