Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.WMS.Core/Application/Dtos/ApplicationDto.cs

@@ -1,5 +1,4 @@
-using System.Runtime.Serialization;
+using DS.Module.Core.Extensions;
-using DS.Module.Core.Extensions;
 
 namespace DS.WMS.Core.Application.Dtos
 {
@@ -98,7 +97,6 @@ namespace DS.WMS.Core.Application.Dtos
         /// <summary>
         /// 所属分部
         /// </summary>
-        [IgnoreDataMember]
         public long? SaleDeptId { get; set; }
 
         /// <summary>

ds-wms-service/DS.WMS.Core/Application/Entity/ApplicationBase.cs

@@ -110,13 +110,6 @@ namespace DS.WMS.Core.Application.Entity
         [SugarColumn(ColumnDescription = "驳回原因", Length = 200, IsNullable = true)]
         public string? Reason { get; set; }
 
-        /// <summary>
-        /// 工作流ID
-        /// </summary>
-        [SugarColumn(ColumnDescription = "工作流ID", IsNullable = true)]
-        public long? FlowId { get; set; }
-
-
         /// <summary>
         /// 是否已打印
         /// </summary>

ds-wms-service/DS.WMS.Core/Application/Method/ApplicationAuditService`1.cs

@@ -13,10 +13,14 @@ namespace DS.WMS.Core.Application.Method
     /// <summary>
     /// 申请单审核服务
     /// </summary>
-    public class ApplicationAuditService<TEntity> : FeeServiceBase, IApplicationAuditService<TEntity>
+    public abstract class ApplicationAuditService<TEntity> : FeeServiceBase, IApplicationAuditService<TEntity>
         where TEntity : ApplicationForm, new()
     {
-        internal static readonly TaskBaseTypeEnum[] AuditTypes = [TaskBaseTypeEnum.APPLICATION_PAYMENT_AUDIT];
+        /// <summary>
+        /// 适用于当前申请单的审核类型
+        /// </summary>
+        public abstract TaskBaseTypeEnum AuditType { get; }
+
         readonly IClientFlowInstanceService flowService;
 
         /// <summary>
@@ -36,7 +40,7 @@ namespace DS.WMS.Core.Application.Method
         /// <returns></returns>
         public async Task<DataResult> AuditAsync(int yesOrNo, string? remark)
         {
-            var recordIds = await GetCurrentFlowsQuery(AuditTypes).Select(x => x.BusinessId).ToArrayAsync();
+            var recordIds = await GetCurrentFlowsQuery([AuditType]).Select(x => x.BusinessId).ToArrayAsync();
             //没有待审批的列表直接返回不再执行后续查询
             if (recordIds.Length == 0)
                 return DataResult.FailedWithDesc(nameof(MultiLanguageConst.NoAuditItems));
@@ -55,49 +59,34 @@ namespace DS.WMS.Core.Application.Method
             {
                 Id = x.Id,
                 ApplicationNO = x.ApplicationNO,
-                Status = x.Status,
+                Status = x.Status
-                FlowId = x.FlowId
             }).ToListAsync();
 
             if (apps.Count == 0)
                 return DataResult.FailedWithDesc(nameof(MultiLanguageConst.EmptyData));
 
-            if (apps.Exists(x => !x.FlowId.HasValue))
-                return DataResult.FailedWithDesc(nameof(MultiLanguageConst.NotInFlows));
-
             var result = PreAudit(apps);
             if (!result.Succeeded)
                 return result;
 
-            var flowIds = apps.Select(x => x.FlowId.GetValueOrDefault());
+            var flows = await flowService.GetInstanceByBSIdAsync(AuditType, null, request.Ids);
-            var flows = await Db.Queryable<FlowInstance>().Where(x => flowIds.Contains(x.Id)).ToListAsync();
+            if (flows.Count != request.Ids.Length)
-            if (flows.Count == 0)
                 return DataResult.FailedWithDesc(nameof(MultiLanguageConst.FlowNotFound));
 
-            if (flows.Exists(x => !x.MakerList.Contains(User.UserId)))
-                return DataResult.FailedWithDesc(nameof(MultiLanguageConst.AuditUnauthorization));
-
             List<string> list = [];
-            foreach (var app in apps)
+            foreach (var item in flows)
             {
-                var flow = flows.Find(x => x.Id == app.FlowId.Value);
-                if (flow == null)
-                    continue;
-
                 result = flowService.AuditFlowInstance(new FlowAuditInfo
                 {
-                    Instance = flow,
+                    Instance = item,
                     Status = request.Result,
                     AuditNote = request.Remark
                 });
 
                 if (!result.Succeeded)
-                    list.Add(app.ApplicationNO);
+                    return result;
             }
 
-            if (list.Count > 0)
-                return DataResult.Failed($"{MultiLanguageConst.Operation_Failed}：{string.Join("、", list)}");
-
             return DataResult.Success;
         }
 
@@ -199,8 +188,7 @@ namespace DS.WMS.Core.Application.Method
                 x.AuditerId,
                 x.AuditerName,
                 x.AuditTime,
-                x.Reason,
+                x.Reason
-                x.FlowId
             }).ExecuteCommandAsync();
         }
     }

ds-wms-service/DS.WMS.Core/Application/Method/ApplicationService`1.cs

@@ -9,6 +9,8 @@ using DS.WMS.Core.Fee.Method;
 using DS.WMS.Core.Flow.Dtos;
 using DS.WMS.Core.Flow.Entity;
 using DS.WMS.Core.Flow.Interface;
+using DS.WMS.Core.Op.Dtos.TaskInteraction;
+using DS.WMS.Core.Op.Interface.TaskInteraction;
 using DS.WMS.Core.Sys.Interface;
 using Microsoft.Extensions.DependencyInjection;
 using SqlSugar;
@@ -24,6 +26,7 @@ namespace DS.WMS.Core.Application.Method
     {
         readonly IClientFlowInstanceService flowService;
         readonly Lazy<ICommonService> commonService;
+        readonly ITaskService taskService;
 
         /// <summary>
         /// 初始化
@@ -33,6 +36,7 @@ namespace DS.WMS.Core.Application.Method
         {
             flowService = serviceProvider.GetRequiredService<IClientFlowInstanceService>();
             commonService = new Lazy<ICommonService>(serviceProvider.GetRequiredService<ICommonService>());
+            taskService = serviceProvider.GetRequiredService<ITaskService>();
         }
 
         #region 保存
@@ -400,13 +404,36 @@ namespace DS.WMS.Core.Application.Method
             if (!result.Succeeded)
                 return result;
 
+            List<TEntity> entities = new List<TEntity>(idArray.Length);
+            bool hasAuthorized = await taskService.HasAuthorizedAsync();
+            await TenantDb.Ado.BeginTranAsync();
+            try
+            {
+                if (hasAuthorized)
+                {
+                    for (int i = 0; i < idArray.Length; i++)
+                    {
+                        var req = new TaskCreationRequest
+                        {
+                            BusinessId = idArray[i],
+                            TaskTypeName = auditType.ToString()
+                        };
+                        result = await taskService.CreateTaskAsync(req);
+
+                        if (result.Succeeded)
+                        {
+                            var entity = new TEntity { Id = req.BusinessId };
+                            OnSubmitApproval(entity);
+                            entities.Add(entity);
+                        }
+                    }
+                }
+                else
+                {
                     var template = await FindTemplateAsync(auditType);
                     if (template == null)
                         return DataResult.FailedWithDesc(nameof(MultiLanguageConst.TemplateNotFound));
 
-            await TenantDb.Ado.BeginTranAsync();
-            try
-            {
                     var list2 = list.Select(x => new TEntity { Id = x.Id, Status = x.Status }).ToList();
                     foreach (var item in list2)
                     {
@@ -421,12 +448,13 @@ namespace DS.WMS.Core.Application.Method
                             var instance = result.Data as FlowInstance;
                             flowService.StartFlowInstance(instance.Id.ToString());
 
-                        item.FlowId = instance.Id;
                             OnSubmitApproval(item);
-                        await TenantDb.Updateable(item).UpdateColumns(x => new { x.Status, x.FlowId }).ExecuteCommandAsync();
+                            entities.Add(item);
+                        }
                     }
                 }
 
+                await TenantDb.Updateable(entities).UpdateColumns(x => new { x.Status }).ExecuteCommandAsync();
                 await TenantDb.Ado.CommitTranAsync();
                 return DataResult.Success;
             }
@@ -469,33 +497,29 @@ namespace DS.WMS.Core.Application.Method
                 {
                     Id = x.Id,
                     ApplicationNO = x.ApplicationNO,
-                    Status = x.Status,
+                    Status = x.Status
-                    FlowId = x.FlowId
                 }).ToListAsync();
 
             if (list.Count == 0)
                 return DataResult.FailedWithDesc(nameof(MultiLanguageConst.EmptyData));
+
             //未在审批状态中
-            var list2 = list.FindAll(x => x.FlowId == null).ToList();
+            if (!await flowService.Exists(ids: ids))
-            if (list2.Count > 0)
+                return DataResult.FailedWithDesc(nameof(MultiLanguageConst.NotInAudit));
-            {
-                string msg = string.Join("; ", list2.Select(x => $"{x.ApplicationNO}"));
-                return DataResult.Failed(string.Format(MultiLanguageConst.GetDescription(nameof(MultiLanguageConst.NoNeedWithdraw)), msg));
-            }
 
-            var flows = list.Select(x => new FlowInstance { Id = x.FlowId.Value, FlowStatus = FlowStatusEnum.Draft, MakerList = string.Empty }).ToList();
+            DataResult result;
-            DateTime dtNow = DateTime.Now;
             try
             {
-                await Db.Updateable(flows).UpdateColumns(x => new { x.FlowStatus, x.MakerList }).ExecuteCommandAsync();
+                result = await flowService.WithdrawAsync(ids);
+                if (!result.Succeeded)
+                    return result;
 
                 foreach (var item in list)
                 {
                     OnWithdraw(item);
-                    item.FlowId = null;
                 }
 
-                await TenantDb.Updateable(list).UpdateColumns(x => new { x.Status, x.FlowId }).ExecuteCommandAsync();
+                await TenantDb.Updateable(list).UpdateColumns(x => new { x.Status }).ExecuteCommandAsync();
 
                 await TenantDb.Ado.CommitTranAsync();
                 return DataResult.Success;

ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs

@@ -18,6 +18,8 @@ namespace DS.WMS.Core.Application.Method
     /// </summary>
     public class InvoiceApplicationAuditService : ApplicationAuditService<InvoiceApplication>, IInvoiceApplicationAuditService
     {
+        public override TaskBaseTypeEnum AuditType => TaskBaseTypeEnum.APPLICATION_INVOICE_AUDIT;
+
         /// <summary>
         /// 初始化
         /// </summary>

ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs

@@ -285,6 +285,7 @@ namespace DS.WMS.Core.Application.Method
                 {
                     Id = a.Id,
                     ApplicationNO = a.ApplicationNO,
+                    AutualCustomerName = a.AutualCustomerName,
                     Currency = a.Currency,
                     CustomerId = a.CustomerId,
                     CustomerName = a.CustomerName,
@@ -298,6 +299,7 @@ namespace DS.WMS.Core.Application.Method
                     InvoiceBillNO = a.InvoiceBillNO,
                     InvoiceRemark = a.InvoiceRemark,
                     SaleDeptId = a.SaleDeptId,
+                    TaxID = a.TaxID,
                     Note = a.Note,
                     ApplyAmount = a.ApplyAmount,
                     OtherCurrencyAmount = a.OtherCurrencyAmount,

ds-wms-service/DS.WMS.Core/Application/Method/PaymentApplicationAuditService.cs

@@ -15,10 +15,12 @@ using SqlSugar;
 namespace DS.WMS.Core.Application.Method
 {
     /// <summary>
-    /// 费用申请单审核服务
+    /// 付费申请审核服务
     /// </summary>
     public class PaymentApplicationAuditService : ApplicationAuditService<PaymentApplication>, IPaymentApplicationAuditService
     {
+        public override TaskBaseTypeEnum AuditType => TaskBaseTypeEnum.APPLICATION_PAYMENT_AUDIT;
+
         /// <summary>
         /// 初始化
         /// </summary>
@@ -51,7 +53,7 @@ namespace DS.WMS.Core.Application.Method
                         break;
 
                     case AuditStatusForQuery.MarkerOnly:
-                        var ids = await GetCurrentFlowsQuery(AuditTypes).Select(x => x.BusinessId).ToListAsync();
+                        var ids = await GetCurrentFlowsQuery([AuditType]).Select(x => x.BusinessId).ToListAsync();
                         if (ids.Count == 0)
                             ids.Add(0L);
                         query = query.Where(x => ids.Contains(x.Id));

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

@@ -15,7 +15,6 @@ using DS.WMS.Core.Sys.Entity;
 using Mapster;
 using Microsoft.Extensions.DependencyInjection;
 using SqlSugar;
-using static AnyDiff.DifferenceLines;
 
 namespace DS.WMS.Core.Fee.Method
 {

ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs

@@ -56,8 +56,8 @@ public class InfoClient : SharedOrgModel<long>
     /// <summary>
     /// Desc:邮箱
     /// </summary>
-    [SugarColumn(ColumnDescription = "邮箱", Length = 50)]
+    [SugarColumn(ColumnDescription = "邮箱", IsNullable = true, Length = 50)]
-    public string Email { get; set; }
+    public string? Email { get; set; }
 
     /// <summary>
     /// Desc:网页

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

@@ -91,10 +91,10 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
                     foreach (var item in list)
                         item.TaskMailId = taskMail.Id;
 
-                    //await TenantDb.Deleteable<BusinessTaskAttachment>().Where(x => x.TaskMailId == taskMail.Id).ExecuteCommandAsync();
+                    await TenantDb.Deleteable<BusinessTaskAttachment>().Where(x => x.TaskMailId == taskMail.Id).ExecuteCommandAsync();
-                    //await TenantDb.Insertable(taskMail.Attachments).ExecuteCommandAsync();
+                    await TenantDb.Insertable(taskMail.Attachments).ExecuteCommandAsync();
 
-                    await TenantDb.Storageable(taskMail.Attachments).DefaultAddElseUpdate().ExecuteCommandAsync();
+                    //await TenantDb.Storageable(taskMail.Attachments).DefaultAddElseUpdate().ExecuteCommandAsync();
                 }
 
                 await TenantDb.Ado.CommitTranAsync();

ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>D:\Code\ds8-solution-pro\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\Source\Repos\DS8\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
   </PropertyGroup>