更新测试的问题

be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/Properties/PublishProfiles/FolderProfile.pubxml

@@ -4,13 +4,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <DeleteExistingFiles>true</DeleteExistingFiles>
+    <DeleteExistingFiles>false</DeleteExistingFiles>
     <ExcludeApp_Data>false</ExcludeApp_Data>
     <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>.\..\..\..\OutPut\BaseData\</PublishUrl>
+    <PublishUrl>D:\发布\WMS</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <SiteUrlToLaunchAfterPublish />
     <TargetFramework>net6.0</TargetFramework>

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

@@ -41,8 +41,21 @@ public class IssueNoteController : AbpController
             p.ToPackingCode = string.Empty;
             if(p.PositionCode.Contains('W'))
             {
-                p.RecommendType = EnumRecommendType.PositionCode;
+                p.RecommendType = EnumRecommendType.W;
             }
+            else if(p.PositionCode.Contains('Q'))
+            {
+                p.RecommendType = EnumRecommendType.Q;
+            }
+            else if (p.PositionCode.Contains('K'))
+            {
+                p.RecommendType = EnumRecommendType.K;
+            }
+            else
+            {
+                p.RecommendType = EnumRecommendType.None;
+            }
+
         });
 
         await _issueNoteAppService.CreateAsync(input).ConfigureAwait(false);

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/BasedataApplicationAutoMapperProfile.cs

@@ -52,5 +52,6 @@ public partial class BasedataApplicationAutoMapperProfile : Profile
         EquipmentAutoMapperProfile();
         SplitPackingRecAutoMapperProfile();
         KittingAutoMapperProfile();
+        
     }
 }

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

@@ -51,15 +51,19 @@ public class PositionCodeAppService
 
         if(input.Code.Contains('W'))
         {
-            input.Type = EnumRecommendType.PositionCode;
+            input.Type = EnumRecommendType.W;
+        }
+        else if (input.Code.Contains('Q'))
+        {
+            input.Type = EnumRecommendType.Q;
         }
         else if(input.Code.Contains('K'))
         {
-            input.Type = EnumRecommendType.KittingCode;
+            input.Type = EnumRecommendType.K;
         }
         else
         {
-            input.Type = EnumRecommendType.WareCode;
+            input.Type = EnumRecommendType.None;
         }
 
         

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

@@ -14,7 +14,6 @@ public class PositionCode : SfsBaseDataAggregateRootBase, IHasCode
     /// 位置代码
     /// </summary>
     [Display(Name = "位置代码")]   
-    [IgnoreUpdate]
     public string Code { get; set; }
     /// <summary>
     /// 物料号

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

@@ -7,21 +7,26 @@ namespace Win_in.Sfs.Shared.Domain.Shared;
 /// </summary>
 public enum EnumRecommendType
 {
+    /// <summary>
+    /// 空枚举
+    /// </summary>
+    None = 0,
+
     /// <summary>
     /// 位置码
     /// </summary>
     [Display(Name = "位置码")]
-    PositionCode = 1,
+    W = 1,
 
     /// <summary>
     /// 器具码
     /// </summary>
     [Display(Name = "器具码")]
-    WareCode = 2,
+    Q = 2,
 
     /// <summary>
     /// Kitting箱码
     /// </summary>
     [Display(Name = "Kitting箱码")]
-    KittingCode = 3,
+    K = 3,
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/ProductRecycleJobs/ProductRecyclePermissions.cs

@@ -0,0 +1,20 @@
+using Volo.Abp.Authorization.Permissions;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public static class ProductRecyclePermissions
+{
+    public const string Default = StorePermissions.GroupName + "." + nameof(ProductRecycleJob);
+    public const string Create = Default + "." + StorePermissions.CreateStr;
+    public const string Update = Default + "." + StorePermissions.UpdateStr;
+    public const string Delete = Default + "." + StorePermissions.DeleteStr;
+
+    public static void AddProductRecycleJobPermission(this PermissionGroupDefinition permissionGroup)
+    {
+        var productRecycleJobPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(ProductRecycleJob)));
+        productRecycleJobPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        productRecycleJobPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        productRecycleJobPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Win_in.Sfs.Wms.Store.Application.Contracts.csproj

@@ -42,6 +42,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <Folder Include="Jobs\ProductRecycleJobs\DTOs\" />
+	  <Folder Include="Jobs\ProductRecycleJobs\Inputs\" />
 	  <Folder Include="Orders" />
 	  <Folder Include="Plans" />
 	</ItemGroup>

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

@@ -214,9 +214,21 @@ 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"))
+            if(detailInput.PositionCode.Contains('W'))
             {
-                detailInput.RecommendType = EnumRecommendType.PositionCode;
+                detailInput.RecommendType = EnumRecommendType.W;
+            }
+            else if(detailInput.PositionCode.Contains('Q'))
+            {
+                detailInput.RecommendType = EnumRecommendType.Q;
+            }
+            else if(detailInput.PositionCode.Contains('K'))
+            {
+                detailInput.RecommendType = EnumRecommendType.K;
+            }
+            else
+            {
+                detailInput.RecommendType = EnumRecommendType.None;
             }
 
             var productionLineDto = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationDto.LocationGroupCode).ConfigureAwait(false);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ProductRecycleJobs/IProductRecycleJobManager.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface IProductRecycleJobManager : IJobManager<ProductRecycleJob>
+{
+    Task<ProductRecycleJob> GetAsync(Expression<Func<ProductRecycleJob, bool>> expression);
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ProductRecycleJobs/IProductRecycleJobRepository.cs

@@ -0,0 +1,6 @@
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface IProductRecycleJobRepository : ISfsJobRepositoryBase<ProductRecycleJob>
+{
+
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ProductRecycleJobs/ProductRecycleExtension.cs

@@ -0,0 +1,21 @@
+using Volo.Abp.Timing;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public static class ProductRecycleExtension
+{
+    public static ProductRecycleJob SetWorkGroup(this ProductRecycleJob job, string warehouseCode, string workGroupCode)
+    {
+        job.WorkGroupCode = workGroupCode;
+        job.WarehouseCode = warehouseCode;
+        return job;
+    }
+
+    public static ProductRecycleJob SetPriority(this ProductRecycleJob job, IClock clock)
+    {
+        job.Priority = PriorityHelper.GetPriority(clock);
+        job.PriorityIncrement = 1;
+        return job;
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ProductRecycleJobs/ProductRecycleJob.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Threading.Tasks;
+using Win_in.Sfs.Shared.Domain.Entities;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+/// <summary>
+/// 产品退拆任务
+/// </summary>
+[Display(Name = "产品退拆任务")]
+public class ProductRecycleJob : SfsJobAggregateRootBase<ProductRecycleJobDetail>
+{
+    /// <summary>
+    /// 车间
+    /// </summary>
+    [Display(Name = "车间")]
+    public string Workshop { get; set; }
+
+    /// <summary>
+    /// 班次
+    /// </summary>
+    [Display(Name = "班次")]
+    public string Shift { get; set; }
+
+    /// <summary>
+    /// 明细列表
+    /// </summary>
+    [IgnoreUpdate]
+    public override List<ProductRecycleJobDetail> Details { get; set; } = new List<ProductRecycleJobDetail>();
+
+    /// <summary>
+    /// 设置任务明细的实际库位和实际数量
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="handledLocationCode"></param>
+    /// <param name="handledLocationErpCode"></param>
+    /// <param name="handledQty"></param>
+    /// <param name="handledWarehouseCode"></param>
+    /// <param name="handledBatch"></param>
+    /// <param name="handledContainerCode"></param>
+    /// <param name="handledLot"></param>
+    /// <param name="handledPackingCode"></param>
+    /// <param name="locationCode"></param>
+    /// <param name="qty"></param>
+    /// <returns></returns>
+    public virtual async Task SetDetail(Guid id, string handledLocationCode, string handledLocationErpCode, string handledWarehouseCode, decimal handledQty, string handledSupplierBatch, DateTime handledArriveDate, DateTime handledProduceDate, DateTime handledExpireDate
+        , string handledContainerCode, string handledLot, string handledPackingCode)
+    {
+        var detail = GetDetail(id);
+        detail.HandledToLocationCode = handledLocationCode;
+        detail.HandledToLocationErpCode = handledLocationErpCode;
+        detail.HandledToWarehouseCode = handledWarehouseCode;
+        detail.HandledQty = handledQty;
+        detail.HandledSupplierBatch = handledSupplierBatch;
+        detail.HandledArriveDate = handledArriveDate;
+        detail.HandledProduceDate = handledProduceDate;
+        detail.HandledExpireDate = handledExpireDate;
+        detail.HandledContainerCode = handledContainerCode;
+        detail.HandledLot = handledLot;
+        detail.HandledPackingCode = handledPackingCode;
+        await Task.CompletedTask.ConfigureAwait(false);
+    }
+
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ProductRecycleJobs/ProductRecycleJobDetail.cs

@@ -0,0 +1,88 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public class ProductRecycleJobDetail : SfsJobRecommendToDetailEntityBase
+{
+    /// <summary>
+    /// Bom版本
+    /// </summary>
+    public string BomVersion { get; set; }
+
+    /// <summary>
+    /// 库位代码
+    /// </summary>
+    public string LocationCode { get; set; }
+
+    /// <summary>
+    /// 库区
+    /// </summary>
+    public string LocationArea { get; set; }
+
+    /// <summary>
+    /// 库位组
+    /// </summary>
+    public string LocationGroup { get; set; }
+
+    /// <summary>
+    /// ERP库位代码
+    /// </summary>
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    /// 原料库位代码
+    /// </summary>
+    public string RawLocationCode { get; set; }
+
+    /// <summary>
+    /// 原料库区
+    /// </summary>
+    public string RawLocationArea { get; set; }
+
+    /// <summary>
+    /// 原料库位组
+    /// </summary>
+    public string RawLocationGroup { get; set; }
+
+    /// <summary>
+    /// 原料ERP库位
+    /// </summary>
+    public string RawLocationErpCode { get; set; }
+
+    /// <summary>
+    /// 原料仓库
+    /// </summary>
+    public string RawWarehouseCode { get; set; }
+
+    /// <summary>
+    /// 计量单位
+    /// </summary>
+    [Display(Name = "计量单位")]
+    [MaxLength(SfsPropertyConst.CodeLength)]
+    public string Uom { get; set; }
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    [Display(Name = "数量")]
+    [Column(TypeName = "decimal(18,6)")]
+    public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 扩展属性
+    /// </summary>
+    public ExtraPropertyDictionary ExtraProperties { get; } = new ExtraPropertyDictionary();
+
+    /// <summary>
+    /// 库存状态
+    /// </summary>
+    public EnumInventoryStatus Status { get; set; }
+
+    /// <summary>
+    /// 仓库代码
+    /// </summary>
+    public string WarehouseCode { get; set; }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ProductRecycleJobs/ProductRecycleJobManager.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win_in.Sfs.Wms.Store.Jobs.ProductRecycleJobs;
+internal class ProductRecycleJobManager
+{
+}