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

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

@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>C:\发布\WMS</PublishUrl>
+    <PublishUrl>D:\发布\WMS\base</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <SiteUrlToLaunchAfterPublish />
     <TargetFramework>net6.0</TargetFramework>

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

@@ -4,17 +4,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <DeleteExistingFiles>true</DeleteExistingFiles>
-    <ExcludeApp_Data>false</ExcludeApp_Data>
-    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>.\..\..\..\OutPut\StoreHost\</PublishUrl>
+    <PublishUrl>D:\~all-publish\WMS2.0_东阳\Win_in.Sfs.Wms.Store.HttpApi.Host</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
-    <SiteUrlToLaunchAfterPublish />
-    <TargetFramework>net6.0</TargetFramework>
-    <ProjectGuid>488eeada-cfed-4016-9884-7a1dcbe5eb9c</ProjectGuid>
-    <SelfContained>false</SelfContained>
   </PropertyGroup>
 </Project>

be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/Properties/PublishProfiles/FolderProfile1.pubxml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
-  <PropertyGroup>
-    <DeleteExistingFiles>False</DeleteExistingFiles>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>D:\~all-publish\WMS2.0_东阳\Win_in.Sfs.Wms.Store.HttpApi.Host</PublishUrl>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-  </PropertyGroup>
-</Project>

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

@@ -13,6 +13,7 @@ public class PositionCodeImportInput : SfsBaseDataImportInputBase
     [Key]
     [Display(Name = "代码")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    [Required(ErrorMessage = "{0}是必填项")]
     public string Code { get; set; }
     /// <summary>
     /// 物料号
@@ -60,6 +61,7 @@ public class PositionCodeImportInput : SfsBaseDataImportInputBase
     /// 类型
     /// </summary>
     [Display(Name = "类型")]
+    [Required(ErrorMessage = "{0}是必填项")]
     public EnumRecommendType Type { get; set; }
 
 }

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

@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp;
 using Volo.Abp.Caching;
+using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Uow;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Basedata.Domain;
@@ -22,6 +23,7 @@ public class PositionCodeAppService
         , IPositionCodeAppService
 {
     private readonly IPositionCodeManager _manager;
+    private new readonly IPositionCodeRepository _repository;
 
     public PositionCodeAppService(IPositionCodeRepository repository, IDistributedCache<PositionCodeDTO> cache, IPositionCodeManager manager) : base(repository, cache)
     {
@@ -29,6 +31,7 @@ public class PositionCodeAppService
         base.UpdatePolicyName = CategoryPermissions.Update;
         base.DeletePolicyName = CategoryPermissions.Delete;
         _manager = manager;
+        _repository = repository;
     }
 
 
@@ -42,6 +45,12 @@ public class PositionCodeAppService
             throw new UserFriendlyException($"{input.Code} 已存在");
         }
 
+        var itemEntity = await _repository.FirstOrDefaultAsync(p => p.PartCode == input.PartCode).ConfigureAwait(false);
+        if(itemEntity != null)
+        {
+            throw new UserFriendlyException($"{input.PartCode} 物品已存在");
+        }
+
         var itemBasic = await ItemBasicAppService.GetByCodeAsync(input.PartCode).ConfigureAwait(false);
         Check.NotNull(itemBasic, "物品代码", $"物品 {input.PartCode} 不存在");
         input.PartName = itemBasic.Name;

be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/PositionCode/PositionCodeDbContextModelCreatingExtensions.cs

@@ -33,6 +33,8 @@ public static class PositionCodeDbContextModelCreatingExtensions
 
             //Indexes
             b.HasIndex(q => new { q.Code,q.PartCode,q.LocationCode }).IsUnique();
+            b.HasIndex(q => new { q.Code }).IsUnique();
+            b.HasIndex(q => new { q.PartCode }).IsUnique();
         });
     }
 }

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

@@ -0,0 +1,23 @@
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+[Display(Name = "客户退拆任务")]
+public class ProductRecycleJobDTO : SfsJobDTOBase<ProductRecycleJobDetailDTO>
+{    
+
+    /// <summary>
+    /// 车间
+    /// </summary>
+    [Display(Name = "车间")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string Workshop { get; set; }
+
+    /// <summary>
+    /// 班次
+    /// </summary>
+    [Display(Name = "班次")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string Shift { get; set; }
+}

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

@@ -0,0 +1,90 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class ProductRecycleJobDetailDTO : SfsJobRecommendToDetailDTOBase
+{
+    /// <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.Application.Contracts/Jobs/ProductRecycleJobs/IProductRecycleJobAppService.cs

@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public interface IProductRecycleJobAppService
+    : ISfsJobAppServiceBase<ProductRecycleJobDTO, SfsJobRequestInputBase, ProductRecycleJobCheckInput, ProductRecycleJobEditInput>
+
+{
+    
+}

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

@@ -0,0 +1,6 @@
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class ProductRecycleJobCheckInput : SfsJobCheckInputBase
+{
+
+}

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

@@ -0,0 +1,90 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class ProductRecycleJobDetailInput : SfsJobRecommendToDetailInputBase
+{
+    /// <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.Application.Contracts/Jobs/ProductRecycleJobs/Inputs/ProductRecycleJobDetailSaveInput.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.FileStorage.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+/// <summary>
+/// 客户退拆 保存模型
+/// </summary>
+public class ProductRecycleJobDetailSaveInput
+{
+    /// <summary>
+    /// Id
+    /// </summary>
+    [Display(Name = "Id")]
+    public Guid Id { get; set; }
+    /// <summary>
+    /// 详情ID
+    /// </summary>
+    [Display(Name = "详情ID")]
+    public Guid DetailId { get; set; }
+
+    /// <summary>
+    /// 不合格原因
+    /// </summary>
+    [Display(Name = "不合格原因")]
+    public string FailedReason { get; set; }
+
+    /// <summary>
+    /// 质量缺陷
+    /// </summary>
+    [Display(Name = "质量缺陷")]
+    public string MassDefect { get; set; }
+       
+
+    /// <summary>
+    /// 图片字节流
+    /// </summary>
+    [Display(Name = "图片字节流")]
+    public List<FileDTO> FilesList { get; set; }
+}

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

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+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;
+
+public class ProductRecycleJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput<ProductRecycleJobDetailInput>
+{
+    #region Create    
+
+    /// <summary>
+    /// 上游任务编号
+    /// </summary>
+    [Display(Name = "上游任务编号")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string UpStreamJobNumber { get; set; }
+
+    /// <summary>
+    /// 任务类型
+    /// </summary>
+    [Display(Name = "任务类型")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public EnumJobType JobType { get; set; }
+
+    /// <summary>
+    /// 是否自动完成
+    /// </summary>
+    [Display(Name = "是否自动完成")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public bool IsAutoComplete { get; set; }
+
+    /// <summary>
+    /// 过期时间
+    /// </summary>
+    [Display(Name = "过期时间")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public DateTime ExpiredTime { get; set; }
+
+    /// <summary>
+    /// 任务明细
+    /// </summary>
+    [Display(Name = "任务明细")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public List<ProductRecycleJobDetailInput> Details { get; set; }
+    #endregion
+}

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

@@ -3,7 +3,7 @@ using Win_in.Sfs.Wms.Store.Domain;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public static class ProductRecyclePermissions
+public static class ProductRecycleJobPermissions
 {
     public const string Default = StorePermissions.GroupName + "." + nameof(ProductRecycleJob);
     public const string Create = Default + "." + StorePermissions.CreateStr;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Permissions/StorePermissionDefinitionProvider.cs

@@ -91,6 +91,7 @@ public class StorePermissionDefinitionProvider : PermissionDefinitionProvider
         storeGroup.AddDeliverJobPermission();
         storeGroup.AddPurchaseReturnJobPermission();
         storeGroup.AddProductReceiveJobPermission();
+        storeGroup.AddProductRecycleJobPermission();
         storeGroup.AddCheckJobPermission();
         storeGroup.AddCountJobPermission();
         storeGroup.AddJisDeliverJobPermission();

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

@@ -42,8 +42,6 @@
 	</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/Jobs/InspectJobs/InspectJobAppService.cs

@@ -170,7 +170,7 @@ public class InspectJobAppService
     public virtual async Task<InspectJobDTO> SaveDetail_SplitPackingAsync(SplitPacking_UpdateJobDetailInput input)
     {
         InspectJob job = await _repository.FindAsync(p => p.Number == input.Number).ConfigureAwait(false);
-        InspectJobDetail detail = job.Details.FirstOrDefault(p => p.PackingCode == input.FromPackingCode && p.InspectQty == input.FromQty);
+        InspectJobDetail detail = job.Details.FirstOrDefault(p => p.PackingCode == input.FromPackingCode); /* && p.ReceiveQty == input.FromQty*/
         if (detail == null)
         {
             throw new UserFriendlyException($"根据PackingCode={input.FromPackingCode}取InspectDetail表为空！");

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/IssueJobAppService.cs

@@ -168,23 +168,24 @@ public class IssueJobAppService
     public virtual async Task<IssueJobDTO> SaveDetail_SplitPackingAsync(SplitPacking_UpdateJobDetailInput input)
     {
         var job = await _repository.FindAsync(p => p.Number == input.Number).ConfigureAwait(false);
-        IssueJobDetail detail = job.Details.FirstOrDefault(p => p.HandledPackingCode == input.FromPackingCode && p.HandledQty == input.FromQty);
+        IssueJobDetail detail = job.Details.FirstOrDefault(p => p.RecommendPackingCode == input.FromPackingCode ); /*&& p.HandledQty == input.FromQty*/
         if (detail == null)
         {
-            throw new UserFriendlyException($"根据HandledPackingCode={input.FromPackingCode}取IssueJobDetail表为空！");
+            //throw new UserFriendlyException($"根据HandledPackingCode={input.FromPackingCode}取IssueJobDetail表为空！");
+            throw new UserFriendlyException($"根据RecommendPackingCode={input.FromPackingCode}取IssueJobDetail表为空！");
         }
         //插入目标箱
         var newDetail = CommonHelper.CloneObj(detail);
         newDetail.SetId(GuidGenerator.Create());
         newDetail.RecommendPackingCode = input.ToPackingCode;
         newDetail.RecommendQty = input.ToQty;
-        newDetail.HandledPackingCode = input.ToPackingCode;
-        newDetail.HandledQty = input.ToQty;
+        newDetail.HandledPackingCode = detail.HandledPackingCode.HasValue() ? input.ToPackingCode : null; //源实际实际箱码有值，则新记录实际箱码有值
+        newDetail.HandledQty = detail.HandledQty > 0 ? input.ToQty : 0;
         //newDetail.CreationTime = CommonHelper.CurTime;
         job.Details.Add(newDetail);
         //修改源箱
         detail.RecommendQty = input.FromQty - input.ToQty;
-        detail.HandledQty = input.FromQty - input.ToQty;
+        detail.HandledQty = detail.HandledQty > 0 ? input.FromQty - input.ToQty : 0;
         var entity = await _repository.UpdateAsync(job).ConfigureAwait(false);
         var ret = ObjectMapper.Map<IssueJob, IssueJobDTO>(entity);
         return ret;

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

@@ -0,0 +1,28 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application;
+
+[Authorize]
+[Route($"{StoreConsts.RootPath}production-recycle-job")]
+
+public class ProductRecycleJobAppService
+    : SfsJobAppServiceBase<ProductRecycleJob, ProductRecycleJobDetail, ProductRecycleJobDTO, SfsJobRequestInputBase, ProductRecycleJobCheckInput, ProductRecycleJobEditInput>
+    , IProductRecycleJobAppService
+{
+    private readonly IProductRecycleJobManager _productRecycleJobManager;
+
+    public ProductRecycleJobAppService(
+        IProductRecycleJobRepository repository, IProductRecycleJobManager productRecycleJobManager)
+        : base(repository, productRecycleJobManager)
+    {
+        _productRecycleJobManager = productRecycleJobManager;
+    }
+
+   
+
+}

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

@@ -0,0 +1,31 @@
+using AutoMapper;
+using Volo.Abp.AutoMapper;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application;
+
+public partial class StoreApplicationAutoMapperProfile : Profile
+{
+    private void ProductRecycleJobAutoMapperProfile()
+    {
+        CreateMap<ProductRecycleJob, ProductRecycleJobDTO>()
+            .ReverseMap();
+
+        CreateMap<ProductRecycleJobDetail, ProductRecycleJobDetailDTO>()
+            ;
+
+        CreateMap<ProductRecycleJobEditInput, ProductRecycleJob>();
+
+        CreateMap<ProductRecycleJobDetailInput, ProductRecycleJobDetail>()
+            .IgnoreAuditedObjectProperties()
+            .Ignore(x => x.MasterID)
+            .Ignore(x => x.TenantId)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.Id);
+
+        CreateMap<ProductRecycleJobDetailDTO, ProductRecycleJobDetail>()
+            ;
+
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/PurchaseReceiptJobs/PurchaseReceiptJobAppService.cs

@@ -237,23 +237,25 @@ public class PurchaseReceiptJobAppService :
     public virtual async Task<PurchaseReceiptJobDTO> SaveDetail_SplitPackingAsync(SplitPacking_UpdateJobDetailInput input)
     {
         var job = await _repository.FindAsync(p => p.Number == input.Number).ConfigureAwait(false);
-        PurchaseReceiptJobDetail detail = job.Details.FirstOrDefault(p => p.HandledPackingCode == input.FromPackingCode && p.HandledQty == input.FromQty);
+        PurchaseReceiptJobDetail detail = job.Details.FirstOrDefault(p => p.RecommendPackingCode == input.FromPackingCode); /* && p.RecommendQty == input.FromQty*/
         if (detail == null)
         {
-            throw new UserFriendlyException($"根据HandledPackingCode={input.FromPackingCode}取ReceiptRequestDetail表为空！");
+            //throw new UserFriendlyException($"根据HandledPackingCode={input.FromPackingCode}取ReceiptRequestDetail表为空！");
+            throw new UserFriendlyException($"根据RecommendPackingCode={input.FromPackingCode}取PurchaseReceiptJobDetail表为空！");
+            
         }
         //插入目标箱
         var newDetail = CommonHelper.CloneObj(detail);
         newDetail.SetId(GuidGenerator.Create());
         newDetail.RecommendPackingCode = input.ToPackingCode;
         newDetail.RecommendQty = input.ToQty;
-        newDetail.HandledPackingCode = input.ToPackingCode;
-        newDetail.HandledQty = input.ToQty;
+        newDetail.HandledPackingCode = detail.HandledPackingCode.HasValue() ? input.ToPackingCode : null; //源实际实际箱码有值，则新记录实际箱码有值
+        newDetail.HandledQty = detail.HandledQty > 0 ? input.ToQty : 0;
         //newDetail.CreationTime = CommonHelper.CurTime;
         job.Details.Add(newDetail);
         //修改源箱
         detail.RecommendQty = input.FromQty - input.ToQty;
-        detail.HandledQty = input.FromQty - input.ToQty;
+        detail.HandledQty = detail.HandledQty > 0 ? input.FromQty - input.ToQty : 0;
         var entity = await _repository.UpdateAsync(job).ConfigureAwait(false);
         var ret = ObjectMapper.Map<PurchaseReceiptJob, PurchaseReceiptJobDTO>(entity);
         return ret;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReceiptRequests/PurchaseReceiptRequestAppService.cs

@@ -168,10 +168,11 @@ public class PurchaseReceiptRequestAppService :
     public virtual async Task<PurchaseReceiptRequestDTO> SaveDetail_SplitPackingAsync(SplitPacking_UpdateJobDetailInput input, string packingCode)
     {
         var request = await _repository.FindAsync(p => p.Number == packingCode).ConfigureAwait(false);
-        PurchaseReceiptRequestDetail detail = request.Details.FirstOrDefault(p => p.PackingCode == input.FromPackingCode && p.Qty == input.FromQty);
+        PurchaseReceiptRequestDetail detail = request.Details.FirstOrDefault(p => p.PackingCode == input.FromPackingCode); /* && p.Qty == input.FromQty*/
         if (detail == null)
         {
-            throw new UserFriendlyException($"根据PackingCode={input.FromPackingCode}取ReceiptRequestDetail表为空！");
+            //throw new UserFriendlyException($"根据PackingCode={input.FromPackingCode}取ReceiptRequestDetail表为空！");
+            throw new UserFriendlyException($"根据PackingCode={input.FromPackingCode}取PurchaseReceiptRequestDetail表为空！");
         }
         //插入目标箱
         var newDetail = CommonHelper.CloneObj(detail);

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

@@ -1,10 +1,61 @@
-using System;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using System.Text;
+using System.Linq.Expressions;
 using System.Threading.Tasks;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Users;
+using Volo.Abp.Validation;
+using Win_in.Sfs.Shared.Domain.Shared;
 
-namespace Win_in.Sfs.Wms.Store.Jobs.ProductRecycleJobs;
-internal class ProductRecycleJobManager
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public class ProductRecycleJobManager : SfsJobManagerBase<ProductRecycleJob, ProductRecycleJobDetail>, IProductRecycleJobManager
+{
+
+    public ProductRecycleJobManager(
+       IProductRecycleJobRepository repository
+       ) : base(repository)
+    {
+    }
+
+    public override void CheckDetails(ProductRecycleJob entity, AbpValidationResult result)
+    {
+        var details = entity.Details;
+        foreach (var detail in details)
+        {
+            if (detail.HandledToLocationCode == null)
+            {
+                result.Errors.Add(new ValidationResult($"{detail.HandledToLocationCode} 不能为空"));
+            }
+
+        }
+    }
+
+    public override async Task<List<ProductRecycleJob>> GetWorkingListByPackingAsync(string packingCode)
+    {
+        return await Repository.GetListAsync(
+            c => c.Details.Any(p => p.RecommendPackingCode == packingCode)
+            && c.JobStatus != EnumJobStatus.Closed
+            && c.JobStatus != EnumJobStatus.Cancelled
+            , true).ConfigureAwait(false);
+
+    }
+
+    public override async Task<List<ProductRecycleJob>> GetWorkingListByContainerAsync(string containerCode)
     {
+        return await Repository.GetListAsync(
+            c => c.Details.Any(p => p.RecommendContainerCode == containerCode)
+                 && c.JobStatus != EnumJobStatus.Closed
+                 && c.JobStatus != EnumJobStatus.Cancelled
+            , true).ConfigureAwait(false);
+
+    }
+
+    public async Task<ProductRecycleJob> GetAsync(Expression<Func<ProductRecycleJob, bool>> expression)
+    {
+        return await Repository.FindAsync(expression).ConfigureAwait(false);
+    }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs

@@ -96,6 +96,7 @@ public interface IStoreDbContext : IEfCoreDbContext
     public DbSet<JisDeliverJob> JisDeliverJobs { get; }
     public DbSet<PurchaseReturnJob> PurchaseReturnJobs { get; }
     public DbSet<ProductReceiveJob> ProductReceiveJobs { get; }
+    public DbSet<ProductRecycleJob> ProductRecycleJobs { get; }
     public DbSet<CheckJob> CheckJobs { get; }
     public DbSet<CountJob> CountJobs { get; }
     public DbSet<UnplannedIssueJob> UnplannedIssueJobs { get; }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/IssueJobDbContextModelCreatingExtensions.cs

@@ -56,7 +56,8 @@ public static class IssueJobDbContextModelCreatingExtensions
             b.Property(q => q.TruncType).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
             b.Property(q => q.PlannedSplitRule).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
             b.Property(q => q.OnTheWayLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
-            b.Property(q => q.RecommendType).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
+            b.Property(q => q.PositionCode).HasMaxLength(SfsPropertyConst.CodeLength).IsRequired(false);
+            b.Property(q => q.RecommendType).HasMaxLength(SfsPropertyConst.CodeLength).HasConversion<string>();
 
             //Relations
             //None

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/ProductRecycleJobs/ProductRecycleJobDbContextModelCreatingExtensions.cs

@@ -0,0 +1,52 @@
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.EntityFrameworkCore;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
+
+public static class ProductRecycleJobDbContextModelCreatingExtensions
+{
+    public static void ConfigureProductRecycleJob(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options)
+    {
+        builder.Entity<ProductRecycleJob>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(StoreDbProperties.JobDbTablePrefix + nameof(ProductRecycleJob), options.Schema);
+            //Configure ABP properties
+            b.ConfigureByConvention();
+            //Configure Sfs base properties
+            b.ConfigureSfsBase();
+            //Configure Job base properties
+            b.ConfigureJob<ProductRecycleJob, ProductRecycleJobDetail>();
+            //Properties
+            b.Property(q => q.Workshop).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.Shift).HasMaxLength(SfsPropertyConst.CodeLength);           
+            //Relations
+            b.HasMany(q => q.Details).WithOne().HasForeignKey(d => d.MasterID).IsRequired();
+            //Indexes
+            b.HasIndex(q => new { q.Number }).IsUnique();
+        });
+
+        builder.Entity<ProductRecycleJobDetail>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(StoreDbProperties.JobDbTablePrefix + nameof(ProductRecycleJobDetail), options.Schema);
+            //Configure ABP properties
+            b.ConfigureByConvention();
+            //Configure Sfs base properties
+            b.ConfigureSfsBase();
+            //Configure Job base properties
+            b.ConfigureJobRecommendToDetail();
+            //Properties
+           
+
+            //Relations
+            //None
+
+            //Indexes
+            //b.HasIndex(q => new { q.PackingCode }).IsUnique();
+        });
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/ProductRecycleJobs/ProductRecycleJobEfCoreRepository.cs

@@ -0,0 +1,11 @@
+using Volo.Abp.EntityFrameworkCore;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
+
+public class ProductRecycleJobEfCoreRepository : SfsJobEfCoreRepositoryBase<StoreDbContext, ProductRecycleJob>, IProductRecycleJobRepository
+{
+    public ProductRecycleJobEfCoreRepository(IDbContextProvider<StoreDbContext> dbContextProvider) : base(dbContextProvider)
+    {
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs

@@ -96,6 +96,7 @@ public class StoreDbContext : AbpDbContext<StoreDbContext>, IStoreDbContext
     public DbSet<JisDeliverJob> JisDeliverJobs { get; set; }
     public DbSet<PurchaseReturnJob> PurchaseReturnJobs { get; set; }
     public DbSet<ProductReceiveJob> ProductReceiveJobs { get; set; }
+    public DbSet<ProductRecycleJob> ProductRecycleJobs { get; set; }
     public DbSet<CheckJob> CheckJobs { get; set; }
     public DbSet<CountJob> CountJobs { get; set; }
     public DbSet<UnplannedIssueJob> UnplannedIssueJobs { get; set; }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs

@@ -115,6 +115,7 @@ public static class StoreDbContextModelCreatingExtensions
         builder.ConfigureJisDeliverJob(options);
         builder.ConfigurePurchaseReturnJob(options);
         builder.ConfigureProductReceiveJob(options);
+        builder.ConfigureProductRecycleJob(options);
         builder.ConfigureCheckJob(options);
         builder.ConfigureCountJob(options);
         builder.ConfigureUnplannedIssueJob(options);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs

@@ -116,6 +116,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule
         context.Services.AddTransient<IJisDeliverJobRepository, JisDeliverJobEfCoreRepository>();
         context.Services.AddTransient<IPurchaseReturnJobRepository, PurchaseReturnJobEfCoreRepository>();
         context.Services.AddTransient<IProductReceiveJobRepository, ProductReceiveJobEfCoreRepository>();
+        context.Services.AddTransient<IProductRecycleJobRepository, ProductRecycleJobEfCoreRepository>();
         context.Services.AddTransient<ICheckJobRepository, CheckJobEfCoreRepository>();
         context.Services.AddTransient<ICountJobRepository, CountJobEfCoreRepository>();
         context.Services.AddTransient<IUnplannedIssueJobRepository, UnplannedIssueJobEfCoreRepository>();
@@ -279,6 +280,8 @@ public class StoreEntityFrameworkCoreModule : AbpModule
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ProductReceiveJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+            options.Entity<ProductRecycleJob>(orderOptions =>
+               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<PurchaseReturnJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<IssueJob>(orderOptions =>

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

@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.EventBus;
+using Volo.Abp.Uow;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Event;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Event.BusinessJob;
+
+
+public class ProductionRecycleJobEventHandler :
+    StoreEventHandlerBase
+, ILocalEventHandler<SfsCreatedEntityEventData<ProductRecycleJob>>
+, ILocalEventHandler<SfsCompletedEntityEventData<ProductRecycleJob>>
+{
+    private readonly IProductRecycleNoteAppService _productRecycleNoteAppService;
+
+    public ProductionRecycleJobEventHandler(
+        IProductRecycleNoteAppService productRecycleNoteAppService
+    )
+    {
+        _productRecycleNoteAppService = productRecycleNoteAppService;
+    }
+
+    [UnitOfWork]
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<ProductRecycleJob> eventData)
+    {
+        var entity = eventData.Entity;
+
+        if (entity.IsAutoComplete)
+        {
+            entity.CompleteTime = Clock.Now;
+            entity.JobStatus = EnumJobStatus.Done;
+
+            foreach (var detail in eventData.Entity.Details)
+            {
+                detail.SetHandledFromRecommend();
+            }
+
+            var note = BuildProductionReturnNote(entity);
+            await _productRecycleNoteAppService.CreateAsync(note).ConfigureAwait(false);
+        }
+    }
+
+    [UnitOfWork]
+    public virtual async Task HandleEventAsync(SfsCompletedEntityEventData<ProductRecycleJob> eventData)
+    {
+        var entity = eventData.Entity;
+
+        var productRecycleNote = BuildProductionReturnNote(entity);
+        await _productRecycleNoteAppService.CreateAsync(productRecycleNote).ConfigureAwait(false);
+
+    }
+
+    private ProductRecycleNoteEditInput BuildProductionReturnNote(ProductRecycleJob entity)
+    {
+        var input = ObjectMapper.Map<ProductRecycleJob, ProductRecycleNoteEditInput>(entity);
+
+        
+        input.Details = new List<ProductRecycleNoteDetailInput>();
+
+        foreach (var detail in entity.Details.Where(detail => detail.HandledQty != 0))
+        {
+            var inputDetail = ObjectMapper.Map<ProductRecycleJobDetail, ProductRecycleNoteDetailInput>(detail);
+            
+            input.Details.Add(inputDetail);
+        }
+
+        return input;
+    }
+}