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/Inventory/EnumTransType.cs

@@ -97,6 +97,7 @@ public enum EnumTransType
     [Display(Name = "新版库内转移")]
     TransferLib = 68,
 
+    
 
     /// <summary>
     /// 库间调拨

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/ThirdLocationJobs/DTOs/ThirdLocationJobDetailDTO.cs

@@ -9,10 +9,16 @@ public class ThirdLocationJobDetailDTO : SfsJobRecommendFromDetailDTOBase, IHasT
 {
 
     /// <summary>
-    /// 请求库位
+    /// 来源库位
     /// </summary>
-    [Display(Name = "请求库位")]
-    public string RequestLocationCode { get; set; }
+    [Display(Name = "来源库位")]
+    public string FromLocationCode { get; set; }
+
+    /// <summary>
+    /// 来源库区
+    /// </summary>
+    [Display(Name = "来源库区")]
+    public string FromLocationArea { get; set; }
 
     /// <summary>
     /// 到库位

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/ThirdLocationJobs/Inputs/ThirdLocationJobDetailInput.cs

@@ -9,12 +9,20 @@ public class ThirdLocationJobDetailInput : SfsJobRecommendFromDetailInputBase, I
 {
 
     /// <summary>
-    /// 请求库位
+    /// 来源库位
     /// </summary>
-    [Display(Name = "请求库位")]
+    [Display(Name = "来源库位")]
     [Required(ErrorMessage = "{0}是必填项")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string RequestLocationCode { get; set; }
+    public string FromLocationCode { get; set; }
+
+    /// <summary>
+    /// 来源库区
+    /// </summary>
+    [Display(Name = "来源库位")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string FromLocationArea { get; set; }
 
     /// <summary>
     /// 到库位

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ThirdLocationRequests/DTOs/ThirdLocationRequestDTO.cs

@@ -37,4 +37,9 @@ public class ThirdLocationRequestDTO : SfsStoreRequestDTOBase<ThirdLocationReque
     /// </summary>
     [Display(Name = "目标ERP储位")]
     public string ToLocationErpCode { get; set; }
+
+    /// <summary>
+    /// 来源库区
+    /// </summary>
+    public string FromLocationArea { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ThirdLocationRequests/Inputs/ThirdLocationRequestDetailInput.cs

@@ -14,6 +14,13 @@ public class ThirdLocationRequestDetailInput : SfsStoreDetailWithQtyInputBase
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string ToLocationCode { get; set; }
 
+    /// <summary>
+    /// 来源库位
+    /// </summary>
+    [Display(Name = "来源库位")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string FromLocationCode { get; set; }
+
     /// <summary>
     /// 来源库区
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ThirdLocationRequests/Inputs/ThirdLocationRequestImportInput.cs

@@ -31,10 +31,17 @@ public class ThirdLocationRequestImportInput : SfsStoreImportInputBase
     [Required]
     public string ToLocationCode { get; set; }
 
+    /// <summary>
+    /// 来源库位
+    /// </summary>
+    [Display(Name = "来源库位")]
+    [Required]
+    public string FromLocationCode { get; set; }
+
     /// <summary>
     /// 来源库区
     /// </summary>
-    [Display(Name = "调出库区")]
+    [Display(Name = "来源库区")]
     [Required]
     public string FromLocationArea { get; set; }
 

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

@@ -86,7 +86,7 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir
         {
             if (item.Qty <= 0)
             {
-                throw new UserFriendlyException($"{item.ItemCode} 物料的需求量必须大于0");
+                throw new UserFriendlyException($"{item.ItemCode} 物品的需求量必须大于0");
             }
         }
 
@@ -94,6 +94,7 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir
         {
             var toLocationDto = await _locationAppService.GetByCodeAsync(detailInput.ToLocationCode).ConfigureAwait(false);
             CheckLocation(toLocationDto, detailInput.ToLocationCode);
+           
             var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detailInput.ItemCode).ConfigureAwait(false);
             CheckItemBasic(itemBasicDto, detailInput.ItemCode);
 
@@ -101,12 +102,7 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir
             detailInput.ToLocationErpCode = toLocationDto.ErpLocationCode;
                       
         }
-
-        //input.AutoSubmit = true;
-        //input.AutoAgree = true;
-        //input.AutoHandle = true;
-        //input.AutoCompleteJob = false;
-        //input.DirectCreateNote = false;
+                
 
         await SetRequestAutoPropertiesAsync(input).ConfigureAwait(false);
 
@@ -333,9 +329,9 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir
             throw new UserFriendlyException($"库位代码为【{LocationCode}】不存在");
         }
 
-        if (LocationDto.Type != EnumLocationType.WIP)
+        if (LocationDto.Type != EnumLocationType.THIRDPARTY)
         {
-            throw new UserFriendlyException($"库位代码【{LocationCode}】不是【{EnumLocationType.WIP.GetDisplayName()}】类型");
+            throw new UserFriendlyException($"库位代码【{LocationCode}】不是【{EnumLocationType.THIRDPARTY.GetDisplayName()}】类型");
         }
     }
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ThirdLocationJobs/ThirdLocationJobDetail.cs

@@ -7,9 +7,14 @@ namespace Win_in.Sfs.Wms.Store.Domain;
 public class ThirdLocationJobDetail : SfsJobRecommendFromDetailEntityBase, IHasToLocation
 {
     /// <summary>
-    /// 请求库位
+    /// 来源库位
     /// </summary>
-    public string RequestLocationCode { get; set; }
+    public string FromLocationCode { get; set; }
+
+    /// <summary>
+    /// 来源库区
+    /// </summary>
+    public string FromLocationArea { get; set; }
 
     /// <summary>
     /// 到库位

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ThirdLocationNotes/ThirdLocationNoteDetail.cs

@@ -7,7 +7,7 @@ public class ThirdLocationNoteDetail : SfsStoreRecommendFromDetailWithFromToEnti
 {
 
     /// <summary>
-    /// 发料时间
+    /// 发出时间
     /// </summary>
     public DateTime IssueTime { get; set; }
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/ThirdLocationRequests/ThirdLocationRequestDetail.cs

@@ -35,10 +35,17 @@ public class ThirdLocationRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasT
     /// </summary>
     public string ToWarehouseCode { get; set; }
 
+    /// <summary>
+    /// 来源库位
+    /// </summary>
+    public string FromLocationCode { get; set; }
+
     /// <summary>
     /// 来源库区
     /// </summary>
     public string FromLocationArea { get; set; }
+    
+
 
     // /// <summary>
     // /// 在途库库位

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/ThirdLocationJobs/ThirdLocationJobDbContextModelCreatingExtensions.cs

@@ -48,7 +48,8 @@ public static class ThirdLocationJobDbContextModelCreatingExtensions
             b.Property(q => q.ToWarehouseCode).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.ToLocationArea).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.ToLocationGroup).HasMaxLength(SfsPropertyConst.CodeLength);
-            b.Property(q => q.RequestLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.FromLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.FromLocationArea).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.ProdLine).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.WorkStation).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.Operation).HasMaxLength(SfsPropertyConst.CodeLength);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/ThirdLocationRequests/ThirdLocationRequestDbContextModelCreatingExtensions.cs

@@ -46,6 +46,8 @@ public static class ThirdLocationRequestDbContextModelCreatingExtensions
             b.Property(q => q.ToWarehouseCode).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.ToLocationArea).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.ToLocationGroup).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.FromLocationCode).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.FromLocationArea).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.ExpiredTime).IsRequired();
             b.Property(q => q.ProdLine).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.WorkStation).HasMaxLength(SfsPropertyConst.CodeLength);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/ThirdLocationRequestAutoMapperProfile.cs

@@ -35,7 +35,7 @@ public partial class StoreEventAutoMapperProfile : Profile
             ;
 
         CreateMap<ThirdLocationRequestDetail, ThirdLocationJobDetailInput>()
-            .ForMember(x => x.RequestLocationCode, y => y.MapFrom(d => d.ToLocationCode))
+            .ForMember(x => x.FromLocationCode, y => y.MapFrom(d => d.FromLocationCode))
             .Ignore(x => x.RecommendFromLocationArea)
             .Ignore(x => x.RecommendFromLocationGroup)
             .Ignore(x => x.HandledFromLocationArea)
@@ -99,7 +99,7 @@ public partial class StoreEventAutoMapperProfile : Profile
             .Ignore(x => x.ToLocationArea)
             .Ignore(x => x.ToLocationGroup)
             .Ignore(x => x.HandledFromWarehouseCode)
-            .Ignore(x => x.RequestLocationCode)
+            .Ignore(x => x.FromLocationCode)
             .Ignore(x => x.ToLocationCode)
             .Ignore(x => x.ProdLine)
             .Ignore(x => x.WorkStation)
@@ -123,12 +123,13 @@ public partial class StoreEventAutoMapperProfile : Profile
             .Ignore(x => x.PlanBeginTime)
             .Ignore(x => x.PlannedSplitRule)
             .Ignore(x => x.DeliveryQty)
-            .Ignore(x => x.RequestLocationCode)
+            .Ignore(x => x.FromLocationCode)
             .Ignore(x => x.ToLocationCode)
             .Ignore(x => x.ProdLine)
             .Ignore(x => x.WorkStation)
             .Ignore(x => x.PositionCode)
             .Ignore(x => x.RecommendType)
+            .Ignore(x => x.FromLocationArea)
             .IgnoreIHasRecommendAndHandledFrom();
 
     }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/ThirdLocationRequestEventHandler.cs

@@ -120,7 +120,7 @@ public class ThirdLocationRequestEventHandler
     {
         var jobs = new List<ThirdLocationJobEditInput>();
 
-        var transactionType = await TransactionTypeAclService.GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None).ConfigureAwait(false);//库存事务
+        var transactionType = await TransactionTypeAclService.GetByTransTypeAsync(EnumTransType.TransferLib, EnumTransSubType.Transfer_Warehouse).ConfigureAwait(false);//库存事务
 
         var toLocationCodes = thirdLocationRequest.Details.Select(p => p.ToLocationCode).Distinct().ToList();//所有发送库位的集合
         var toLocations = await _locationAppService.GetByCodesAsync(toLocationCodes).ConfigureAwait(false);//所有库位的集合
@@ -245,7 +245,7 @@ public class ThirdLocationRequestEventHandler
         //ProductionLineDTO prodLine = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationGroupCode).ConfigureAwait(false);
 
         var detail = ObjectMapper.Map<BalanceDTO, ThirdLocationJobDetailInput>(balance);
-        detail.RequestLocationCode = thirdLocationRequestDetail.ToLocationCode;
+        detail.FromLocationCode = thirdLocationRequestDetail.FromLocationCode;
         detail.WorkStation = thirdLocationRequestDetail.WorkStation;
         detail.ExpiredTime = thirdLocationRequestDetail.ExpiredTime;
         detail.PositionCode = thirdLocationRequestDetail.PositionCode;
@@ -271,6 +271,7 @@ public class ThirdLocationRequestEventHandler
         detail.ToLocationErpCode = thirdLocationRequestDetail.ToLocationErpCode;
         detail.ToLocationArea = thirdLocationRequestDetail.ToLocationArea;
         detail.ToWarehouseCode = thirdLocationRequestDetail.ToWarehouseCode;
+        detail.FromLocationArea = thirdLocationRequestDetail.FromLocationArea;
 
         //detail.ProdLine = prodLine == null ? toLocationGroupCode : prodLine.Code;
         detail.ProdLine = toLocationGroupCode;