修改服务流程保存

Myshipping.Application/Service/TrackingSystem/Dtos/TrackingSystemMapper.cs

@@ -127,6 +127,11 @@ namespace Myshipping.Application
             .Map(dest => dest.StatusSKUId, src => src.STATUS_SKU_ID)
             .Map(dest => dest.ShowName, src => src.SHOW_NAME);
 
+            config.ForType<ServiceWorkFlowActivitiesInfo, ServiceWorkFlowActivitiesSubShowDto>()
+            .Map(dest => dest.PKId, src => src.PK_ID)
+            .Map(dest => dest.StatusSKUId, src => src.STATUS_SKU_ID)
+            .Map(dest => dest.ShowName, src => src.SHOW_NAME);
+
             config.ForType<ServiceWorkFlowActivitiesInfo, ServiceWorkFlowActivitiesDto>()
             .Map(dest => dest.PKId, src => src.PK_ID)
             .Map(dest => dest.StatusSKUId, src => src.STATUS_SKU_ID)

Myshipping.Application/Service/TrackingSystem/ServiceWorkFlowBaseService.cs

@@ -238,15 +238,15 @@ namespace Myshipping.Application
 
                 //批量删除服务流程与服务项目关系（物理删除）
                 _serviceWorkFlowProjectRelationRepository.EntityContext.Deleteable<ServiceWorkFlowProjectRelation>()
-                    .Where(a => a.SERVICE_WORKFLOW_ID == entity.PK_ID);
+                    .EnableQueryFilter().Where(a => a.SERVICE_WORKFLOW_ID == entity.PK_ID).ExecuteCommand();
 
                 //批量删除服务流程与服务活动关系（物理删除）
-                _serviceWorkFlowActivitiesRelationRepository.EntityContext.Deleteable<ServiceWorkFlowProjectRelation>()
+                _serviceWorkFlowActivitiesRelationRepository.EntityContext.Deleteable<ServiceWorkFlowActivitiesRelation>()
-                    .Where(a => a.SERVICE_WORKFLOW_ID == entity.PK_ID);
+                    .EnableQueryFilter().Where(a => a.SERVICE_WORKFLOW_ID == entity.PK_ID).ExecuteCommand();
 
                 //批量删除服务流程活动与子活动的关系（物理删除）
                 _serviceWorkFlowActivitiesSubRelationRepository.EntityContext.Deleteable<ServiceWorkFlowActivitiesSubRelation>()
-                    .Where(a => a.SERVICE_WORKFLOW_ID == entity.PK_ID);
+                   .EnableQueryFilter().Where(a => a.SERVICE_WORKFLOW_ID == entity.PK_ID).ExecuteCommand();
             }
 
             //服务流程与服务项目关系
@@ -271,6 +271,7 @@ namespace Myshipping.Application
                         PK_ID = IDGen.NextID().ToString(),
                         SERVICE_WORKFLOW_ID = entity.PK_ID,
                         SERVICE_ACTIVITIES_ID = sku.PKId,
+                        SORT_NO = sku.SortNo,
                         IS_CONTAINS_SUB = sku.IsContainsSub,
                         VAL_TYPE = !string.IsNullOrWhiteSpace(sku.ValType)? sku.ValType: StatusSKUValTypeEnum.DATETIME.ToString()
                     };
@@ -286,7 +287,8 @@ namespace Myshipping.Application
                                 PK_ID = IDGen.NextID().ToString(),
                                 SERVICE_WORKFLOW_ID = entity.PK_ID,
                                 SERVICE_ACTIVITIES_ID = sku.PKId,
-                                SUB_SERVICE_ACTIVITIES_ID = sub.PKId
+                                SUB_SERVICE_ACTIVITIES_ID = sub.PKId,
+                                SORT_NO = sub.SortNo
                             };
 
                             await _serviceWorkFlowActivitiesSubRelationRepository.InsertAsync(wfRelationActivitiesSub);
@@ -413,6 +415,7 @@ namespace Myshipping.Application
 
                         return new { Key = a.Key, SubList = currArg.OrderBy(b=>b.SortNo)
                             .Select(b => {
+
                             var actModel = b.Act.Adapt<ServiceWorkFlowActivitiesSubShowDto>();
 
                             actModel.SortNo = b.SortNo;