Merge branch 'cd299' into dev

src/Hotline.Api/Controllers/OrderController.cs

@@ -4602,7 +4602,7 @@ public class OrderController : BaseController
         model.StepName = step.Name;
         model.StepCode = step.Code;
         model.State = 1;
-        model.ESpecialType = ESpecialType.ReTransact;
+        model.SpecialType = ESpecialType.ReTransact;
         model.LastFileOpinion = order.FileOpinion;
         model.FirstFileOpinion = order.FileOpinion;
         var firstSpecial = await _orderSpecialRepository.Queryable().Where(x => x.OrderId == dto.OrderId).FirstAsync();
@@ -5114,7 +5114,8 @@ public class OrderController : BaseController
     public async Task<object> ReTransactBaseData(string id)
     {
         var order = await _orderRepository.GetAsync(id, HttpContext.RequestAborted);
-        List<Kv> orgs = new();
+        var isInstaShot = order.SourceChannel.Contains("随手拍");
+		List<Kv> orgs = new();
         if (order == null) throw UserFriendlyException.SameMessage("无效工单信息！");
         //中心会签调取方法
         var org = await _workflowDomainService.GetLevelOneOrgsAsync(order.WorkflowId, HttpContext.RequestAborted);
@@ -5125,9 +5126,8 @@ public class OrderController : BaseController
         {
             SpecialTimeType = EnumExts.GetDescriptions<ETimeType>(),
             SpecialReason = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.SpecialReason),
-            ReTransactErrorType = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.ReTransactErrorType),
-            InstaShotSpecialReason = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.InstaShotSpecialReason),
-			Step = step,
+            ReTransactErrorType = isInstaShot ? _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.InstaShotSpecialReason) : _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.ReTransactErrorType),
+            Step = step,
             Orgs = orgs,
         };
         return rsp;

src/Hotline.Application/Orders/OrderApplication.cs

@@ -928,7 +928,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         return _orderSpecialDetailRepository.Queryable()
             .Includes(x => x.OrderSpecial)
             .WhereIF(!string.IsNullOrEmpty(dto.OrgName), x => x.OrgName.Contains(dto.OrgName!))
-            .Where(x => x.OrderSpecial.ESpecialType == ESpecialType.ReTransact)
+            .Where(x => x.OrderSpecial.SpecialType == ESpecialType.ReTransact)
             .Where(x => x.OrderSpecial.CreationTime >= dto.StartTime)
             .Where(x => x.OrderSpecial.CreationTime <= dto.EndTime)
             .GroupBy(x => new { Time = x.OrderSpecial.CreationTime.ToString("yyyy-MM-dd"), x.OrgId, x.OrgName })
@@ -957,7 +957,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .WhereIF(!string.IsNullOrEmpty(dto.OrgName), x => x.OrgName.Contains(dto.OrgName!))
             .WhereIF(!string.IsNullOrEmpty(dto.ErrorName), x => x.ErrorName.Contains(dto.ErrorName!))
             .WhereIF(!string.IsNullOrEmpty(dto.No), x => x.OrderSpecial!.Order!.No!.Contains(dto.No!))
-            .Where(x => x.OrderSpecial.ESpecialType == ESpecialType.ReTransact)
+            .Where(x => x.OrderSpecial.SpecialType == ESpecialType.ReTransact)
             .Where(x => x.OrderSpecial.CreationTime >= dto.StartTime)
             .Where(x => x.OrderSpecial.CreationTime <= dto.EndTime);
     }

src/Hotline.Share/Dtos/Order/OrderSpecialDto.cs

@@ -456,6 +456,8 @@ namespace Hotline.Share.Dtos.Order
 
 	public class OrderReTransactDto : OrderSpecialAddDto
 	{
+		public ESpecialType? SpecialType { get; set; }
+
 		/// <summary>
 		/// 错件类型
 		/// </summary>

src/Hotline.Share/Enums/Order/ESpecialType.cs

@@ -17,5 +17,12 @@ namespace Hotline.Share.Enums.Order
 		/// 重办
 		/// </summary>
 		ReTransact = 2,
+
+
+
+		/// <summary>
+		/// 退回
+		/// </summary>
+		SendBack = 3,
 	}
 }

src/Hotline/Orders/OrderSpecial.cs

@@ -114,7 +114,7 @@ namespace Hotline.Orders
         /// <summary>
         /// 特提类型
         /// </summary>
-        public ESpecialType? ESpecialType { get; set; }
+        public ESpecialType? SpecialType { get; set; }
 
 		/// <summary>
 		/// 错件类型