增加推荐类型枚举，位置码、器具、Kitting箱

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/IssueNoteController.cs

@@ -39,6 +39,10 @@ public class IssueNoteController : AbpController
         {
             p.ToLot = string.Empty;
             p.ToPackingCode = string.Empty;
+            if(p.PositionCode.Contains('W'))
+            {
+                p.RecommendType = EnumRecommendType.PositionCode;
+            }
         });
 
         await _issueNoteAppService.CreateAsync(input).ConfigureAwait(false);

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/DTOs/PositionCodeDTO.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Basedata.Application.Contracts;
 
@@ -32,6 +33,12 @@ public class PositionCodeDTO : SfsBaseDataDTOBase, IHasCode
     [StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string PartDesc { get; set; }
     /// <summary>
+    /// 基本计量单位
+    /// </summary>
+    [Display(Name = "基本计量单位")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string BasicUom { get; set; }
+    /// <summary>
     /// 库位
     /// </summary>
     [Display(Name = "库位")]
@@ -48,4 +55,9 @@ public class PositionCodeDTO : SfsBaseDataDTOBase, IHasCode
     /// </summary>
     [Display(Name = "标包数量")]
     public decimal StdPackQty { get; set; }
+    /// <summary>
+    /// 类型
+    /// </summary>
+    [Display(Name = "类型")]
+    public EnumRecommendType Type { get; set; }
 }

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeEditInput.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Basedata.Application.Contracts;
 
@@ -24,6 +25,11 @@ public class PositionCodeEditInput : SfsBaseDataCreateOrUpdateInputBase
     [Display(Name = "物料描述")]
     public string PartDesc { get; set; }
     /// <summary>
+    /// 基本计量单位
+    /// </summary>
+    [Display(Name = "基本计量单位")]
+    public string BasicUom { get; set; }
+    /// <summary>
     /// 库位
     /// </summary>
     [Display(Name = "库位")]
@@ -38,8 +44,11 @@ public class PositionCodeEditInput : SfsBaseDataCreateOrUpdateInputBase
     /// </summary>
     [Display(Name = "标包数量")]
     public decimal StdPackQty { get; set; }
-   
-
+    /// <summary>
+    /// 类型
+    /// </summary>
+    [Display(Name = "类型")]
+    public EnumRecommendType Type { get; set; }
 
     #endregion
 

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Basedata.Application.Contracts;
 
@@ -32,6 +33,12 @@ public class PositionCodeImportInput : SfsBaseDataImportInputBase
     [StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string PartDesc { get; set; }
     /// <summary>
+    /// 基本计量单位
+    /// </summary>
+    [Display(Name = "基本计量单位")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string BasicUom { get; set; }
+    /// <summary>
     /// 库位
     /// </summary>
     [Display(Name = "库位")]
@@ -49,6 +56,10 @@ public class PositionCodeImportInput : SfsBaseDataImportInputBase
     [Display(Name = "标包数量")]
     [Required(ErrorMessage = "{0}是必填项")]
     public decimal StdPackQty { get; set; }
+    /// <summary>
+    /// 类型
+    /// </summary>
+    [Display(Name = "类型")]
+    public EnumRecommendType Type { get; set; }
 
-   
 }

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCode/PositionCodeAppService.cs

@@ -7,6 +7,7 @@ using Volo.Abp.Uow;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Basedata.Domain;
 using Win_in.Sfs.Basedata.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Basedata.Application;
 
@@ -32,7 +33,7 @@ public class PositionCodeAppService
     [UnitOfWork]
     public override async Task<PositionCodeDTO> CreateAsync(PositionCodeEditInput input)
     {
-        var existEntity = await GetByCodeAsync("W"+input.Code).ConfigureAwait(false);
+        var existEntity = await GetByCodeAsync(input.Code).ConfigureAwait(false);
         if (existEntity != null)
         {
             throw new UserFriendlyException($"{input.Code} 已存在");
@@ -42,12 +43,26 @@ public class PositionCodeAppService
         Check.NotNull(itemBasic, "物品代码", $"物品 {input.PartCode} 不存在");
         input.PartName = itemBasic.Name;
         input.PartDesc = itemBasic.Desc1;
+        input.BasicUom = itemBasic.BasicUom;
 
         var location = await LocationAppService.GetByCodeAsync(input.LocationCode).ConfigureAwait(false);
         Check.NotNull(location, "库位代码", $"库位 {input.LocationCode} 不存在");
         input.LocationName = location.Name;
 
-        input.Code = "W" + input.Code;
+        if(input.Code.Contains('W'))
+        {
+            input.Type = EnumRecommendType.PositionCode;
+        }
+        else if(input.Code.Contains('K'))
+        {
+            input.Type = EnumRecommendType.KittingCode;
+        }
+        else
+        {
+            input.Type = EnumRecommendType.WareCode;
+        }
+
+        
         return await base.CreateAsync(input).ConfigureAwait(false);
     }
 }

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PositionCode/PositionCode.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Entities;
+using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Basedata.Domain;
 
@@ -31,6 +32,11 @@ public class PositionCode : SfsBaseDataAggregateRootBase, IHasCode
     [Display(Name = "物料描述")]
     public string PartDesc { get; set; }
     /// <summary>
+    /// 基本计量单位
+    /// </summary>
+    [Display(Name = "基本计量单位")]
+    public string BasicUom { get; set; }
+    /// <summary>
     /// 库位
     /// </summary>
     [Display(Name = "库位")]
@@ -39,12 +45,16 @@ public class PositionCode : SfsBaseDataAggregateRootBase, IHasCode
     /// 库位名称
     /// </summary>
     [Display(Name = "库位名称")]
-    public string LocationName { get; set; }
+    public string LocationName { get; set; }   
     /// <summary>
     /// 标包数量
     /// </summary>
     [Display(Name = "标包数量")]
     public decimal StdPackQty { get; set; }
-   
+    /// <summary>
+    /// 类型
+    /// </summary>
+    [Display(Name = "类型")]
+    public EnumRecommendType Type { get; set; }
 
 }

be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumRecommendType.cs

@@ -0,0 +1,27 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Win_in.Sfs.Shared.Domain.Shared;
+
+/// <summary>
+/// 推荐类型
+/// </summary>
+public enum EnumRecommendType
+{
+    /// <summary>
+    /// 位置码
+    /// </summary>
+    [Display(Name = "位置码")]
+    PositionCode = 1,
+
+    /// <summary>
+    /// 器具码
+    /// </summary>
+    [Display(Name = "器具码")]
+    WareCode = 2,
+
+    /// <summary>
+    /// Kitting箱码
+    /// </summary>
+    [Display(Name = "Kitting箱码")]
+    KittingCode = 3,
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/Inputs/IssueJobDetailInput.cs

@@ -121,4 +121,14 @@ public class IssueJobDetailInput : SfsJobRecommendFromDetailInputBase, IHasToLoc
     /// </summary>
     [Display(Name = "每次配送数量")]
     public decimal DeliveryQty { get; set; }
+
+    /// <summary>
+    /// 位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    /// 推荐类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/Inputs/IssueNoteDetailInput.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -39,4 +40,14 @@ public class IssueNoteDetailInput : SfsStoreRecommendFromDetailWithFromToInputBa
     [Display(Name = "在途库库位")]
     public string OnTheWayLocationCode { get; set; }
 
+    /// <summary>
+    /// 位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    /// 推荐类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/MaterialRequestDetailInput.cs

@@ -71,4 +71,15 @@ public class MaterialRequestDetailInput : SfsStoreDetailWithQtyInputBase
     [Display(Name = "明细状态")]
     public EnumStatus Status { get; set; }
 
+    /// <summary>
+    /// 位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    /// 推荐类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/MaterialRequestAppService.cs

@@ -214,6 +214,10 @@ public class MaterialRequestAppService : SfsStoreRequestAppServiceBase<MaterialR
             var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detailInput.ItemCode).ConfigureAwait(false);
             CheckItemBasic(itemBasicDto, detailInput.ItemCode);
             detailInput.ItemDesc1 = itemBasicDto.Desc1;
+            if(detailInput.PositionCode.Contains("W"))
+            {
+                detailInput.RecommendType = EnumRecommendType.PositionCode;
+            }
 
             var productionLineDto = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationDto.LocationGroupCode).ConfigureAwait(false);
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobDetail.cs

@@ -90,4 +90,15 @@ public class IssueJobDetail : SfsJobRecommendFromDetailEntityBase, IHasToLocatio
     /// 每次配送数量
     /// </summary>
     public decimal DeliveryQty { get; set; }
+
+    /// <summary>
+    /// 位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    /// 推荐类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNoteDetail.cs

@@ -1,4 +1,5 @@
 using System;
+using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
@@ -29,4 +30,14 @@ public class IssueNoteDetail : SfsStoreRecommendFromDetailWithFromToEntityBase
     /// 在途库库位
     /// </summary>
     public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    /// 位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    /// 推荐类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestDetail.cs

@@ -90,4 +90,15 @@ public class MaterialRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasToLoca
     /// </summary>
     [NotMapped]
     public decimal NotFinishQty => Qty - ReceivedQty;
+
+    /// <summary>
+    /// 位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    /// 推荐类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
 }

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

@@ -123,9 +123,11 @@ public partial class StoreEventAutoMapperProfile : Profile
             .Ignore(x => x.PlannedSplitRule)
             .Ignore(x => x.DeliveryQty)
             .Ignore(x => x.RequestLocationCode)
-             .Ignore(x => x.ToLocationCode)
+            .Ignore(x => x.ToLocationCode)
             .Ignore(x => x.ProdLine)
             .Ignore(x => x.WorkStation)
+            .Ignore(x => x.PositionCode)
+            .Ignore(x => x.RecommendType)
             .IgnoreIHasRecommendAndHandledFrom();
 
     }

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

@@ -244,6 +244,8 @@ public class MaterialRequestEventHandler
         detail.RequestLocationCode = materialRequestDetail.ToLocationCode;
         detail.WorkStation = materialRequestDetail.WorkStation;
         detail.ExpiredTime = materialRequestDetail.ExpiredTime;
+        detail.PositionCode = materialRequestDetail.PositionCode;
+        detail.RecommendType = materialRequestDetail.RecommendType;
 
         detail.RecommendPackingCode = balance.PackingCode;
         detail.RecommendContainerCode = balance.ContainerCode;