Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Basedata/EnumLocationType.cs

@@ -73,4 +73,9 @@ public enum EnumLocationType
     /// 在途库
     /// </summary>
     [Display(Name = "在途库")] TRANSPORT = 13,
+
+    /// <summary>
+    /// 三方库
+    /// </summary>
+    [Display(Name = "三方库")] THIRDPARTY = 14,
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAppService.cs

@@ -102,11 +102,13 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir
                       
         }
 
-        input.AutoSubmit = true;
+        //input.AutoSubmit = true;
-        input.AutoAgree = true;
+        //input.AutoAgree = true;
-        input.AutoHandle = true;
+        //input.AutoHandle = true;
-        input.AutoCompleteJob = false;
+        //input.AutoCompleteJob = false;
-        input.DirectCreateNote = false;
+        //input.DirectCreateNote = false;
+
+        await SetRequestAutoPropertiesAsync(input).ConfigureAwait(false);
 
         var entity = ObjectMapper.Map<ThirdLocationRequestEditInput, ThirdLocationRequest>(input);
 
@@ -139,14 +141,15 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir
     /// <returns></returns>
     private async Task SetRequestAutoPropertiesAsync(ThirdLocationRequestEditInput entity)
     {
-        var tranType = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.PurchaseReturn, EnumTransSubType.None).ConfigureAwait(false);
+        var tranType = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None).ConfigureAwait(false);
 
         Check.NotNull(tranType, "事务类型", "事务类型不存在");
 
-        entity.AutoCompleteJob = tranType.AutoCompleteJob;
+        
         entity.AutoSubmit = tranType.AutoSubmitRequest;
         entity.AutoAgree = tranType.AutoAgreeRequest;
         entity.AutoHandle = tranType.AutoHandleRequest;
+        entity.AutoCompleteJob = tranType.AutoCompleteJob;
         entity.DirectCreateNote = tranType.DirectCreateNote;
     }
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/ThirdLocationJobEventHandler.cs

@@ -44,7 +44,7 @@ public class ThirdLocationJobEventHandler :
     #region 私有
 
     /// <summary>
-    ///     创建补料记录实体
+    /// 创建记录实体
     /// </summary>
     /// <param name="entity"></param>
     /// <returns></returns>