解决文件更名后冲突

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs

@@ -25,7 +25,7 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent.Incoming;
 public class InjectionMoldingRequestReader : IReader
 {
 
-    private readonly IInjectionRequestAppService _injectionRequest;
+    private readonly IInjectionIssueRequestAppService _injectionRequest;
     private readonly IItemBasicAppService _itemService;
     private readonly ILocationAppService _locService;
   
@@ -34,7 +34,7 @@ public class InjectionMoldingRequestReader : IReader
     private readonly IHttpClientFactory _httpClientFactory;
    
     public InjectionMoldingRequestReader(
-        IInjectionRequestAppService injectionRequest
+        IInjectionIssueRequestAppService injectionRequest
     
         , ILogger<InjectionMoldingRequestReader> logger
         , IOptions<InjectionMoldingTaskOptions> options
@@ -53,6 +53,13 @@ public class InjectionMoldingRequestReader : IReader
         _locService = locService;
 
     }
+    
+
+    
+
+        
+
+
 
 
 /// <summary>
@@ -61,59 +68,50 @@ public class InjectionMoldingRequestReader : IReader
 /// <returns></returns>
 
     public virtual async Task<List<IncomingFromExternal>> ReadAsync()
-    {
+    {  
         try
         {
-            // 创建 SfsStoreRequestInputBase 对象以设定作业条件
+            // 获取注塑叫料任务数量
-            var jobCondition = new SfsStoreRequestInputBase();
+            var count = await _injectionRequest.GetCountAsync().ConfigureAwait(false);
-            Filter filter = new Filter()
+            List<InjectionIssueRequestEditInput> joblist = new List<InjectionIssueRequestEditInput>();
-            {
+            if (count == 0)
-                Action = "<>",
-                Column = "RequestStatus",
-                Logic = EnumFilterLogic.And.ToString(),
-                Value = (EnumRequestStatus.Completed).ToString()
-            };
-            // 添加筛选条件：请求状态不等于已完成
-            jobCondition.Condition.Filters.Add(filter);
-            filter = new Filter()
-            {
-                Action = "==",
-                Column = "Type",
-                Logic = EnumFilterLogic.And.ToString(),
-                Value = "Vision"
-            };
-            // 添加筛选条件：类型为 Vision
-            jobCondition.Condition.Filters.Add(filter);
-            // 通过筛选条件获取作业列表
-            var jobs = await _injectionRequest.GetAllListByFilterAsync(jobCondition).ConfigureAwait(false);
-            List<InjectionRequestEditInput> joblist = new List<InjectionRequestEditInput>();
-            if (jobs.Count == 0)
             {
                 // 调用 ReaderCameraApi 方法获取摄像头信息
                 string camera = await ReaderCameraApi().ConfigureAwait(false);
-
                 List<InjectionRequest> cameraList = new List<InjectionRequest>();
-
                 if (camera == "Error occured")
                 {
                     // 记录错误日志并返回空列表
-                    _logger.LogError($"没有读取到摄像头信息{DateTime.Now},请检查网络");
+                    _logger.LogInformation($"没有读取到摄像头信息{DateTime.Now},请检查网络");
                     return new List<IncomingFromExternal>();
                 }
-                // 将摄像头信息转换为注塑叫料明细任务数据
+                //将摄像头信息转换为注塑叫料明细任务数据
                 cameraList = System.Text.Json.JsonSerializer.Deserialize<List<InjectionRequest>>(camera);
-
+                //测试数据
-                InjectionRequestEditInput input = new InjectionRequestEditInput();
+                //var cameraList = new List<InjectionRequest>()
-                List<InjectionRequestDetailInput> injectionRequestDetails = new List<InjectionRequestDetailInput>();
+                //{
-
+                //  new InjectionRequest() { ItemCode = "THILDD0A542AG", ToLocCode = "ZSXB2", Qty = 100 },
+                // };
+                InjectionIssueRequestEditInput input = new InjectionIssueRequestEditInput();
+                input.Worker = "Vision";
+                input.Type = "Vision";
+                input.AutoSubmit = true;
+                input.ActiveDate = DateTime.Now;
+                input.UseOnTheWayLocation = false;
+                input.Remark = "视觉叫料";
+                List<InjectionIssueRequestDetailInput> injectionRequestDetails = new List<InjectionIssueRequestDetailInput>();
                 foreach (var job in cameraList)
                 {
-
+                    var detailInput = new InjectionIssueRequestDetailInput()
-                    var detailInput = new InjectionRequestDetailInput()
                     {
                         ItemCode = job.ItemCode,
                         ToLocationCode = job.ToLocCode,
                         Qty = job.Qty,
+                        RecommendType = EnumRecommendType.W,
+                        IssuedQty = 0,
+                        ReceivedQty = 0,
+                        Status = EnumStatus.Open,
+                        RequestStatus = EnumRequestStatus.New,
                     };
                     // 添加注塑叫料明细任务数据
                     injectionRequestDetails.Add(detailInput);
@@ -126,7 +124,7 @@ public class InjectionMoldingRequestReader : IReader
                     // 记录错误日志并返回空列表
                     foreach (var error in errors)
                     {
-                        _logger.LogError(error);
+                        _logger.LogInformation(error);
                     }
                     return new List<IncomingFromExternal>();
 
@@ -134,19 +132,16 @@ public class InjectionMoldingRequestReader : IReader
                 // 创建新的注塑请求并将数据写入数据库
                 await _injectionRequest.CreateAsync(input).ConfigureAwait(false);
             }
+            else
+            {
+                _logger.LogInformation("注塑叫料任务已存在，无需读取");
+            }
         }
         // 捕获特定异常并记录日志
-        catch (AbpException ex)
+     
-        {
-            _logger.LogError(ex.Message);
-        }
-        catch (JsonException ex)
-        {
-            _logger.LogError(ex.Message);
-        }
         catch (Exception ex)
         {
-            _logger.LogError(ex.Message);
+            _logger.LogInformation(ex.Message);
         }
         // 返回空列表
         return new List<IncomingFromExternal>();
@@ -158,7 +153,7 @@ public class InjectionMoldingRequestReader : IReader
     /// </summary>
     /// <param name="p_list"></param>
     /// <returns></returns>
-    private async Task<List<string>> BindAsync(List<InjectionRequestDetailInput> p_list)
+    private async Task<List<string>> BindAsync(List<InjectionIssueRequestDetailInput> p_list)
     {
         // 异步方法，将输入的请求绑定到对应的零件和库位信息，返回错误列表
         List<string> errors = new List<string>();
@@ -173,6 +168,7 @@ public class InjectionMoldingRequestReader : IReader
                 request.ItemDesc1 = itm.Desc1;
                 request.ItemDesc2 = itm.Desc2;
                 request.ItemName = itm.Name;
+                request.Uom = itm.BasicUom;
             }
             // 获取对应库位信息
             var loc = await _locService.GetByCodeAsync(request.ToLocationCode).ConfigureAwait(false);
@@ -184,6 +180,7 @@ public class InjectionMoldingRequestReader : IReader
                 request.ToLocationGroup = loc.LocationGroupCode;
                 request.ToLocationErpCode = loc.ErpLocationCode;
                 request.ToWarehouseCode = loc.WarehouseCode;
+                request.ToLocationArea = loc.AreaCode;
             }
         }
         // 返回错误列表
@@ -209,6 +206,7 @@ public class InjectionMoldingRequestReader : IReader
         // 将用户名和密码转换为Base64编码的凭据，并设置请求的身份验证信息
         var credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}"));
         client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", credentials);
+     
 
         // 发送GET请求到远程摄像头地址并等待响应
         var response = await client.GetAsync(address).ConfigureAwait(false);

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentModule.cs

@@ -36,6 +36,7 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent;
 [DependsOn(
     typeof(StoreApplicationContractsModule),
     typeof(InventoryApplicationContractsModule),
+    typeof(BasedataApplicationContractsModule),
     typeof(LabelApplicationContractsModule),
     //typeof(DataExchangeDomainModule),
     //typeof(DataExchangeEntityFrameworkCoreModule),

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent.csproj

@@ -20,6 +20,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<ProjectReference Include="..\..\..\Modules\BaseData\src\Win_in.Sfs.Basedata.Application.Contracts\Win_in.Sfs.Basedata.Application.Contracts.csproj" />
 		<ProjectReference Include="..\..\..\Modules\Label\src\Win_in.Sfs.Label.Application.Contracts\Win_in.Sfs.Label.Application.Contracts.csproj" />
 		<ProjectReference Include="..\..\..\Modules\Shared\src\Win_in.Sfs.Shared.Host\Win_in.Sfs.Shared.Host.csproj" />
 		<ProjectReference Include="..\..\..\Modules\Store\src\Win_in.Sfs.Wms.Store.Application.Contracts\Win_in.Sfs.Wms.Store.Application.Contracts.csproj" />

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/appsettings.json

@@ -24,7 +24,7 @@
 
 
   "RemoteServices": {
- 
+
 
     "Inventory": {
       "BaseUrl": "http://localhost:59095/"
@@ -40,8 +40,12 @@
     },
     "Store": {
       "BaseUrl": "http://localhost:59095/"
+    },
+    "BaseData": {
+      "BaseUrl": "http://localhost:59094/"
     }
 
+
   },
 
 

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/InjectionJobController.cs

@@ -22,9 +22,9 @@ namespace Win_in.Sfs.Wms.Pda.Controllers.Jobs;
 /// </summary>
 [ApiController]
 [Route($"{PdaHostConst.ROOT_ROUTE}job/injection")]
-public class InjectionJobController : AbpController
+public class InjectionIssueJobController : AbpController
 {
-    private readonly IInjectionJobAppService _injectionJobAppService;
+    private readonly IInjectionIssueJobAppService _injectionJobAppService;
 
     private readonly IUserWorkGroupAppService _userWorkGroupAppService;
 
@@ -35,8 +35,8 @@ public class InjectionJobController : AbpController
     /// </summary>
     /// <param name="injectionJobAppService"></param>
     /// <param name="userWorkGroupAppService"></param>
-    public InjectionJobController(
+    public InjectionIssueJobController(
-        IInjectionJobAppService injectionJobAppService,
+        IInjectionIssueJobAppService injectionJobAppService,
         IDictAppService dictApp
         , IUserWorkGroupAppService userWorkGroupAppService)
     {
@@ -52,7 +52,7 @@ public class InjectionJobController : AbpController
     /// <returns></returns>
     [HttpGet("{id}")]
 
-    public virtual async Task<ActionResult<InjectionJobDTO>> GetAsync(Guid id)
+    public virtual async Task<ActionResult<InjectionIssueJobDTO>> GetAsync(Guid id)
     {
         var result = await _injectionJobAppService.GetAsync(id).ConfigureAwait(false);
         return Ok(result);
@@ -64,7 +64,7 @@ public class InjectionJobController : AbpController
     /// <param name="sfsRequestDTO"></param>
     /// <returns></returns>
     [HttpPost("list")]
-    public virtual async Task<PagedResultDto<InjectionJobDTO>> GetListAsync(SfsJobRequestInputBase sfsRequestDTO)
+    public virtual async Task<PagedResultDto<InjectionIssueJobDTO>> GetListAsync(SfsJobRequestInputBase sfsRequestDTO)
     {
         var list = await _injectionJobAppService.GetPagedListByFilterAsync(sfsRequestDTO, true).ConfigureAwait(false);
         return list;
@@ -77,7 +77,7 @@ public class InjectionJobController : AbpController
     /// <param name="pageIndex"></param>
     /// <returns></returns>
     [HttpGet("list")]
-    public virtual async Task<PagedResultDto<InjectionJobDTO>> GetListAsync(int pageSize, int pageIndex)
+    public virtual async Task<PagedResultDto<InjectionIssueJobDTO>> GetListAsync(int pageSize, int pageIndex)
     {
         var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
         var jsonStatus = JsonSerializer.Serialize(status);
@@ -86,7 +86,7 @@ public class InjectionJobController : AbpController
         {
             MaxResultCount = pageSize,
             SkipCount = (pageIndex - 1) * pageSize,
-            Sorting = $"{nameof(InjectionJobDTO.CreationTime)} ASC",
+            Sorting = $"{nameof(InjectionIssueJobDTO.CreationTime)} ASC",
             Condition = new Condition
             {
                 Filters = new List<Filter>
@@ -109,7 +109,7 @@ public class InjectionJobController : AbpController
     /// <param name="jobNumber"></param>
     /// <returns></returns>
     [HttpGet("by-number/{jobNumber}")]
-    public virtual async Task<ActionResult<InjectionJobDTO>> GetByNumberAsync(string jobNumber)
+    public virtual async Task<ActionResult<InjectionIssueJobDTO>> GetByNumberAsync(string jobNumber)
     {
         var jobDto = await _injectionJobAppService.GetByNumberAsync(jobNumber).ConfigureAwait(false);
         if (jobDto == null)
@@ -143,13 +143,13 @@ public class InjectionJobController : AbpController
 
         var request = new SfsJobRequestInputBase
         {
-            Sorting = $"{nameof(InjectionJobDTO.Priority)} ASC",
+            Sorting = $"{nameof(InjectionIssueJobDTO.Priority)} ASC",
             Condition = new Condition
             {
                 Filters = new List<Filter>
                 {
-                    new(nameof(InjectionJobDTO.WorkGroupCode),jsonCodes,"In"),
+                    new(nameof(InjectionIssueJobDTO.WorkGroupCode),jsonCodes,"In"),
-                    new(nameof(InjectionJobDTO.JobStatus),jsonStatus,"In")
+                    new(nameof(InjectionIssueJobDTO.JobStatus),jsonStatus,"In")
                 }
             }
         };
@@ -188,7 +188,7 @@ public class InjectionJobController : AbpController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpPost("finish/{id}")]
-    public virtual async Task FinishAsync(Guid id, [FromBody] InjectionJobDTO dto)
+    public virtual async Task FinishAsync(Guid id, [FromBody] InjectionIssueJobDTO dto)
     {
         await _injectionJobAppService.CompleteAsync(id, dto).ConfigureAwait(false);
     }

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

@@ -11,15 +11,15 @@ namespace Win_in.Sfs.Wms.Pda.Controllers.Stores;
 [ApiController]
 [Route($"{PdaHostConst.ROOT_ROUTE}store/injection-note")]
 
-public class InjectionNoteController : AbpController
+public class InjectionIssueNoteController : AbpController
 {
-    private readonly IInjectionNoteAppService _injectionNoteAppService;
+    private readonly IInjectionIssueNoteAppService _injectionNoteAppService;
 
     /// <summary>
     /// 
     /// </summary>
     /// <param name="injectionNoteAppService"></param>
-    public InjectionNoteController(IInjectionNoteAppService injectionNoteAppService)
+    public InjectionIssueNoteController(IInjectionIssueNoteAppService injectionNoteAppService)
     {
         _injectionNoteAppService = injectionNoteAppService;
     }
@@ -30,7 +30,7 @@ public class InjectionNoteController : AbpController
     /// <param name="input">CreateInput</param>
     /// <returns></returns>
     [HttpPost("")]
-    public virtual async Task CreateAsync(InjectionNoteEditInput input)
+    public virtual async Task CreateAsync(InjectionIssueNoteEditInput input)
     {
         await _injectionNoteAppService.CreateAsync(input).ConfigureAwait(false);
     }

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

@@ -11,17 +11,17 @@ namespace Win_in.Sfs.Wms.Pda.Controllers.Stores;
 [ApiController]
 [Route($"{PdaHostConst.ROOT_ROUTE}store/injection-request")]
 
-public class InjectionRequestController : AbpController
+public class InjectionIssueRequestController : AbpController
 {
-    private readonly IInjectionRequestAppService _injectionRequestAppService;
+    private readonly IInjectionIssueRequestAppService _injectionRequestAppService;
 
     /// <summary>
     ///
     /// </summary>
-    /// <param name="InjectionRequestAppService"></param>
+    /// <param name="InjectionIssueRequestAppService"></param>
-    public InjectionRequestController(IInjectionRequestAppService InjectionRequestAppService)
+    public InjectionIssueRequestController(IInjectionIssueRequestAppService InjectionIssueRequestAppService)
     {
-        _injectionRequestAppService = InjectionRequestAppService;
+        _injectionRequestAppService = InjectionIssueRequestAppService;
     }
 
     /// <summary>
@@ -30,7 +30,7 @@ public class InjectionRequestController : AbpController
     /// <param name="input"></param>
     /// <returns></returns>
     [HttpPost("")]
-    public virtual async Task CreateAsync(InjectionRequestEditInput input)
+    public virtual async Task CreateAsync(InjectionIssueRequestEditInput input)
     {
         _ = await _injectionRequestAppService.CreateAsync(input).ConfigureAwait(false);
     }
@@ -42,7 +42,7 @@ public class InjectionRequestController : AbpController
     /// <returns></returns>
     [HttpGet("{number}")]
 
-    public virtual async Task<ActionResult<InjectionRequestDTO>> GetAsync(string number)
+    public virtual async Task<ActionResult<InjectionIssueRequestDTO>> GetAsync(string number)
     {
         var result = await _injectionRequestAppService.GetByNumberAsync(number).ConfigureAwait(false);
         return Ok(result);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/DTOs/ChassisOperationSequenceDTO.cs

@@ -3,46 +3,27 @@ using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
-
 /// <summary>
-///     底盘信息
+///     底盘执行位置序列
 /// </summary>
-[Display(Name = "底盘信息")]
+[Display(Name = "底盘执行位置序列")]
 public class ChassisOperationSequenceDTO : SfsBasicDTOBase
 {
     /// <summary>
-    ///     Wms编号
+    ///     kitting执行序列号
-    /// </summary>
-    [Display(Name = "Wms编号")]
-    public string Number { get; set; }
-
-    /// <summary>
-    ///     底盘号
-    /// </summary>
-    [Display(Name = "底盘号")]
-    public string ChassisOperationSequenceNumber { get; set; }
-
-    /// <summary>
-    ///     描述
     /// </summary>
-    [Display(Name = "描述")]
+    [Display(Name = "kitting执行序列号")]
-    public string Description { get; set; }
+    public string KittingNumber { get; set; }
 
     /// <summary>
-    ///     底盘生产时间
+    ///     kitting代码
     /// </summary>
-    [Display(Name = "底盘生产时间")]
+    [Display(Name = "kitting代码")]
-    public DateTime ProduceDateTime { get; set; }
+    public string KittingCode { get; set; }
 
     /// <summary>
-    ///     接收接口时间
+    ///     底盘号
-    /// </summary>
-    [Display(Name = "接收接口时间")]
-    public DateTime ReceiveInterfaceDateTime { get; set; }
-
-    /// <summary>
-    ///     执行位置排序列
     /// </summary>
-    [Display(Name = "执行位置排序列")]
+    [Display(Name = "底盘号")]
-    public long SortNumber { get; set; }
+    public string ChassisNumber { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceEditInput.cs

@@ -4,45 +4,27 @@ using System.ComponentModel.DataAnnotations;
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 /// <summary>
-///     底盘信息
+///     底盘执行位置序列
 /// </summary>
-[Display(Name = "底盘信息")]
+[Display(Name = "底盘执行位置序列")]
 public class ChassisOperationSequenceEditInput
     : SfsStoreCreateOrUpdateInputBase
 {
     /// <summary>
-    ///     Wms编号
+    ///     kitting执行序列号
     /// </summary>
-    [Display(Name = "Wms编号")]
+    [Display(Name = "kitting执行序列号")]
-    public string Number { get; set; }
+    public string KittingNumber { get; set; }
 
     /// <summary>
-    ///     底盘号
+    ///     kitting代码
     /// </summary>
-    [Display(Name = "底盘号")]
+    [Display(Name = "kitting代码")]
-    public string ChassisOperationSequenceNumber { get; set; }
+    public string KittingCode { get; set; }
 
     /// <summary>
-    ///     描述
+    ///     底盘号
-    /// </summary>
-    [Display(Name = "描述")]
-    public string Description { get; set; }
-
-    /// <summary>
-    ///     底盘生产时间
-    /// </summary>
-    [Display(Name = "底盘生产时间")]
-    public DateTime ProduceDateTime { get; set; }
-
-    /// <summary>
-    ///     接收接口时间
-    /// </summary>
-    [Display(Name = "接收接口时间")]
-    public DateTime ReceiveInterfaceDateTime { get; set; }
-
-    /// <summary>
-    ///     执行位置排序列
     /// </summary>
-    [Display(Name = "执行位置排序列")]
+    [Display(Name = "底盘号")]
-    public long SortNumber { get; set; }
+    public string ChassisNumber { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceImportInput.cs

@@ -8,44 +8,26 @@ using Win_in.Sfs.Shared.Domain.Shared;
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 /// <summary>
-///     底盘信息
+///     底盘执行位置序列
 /// </summary>
-[Display(Name = "底盘信息")]
+[Display(Name = "底盘执行位置序列")]
 public class ChassisOperationSequenceImportInput : SfsStoreImportInputBase
 {
     /// <summary>
-    ///     Wms编号
+    ///     kitting执行序列号
     /// </summary>
-    [Display(Name = "Wms编号")]
+    [Display(Name = "kitting执行序列号")]
-    public string Number { get; set; }
+    public string KittingNumber { get; set; }
 
     /// <summary>
-    ///     底盘号
+    ///     kitting代码
     /// </summary>
-    [Display(Name = "底盘号")]
+    [Display(Name = "kitting代码")]
-    public string ChassisOperationSequenceNumber { get; set; }
+    public string KittingCode { get; set; }
 
     /// <summary>
-    ///     描述
+    ///     底盘号
-    /// </summary>
-    [Display(Name = "描述")]
-    public string Description { get; set; }
-
-    /// <summary>
-    ///     底盘生产时间
-    /// </summary>
-    [Display(Name = "底盘生产时间")]
-    public DateTime ProduceDateTime { get; set; }
-
-    /// <summary>
-    ///     接收接口时间
-    /// </summary>
-    [Display(Name = "接收接口时间")]
-    public DateTime ReceiveInterfaceDateTime { get; set; }
-
-    /// <summary>
-    ///     执行位置排序列
     /// </summary>
-    [Display(Name = "执行位置排序列")]
+    [Display(Name = "底盘号")]
-    public long SortNumber { get; set; }
+    public string ChassisNumber { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobPermissions.cs

@@ -0,0 +1,27 @@
+using Volo.Abp.Authorization.Permissions;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public static class AssembleIssueJobPermissions
+{
+
+    public const string Default = StorePermissions.GroupName + "." + nameof(AssembleIssueJob);
+    public const string Create = Default + "." + StorePermissions.CreateStr;
+    public const string Update = Default + "." + StorePermissions.UpdateStr;
+    public const string Delete = Default + "." + StorePermissions.DeleteStr;
+
+    //自动发料任务
+    public const string AutoAssembleIssueJob = StorePermissions.GroupName + "." + nameof(AutoAssembleIssueJob);
+
+    public static void AddAssembleIssueJobPermission(this PermissionGroupDefinition permissionGroup)
+    {
+        var AssembleIssueJobPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleIssueJob)));
+        AssembleIssueJobPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        AssembleIssueJobPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        AssembleIssueJobPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+
+        permissionGroup.AddPermission(AutoAssembleIssueJob, StorePermissionDefinitionProvider.L(nameof(AutoAssembleIssueJob)));
+
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/DTOs/AssembleJobDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/DTOs/AssembleIssueJobDTO.cs

@@ -7,7 +7,7 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 /// 装配发料任务
 /// </summary>
 [Display(Name = "装配发料任务")]
-public class AssembleJobDTO : SfsJobDTOBase<AssembleJobDetailDTO>
+public class AssembleIssueJobDTO : SfsJobDTOBase<AssembleIssueJobDetailDTO>
 {
     /// <summary>
     /// 叫料请求类型

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobDetailInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/DTOs/AssembleIssueJobDetailDTO.cs

@@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class AssembleJobDetailInput : SfsDetailInputBase
+public class AssembleIssueJobDetailDTO : SfsDetailDTOBase
 {
     #region 库存基础信息
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/IAssembleIssueJobAppService.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public interface IAssembleIssueJobAppService
+    : ISfsJobAppServiceBase<AssembleIssueJobDTO, SfsJobRequestInputBase, AssembleIssueJobCheckInput, AssembleIssueJobEditInput>
+{
+    Task CancelByMaterialRequestAsync(string assembleNumber);
+
+    Task<List<AssembleIssueJobDTO>> GetByRequestNumberAsync(string requestNumber);
+
+}

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

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

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

@@ -0,0 +1,519 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class AssembleIssueJobDetailInput : SfsDetailInputBase
+{
+    #region 库存基础信息
+
+    /// <summary>
+    ///     物品代码
+    /// </summary>
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    [Column(TypeName = "decimal(18,6)")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    public EnumInventoryStatus Status { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    public string Uom { get; set; }
+
+    #endregion
+
+    #region 请求信息
+
+    /// <summary>
+    ///     请求库位
+    /// </summary>
+    public string RequestLocationCode { get; set; }
+
+    /// <summary>
+    ///     到库区
+    /// </summary>
+    public string RequestLocationArea { get; set; }
+
+    /// <summary>
+    ///     到库位组
+    /// </summary>
+    public string RequestLocationGroup { get; set; }
+
+    /// <summary>
+    ///     到ERP库位
+    /// </summary>
+    public string RequestLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     到仓库
+    /// </summary>
+    public string RequestWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     在途库库位
+    /// </summary>
+    public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    ///     生产线
+    /// </summary>
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    ///     位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    ///     推荐的类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
+    /// <summary>
+    ///     需求数量
+    /// </summary>
+    public decimal RequestQty { get; set; }
+
+    #endregion
+
+    #region 推荐来源
+
+    /// <summary>
+    ///     推荐来源托标签
+    /// </summary>
+    public string RecommendFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源箱标签
+    /// </summary>
+    public string RecommendFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次供应商批次
+    /// </summary>
+    public string RecommendFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次到货时间
+    /// </summary>
+    public DateTime RecommendFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次生产时间
+    /// </summary>
+    public DateTime RecommendFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次过期时间
+    /// </summary>
+    public DateTime RecommendFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次排序
+    /// </summary>
+    public string RecommendFromLot { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位
+    /// </summary>
+    public string RecommendFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源库区
+    /// </summary>
+    public string RecommendFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位组
+    /// </summary>
+    public string RecommendFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐来源ERP库位
+    /// </summary>
+    public string RecommendFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源仓库
+    /// </summary>
+    public string RecommendFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源数量
+    /// </summary>
+    public decimal RecommendFromQty { get; set; }
+
+    #endregion
+
+    #region 推荐目标
+
+    /// <summary>
+    ///     推荐目标托标签
+    /// </summary>
+    public string RecommendToContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标箱标签
+    /// </summary>
+    public string RecommendToPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次供应商批次
+    /// </summary>
+    public string RecommendToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次到货时间
+    /// </summary>
+    public DateTime RecommendToArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次生产时间
+    /// </summary>
+    public DateTime RecommendToProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次过期时间
+    /// </summary>
+    public DateTime RecommendToExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次排序
+    /// </summary>
+    public string RecommendToLot { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位
+    /// </summary>
+    public string RecommendToLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标库区
+    /// </summary>
+    public string RecommendToLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位组
+    /// </summary>
+    public string RecommendToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐目标ERP库位
+    /// </summary>
+    public string RecommendToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标仓库
+    /// </summary>
+    public string RecommendToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标数量
+    /// </summary>
+    public decimal RecommendToQty { get; set; }
+
+    #endregion
+
+    #region 库移来源
+
+    /// <summary>
+    ///     库移来源托标签
+    /// </summary>
+    public string TransferLibFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移来源箱标签
+    /// </summary>
+    public string TransferLibFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移来源批次供应商批次
+    /// </summary>
+    public string TransferLibFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移来源批次到货时间
+    /// </summary>
+    public DateTime TransferLibFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次生产时间
+    /// </summary>
+    public DateTime TransferLibFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次过期时间
+    /// </summary>
+    public DateTime TransferLibFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次排序
+    /// </summary>
+    public string TransferLibFromLot { get; set; }
+
+    /// <summary>
+    ///     库移来源库位
+    /// </summary>
+    public string TransferLibFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移来源库区
+    /// </summary>
+    public string TransferLibFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移来源库位组
+    /// </summary>
+    public string TransferLibFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移来源ERP库位
+    /// </summary>
+    public string TransferLibFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移来源仓库
+    /// </summary>
+    public string TransferLibFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移来源数量
+    /// </summary>
+    public decimal TransferLibFromQty { get; set; }
+
+    #endregion
+
+    #region 库移目标
+
+    /// <summary>
+    ///     库移目标托标签
+    /// </summary>
+    public string TransferLibToContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移目标箱标签
+    /// </summary>
+    public string TransferLibToPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移目标批次供应商批次
+    /// </summary>
+    public string TransferLibToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移目标批次到货时间
+    /// </summary>
+    public DateTime TransferLibToArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次生产时间
+    /// </summary>
+    public DateTime TransferLibToProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次过期时间
+    /// </summary>
+    public DateTime TransferLibToExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次排序
+    /// </summary>
+    public string TransferLibToLot { get; set; }
+
+    /// <summary>
+    ///     库移目标库位
+    /// </summary>
+    public string TransferLibToLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移目标库区
+    /// </summary>
+    public string TransferLibToLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移目标库位组
+    /// </summary>
+    public string TransferLibToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移目标ERP库位
+    /// </summary>
+    public string TransferLibToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移目标仓库
+    /// </summary>
+    public string TransferLibToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移目标数量
+    /// </summary>
+    public decimal TransferLibToQty { get; set; }
+
+    #endregion
+
+    #region 实际来源
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledFromLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledFromQty { get; set; }
+
+    #endregion
+
+    #region 实际目标
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledToContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledToPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledToArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledToProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledToExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledToLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledToLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledToLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledToQty { get; set; }
+
+    #endregion
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobEditInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/Inputs/AssembleIssueJobEditInput.cs

@@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class AssembleJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput<AssembleJobDetailInput>
+public class AssembleIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput<AssembleIssueJobDetailInput>
 {
     #region Create
     /// <summary>
@@ -57,7 +57,7 @@ public class AssembleJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateIn
     /// </summary>
     [Display(Name = "任务明细")]
     [Required(ErrorMessage = "{0}是必填项")]
-    public List<AssembleJobDetailInput> Details { get; set; } = new();
+    public List<AssembleIssueJobDetailInput> Details { get; set; } = new();
         
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/AssembleJobPermissions.cs

@@ -1,27 +0,0 @@
-using Volo.Abp.Authorization.Permissions;
-using Win_in.Sfs.Wms.Store.Domain;
-
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
-
-public static class AssembleJobPermissions
-{
-
-    public const string Default = StorePermissions.GroupName + "." + nameof(AssembleJob);
-    public const string Create = Default + "." + StorePermissions.CreateStr;
-    public const string Update = Default + "." + StorePermissions.UpdateStr;
-    public const string Delete = Default + "." + StorePermissions.DeleteStr;
-
-    //自动发料任务
-    public const string AutoAssembleJob = StorePermissions.GroupName + "." + nameof(AutoAssembleJob);
-
-    public static void AddAssembleJobPermission(this PermissionGroupDefinition permissionGroup)
-    {
-        var AssembleJobPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleJob)));
-        AssembleJobPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
-        AssembleJobPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
-        AssembleJobPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
-
-        permissionGroup.AddPermission(AutoAssembleJob, StorePermissionDefinitionProvider.L(nameof(AutoAssembleJob)));
-
-    }
-}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/IAssembleJobAppService.cs

@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
-
-public interface IAssembleJobAppService
-    : ISfsJobAppServiceBase<AssembleJobDTO, SfsJobRequestInputBase, AssembleJobCheckInput, AssembleJobEditInput>
-{
-    Task CancelByMaterialRequestAsync(string assembleNumber);
-
-    Task<List<AssembleJobDTO>> GetByRequestNumberAsync(string requestNumber);
-
-}

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

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

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionJobDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionIssueJobDTO.cs

@@ -7,7 +7,7 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 ///     注塑发料任务
 /// </summary>
 [Display(Name = "注塑发料任务")]
-public class InjectionJobDTO : SfsJobDTOBase<InjectionJobDetailDTO>
+public class InjectionIssueJobDTO : SfsJobDTOBase<InjectionIssueJobDetailDTO>
 {
     /// <summary>
     ///     叫料请求类型
@@ -28,7 +28,7 @@ public class InjectionJobDTO : SfsJobDTOBase<InjectionJobDetailDTO>
     /// </summary>
     [Display(Name = "要货单号")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string InjectionRequestNumber { get; set; }
+    public string InjectionIssueRequestNumber { get; set; }
 
     /// <summary>
     ///     使用在途库

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionJobDetailDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionIssueJobDetailDTO.cs

@@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class InjectionJobDetailDTO : SfsDetailDTOBase
+public class InjectionIssueJobDetailDTO : SfsDetailDTOBase
 {
     #region 库存基础信息
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/IInjectionIssueJobAppService.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public interface IInjectionIssueJobAppService
+    : ISfsJobAppServiceBase<InjectionIssueJobDTO, SfsJobRequestInputBase, InjectionIssueJobCheckInput, InjectionIssueJobEditInput>
+{
+    Task CancelByMaterialRequestAsync(string injectionNumber);
+
+    Task<List<InjectionIssueJobDTO>> GetByRequestNumberAsync(string requestNumber);
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/IInjectionJobAppService.cs

@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
-
-public interface IInjectionJobAppService
-    : ISfsJobAppServiceBase<InjectionJobDTO, SfsJobRequestInputBase, InjectionJobCheckInput, InjectionJobEditInput>
-{
-    Task CancelByMaterialRequestAsync(string injectionNumber);
-
-    Task<List<InjectionJobDTO>> GetByRequestNumberAsync(string requestNumber);
-}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/InjectionIssueJobPermissions.cs

@@ -0,0 +1,27 @@
+using Volo.Abp.Authorization.Permissions;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public static class InjectionIssueJobPermissions
+{
+
+    public const string Default = StorePermissions.GroupName + "." + nameof(InjectionIssueJob);
+    public const string Create = Default + "." + StorePermissions.CreateStr;
+    public const string Update = Default + "." + StorePermissions.UpdateStr;
+    public const string Delete = Default + "." + StorePermissions.DeleteStr;
+
+    //自动发料任务
+    public const string AutoInjectionIssueJob = StorePermissions.GroupName + "." + nameof(AutoInjectionIssueJob);
+
+    public static void AddInjectionIssueJobPermission(this PermissionGroupDefinition permissionGroup)
+    {
+        var InjectionIssueJobPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionIssueJob)));
+        InjectionIssueJobPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        InjectionIssueJobPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        InjectionIssueJobPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+
+        permissionGroup.AddPermission(AutoInjectionIssueJob, StorePermissionDefinitionProvider.L(nameof(AutoInjectionIssueJob)));
+
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/InjectionJobPermissions.cs

@@ -1,27 +0,0 @@
-using Volo.Abp.Authorization.Permissions;
-using Win_in.Sfs.Wms.Store.Domain;
-
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
-
-public static class InjectionJobPermissions
-{
-
-    public const string Default = StorePermissions.GroupName + "." + nameof(InjectionJob);
-    public const string Create = Default + "." + StorePermissions.CreateStr;
-    public const string Update = Default + "." + StorePermissions.UpdateStr;
-    public const string Delete = Default + "." + StorePermissions.DeleteStr;
-
-    //自动发料任务
-    public const string AutoInjectionJob = StorePermissions.GroupName + "." + nameof(AutoInjectionJob);
-
-    public static void AddInjectionJobPermission(this PermissionGroupDefinition permissionGroup)
-    {
-        var InjectionJobPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionJob)));
-        InjectionJobPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
-        InjectionJobPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
-        InjectionJobPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
-
-        permissionGroup.AddPermission(AutoInjectionJob, StorePermissionDefinitionProvider.L(nameof(AutoInjectionJob)));
-
-    }
-}

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

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

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

@@ -0,0 +1,519 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class InjectionIssueJobDetailInput : SfsDetailInputBase
+{
+    #region 库存基础信息
+
+    /// <summary>
+    ///     物品代码
+    /// </summary>
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    [Column(TypeName = "decimal(18,6)")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    public EnumInventoryStatus Status { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    public string Uom { get; set; }
+
+    #endregion
+
+    #region 请求信息
+
+    /// <summary>
+    ///     请求库位
+    /// </summary>
+    public string RequestLocationCode { get; set; }
+
+    /// <summary>
+    ///     到库区
+    /// </summary>
+    public string RequestLocationArea { get; set; }
+
+    /// <summary>
+    ///     到库位组
+    /// </summary>
+    public string RequestLocationGroup { get; set; }
+
+    /// <summary>
+    ///     到ERP库位
+    /// </summary>
+    public string RequestLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     到仓库
+    /// </summary>
+    public string RequestWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     在途库库位
+    /// </summary>
+    public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    ///     生产线
+    /// </summary>
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    ///     位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    ///     推荐的类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
+    /// <summary>
+    ///     需求数量
+    /// </summary>
+    public decimal RequestQty { get; set; }
+
+    #endregion
+
+    #region 推荐来源
+
+    /// <summary>
+    ///     推荐来源托标签
+    /// </summary>
+    public string RecommendFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源箱标签
+    /// </summary>
+    public string RecommendFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次供应商批次
+    /// </summary>
+    public string RecommendFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次到货时间
+    /// </summary>
+    public DateTime RecommendFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次生产时间
+    /// </summary>
+    public DateTime RecommendFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次过期时间
+    /// </summary>
+    public DateTime RecommendFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次排序
+    /// </summary>
+    public string RecommendFromLot { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位
+    /// </summary>
+    public string RecommendFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源库区
+    /// </summary>
+    public string RecommendFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位组
+    /// </summary>
+    public string RecommendFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐来源ERP库位
+    /// </summary>
+    public string RecommendFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源仓库
+    /// </summary>
+    public string RecommendFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源数量
+    /// </summary>
+    public decimal RecommendFromQty { get; set; }
+
+    #endregion
+
+    #region 推荐目标
+
+    /// <summary>
+    ///     推荐目标托标签
+    /// </summary>
+    public string RecommendToContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标箱标签
+    /// </summary>
+    public string RecommendToPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次供应商批次
+    /// </summary>
+    public string RecommendToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次到货时间
+    /// </summary>
+    public DateTime RecommendToArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次生产时间
+    /// </summary>
+    public DateTime RecommendToProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次过期时间
+    /// </summary>
+    public DateTime RecommendToExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次排序
+    /// </summary>
+    public string RecommendToLot { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位
+    /// </summary>
+    public string RecommendToLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标库区
+    /// </summary>
+    public string RecommendToLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位组
+    /// </summary>
+    public string RecommendToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐目标ERP库位
+    /// </summary>
+    public string RecommendToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标仓库
+    /// </summary>
+    public string RecommendToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标数量
+    /// </summary>
+    public decimal RecommendToQty { get; set; }
+
+    #endregion
+
+    #region 库移来源
+
+    /// <summary>
+    ///     库移来源托标签
+    /// </summary>
+    public string TransferLibFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移来源箱标签
+    /// </summary>
+    public string TransferLibFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移来源批次供应商批次
+    /// </summary>
+    public string TransferLibFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移来源批次到货时间
+    /// </summary>
+    public DateTime TransferLibFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次生产时间
+    /// </summary>
+    public DateTime TransferLibFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次过期时间
+    /// </summary>
+    public DateTime TransferLibFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次排序
+    /// </summary>
+    public string TransferLibFromLot { get; set; }
+
+    /// <summary>
+    ///     库移来源库位
+    /// </summary>
+    public string TransferLibFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移来源库区
+    /// </summary>
+    public string TransferLibFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移来源库位组
+    /// </summary>
+    public string TransferLibFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移来源ERP库位
+    /// </summary>
+    public string TransferLibFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移来源仓库
+    /// </summary>
+    public string TransferLibFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移来源数量
+    /// </summary>
+    public decimal TransferLibFromQty { get; set; }
+
+    #endregion
+
+    #region 库移目标
+
+    /// <summary>
+    ///     库移目标托标签
+    /// </summary>
+    public string TransferLibToContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移目标箱标签
+    /// </summary>
+    public string TransferLibToPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移目标批次供应商批次
+    /// </summary>
+    public string TransferLibToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移目标批次到货时间
+    /// </summary>
+    public DateTime TransferLibToArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次生产时间
+    /// </summary>
+    public DateTime TransferLibToProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次过期时间
+    /// </summary>
+    public DateTime TransferLibToExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次排序
+    /// </summary>
+    public string TransferLibToLot { get; set; }
+
+    /// <summary>
+    ///     库移目标库位
+    /// </summary>
+    public string TransferLibToLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移目标库区
+    /// </summary>
+    public string TransferLibToLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移目标库位组
+    /// </summary>
+    public string TransferLibToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移目标ERP库位
+    /// </summary>
+    public string TransferLibToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移目标仓库
+    /// </summary>
+    public string TransferLibToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移目标数量
+    /// </summary>
+    public decimal TransferLibToQty { get; set; }
+
+    #endregion
+
+    #region 实际来源
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledFromLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledFromQty { get; set; }
+
+    #endregion
+
+    #region 实际目标
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledToContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledToPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledToArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledToProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledToExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledToLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledToLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledToLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledToQty { get; set; }
+
+    #endregion
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionJobEditInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobEditInput.cs

@@ -7,7 +7,7 @@ using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class InjectionJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput<InjectionJobDetailInput>
+public class InjectionIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput<InjectionIssueJobDetailInput>
 {
     #region Create
     /// <summary>
@@ -23,7 +23,7 @@ public class InjectionJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateI
     [Display(Name = "要货单号")]
     [Required(ErrorMessage = "{0}是必填项")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string InjectionRequestNumber { get; set; }
+    public string InjectionIssueRequestNumber { get; set; }
 
     /// <summary>
     /// 叫料请求类型
@@ -58,7 +58,7 @@ public class InjectionJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateI
     /// </summary>
     [Display(Name = "任务明细")]
     [Required(ErrorMessage = "{0}是必填项")]
-    public List<InjectionJobDetailInput> Details { get; set; } = new();
+    public List<InjectionIssueJobDetailInput> Details { get; set; } = new();
 
     /// <summary>
     /// 使用在途库

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

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

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNotePermissions.cs

@@ -0,0 +1,30 @@
+using Volo.Abp.Authorization.Permissions;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public static class AssembleIssueNotePermissions
+{
+
+    public const string Default = StorePermissions.GroupName + "." + nameof(AssembleIssueNote);
+    public const string Create = Default + "." + StorePermissions.CreateStr;
+    public const string Update = Default + "." + StorePermissions.UpdateStr;
+    public const string Delete = Default + "." + StorePermissions.DeleteStr;
+
+    //自动发料记录
+    public const string AutoAssembleIssueNote = StorePermissions.GroupName + "." + nameof(AutoAssembleIssueNote);
+
+    //直接发料
+    public const string DirectAssembleIssueNote = StorePermissions.GroupName + "." + nameof(DirectAssembleIssueNote);
+
+    public static void AddAssembleIssueNotePermission(this PermissionGroupDefinition permissionGroup)
+    {
+        var AssembleIssueNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleIssueNote)));
+        AssembleIssueNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        AssembleIssueNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        AssembleIssueNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+
+        permissionGroup.AddPermission(AutoAssembleIssueNote, StorePermissionDefinitionProvider.L(nameof(AutoAssembleIssueNote)));
+        permissionGroup.AddPermission(DirectAssembleIssueNote, StorePermissionDefinitionProvider.L(nameof(DirectAssembleIssueNote)));
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/DTOs/AssembleNoteDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/DTOs/AssembleIssueNoteDTO.cs

@@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class AssembleNoteDTO : SfsStoreDTOBase<AssembleNoteDetailDTO>, IHasJobNumber, IHasRequestNumber
+public class AssembleIssueNoteDTO : SfsStoreDTOBase<AssembleIssueNoteDetailDTO>, IHasJobNumber, IHasRequestNumber
 {
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/DTOs/AssembleJobDetailDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/DTOs/AssembleIssueNoteDetailDTO.cs

@@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class AssembleJobDetailDTO : SfsDetailDTOBase
+public class AssembleIssueNoteDetailDTO : SfsDetailDTOBase
 {
     #region 库存基础信息
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/IAssembleIssueNoteAppService.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public interface IAssembleIssueNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase<AssembleIssueNoteDTO, SfsStoreRequestInputBase, AssembleIssueNoteDetailDTO, SfsStoreRequestInputBase>
+{
+    Task<AssembleIssueNoteDTO> CreateAsync(AssembleIssueNoteEditInput input);
+
+    Task<AssembleIssueNoteDTO> ConfirmAsync(Guid id);
+
+    Task<AssembleIssueNoteDTO> ConfirmAsync(string number);
+
+    Task<PagedResultDto<AssembleIssueNoteDTO>> GetListByTypeAsync(SfsStoreRequestInputBase requestInput,
+        string requestType, bool includeDetails = false, CancellationToken cancellationToken = default);
+
+    Task<List<AssembleIssueNoteDTO>> GetListUnConfirmedByTypeAsync(string requestType);
+}

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

@@ -0,0 +1,519 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class AssembleIssueNoteDetailInput : SfsDetailInputBase
+{
+    #region 库存基础信息
+
+    /// <summary>
+    ///     物品代码
+    /// </summary>
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    [Column(TypeName = "decimal(18,6)")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    public EnumInventoryStatus Status { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    public string Uom { get; set; }
+
+    #endregion
+
+    #region 请求信息
+
+    /// <summary>
+    ///     请求库位
+    /// </summary>
+    public string RequestLocationCode { get; set; }
+
+    /// <summary>
+    ///     到库区
+    /// </summary>
+    public string RequestLocationArea { get; set; }
+
+    /// <summary>
+    ///     到库位组
+    /// </summary>
+    public string RequestLocationGroup { get; set; }
+
+    /// <summary>
+    ///     到ERP库位
+    /// </summary>
+    public string RequestLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     到仓库
+    /// </summary>
+    public string RequestWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     在途库库位
+    /// </summary>
+    public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    ///     生产线
+    /// </summary>
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    ///     位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    ///     推荐的类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
+    /// <summary>
+    ///     需求数量
+    /// </summary>
+    public decimal RequestQty { get; set; }
+
+    #endregion
+
+    #region 推荐来源
+
+    /// <summary>
+    ///     推荐来源托标签
+    /// </summary>
+    public string RecommendFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源箱标签
+    /// </summary>
+    public string RecommendFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次供应商批次
+    /// </summary>
+    public string RecommendFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次到货时间
+    /// </summary>
+    public DateTime RecommendFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次生产时间
+    /// </summary>
+    public DateTime RecommendFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次过期时间
+    /// </summary>
+    public DateTime RecommendFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次排序
+    /// </summary>
+    public string RecommendFromLot { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位
+    /// </summary>
+    public string RecommendFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源库区
+    /// </summary>
+    public string RecommendFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位组
+    /// </summary>
+    public string RecommendFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐来源ERP库位
+    /// </summary>
+    public string RecommendFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源仓库
+    /// </summary>
+    public string RecommendFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源数量
+    /// </summary>
+    public decimal RecommendFromQty { get; set; }
+
+    #endregion
+
+    #region 推荐目标
+
+    /// <summary>
+    ///     推荐目标托标签
+    /// </summary>
+    public string RecommendToContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标箱标签
+    /// </summary>
+    public string RecommendToPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次供应商批次
+    /// </summary>
+    public string RecommendToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次到货时间
+    /// </summary>
+    public DateTime RecommendToArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次生产时间
+    /// </summary>
+    public DateTime RecommendToProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次过期时间
+    /// </summary>
+    public DateTime RecommendToExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次排序
+    /// </summary>
+    public string RecommendToLot { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位
+    /// </summary>
+    public string RecommendToLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标库区
+    /// </summary>
+    public string RecommendToLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位组
+    /// </summary>
+    public string RecommendToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐目标ERP库位
+    /// </summary>
+    public string RecommendToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标仓库
+    /// </summary>
+    public string RecommendToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标数量
+    /// </summary>
+    public decimal RecommendToQty { get; set; }
+
+    #endregion
+
+    #region 库移来源
+
+    /// <summary>
+    ///     库移来源托标签
+    /// </summary>
+    public string TransferLibFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移来源箱标签
+    /// </summary>
+    public string TransferLibFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移来源批次供应商批次
+    /// </summary>
+    public string TransferLibFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移来源批次到货时间
+    /// </summary>
+    public DateTime TransferLibFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次生产时间
+    /// </summary>
+    public DateTime TransferLibFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次过期时间
+    /// </summary>
+    public DateTime TransferLibFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次排序
+    /// </summary>
+    public string TransferLibFromLot { get; set; }
+
+    /// <summary>
+    ///     库移来源库位
+    /// </summary>
+    public string TransferLibFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移来源库区
+    /// </summary>
+    public string TransferLibFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移来源库位组
+    /// </summary>
+    public string TransferLibFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移来源ERP库位
+    /// </summary>
+    public string TransferLibFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移来源仓库
+    /// </summary>
+    public string TransferLibFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移来源数量
+    /// </summary>
+    public decimal TransferLibFromQty { get; set; }
+
+    #endregion
+
+    #region 库移目标
+
+    /// <summary>
+    ///     库移目标托标签
+    /// </summary>
+    public string TransferLibToContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移目标箱标签
+    /// </summary>
+    public string TransferLibToPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移目标批次供应商批次
+    /// </summary>
+    public string TransferLibToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移目标批次到货时间
+    /// </summary>
+    public DateTime TransferLibToArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次生产时间
+    /// </summary>
+    public DateTime TransferLibToProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次过期时间
+    /// </summary>
+    public DateTime TransferLibToExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次排序
+    /// </summary>
+    public string TransferLibToLot { get; set; }
+
+    /// <summary>
+    ///     库移目标库位
+    /// </summary>
+    public string TransferLibToLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移目标库区
+    /// </summary>
+    public string TransferLibToLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移目标库位组
+    /// </summary>
+    public string TransferLibToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移目标ERP库位
+    /// </summary>
+    public string TransferLibToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移目标仓库
+    /// </summary>
+    public string TransferLibToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移目标数量
+    /// </summary>
+    public decimal TransferLibToQty { get; set; }
+
+    #endregion
+
+    #region 实际来源
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledFromLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledFromQty { get; set; }
+
+    #endregion
+
+    #region 实际目标
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledToContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledToPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledToArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledToProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledToExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledToLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledToLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledToLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledToQty { get; set; }
+
+    #endregion
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteEditInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteEditInput.cs

@@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class AssembleNoteEditInput : SfsStoreCreateOrUpdateInputBase
+public class AssembleIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase
 {
     #region Base
     /// <summary>
@@ -32,7 +32,7 @@ public class AssembleNoteEditInput : SfsStoreCreateOrUpdateInputBase
     /// 明细列表
     /// </summary>
     [Display(Name = "明细列表")]
-    public List<AssembleNoteDetailInput> Details { get; set; }
+    public List<AssembleIssueNoteDetailInput> Details { get; set; }
 
     /// <summary>
     /// 请求号码

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteImportInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteImportInput.cs

@@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class AssembleNoteImportInput : SfsStoreImportInputBase, IHasJobNumber, IHasRequestNumber
+public class AssembleIssueNoteImportInput : SfsStoreImportInputBase, IHasJobNumber, IHasRequestNumber
 {
     /// <summary>
     /// 任务ID

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/AssembleNotePermissions.cs

@@ -1,30 +0,0 @@
-using Volo.Abp.Authorization.Permissions;
-using Win_in.Sfs.Wms.Store.Domain;
-
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
-
-public static class AssembleNotePermissions
-{
-
-    public const string Default = StorePermissions.GroupName + "." + nameof(AssembleNote);
-    public const string Create = Default + "." + StorePermissions.CreateStr;
-    public const string Update = Default + "." + StorePermissions.UpdateStr;
-    public const string Delete = Default + "." + StorePermissions.DeleteStr;
-
-    //自动发料记录
-    public const string AutoAssembleNote = StorePermissions.GroupName + "." + nameof(AutoAssembleNote);
-
-    //直接发料
-    public const string DirectAssembleNote = StorePermissions.GroupName + "." + nameof(DirectAssembleNote);
-
-    public static void AddAssembleNotePermission(this PermissionGroupDefinition permissionGroup)
-    {
-        var AssembleNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleNote)));
-        AssembleNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
-        AssembleNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
-        AssembleNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
-
-        permissionGroup.AddPermission(AutoAssembleNote, StorePermissionDefinitionProvider.L(nameof(AutoAssembleNote)));
-        permissionGroup.AddPermission(DirectAssembleNote, StorePermissionDefinitionProvider.L(nameof(DirectAssembleNote)));
-    }
-}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/DTOs/AssembleNoteDetailDTO.cs

@@ -1,519 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Win_in.Sfs.Shared.Application.Contracts;
-using Win_in.Sfs.Shared.Domain.Shared;
-
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
-
-public class AssembleNoteDetailDTO : SfsDetailDTOBase
-{
-    #region 库存基础信息
-
-    /// <summary>
-    ///     物品代码
-    /// </summary>
-    public string ItemCode { get; set; }
-
-    /// <summary>
-    ///     物品名称
-    /// </summary>
-    public string ItemName { get; set; }
-
-    /// <summary>
-    ///     物品描述1
-    /// </summary>
-    public string ItemDesc1 { get; set; }
-
-    /// <summary>
-    ///     物品描述2
-    /// </summary>
-    public string ItemDesc2 { get; set; }
-
-    /// <summary>
-    ///     标包数量
-    /// </summary>
-    [Display(Name = "标包数量")]
-    [Column(TypeName = "decimal(18,6)")]
-    public decimal StdPackQty { get; set; }
-
-    /// <summary>
-    ///     库存状态
-    /// </summary>
-    public EnumInventoryStatus Status { get; set; }
-
-    /// <summary>
-    ///     计量单位
-    /// </summary>
-    public string Uom { get; set; }
-
-    #endregion
-
-    #region 请求信息
-
-    /// <summary>
-    ///     请求库位
-    /// </summary>
-    public string RequestLocationCode { get; set; }
-
-    /// <summary>
-    ///     到库区
-    /// </summary>
-    public string RequestLocationArea { get; set; }
-
-    /// <summary>
-    ///     到库位组
-    /// </summary>
-    public string RequestLocationGroup { get; set; }
-
-    /// <summary>
-    ///     到ERP库位
-    /// </summary>
-    public string RequestLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     到仓库
-    /// </summary>
-    public string RequestWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     在途库库位
-    /// </summary>
-    public string OnTheWayLocationCode { get; set; }
-
-    /// <summary>
-    ///     生产线
-    /// </summary>
-    public string ProdLine { get; set; }
-
-    /// <summary>
-    ///     位置码
-    /// </summary>
-    public string PositionCode { get; set; }
-
-    /// <summary>
-    ///     推荐的类型
-    /// </summary>
-    public EnumRecommendType RecommendType { get; set; }
-
-    /// <summary>
-    ///     需求数量
-    /// </summary>
-    public decimal RequestQty { get; set; }
-
-    #endregion
-
-    #region 推荐来源
-
-    /// <summary>
-    ///     推荐来源托标签
-    /// </summary>
-    public string RecommendFromContainerCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源箱标签
-    /// </summary>
-    public string RecommendFromPackingCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次供应商批次
-    /// </summary>
-    public string RecommendFromSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次到货时间
-    /// </summary>
-    public DateTime RecommendFromArriveDate { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次生产时间
-    /// </summary>
-    public DateTime RecommendFromProduceDate { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次过期时间
-    /// </summary>
-    public DateTime RecommendFromExpireDate { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次排序
-    /// </summary>
-    public string RecommendFromLot { get; set; }
-
-    /// <summary>
-    ///     推荐来源库位
-    /// </summary>
-    public string RecommendFromLocationCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源库区
-    /// </summary>
-    public string RecommendFromLocationArea { get; set; }
-
-    /// <summary>
-    ///     推荐来源库位组
-    /// </summary>
-    public string RecommendFromLocationGroup { get; set; }
-
-    /// <summary>
-    ///     推荐来源ERP库位
-    /// </summary>
-    public string RecommendFromLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源仓库
-    /// </summary>
-    public string RecommendFromWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源数量
-    /// </summary>
-    public decimal RecommendFromQty { get; set; }
-
-    #endregion
-
-    #region 推荐目标
-
-    /// <summary>
-    ///     推荐目标托标签
-    /// </summary>
-    public string RecommendToContainerCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标箱标签
-    /// </summary>
-    public string RecommendToPackingCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次供应商批次
-    /// </summary>
-    public string RecommendToSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次到货时间
-    /// </summary>
-    public DateTime RecommendToArriveDate { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次生产时间
-    /// </summary>
-    public DateTime RecommendToProduceDate { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次过期时间
-    /// </summary>
-    public DateTime RecommendToExpireDate { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次排序
-    /// </summary>
-    public string RecommendToLot { get; set; }
-
-    /// <summary>
-    ///     推荐目标库位
-    /// </summary>
-    public string RecommendToLocationCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标库区
-    /// </summary>
-    public string RecommendToLocationArea { get; set; }
-
-    /// <summary>
-    ///     推荐目标库位组
-    /// </summary>
-    public string RecommendToLocationGroup { get; set; }
-
-    /// <summary>
-    ///     推荐目标ERP库位
-    /// </summary>
-    public string RecommendToLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标仓库
-    /// </summary>
-    public string RecommendToWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标数量
-    /// </summary>
-    public decimal RecommendToQty { get; set; }
-
-    #endregion
-
-    #region 库移来源
-
-    /// <summary>
-    ///     库移来源托标签
-    /// </summary>
-    public string TransferLibFromContainerCode { get; set; }
-
-    /// <summary>
-    ///     库移来源箱标签
-    /// </summary>
-    public string TransferLibFromPackingCode { get; set; }
-
-    /// <summary>
-    ///     库移来源批次供应商批次
-    /// </summary>
-    public string TransferLibFromSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     库移来源批次到货时间
-    /// </summary>
-    public DateTime TransferLibFromArriveDate { get; set; }
-
-    /// <summary>
-    ///     库移来源批次生产时间
-    /// </summary>
-    public DateTime TransferLibFromProduceDate { get; set; }
-
-    /// <summary>
-    ///     库移来源批次过期时间
-    /// </summary>
-    public DateTime TransferLibFromExpireDate { get; set; }
-
-    /// <summary>
-    ///     库移来源批次排序
-    /// </summary>
-    public string TransferLibFromLot { get; set; }
-
-    /// <summary>
-    ///     库移来源库位
-    /// </summary>
-    public string TransferLibFromLocationCode { get; set; }
-
-    /// <summary>
-    ///     库移来源库区
-    /// </summary>
-    public string TransferLibFromLocationArea { get; set; }
-
-    /// <summary>
-    ///     库移来源库位组
-    /// </summary>
-    public string TransferLibFromLocationGroup { get; set; }
-
-    /// <summary>
-    ///     库移来源ERP库位
-    /// </summary>
-    public string TransferLibFromLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     库移来源仓库
-    /// </summary>
-    public string TransferLibFromWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     库移来源数量
-    /// </summary>
-    public decimal TransferLibFromQty { get; set; }
-
-    #endregion
-
-    #region 库移目标
-
-    /// <summary>
-    ///     库移目标托标签
-    /// </summary>
-    public string TransferLibToContainerCode { get; set; }
-
-    /// <summary>
-    ///     库移目标箱标签
-    /// </summary>
-    public string TransferLibToPackingCode { get; set; }
-
-    /// <summary>
-    ///     库移目标批次供应商批次
-    /// </summary>
-    public string TransferLibToSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     库移目标批次到货时间
-    /// </summary>
-    public DateTime TransferLibToArriveDate { get; set; }
-
-    /// <summary>
-    ///     库移目标批次生产时间
-    /// </summary>
-    public DateTime TransferLibToProduceDate { get; set; }
-
-    /// <summary>
-    ///     库移目标批次过期时间
-    /// </summary>
-    public DateTime TransferLibToExpireDate { get; set; }
-
-    /// <summary>
-    ///     库移目标批次排序
-    /// </summary>
-    public string TransferLibToLot { get; set; }
-
-    /// <summary>
-    ///     库移目标库位
-    /// </summary>
-    public string TransferLibToLocationCode { get; set; }
-
-    /// <summary>
-    ///     库移目标库区
-    /// </summary>
-    public string TransferLibToLocationArea { get; set; }
-
-    /// <summary>
-    ///     库移目标库位组
-    /// </summary>
-    public string TransferLibToLocationGroup { get; set; }
-
-    /// <summary>
-    ///     库移目标ERP库位
-    /// </summary>
-    public string TransferLibToLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     库移目标仓库
-    /// </summary>
-    public string TransferLibToWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     库移目标数量
-    /// </summary>
-    public decimal TransferLibToQty { get; set; }
-
-    #endregion
-
-    #region 实际来源
-
-    /// <summary>
-    ///     实际目标托标签
-    /// </summary>
-    public string HandledFromContainerCode { get; set; }
-
-    /// <summary>
-    ///     实际箱标签
-    /// </summary>
-    public string HandledFromPackingCode { get; set; }
-
-    /// <summary>
-    ///     实际批次供应商批次
-    /// </summary>
-    public string HandledFromSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     实际批次到货时间
-    /// </summary>
-    public DateTime HandledFromArriveDate { get; set; }
-
-    /// <summary>
-    ///     实际批次生产时间
-    /// </summary>
-    public DateTime HandledFromProduceDate { get; set; }
-
-    /// <summary>
-    ///     实际批次过期时间
-    /// </summary>
-    public DateTime HandledFromExpireDate { get; set; }
-
-    /// <summary>
-    ///     实际批次排序
-    /// </summary>
-    public string HandledFromLot { get; set; }
-
-    /// <summary>
-    ///     实际库位
-    /// </summary>
-    public string HandledFromLocationCode { get; set; }
-
-    /// <summary>
-    ///     实际库区
-    /// </summary>
-    public string HandledFromLocationArea { get; set; }
-
-    /// <summary>
-    ///     实际库位组
-    /// </summary>
-    public string HandledFromLocationGroup { get; set; }
-
-    /// <summary>
-    ///     实际ERP库位
-    /// </summary>
-    public string HandledFromLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     实际仓库
-    /// </summary>
-    public string HandledFromWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     实际数量
-    /// </summary>
-    public decimal HandledFromQty { get; set; }
-
-    #endregion
-
-    #region 实际目标
-
-    /// <summary>
-    ///     实际目标托标签
-    /// </summary>
-    public string HandledToContainerCode { get; set; }
-
-    /// <summary>
-    ///     实际箱标签
-    /// </summary>
-    public string HandledToPackingCode { get; set; }
-
-    /// <summary>
-    ///     实际批次供应商批次
-    /// </summary>
-    public string HandledToSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     实际批次到货时间
-    /// </summary>
-    public DateTime HandledToArriveDate { get; set; }
-
-    /// <summary>
-    ///     实际批次生产时间
-    /// </summary>
-    public DateTime HandledToProduceDate { get; set; }
-
-    /// <summary>
-    ///     实际批次过期时间
-    /// </summary>
-    public DateTime HandledToExpireDate { get; set; }
-
-    /// <summary>
-    ///     实际批次排序
-    /// </summary>
-    public string HandledToLot { get; set; }
-
-    /// <summary>
-    ///     实际库位
-    /// </summary>
-    public string HandledToLocationCode { get; set; }
-
-    /// <summary>
-    ///     实际库区
-    /// </summary>
-    public string HandledToLocationArea { get; set; }
-
-    /// <summary>
-    ///     实际库位组
-    /// </summary>
-    public string HandledToLocationGroup { get; set; }
-
-    /// <summary>
-    ///     实际ERP库位
-    /// </summary>
-    public string HandledToLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     实际仓库
-    /// </summary>
-    public string HandledToWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     实际数量
-    /// </summary>
-    public decimal HandledToQty { get; set; }
-
-    #endregion
-}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/IAssembleNoteAppService.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
-
-public interface IAssembleNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase<AssembleNoteDTO, SfsStoreRequestInputBase, AssembleNoteDetailDTO, SfsStoreRequestInputBase>
-{
-    Task<AssembleNoteDTO> CreateAsync(AssembleNoteEditInput input);
-
-    Task<AssembleNoteDTO> ConfirmAsync(Guid id);
-
-    Task<AssembleNoteDTO> ConfirmAsync(string number);
-
-    Task<PagedResultDto<AssembleNoteDTO>> GetListByTypeAsync(SfsStoreRequestInputBase requestInput,
-        string requestType, bool includeDetails = false, CancellationToken cancellationToken = default);
-
-    Task<List<AssembleNoteDTO>> GetListUnConfirmedByTypeAsync(string requestType);
-}

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

@@ -1,519 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Win_in.Sfs.Shared.Application.Contracts;
-using Win_in.Sfs.Shared.Domain.Shared;
-
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
-
-public class AssembleNoteDetailInput : SfsDetailInputBase
-{
-    #region 库存基础信息
-
-    /// <summary>
-    ///     物品代码
-    /// </summary>
-    public string ItemCode { get; set; }
-
-    /// <summary>
-    ///     物品名称
-    /// </summary>
-    public string ItemName { get; set; }
-
-    /// <summary>
-    ///     物品描述1
-    /// </summary>
-    public string ItemDesc1 { get; set; }
-
-    /// <summary>
-    ///     物品描述2
-    /// </summary>
-    public string ItemDesc2 { get; set; }
-
-    /// <summary>
-    ///     标包数量
-    /// </summary>
-    [Display(Name = "标包数量")]
-    [Column(TypeName = "decimal(18,6)")]
-    public decimal StdPackQty { get; set; }
-
-    /// <summary>
-    ///     库存状态
-    /// </summary>
-    public EnumInventoryStatus Status { get; set; }
-
-    /// <summary>
-    ///     计量单位
-    /// </summary>
-    public string Uom { get; set; }
-
-    #endregion
-
-    #region 请求信息
-
-    /// <summary>
-    ///     请求库位
-    /// </summary>
-    public string RequestLocationCode { get; set; }
-
-    /// <summary>
-    ///     到库区
-    /// </summary>
-    public string RequestLocationArea { get; set; }
-
-    /// <summary>
-    ///     到库位组
-    /// </summary>
-    public string RequestLocationGroup { get; set; }
-
-    /// <summary>
-    ///     到ERP库位
-    /// </summary>
-    public string RequestLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     到仓库
-    /// </summary>
-    public string RequestWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     在途库库位
-    /// </summary>
-    public string OnTheWayLocationCode { get; set; }
-
-    /// <summary>
-    ///     生产线
-    /// </summary>
-    public string ProdLine { get; set; }
-
-    /// <summary>
-    ///     位置码
-    /// </summary>
-    public string PositionCode { get; set; }
-
-    /// <summary>
-    ///     推荐的类型
-    /// </summary>
-    public EnumRecommendType RecommendType { get; set; }
-
-    /// <summary>
-    ///     需求数量
-    /// </summary>
-    public decimal RequestQty { get; set; }
-
-    #endregion
-
-    #region 推荐来源
-
-    /// <summary>
-    ///     推荐来源托标签
-    /// </summary>
-    public string RecommendFromContainerCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源箱标签
-    /// </summary>
-    public string RecommendFromPackingCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次供应商批次
-    /// </summary>
-    public string RecommendFromSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次到货时间
-    /// </summary>
-    public DateTime RecommendFromArriveDate { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次生产时间
-    /// </summary>
-    public DateTime RecommendFromProduceDate { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次过期时间
-    /// </summary>
-    public DateTime RecommendFromExpireDate { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次排序
-    /// </summary>
-    public string RecommendFromLot { get; set; }
-
-    /// <summary>
-    ///     推荐来源库位
-    /// </summary>
-    public string RecommendFromLocationCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源库区
-    /// </summary>
-    public string RecommendFromLocationArea { get; set; }
-
-    /// <summary>
-    ///     推荐来源库位组
-    /// </summary>
-    public string RecommendFromLocationGroup { get; set; }
-
-    /// <summary>
-    ///     推荐来源ERP库位
-    /// </summary>
-    public string RecommendFromLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源仓库
-    /// </summary>
-    public string RecommendFromWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源数量
-    /// </summary>
-    public decimal RecommendFromQty { get; set; }
-
-    #endregion
-
-    #region 推荐目标
-
-    /// <summary>
-    ///     推荐目标托标签
-    /// </summary>
-    public string RecommendToContainerCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标箱标签
-    /// </summary>
-    public string RecommendToPackingCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次供应商批次
-    /// </summary>
-    public string RecommendToSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次到货时间
-    /// </summary>
-    public DateTime RecommendToArriveDate { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次生产时间
-    /// </summary>
-    public DateTime RecommendToProduceDate { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次过期时间
-    /// </summary>
-    public DateTime RecommendToExpireDate { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次排序
-    /// </summary>
-    public string RecommendToLot { get; set; }
-
-    /// <summary>
-    ///     推荐目标库位
-    /// </summary>
-    public string RecommendToLocationCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标库区
-    /// </summary>
-    public string RecommendToLocationArea { get; set; }
-
-    /// <summary>
-    ///     推荐目标库位组
-    /// </summary>
-    public string RecommendToLocationGroup { get; set; }
-
-    /// <summary>
-    ///     推荐目标ERP库位
-    /// </summary>
-    public string RecommendToLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标仓库
-    /// </summary>
-    public string RecommendToWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标数量
-    /// </summary>
-    public decimal RecommendToQty { get; set; }
-
-    #endregion
-
-    #region 库移来源
-
-    /// <summary>
-    ///     库移来源托标签
-    /// </summary>
-    public string TransferLibFromContainerCode { get; set; }
-
-    /// <summary>
-    ///     库移来源箱标签
-    /// </summary>
-    public string TransferLibFromPackingCode { get; set; }
-
-    /// <summary>
-    ///     库移来源批次供应商批次
-    /// </summary>
-    public string TransferLibFromSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     库移来源批次到货时间
-    /// </summary>
-    public DateTime TransferLibFromArriveDate { get; set; }
-
-    /// <summary>
-    ///     库移来源批次生产时间
-    /// </summary>
-    public DateTime TransferLibFromProduceDate { get; set; }
-
-    /// <summary>
-    ///     库移来源批次过期时间
-    /// </summary>
-    public DateTime TransferLibFromExpireDate { get; set; }
-
-    /// <summary>
-    ///     库移来源批次排序
-    /// </summary>
-    public string TransferLibFromLot { get; set; }
-
-    /// <summary>
-    ///     库移来源库位
-    /// </summary>
-    public string TransferLibFromLocationCode { get; set; }
-
-    /// <summary>
-    ///     库移来源库区
-    /// </summary>
-    public string TransferLibFromLocationArea { get; set; }
-
-    /// <summary>
-    ///     库移来源库位组
-    /// </summary>
-    public string TransferLibFromLocationGroup { get; set; }
-
-    /// <summary>
-    ///     库移来源ERP库位
-    /// </summary>
-    public string TransferLibFromLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     库移来源仓库
-    /// </summary>
-    public string TransferLibFromWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     库移来源数量
-    /// </summary>
-    public decimal TransferLibFromQty { get; set; }
-
-    #endregion
-
-    #region 库移目标
-
-    /// <summary>
-    ///     库移目标托标签
-    /// </summary>
-    public string TransferLibToContainerCode { get; set; }
-
-    /// <summary>
-    ///     库移目标箱标签
-    /// </summary>
-    public string TransferLibToPackingCode { get; set; }
-
-    /// <summary>
-    ///     库移目标批次供应商批次
-    /// </summary>
-    public string TransferLibToSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     库移目标批次到货时间
-    /// </summary>
-    public DateTime TransferLibToArriveDate { get; set; }
-
-    /// <summary>
-    ///     库移目标批次生产时间
-    /// </summary>
-    public DateTime TransferLibToProduceDate { get; set; }
-
-    /// <summary>
-    ///     库移目标批次过期时间
-    /// </summary>
-    public DateTime TransferLibToExpireDate { get; set; }
-
-    /// <summary>
-    ///     库移目标批次排序
-    /// </summary>
-    public string TransferLibToLot { get; set; }
-
-    /// <summary>
-    ///     库移目标库位
-    /// </summary>
-    public string TransferLibToLocationCode { get; set; }
-
-    /// <summary>
-    ///     库移目标库区
-    /// </summary>
-    public string TransferLibToLocationArea { get; set; }
-
-    /// <summary>
-    ///     库移目标库位组
-    /// </summary>
-    public string TransferLibToLocationGroup { get; set; }
-
-    /// <summary>
-    ///     库移目标ERP库位
-    /// </summary>
-    public string TransferLibToLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     库移目标仓库
-    /// </summary>
-    public string TransferLibToWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     库移目标数量
-    /// </summary>
-    public decimal TransferLibToQty { get; set; }
-
-    #endregion
-
-    #region 实际来源
-
-    /// <summary>
-    ///     实际目标托标签
-    /// </summary>
-    public string HandledFromContainerCode { get; set; }
-
-    /// <summary>
-    ///     实际箱标签
-    /// </summary>
-    public string HandledFromPackingCode { get; set; }
-
-    /// <summary>
-    ///     实际批次供应商批次
-    /// </summary>
-    public string HandledFromSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     实际批次到货时间
-    /// </summary>
-    public DateTime HandledFromArriveDate { get; set; }
-
-    /// <summary>
-    ///     实际批次生产时间
-    /// </summary>
-    public DateTime HandledFromProduceDate { get; set; }
-
-    /// <summary>
-    ///     实际批次过期时间
-    /// </summary>
-    public DateTime HandledFromExpireDate { get; set; }
-
-    /// <summary>
-    ///     实际批次排序
-    /// </summary>
-    public string HandledFromLot { get; set; }
-
-    /// <summary>
-    ///     实际库位
-    /// </summary>
-    public string HandledFromLocationCode { get; set; }
-
-    /// <summary>
-    ///     实际库区
-    /// </summary>
-    public string HandledFromLocationArea { get; set; }
-
-    /// <summary>
-    ///     实际库位组
-    /// </summary>
-    public string HandledFromLocationGroup { get; set; }
-
-    /// <summary>
-    ///     实际ERP库位
-    /// </summary>
-    public string HandledFromLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     实际仓库
-    /// </summary>
-    public string HandledFromWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     实际数量
-    /// </summary>
-    public decimal HandledFromQty { get; set; }
-
-    #endregion
-
-    #region 实际目标
-
-    /// <summary>
-    ///     实际目标托标签
-    /// </summary>
-    public string HandledToContainerCode { get; set; }
-
-    /// <summary>
-    ///     实际箱标签
-    /// </summary>
-    public string HandledToPackingCode { get; set; }
-
-    /// <summary>
-    ///     实际批次供应商批次
-    /// </summary>
-    public string HandledToSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     实际批次到货时间
-    /// </summary>
-    public DateTime HandledToArriveDate { get; set; }
-
-    /// <summary>
-    ///     实际批次生产时间
-    /// </summary>
-    public DateTime HandledToProduceDate { get; set; }
-
-    /// <summary>
-    ///     实际批次过期时间
-    /// </summary>
-    public DateTime HandledToExpireDate { get; set; }
-
-    /// <summary>
-    ///     实际批次排序
-    /// </summary>
-    public string HandledToLot { get; set; }
-
-    /// <summary>
-    ///     实际库位
-    /// </summary>
-    public string HandledToLocationCode { get; set; }
-
-    /// <summary>
-    ///     实际库区
-    /// </summary>
-    public string HandledToLocationArea { get; set; }
-
-    /// <summary>
-    ///     实际库位组
-    /// </summary>
-    public string HandledToLocationGroup { get; set; }
-
-    /// <summary>
-    ///     实际ERP库位
-    /// </summary>
-    public string HandledToLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     实际仓库
-    /// </summary>
-    public string HandledToWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     实际数量
-    /// </summary>
-    public decimal HandledToQty { get; set; }
-
-    #endregion
-}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/DTOs/InjectionNoteDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/DTOs/InjectionIssueNoteDTO.cs

@@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class InjectionNoteDTO : SfsStoreDTOBase<InjectionNoteDetailDTO>, IHasJobNumber, IHasRequestNumber
+public class InjectionIssueNoteDTO : SfsStoreDTOBase<InjectionIssueNoteDetailDTO>, IHasJobNumber, IHasRequestNumber
 {
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionJobDetailInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/DTOs/InjectionIssueNoteDetailDTO.cs

@@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class InjectionJobDetailInput : SfsDetailInputBase
+public class InjectionIssueNoteDetailDTO : SfsDetailDTOBase
 {
     #region 库存基础信息
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/IInjectionIssueNoteAppService.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public interface IInjectionIssueNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase<InjectionIssueNoteDTO, SfsStoreRequestInputBase, InjectionIssueNoteDetailDTO, SfsStoreRequestInputBase>
+{
+    Task<InjectionIssueNoteDTO> CreateAsync(InjectionIssueNoteEditInput input);
+
+    Task<InjectionIssueNoteDTO> ConfirmAsync(Guid id);
+
+    Task<InjectionIssueNoteDTO> ConfirmAsync(string number);
+
+    Task<PagedResultDto<InjectionIssueNoteDTO>> GetListByTypeAsync(SfsStoreRequestInputBase requestInput,
+        string requestType, bool includeDetails = false, CancellationToken cancellationToken = default);
+
+    Task<List<InjectionIssueNoteDTO>> GetListUnConfirmedByTypeAsync(string requestType);
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/InjectionNotePermissions.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNotePermissions.cs

@@ -3,28 +3,28 @@ using Win_in.Sfs.Wms.Store.Domain;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public static class InjectionNotePermissions
+public static class InjectionIssueNotePermissions
 {
 
-    public const string Default = StorePermissions.GroupName + "." + nameof(InjectionNote);
+    public const string Default = StorePermissions.GroupName + "." + nameof(InjectionIssueNote);
     public const string Create = Default + "." + StorePermissions.CreateStr;
     public const string Update = Default + "." + StorePermissions.UpdateStr;
     public const string Delete = Default + "." + StorePermissions.DeleteStr;
 
     //自动发料记录
-    public const string AutoInjectionNote = StorePermissions.GroupName + "." + nameof(AutoInjectionNote);
+    public const string AutoInjectionIssueNote = StorePermissions.GroupName + "." + nameof(AutoInjectionIssueNote);
 
     //直接发料
-    public const string DirectInjectionNote = StorePermissions.GroupName + "." + nameof(DirectInjectionNote);
+    public const string DirectInjectionIssueNote = StorePermissions.GroupName + "." + nameof(DirectInjectionIssueNote);
 
-    public static void AddInjectionNotePermission(this PermissionGroupDefinition permissionGroup)
+    public static void AddInjectionIssueNotePermission(this PermissionGroupDefinition permissionGroup)
     {
-        var injectionNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionNote)));
+        var injectionNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionIssueNote)));
         injectionNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
         injectionNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
         injectionNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
 
-        permissionGroup.AddPermission(AutoInjectionNote, StorePermissionDefinitionProvider.L(nameof(AutoInjectionNote)));
+        permissionGroup.AddPermission(AutoInjectionIssueNote, StorePermissionDefinitionProvider.L(nameof(AutoInjectionIssueNote)));
-        permissionGroup.AddPermission(DirectInjectionNote, StorePermissionDefinitionProvider.L(nameof(DirectInjectionNote)));
+        permissionGroup.AddPermission(DirectInjectionIssueNote, StorePermissionDefinitionProvider.L(nameof(DirectInjectionIssueNote)));
     }
 }

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

@@ -0,0 +1,519 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class InjectionIssueNoteDetailInput : SfsDetailInputBase
+{
+    #region 库存基础信息
+
+    /// <summary>
+    ///     物品代码
+    /// </summary>
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    [Column(TypeName = "decimal(18,6)")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    public EnumInventoryStatus Status { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    public string Uom { get; set; }
+
+    #endregion
+
+    #region 请求信息
+
+    /// <summary>
+    ///     请求库位
+    /// </summary>
+    public string RequestLocationCode { get; set; }
+
+    /// <summary>
+    ///     到库区
+    /// </summary>
+    public string RequestLocationArea { get; set; }
+
+    /// <summary>
+    ///     到库位组
+    /// </summary>
+    public string RequestLocationGroup { get; set; }
+
+    /// <summary>
+    ///     到ERP库位
+    /// </summary>
+    public string RequestLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     到仓库
+    /// </summary>
+    public string RequestWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     在途库库位
+    /// </summary>
+    public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    ///     生产线
+    /// </summary>
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    ///     位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    ///     推荐的类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
+    /// <summary>
+    ///     需求数量
+    /// </summary>
+    public decimal RequestQty { get; set; }
+
+    #endregion
+
+    #region 推荐来源
+
+    /// <summary>
+    ///     推荐来源托标签
+    /// </summary>
+    public string RecommendFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源箱标签
+    /// </summary>
+    public string RecommendFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次供应商批次
+    /// </summary>
+    public string RecommendFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次到货时间
+    /// </summary>
+    public DateTime RecommendFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次生产时间
+    /// </summary>
+    public DateTime RecommendFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次过期时间
+    /// </summary>
+    public DateTime RecommendFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次排序
+    /// </summary>
+    public string RecommendFromLot { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位
+    /// </summary>
+    public string RecommendFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源库区
+    /// </summary>
+    public string RecommendFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位组
+    /// </summary>
+    public string RecommendFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐来源ERP库位
+    /// </summary>
+    public string RecommendFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源仓库
+    /// </summary>
+    public string RecommendFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源数量
+    /// </summary>
+    public decimal RecommendFromQty { get; set; }
+
+    #endregion
+
+    #region 推荐目标
+
+    /// <summary>
+    ///     推荐目标托标签
+    /// </summary>
+    public string RecommendToContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标箱标签
+    /// </summary>
+    public string RecommendToPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次供应商批次
+    /// </summary>
+    public string RecommendToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次到货时间
+    /// </summary>
+    public DateTime RecommendToArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次生产时间
+    /// </summary>
+    public DateTime RecommendToProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次过期时间
+    /// </summary>
+    public DateTime RecommendToExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次排序
+    /// </summary>
+    public string RecommendToLot { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位
+    /// </summary>
+    public string RecommendToLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标库区
+    /// </summary>
+    public string RecommendToLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位组
+    /// </summary>
+    public string RecommendToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐目标ERP库位
+    /// </summary>
+    public string RecommendToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标仓库
+    /// </summary>
+    public string RecommendToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标数量
+    /// </summary>
+    public decimal RecommendToQty { get; set; }
+
+    #endregion
+
+    #region 库移来源
+
+    /// <summary>
+    ///     库移来源托标签
+    /// </summary>
+    public string TransferLibFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移来源箱标签
+    /// </summary>
+    public string TransferLibFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移来源批次供应商批次
+    /// </summary>
+    public string TransferLibFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移来源批次到货时间
+    /// </summary>
+    public DateTime TransferLibFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次生产时间
+    /// </summary>
+    public DateTime TransferLibFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次过期时间
+    /// </summary>
+    public DateTime TransferLibFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次排序
+    /// </summary>
+    public string TransferLibFromLot { get; set; }
+
+    /// <summary>
+    ///     库移来源库位
+    /// </summary>
+    public string TransferLibFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移来源库区
+    /// </summary>
+    public string TransferLibFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移来源库位组
+    /// </summary>
+    public string TransferLibFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移来源ERP库位
+    /// </summary>
+    public string TransferLibFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移来源仓库
+    /// </summary>
+    public string TransferLibFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移来源数量
+    /// </summary>
+    public decimal TransferLibFromQty { get; set; }
+
+    #endregion
+
+    #region 库移目标
+
+    /// <summary>
+    ///     库移目标托标签
+    /// </summary>
+    public string TransferLibToContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移目标箱标签
+    /// </summary>
+    public string TransferLibToPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移目标批次供应商批次
+    /// </summary>
+    public string TransferLibToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移目标批次到货时间
+    /// </summary>
+    public DateTime TransferLibToArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次生产时间
+    /// </summary>
+    public DateTime TransferLibToProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次过期时间
+    /// </summary>
+    public DateTime TransferLibToExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次排序
+    /// </summary>
+    public string TransferLibToLot { get; set; }
+
+    /// <summary>
+    ///     库移目标库位
+    /// </summary>
+    public string TransferLibToLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移目标库区
+    /// </summary>
+    public string TransferLibToLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移目标库位组
+    /// </summary>
+    public string TransferLibToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移目标ERP库位
+    /// </summary>
+    public string TransferLibToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移目标仓库
+    /// </summary>
+    public string TransferLibToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移目标数量
+    /// </summary>
+    public decimal TransferLibToQty { get; set; }
+
+    #endregion
+
+    #region 实际来源
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledFromLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledFromQty { get; set; }
+
+    #endregion
+
+    #region 实际目标
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledToContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledToPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledToArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledToProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledToExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledToLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledToLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledToLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledToQty { get; set; }
+
+    #endregion
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/Inputs/InjectionNoteEditInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteEditInput.cs

@@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class InjectionNoteEditInput : SfsStoreCreateOrUpdateInputBase
+public class InjectionIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase
 {
     #region Base
     /// <summary>
@@ -32,7 +32,7 @@ public class InjectionNoteEditInput : SfsStoreCreateOrUpdateInputBase
     /// 明细列表
     /// </summary>
     [Display(Name = "明细列表")]
-    public List<InjectionNoteDetailInput> Details { get; set; }
+    public List<InjectionIssueNoteDetailInput> Details { get; set; }
 
     /// <summary>
     /// 请求号码

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/Inputs/InjectionNoteImportInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteImportInput.cs

@@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class InjectionNoteImportInput : SfsStoreImportInputBase, IHasJobNumber, IHasRequestNumber
+public class InjectionIssueNoteImportInput : SfsStoreImportInputBase, IHasJobNumber, IHasRequestNumber
 {
     /// <summary>
     /// 任务ID

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/DTOs/InjectionNoteDetailDTO.cs

@@ -1,519 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Win_in.Sfs.Shared.Application.Contracts;
-using Win_in.Sfs.Shared.Domain.Shared;
-
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
-
-public class InjectionNoteDetailDTO : SfsDetailDTOBase
-{
-    #region 库存基础信息
-
-    /// <summary>
-    ///     物品代码
-    /// </summary>
-    public string ItemCode { get; set; }
-
-    /// <summary>
-    ///     物品名称
-    /// </summary>
-    public string ItemName { get; set; }
-
-    /// <summary>
-    ///     物品描述1
-    /// </summary>
-    public string ItemDesc1 { get; set; }
-
-    /// <summary>
-    ///     物品描述2
-    /// </summary>
-    public string ItemDesc2 { get; set; }
-
-    /// <summary>
-    ///     标包数量
-    /// </summary>
-    [Display(Name = "标包数量")]
-    [Column(TypeName = "decimal(18,6)")]
-    public decimal StdPackQty { get; set; }
-
-    /// <summary>
-    ///     库存状态
-    /// </summary>
-    public EnumInventoryStatus Status { get; set; }
-
-    /// <summary>
-    ///     计量单位
-    /// </summary>
-    public string Uom { get; set; }
-
-    #endregion
-
-    #region 请求信息
-
-    /// <summary>
-    ///     请求库位
-    /// </summary>
-    public string RequestLocationCode { get; set; }
-
-    /// <summary>
-    ///     到库区
-    /// </summary>
-    public string RequestLocationArea { get; set; }
-
-    /// <summary>
-    ///     到库位组
-    /// </summary>
-    public string RequestLocationGroup { get; set; }
-
-    /// <summary>
-    ///     到ERP库位
-    /// </summary>
-    public string RequestLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     到仓库
-    /// </summary>
-    public string RequestWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     在途库库位
-    /// </summary>
-    public string OnTheWayLocationCode { get; set; }
-
-    /// <summary>
-    ///     生产线
-    /// </summary>
-    public string ProdLine { get; set; }
-
-    /// <summary>
-    ///     位置码
-    /// </summary>
-    public string PositionCode { get; set; }
-
-    /// <summary>
-    ///     推荐的类型
-    /// </summary>
-    public EnumRecommendType RecommendType { get; set; }
-
-    /// <summary>
-    ///     需求数量
-    /// </summary>
-    public decimal RequestQty { get; set; }
-
-    #endregion
-
-    #region 推荐来源
-
-    /// <summary>
-    ///     推荐来源托标签
-    /// </summary>
-    public string RecommendFromContainerCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源箱标签
-    /// </summary>
-    public string RecommendFromPackingCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次供应商批次
-    /// </summary>
-    public string RecommendFromSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次到货时间
-    /// </summary>
-    public DateTime RecommendFromArriveDate { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次生产时间
-    /// </summary>
-    public DateTime RecommendFromProduceDate { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次过期时间
-    /// </summary>
-    public DateTime RecommendFromExpireDate { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次排序
-    /// </summary>
-    public string RecommendFromLot { get; set; }
-
-    /// <summary>
-    ///     推荐来源库位
-    /// </summary>
-    public string RecommendFromLocationCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源库区
-    /// </summary>
-    public string RecommendFromLocationArea { get; set; }
-
-    /// <summary>
-    ///     推荐来源库位组
-    /// </summary>
-    public string RecommendFromLocationGroup { get; set; }
-
-    /// <summary>
-    ///     推荐来源ERP库位
-    /// </summary>
-    public string RecommendFromLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源仓库
-    /// </summary>
-    public string RecommendFromWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源数量
-    /// </summary>
-    public decimal RecommendFromQty { get; set; }
-
-    #endregion
-
-    #region 推荐目标
-
-    /// <summary>
-    ///     推荐目标托标签
-    /// </summary>
-    public string RecommendToContainerCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标箱标签
-    /// </summary>
-    public string RecommendToPackingCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次供应商批次
-    /// </summary>
-    public string RecommendToSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次到货时间
-    /// </summary>
-    public DateTime RecommendToArriveDate { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次生产时间
-    /// </summary>
-    public DateTime RecommendToProduceDate { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次过期时间
-    /// </summary>
-    public DateTime RecommendToExpireDate { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次排序
-    /// </summary>
-    public string RecommendToLot { get; set; }
-
-    /// <summary>
-    ///     推荐目标库位
-    /// </summary>
-    public string RecommendToLocationCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标库区
-    /// </summary>
-    public string RecommendToLocationArea { get; set; }
-
-    /// <summary>
-    ///     推荐目标库位组
-    /// </summary>
-    public string RecommendToLocationGroup { get; set; }
-
-    /// <summary>
-    ///     推荐目标ERP库位
-    /// </summary>
-    public string RecommendToLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标仓库
-    /// </summary>
-    public string RecommendToWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标数量
-    /// </summary>
-    public decimal RecommendToQty { get; set; }
-
-    #endregion
-
-    #region 库移来源
-
-    /// <summary>
-    ///     库移来源托标签
-    /// </summary>
-    public string TransferLibFromContainerCode { get; set; }
-
-    /// <summary>
-    ///     库移来源箱标签
-    /// </summary>
-    public string TransferLibFromPackingCode { get; set; }
-
-    /// <summary>
-    ///     库移来源批次供应商批次
-    /// </summary>
-    public string TransferLibFromSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     库移来源批次到货时间
-    /// </summary>
-    public DateTime TransferLibFromArriveDate { get; set; }
-
-    /// <summary>
-    ///     库移来源批次生产时间
-    /// </summary>
-    public DateTime TransferLibFromProduceDate { get; set; }
-
-    /// <summary>
-    ///     库移来源批次过期时间
-    /// </summary>
-    public DateTime TransferLibFromExpireDate { get; set; }
-
-    /// <summary>
-    ///     库移来源批次排序
-    /// </summary>
-    public string TransferLibFromLot { get; set; }
-
-    /// <summary>
-    ///     库移来源库位
-    /// </summary>
-    public string TransferLibFromLocationCode { get; set; }
-
-    /// <summary>
-    ///     库移来源库区
-    /// </summary>
-    public string TransferLibFromLocationArea { get; set; }
-
-    /// <summary>
-    ///     库移来源库位组
-    /// </summary>
-    public string TransferLibFromLocationGroup { get; set; }
-
-    /// <summary>
-    ///     库移来源ERP库位
-    /// </summary>
-    public string TransferLibFromLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     库移来源仓库
-    /// </summary>
-    public string TransferLibFromWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     库移来源数量
-    /// </summary>
-    public decimal TransferLibFromQty { get; set; }
-
-    #endregion
-
-    #region 库移目标
-
-    /// <summary>
-    ///     库移目标托标签
-    /// </summary>
-    public string TransferLibToContainerCode { get; set; }
-
-    /// <summary>
-    ///     库移目标箱标签
-    /// </summary>
-    public string TransferLibToPackingCode { get; set; }
-
-    /// <summary>
-    ///     库移目标批次供应商批次
-    /// </summary>
-    public string TransferLibToSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     库移目标批次到货时间
-    /// </summary>
-    public DateTime TransferLibToArriveDate { get; set; }
-
-    /// <summary>
-    ///     库移目标批次生产时间
-    /// </summary>
-    public DateTime TransferLibToProduceDate { get; set; }
-
-    /// <summary>
-    ///     库移目标批次过期时间
-    /// </summary>
-    public DateTime TransferLibToExpireDate { get; set; }
-
-    /// <summary>
-    ///     库移目标批次排序
-    /// </summary>
-    public string TransferLibToLot { get; set; }
-
-    /// <summary>
-    ///     库移目标库位
-    /// </summary>
-    public string TransferLibToLocationCode { get; set; }
-
-    /// <summary>
-    ///     库移目标库区
-    /// </summary>
-    public string TransferLibToLocationArea { get; set; }
-
-    /// <summary>
-    ///     库移目标库位组
-    /// </summary>
-    public string TransferLibToLocationGroup { get; set; }
-
-    /// <summary>
-    ///     库移目标ERP库位
-    /// </summary>
-    public string TransferLibToLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     库移目标仓库
-    /// </summary>
-    public string TransferLibToWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     库移目标数量
-    /// </summary>
-    public decimal TransferLibToQty { get; set; }
-
-    #endregion
-
-    #region 实际来源
-
-    /// <summary>
-    ///     实际目标托标签
-    /// </summary>
-    public string HandledFromContainerCode { get; set; }
-
-    /// <summary>
-    ///     实际箱标签
-    /// </summary>
-    public string HandledFromPackingCode { get; set; }
-
-    /// <summary>
-    ///     实际批次供应商批次
-    /// </summary>
-    public string HandledFromSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     实际批次到货时间
-    /// </summary>
-    public DateTime HandledFromArriveDate { get; set; }
-
-    /// <summary>
-    ///     实际批次生产时间
-    /// </summary>
-    public DateTime HandledFromProduceDate { get; set; }
-
-    /// <summary>
-    ///     实际批次过期时间
-    /// </summary>
-    public DateTime HandledFromExpireDate { get; set; }
-
-    /// <summary>
-    ///     实际批次排序
-    /// </summary>
-    public string HandledFromLot { get; set; }
-
-    /// <summary>
-    ///     实际库位
-    /// </summary>
-    public string HandledFromLocationCode { get; set; }
-
-    /// <summary>
-    ///     实际库区
-    /// </summary>
-    public string HandledFromLocationArea { get; set; }
-
-    /// <summary>
-    ///     实际库位组
-    /// </summary>
-    public string HandledFromLocationGroup { get; set; }
-
-    /// <summary>
-    ///     实际ERP库位
-    /// </summary>
-    public string HandledFromLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     实际仓库
-    /// </summary>
-    public string HandledFromWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     实际数量
-    /// </summary>
-    public decimal HandledFromQty { get; set; }
-
-    #endregion
-
-    #region 实际目标
-
-    /// <summary>
-    ///     实际目标托标签
-    /// </summary>
-    public string HandledToContainerCode { get; set; }
-
-    /// <summary>
-    ///     实际箱标签
-    /// </summary>
-    public string HandledToPackingCode { get; set; }
-
-    /// <summary>
-    ///     实际批次供应商批次
-    /// </summary>
-    public string HandledToSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     实际批次到货时间
-    /// </summary>
-    public DateTime HandledToArriveDate { get; set; }
-
-    /// <summary>
-    ///     实际批次生产时间
-    /// </summary>
-    public DateTime HandledToProduceDate { get; set; }
-
-    /// <summary>
-    ///     实际批次过期时间
-    /// </summary>
-    public DateTime HandledToExpireDate { get; set; }
-
-    /// <summary>
-    ///     实际批次排序
-    /// </summary>
-    public string HandledToLot { get; set; }
-
-    /// <summary>
-    ///     实际库位
-    /// </summary>
-    public string HandledToLocationCode { get; set; }
-
-    /// <summary>
-    ///     实际库区
-    /// </summary>
-    public string HandledToLocationArea { get; set; }
-
-    /// <summary>
-    ///     实际库位组
-    /// </summary>
-    public string HandledToLocationGroup { get; set; }
-
-    /// <summary>
-    ///     实际ERP库位
-    /// </summary>
-    public string HandledToLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     实际仓库
-    /// </summary>
-    public string HandledToWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     实际数量
-    /// </summary>
-    public decimal HandledToQty { get; set; }
-
-    #endregion
-}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/IInjectionNoteAppService.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
-
-public interface IInjectionNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase<InjectionNoteDTO, SfsStoreRequestInputBase, InjectionNoteDetailDTO, SfsStoreRequestInputBase>
-{
-    Task<InjectionNoteDTO> CreateAsync(InjectionNoteEditInput input);
-
-    Task<InjectionNoteDTO> ConfirmAsync(Guid id);
-
-    Task<InjectionNoteDTO> ConfirmAsync(string number);
-
-    Task<PagedResultDto<InjectionNoteDTO>> GetListByTypeAsync(SfsStoreRequestInputBase requestInput,
-        string requestType, bool includeDetails = false, CancellationToken cancellationToken = default);
-
-    Task<List<InjectionNoteDTO>> GetListUnConfirmedByTypeAsync(string requestType);
-}

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

@@ -1,519 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Win_in.Sfs.Shared.Application.Contracts;
-using Win_in.Sfs.Shared.Domain.Shared;
-
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
-
-public class InjectionNoteDetailInput : SfsDetailInputBase
-{
-    #region 库存基础信息
-
-    /// <summary>
-    ///     物品代码
-    /// </summary>
-    public string ItemCode { get; set; }
-
-    /// <summary>
-    ///     物品名称
-    /// </summary>
-    public string ItemName { get; set; }
-
-    /// <summary>
-    ///     物品描述1
-    /// </summary>
-    public string ItemDesc1 { get; set; }
-
-    /// <summary>
-    ///     物品描述2
-    /// </summary>
-    public string ItemDesc2 { get; set; }
-
-    /// <summary>
-    ///     标包数量
-    /// </summary>
-    [Display(Name = "标包数量")]
-    [Column(TypeName = "decimal(18,6)")]
-    public decimal StdPackQty { get; set; }
-
-    /// <summary>
-    ///     库存状态
-    /// </summary>
-    public EnumInventoryStatus Status { get; set; }
-
-    /// <summary>
-    ///     计量单位
-    /// </summary>
-    public string Uom { get; set; }
-
-    #endregion
-
-    #region 请求信息
-
-    /// <summary>
-    ///     请求库位
-    /// </summary>
-    public string RequestLocationCode { get; set; }
-
-    /// <summary>
-    ///     到库区
-    /// </summary>
-    public string RequestLocationArea { get; set; }
-
-    /// <summary>
-    ///     到库位组
-    /// </summary>
-    public string RequestLocationGroup { get; set; }
-
-    /// <summary>
-    ///     到ERP库位
-    /// </summary>
-    public string RequestLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     到仓库
-    /// </summary>
-    public string RequestWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     在途库库位
-    /// </summary>
-    public string OnTheWayLocationCode { get; set; }
-
-    /// <summary>
-    ///     生产线
-    /// </summary>
-    public string ProdLine { get; set; }
-
-    /// <summary>
-    ///     位置码
-    /// </summary>
-    public string PositionCode { get; set; }
-
-    /// <summary>
-    ///     推荐的类型
-    /// </summary>
-    public EnumRecommendType RecommendType { get; set; }
-
-    /// <summary>
-    ///     需求数量
-    /// </summary>
-    public decimal RequestQty { get; set; }
-
-    #endregion
-
-    #region 推荐来源
-
-    /// <summary>
-    ///     推荐来源托标签
-    /// </summary>
-    public string RecommendFromContainerCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源箱标签
-    /// </summary>
-    public string RecommendFromPackingCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次供应商批次
-    /// </summary>
-    public string RecommendFromSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次到货时间
-    /// </summary>
-    public DateTime RecommendFromArriveDate { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次生产时间
-    /// </summary>
-    public DateTime RecommendFromProduceDate { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次过期时间
-    /// </summary>
-    public DateTime RecommendFromExpireDate { get; set; }
-
-    /// <summary>
-    ///     推荐来源批次排序
-    /// </summary>
-    public string RecommendFromLot { get; set; }
-
-    /// <summary>
-    ///     推荐来源库位
-    /// </summary>
-    public string RecommendFromLocationCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源库区
-    /// </summary>
-    public string RecommendFromLocationArea { get; set; }
-
-    /// <summary>
-    ///     推荐来源库位组
-    /// </summary>
-    public string RecommendFromLocationGroup { get; set; }
-
-    /// <summary>
-    ///     推荐来源ERP库位
-    /// </summary>
-    public string RecommendFromLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源仓库
-    /// </summary>
-    public string RecommendFromWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     推荐来源数量
-    /// </summary>
-    public decimal RecommendFromQty { get; set; }
-
-    #endregion
-
-    #region 推荐目标
-
-    /// <summary>
-    ///     推荐目标托标签
-    /// </summary>
-    public string RecommendToContainerCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标箱标签
-    /// </summary>
-    public string RecommendToPackingCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次供应商批次
-    /// </summary>
-    public string RecommendToSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次到货时间
-    /// </summary>
-    public DateTime RecommendToArriveDate { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次生产时间
-    /// </summary>
-    public DateTime RecommendToProduceDate { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次过期时间
-    /// </summary>
-    public DateTime RecommendToExpireDate { get; set; }
-
-    /// <summary>
-    ///     推荐目标批次排序
-    /// </summary>
-    public string RecommendToLot { get; set; }
-
-    /// <summary>
-    ///     推荐目标库位
-    /// </summary>
-    public string RecommendToLocationCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标库区
-    /// </summary>
-    public string RecommendToLocationArea { get; set; }
-
-    /// <summary>
-    ///     推荐目标库位组
-    /// </summary>
-    public string RecommendToLocationGroup { get; set; }
-
-    /// <summary>
-    ///     推荐目标ERP库位
-    /// </summary>
-    public string RecommendToLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标仓库
-    /// </summary>
-    public string RecommendToWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     推荐目标数量
-    /// </summary>
-    public decimal RecommendToQty { get; set; }
-
-    #endregion
-
-    #region 库移来源
-
-    /// <summary>
-    ///     库移来源托标签
-    /// </summary>
-    public string TransferLibFromContainerCode { get; set; }
-
-    /// <summary>
-    ///     库移来源箱标签
-    /// </summary>
-    public string TransferLibFromPackingCode { get; set; }
-
-    /// <summary>
-    ///     库移来源批次供应商批次
-    /// </summary>
-    public string TransferLibFromSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     库移来源批次到货时间
-    /// </summary>
-    public DateTime TransferLibFromArriveDate { get; set; }
-
-    /// <summary>
-    ///     库移来源批次生产时间
-    /// </summary>
-    public DateTime TransferLibFromProduceDate { get; set; }
-
-    /// <summary>
-    ///     库移来源批次过期时间
-    /// </summary>
-    public DateTime TransferLibFromExpireDate { get; set; }
-
-    /// <summary>
-    ///     库移来源批次排序
-    /// </summary>
-    public string TransferLibFromLot { get; set; }
-
-    /// <summary>
-    ///     库移来源库位
-    /// </summary>
-    public string TransferLibFromLocationCode { get; set; }
-
-    /// <summary>
-    ///     库移来源库区
-    /// </summary>
-    public string TransferLibFromLocationArea { get; set; }
-
-    /// <summary>
-    ///     库移来源库位组
-    /// </summary>
-    public string TransferLibFromLocationGroup { get; set; }
-
-    /// <summary>
-    ///     库移来源ERP库位
-    /// </summary>
-    public string TransferLibFromLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     库移来源仓库
-    /// </summary>
-    public string TransferLibFromWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     库移来源数量
-    /// </summary>
-    public decimal TransferLibFromQty { get; set; }
-
-    #endregion
-
-    #region 库移目标
-
-    /// <summary>
-    ///     库移目标托标签
-    /// </summary>
-    public string TransferLibToContainerCode { get; set; }
-
-    /// <summary>
-    ///     库移目标箱标签
-    /// </summary>
-    public string TransferLibToPackingCode { get; set; }
-
-    /// <summary>
-    ///     库移目标批次供应商批次
-    /// </summary>
-    public string TransferLibToSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     库移目标批次到货时间
-    /// </summary>
-    public DateTime TransferLibToArriveDate { get; set; }
-
-    /// <summary>
-    ///     库移目标批次生产时间
-    /// </summary>
-    public DateTime TransferLibToProduceDate { get; set; }
-
-    /// <summary>
-    ///     库移目标批次过期时间
-    /// </summary>
-    public DateTime TransferLibToExpireDate { get; set; }
-
-    /// <summary>
-    ///     库移目标批次排序
-    /// </summary>
-    public string TransferLibToLot { get; set; }
-
-    /// <summary>
-    ///     库移目标库位
-    /// </summary>
-    public string TransferLibToLocationCode { get; set; }
-
-    /// <summary>
-    ///     库移目标库区
-    /// </summary>
-    public string TransferLibToLocationArea { get; set; }
-
-    /// <summary>
-    ///     库移目标库位组
-    /// </summary>
-    public string TransferLibToLocationGroup { get; set; }
-
-    /// <summary>
-    ///     库移目标ERP库位
-    /// </summary>
-    public string TransferLibToLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     库移目标仓库
-    /// </summary>
-    public string TransferLibToWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     库移目标数量
-    /// </summary>
-    public decimal TransferLibToQty { get; set; }
-
-    #endregion
-
-    #region 实际来源
-
-    /// <summary>
-    ///     实际目标托标签
-    /// </summary>
-    public string HandledFromContainerCode { get; set; }
-
-    /// <summary>
-    ///     实际箱标签
-    /// </summary>
-    public string HandledFromPackingCode { get; set; }
-
-    /// <summary>
-    ///     实际批次供应商批次
-    /// </summary>
-    public string HandledFromSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     实际批次到货时间
-    /// </summary>
-    public DateTime HandledFromArriveDate { get; set; }
-
-    /// <summary>
-    ///     实际批次生产时间
-    /// </summary>
-    public DateTime HandledFromProduceDate { get; set; }
-
-    /// <summary>
-    ///     实际批次过期时间
-    /// </summary>
-    public DateTime HandledFromExpireDate { get; set; }
-
-    /// <summary>
-    ///     实际批次排序
-    /// </summary>
-    public string HandledFromLot { get; set; }
-
-    /// <summary>
-    ///     实际库位
-    /// </summary>
-    public string HandledFromLocationCode { get; set; }
-
-    /// <summary>
-    ///     实际库区
-    /// </summary>
-    public string HandledFromLocationArea { get; set; }
-
-    /// <summary>
-    ///     实际库位组
-    /// </summary>
-    public string HandledFromLocationGroup { get; set; }
-
-    /// <summary>
-    ///     实际ERP库位
-    /// </summary>
-    public string HandledFromLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     实际仓库
-    /// </summary>
-    public string HandledFromWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     实际数量
-    /// </summary>
-    public decimal HandledFromQty { get; set; }
-
-    #endregion
-
-    #region 实际目标
-
-    /// <summary>
-    ///     实际目标托标签
-    /// </summary>
-    public string HandledToContainerCode { get; set; }
-
-    /// <summary>
-    ///     实际箱标签
-    /// </summary>
-    public string HandledToPackingCode { get; set; }
-
-    /// <summary>
-    ///     实际批次供应商批次
-    /// </summary>
-    public string HandledToSupplierBatch { get; set; }
-
-    /// <summary>
-    ///     实际批次到货时间
-    /// </summary>
-    public DateTime HandledToArriveDate { get; set; }
-
-    /// <summary>
-    ///     实际批次生产时间
-    /// </summary>
-    public DateTime HandledToProduceDate { get; set; }
-
-    /// <summary>
-    ///     实际批次过期时间
-    /// </summary>
-    public DateTime HandledToExpireDate { get; set; }
-
-    /// <summary>
-    ///     实际批次排序
-    /// </summary>
-    public string HandledToLot { get; set; }
-
-    /// <summary>
-    ///     实际库位
-    /// </summary>
-    public string HandledToLocationCode { get; set; }
-
-    /// <summary>
-    ///     实际库区
-    /// </summary>
-    public string HandledToLocationArea { get; set; }
-
-    /// <summary>
-    ///     实际库位组
-    /// </summary>
-    public string HandledToLocationGroup { get; set; }
-
-    /// <summary>
-    ///     实际ERP库位
-    /// </summary>
-    public string HandledToLocationErpCode { get; set; }
-
-    /// <summary>
-    ///     实际仓库
-    /// </summary>
-    public string HandledToWarehouseCode { get; set; }
-
-    /// <summary>
-    ///     实际数量
-    /// </summary>
-    public decimal HandledToQty { get; set; }
-
-    #endregion
-}

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

@@ -26,15 +26,15 @@ public class StorePermissionDefinitionProvider : PermissionDefinitionProvider
         storeGroup.AddPurchaseReturnNotePermission();
         storeGroup.AddPutawayNotePermission();
         storeGroup.AddMaterialRequestPermission();
-        storeGroup.AddInjectionRequestPermission();
+        storeGroup.AddInjectionIssueRequestPermission();
         storeGroup.AddKittingIssueRequestPermission();
         storeGroup.AddAssembleIssueRequestsPermission();
         storeGroup.AddThirdLocationRequestPermission();
         storeGroup.AddContainerRequestPermission();
         storeGroup.AddIssueNotePermission();
-        storeGroup.AddInjectionNotePermission();
+        storeGroup.AddInjectionIssueNotePermission();
-        storeGroup.AddKittingIssueNotePermission();
+        storeGroup.AddAssembleIssueNotePermission();
-        storeGroup.AddAssembleNotePermission();
+		storeGroup.AddKittingIssueNotePermission();
         storeGroup.AddThirdLocationNotePermission();
         storeGroup.AddContainerNotePermission();
         storeGroup.AddUnplannedReceiptNotePermission();
@@ -101,10 +101,10 @@ public class StorePermissionDefinitionProvider : PermissionDefinitionProvider
         storeGroup.AddInspectJobPermission();
         storeGroup.AddPutawayJobPermission();
         storeGroup.AddIssueJobPermission();
-        storeGroup.AddInjectionJobPermission();
+        storeGroup.AddInjectionIssueJobPermission();
         storeGroup.AddKittingIssueJobPermission();
         storeGroup.AddCoatingIssueJobPermission();
-        storeGroup.AddAssembleJobPermission();
+        storeGroup.AddAssembleIssueJobPermission();
         storeGroup.AddThirdLocationJobPermission();
         storeGroup.AddContainerJobPermission();
         storeGroup.AddDeliverJobPermission();

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestDTO.cs

@@ -3,7 +3,7 @@ using Win_in.Sfs.Wms.Store.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
-public class CoatingMaterialRequestDTO : SfsStoreRequestDTOBase<CoatingMaterialRequestDetailDTO>, IHasNumber
+public class CoatingIssueRequestDTO : SfsStoreRequestDTOBase<CoatingIssueRequestDetailDTO>, IHasNumber
 {
     /// <summary>
     ///     叫料类型

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestDetailDTO.cs

@@ -7,7 +7,7 @@ using Win_in.Sfs.Wms.Store.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
-public class CoatingMaterialRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
+public class CoatingIssueRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
 
 {
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestDetailInput.cs

@@ -6,7 +6,7 @@ using Win_in.Sfs.Wms.Store.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
-public class CoatingMaterialRequestDetailInput : SfsStoreDetailWithQtyInputBase
+public class CoatingIssueRequestDetailInput : SfsStoreDetailWithQtyInputBase
 {
     #region 目标库位信息
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestEditInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestEditInput.cs

@@ -5,7 +5,7 @@ using Win_in.Sfs.Wms.Store.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
-public class CoatingMaterialRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
+public class CoatingIssueRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
 {
     #region Base   
 
@@ -25,7 +25,7 @@ public class CoatingMaterialRequestEditInput : SfsStoreRequestCreateOrUpdateInpu
     /// 明细列表
     /// </summary>
     [Display(Name = "明细列表")]
-    public List<CoatingMaterialRequestDetailInput> Details { get; set; } = new List<CoatingMaterialRequestDetailInput>();
+    public List<CoatingIssueRequestDetailInput> Details { get; set; } = new List<CoatingIssueRequestDetailInput>();
     #endregion
 
     #region Create  

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestImportInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestImportInput.cs

@@ -6,7 +6,7 @@ using Win_in.Sfs.Wms.Store.Application.Contracts;
 namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 [Display(Name = "叫料申请")]
-public class CoatingMaterialRequestImportInput : SfsStoreImportInputBase
+public class CoatingIssueRequestImportInput : SfsStoreImportInputBase
 {
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestPermissions.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestPermissions.cs

@@ -3,10 +3,10 @@ using Win_in.Sfs.Wms.Store.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
-public static class CoatingMaterialRequestPermissions
+public static class CoatingIssueRequestPermissions
 {
 
-    public const string Default = StorePermissions.GroupName + "." + nameof(CoatingMaterialRequest);
+    public const string Default = StorePermissions.GroupName + "." + nameof(CoatingIssueRequest);
     public const string Create = Default + "." + StorePermissions.CreateStr;
     public const string Update = Default + "." + StorePermissions.UpdateStr;
     public const string Delete = Default + "." + StorePermissions.DeleteStr;
@@ -14,9 +14,9 @@ public static class CoatingMaterialRequestPermissions
     //自动叫料申请
     public const string AutoMaterialRequest = StorePermissions.GroupName + "." + nameof(AutoMaterialRequest);
 
-    public static void AddCoatingMaterialRequestPermission(this PermissionGroupDefinition permissionGroup)
+    public static void AddCoatingIssueRequestPermission(this PermissionGroupDefinition permissionGroup)
     {
-        var MaterialRequestPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(CoatingMaterialRequest)));
+        var MaterialRequestPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(CoatingIssueRequest)));
         MaterialRequestPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
         MaterialRequestPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
         MaterialRequestPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/ICoatingIssueRequestAppService.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
+
+public interface ICoatingIssueRequestAppService
+    : ISfsStoreRequestMasterAppServiceBase<CoatingIssueRequestDTO, SfsStoreRequestInputBase, CoatingIssueRequestEditInput, CoatingIssueRequestDetailDTO, SfsStoreRequestInputBase>
+
+{
+    Task<CoatingIssueRequestDTO> CreateAndHandleAsync(CoatingIssueRequestEditInput input);      
+      
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs

@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Win_in.Sfs.Wms.Store.Application.Contracts;
-
-namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
-
-public interface ICoatingMaterialRequestAppService
-    : ISfsStoreRequestMasterAppServiceBase<CoatingMaterialRequestDTO, SfsStoreRequestInputBase, CoatingMaterialRequestEditInput, CoatingMaterialRequestDetailDTO, SfsStoreRequestInputBase>
-
-{
-    Task<CoatingMaterialRequestDTO> CreateAndHandleAsync(CoatingMaterialRequestEditInput input);      
-      
-}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/DTOs/InjectionRequestDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/DTOs/InjectionIssueRequestDTO.cs

@@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class InjectionRequestDTO : SfsStoreRequestDTOBase<InjectionRequestDetailDTO>, IHasNumber
+public class InjectionIssueRequestDTO : SfsStoreRequestDTOBase<InjectionIssueRequestDetailDTO>, IHasNumber
 {
     /// <summary>
     ///     叫料类型

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/DTOs/InjectionRequestDetailDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/DTOs/InjectionIssueRequestDetailDTO.cs

@@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class InjectionRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
+public class InjectionIssueRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
 {
     /// <summary>
     /// 已发数量

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/IInjectionIssueRequestAppService.cs

@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public interface IInjectionIssueRequestAppService
+    : ISfsStoreRequestMasterAppServiceBase<InjectionIssueRequestDTO, SfsStoreRequestInputBase, InjectionIssueRequestEditInput, InjectionIssueRequestDetailDTO, SfsStoreRequestInputBase>
+
+{
+    Task<InjectionIssueRequestDTO> CreateAndHandleAsync(InjectionIssueRequestEditInput input);
+
+    /// <summary>
+    /// 获取已完成的叫料单数量
+    /// </summary>
+    /// <returns></returns>
+    Task<long> GetCountAsync();
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/InjectionIssueRequestPermissions.cs

@@ -0,0 +1,27 @@
+using Volo.Abp.Authorization.Permissions;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public static class InjectionIssueRequestPermissions
+{
+
+    public const string Default = StorePermissions.GroupName + "." + nameof(InjectionIssueRequest);
+    public const string Create = Default + "." + StorePermissions.CreateStr;
+    public const string Update = Default + "." + StorePermissions.UpdateStr;
+    public const string Delete = Default + "." + StorePermissions.DeleteStr;
+
+    //自动叫料申请
+    public const string AutoInjectionIssueRequest = StorePermissions.GroupName + "." + nameof(AutoInjectionIssueRequest);
+
+    public static void AddInjectionIssueRequestPermission(this PermissionGroupDefinition permissionGroup)
+    {
+        var InjectionIssueRequestPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionIssueRequest)));
+        InjectionIssueRequestPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        InjectionIssueRequestPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        InjectionIssueRequestPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+
+        permissionGroup.AddPermission(AutoInjectionIssueRequest, StorePermissionDefinitionProvider.L(nameof(AutoInjectionIssueRequest)));
+
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestDetailInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/Inputs/InjectionIssueRequestDetailInput.cs

@@ -5,7 +5,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class InjectionRequestDetailInput : SfsStoreDetailWithQtyInputBase
+public class InjectionIssueRequestDetailInput : SfsStoreDetailWithQtyInputBase
 {
     #region 目标库位信息
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestEditInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/Inputs/InjectionIssueRequestEditInput.cs

@@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class InjectionRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
+public class InjectionIssueRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
 {
     #region Base   
 
@@ -24,7 +24,7 @@ public class InjectionRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
     /// 明细列表
     /// </summary>
     [Display(Name = "明细列表")]
-    public List<InjectionRequestDetailInput> Details { get; set; } = new List<InjectionRequestDetailInput>();
+    public List<InjectionIssueRequestDetailInput> Details { get; set; } = new List<InjectionIssueRequestDetailInput>();
     #endregion
 
     #region Create  

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestImportInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/Inputs/InjectionIssueRequestImportInput.cs

@@ -5,7 +5,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 [Display(Name = "叫料申请")]
-public class InjectionRequestImportInput : SfsStoreImportInputBase
+public class InjectionIssueRequestImportInput : SfsStoreImportInputBase
 {
     /// <summary>
     /// 叫料类型

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/IInjectionRequestAppService.cs

@@ -1,13 +1,13 @@
-using System.Collections.Generic;
-using System.Threading;
 using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 public interface IInjectionRequestAppService
-    : ISfsStoreRequestMasterAppServiceBase<InjectionRequestDTO, SfsStoreRequestInputBase, InjectionRequestEditInput, InjectionRequestDetailDTO, SfsStoreRequestInputBase>
+    : ISfsStoreRequestMasterAppServiceBase<InjectionIssueRequestDTO, SfsStoreRequestInputBase,
+        InjectionIssueRequestEditInput, InjectionIssueRequestDetailDTO, SfsStoreRequestInputBase>
 
 {
-    Task<InjectionRequestDTO> CreateAndHandleAsync(InjectionRequestEditInput input);
+    Task<InjectionIssueRequestDTO> CreateAndHandleAsync(InjectionIssueRequestEditInput input);
+
+    Task<int> GetCountAsync();
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/InjectionRequestPermissions.cs

@@ -1,27 +0,0 @@
-using Volo.Abp.Authorization.Permissions;
-using Win_in.Sfs.Wms.Store.Domain;
-
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
-
-public static class InjectionRequestPermissions
-{
-
-    public const string Default = StorePermissions.GroupName + "." + nameof(InjectionRequest);
-    public const string Create = Default + "." + StorePermissions.CreateStr;
-    public const string Update = Default + "." + StorePermissions.UpdateStr;
-    public const string Delete = Default + "." + StorePermissions.DeleteStr;
-
-    //自动叫料申请
-    public const string AutoInjectionRequest = StorePermissions.GroupName + "." + nameof(AutoInjectionRequest);
-
-    public static void AddInjectionRequestPermission(this PermissionGroupDefinition permissionGroup)
-    {
-        var InjectionRequestPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionRequest)));
-        InjectionRequestPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
-        InjectionRequestPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
-        InjectionRequestPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
-
-        permissionGroup.AddPermission(AutoInjectionRequest, StorePermissionDefinitionProvider.L(nameof(AutoInjectionRequest)));
-
-    }
-}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleJobs/AssembleJobAppService.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs

@@ -23,17 +23,17 @@ namespace Win_in.Sfs.Wms.Store.Application;
 
 [Authorize]
 [Route($"{StoreConsts.RootPath}assemble-job")]
-public class AssembleJobAppService
+public class AssembleIssueJobAppService
-    : SfsJobAppServiceBase<AssembleJob, AssembleJobDetail, AssembleJobDTO, SfsJobRequestInputBase,
+    : SfsJobAppServiceBase<AssembleIssueJob, AssembleIssueJobDetail, AssembleIssueJobDTO, SfsJobRequestInputBase,
-            AssembleJobCheckInput, AssembleJobEditInput>,
+            AssembleIssueJobCheckInput, AssembleIssueJobEditInput>,
-        IAssembleJobAppService, ITransferLibCallback
+        IAssembleIssueJobAppService, ITransferLibCallback
 {
-    private readonly IAssembleJobManager _assembleJobManager;
+    private readonly IAssembleIssueJobManager _assembleJobManager;
     private readonly ILocationAppService _locationAppService;
     private readonly ITransferLibJobAppService _transferLibJobAppService;
 
-    public AssembleJobAppService(
+    public AssembleIssueJobAppService(
-        IAssembleJobRepository repository, IAssembleJobManager assembleJobManager,
+        IAssembleIssueJobRepository repository, IAssembleIssueJobManager assembleJobManager,
         ILocationAppService locationAppService, ITransferLibJobAppService transferLibJobAppService) : base(repository, assembleJobManager)
     {
         _assembleJobManager = assembleJobManager;
@@ -42,7 +42,7 @@ public class AssembleJobAppService
     }
 
     [HttpPost("add-many")]
-    public override async Task<List<AssembleJobDTO>> CreateManyAsync(List<AssembleJobEditInput> inputs)
+    public override async Task<List<AssembleIssueJobDTO>> CreateManyAsync(List<AssembleIssueJobEditInput> inputs)
     {
         foreach (var input in inputs)
         {
@@ -53,7 +53,7 @@ public class AssembleJobAppService
     }
 
     [HttpPost("")]
-    public override async Task<AssembleJobDTO> CreateAsync(AssembleJobEditInput input)
+    public override async Task<AssembleIssueJobDTO> CreateAsync(AssembleIssueJobEditInput input)
     {
         await CheckMinRowAndSetStatusAsync(input).ConfigureAwait(false);
 
@@ -65,7 +65,7 @@ public class AssembleJobAppService
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    private async Task CheckMinRowAndSetStatusAsync(AssembleJobEditInput input)
+    private async Task CheckMinRowAndSetStatusAsync(AssembleIssueJobEditInput input)
     {
         var jobDetailInputdetail = input.Details.FirstOrDefault();
 
@@ -130,11 +130,11 @@ public class AssembleJobAppService
     }
 
     [HttpPost("by-request-number/{requestNumber}")]
-    public virtual async Task<List<AssembleJobDTO>> GetByRequestNumberAsync(string requestNumber)
+    public virtual async Task<List<AssembleIssueJobDTO>> GetByRequestNumberAsync(string requestNumber)
     {
         var entitys = await _repository.GetListAsync(p => p.AssembleRequestNumber == requestNumber)
             .ConfigureAwait(false);
-        return ObjectMapper.Map<List<AssembleJob>, List<AssembleJobDTO>>(entitys);
+        return ObjectMapper.Map<List<AssembleIssueJob>, List<AssembleIssueJobDTO>>(entitys);
     }
 
     [HttpPost("Do-Call-Back")]

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleJobs/AssembleJobAutoMapperProfile.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAutoMapperProfile.cs

@@ -7,18 +7,18 @@ namespace Win_in.Sfs.Wms.Store.Application;
 
 public partial class StoreApplicationAutoMapperProfile : Profile
 {
-    private void AssembleJobAutoMapperProfile()
+    private void AssembleIssueJobAutoMapperProfile()
     {
-        CreateMap<AssembleJob, AssembleJobDTO>()
+        CreateMap<AssembleIssueJob, AssembleIssueJobDTO>()
              .ReverseMap();        
 
-        CreateMap<AssembleJobDetail, AssembleJobDetailDTO>()
+        CreateMap<AssembleIssueJobDetail, AssembleIssueJobDetailDTO>()
             ;
 
-        CreateMap<AssembleJobDetailDTO, AssembleJobDetail>()
+        CreateMap<AssembleIssueJobDetailDTO, AssembleIssueJobDetail>()
             ;
 
-        CreateMap<AssembleJobDetailInput, AssembleJobDetail>()
+        CreateMap<AssembleIssueJobDetailInput, AssembleIssueJobDetail>()
             .IgnoreAuditedObjectProperties()
             .Ignore(x => x.MasterID)
             .Ignore(x => x.TenantId)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionJobs/InjectionJobAppService.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs

@@ -23,17 +23,17 @@ namespace Win_in.Sfs.Wms.Store.Application;
 
 [Authorize]
 [Route($"{StoreConsts.RootPath}injection-job")]
-public class InjectionJobAppService
+public class InjectionIssueJobAppService
-    : SfsJobAppServiceBase<InjectionJob, InjectionJobDetail, InjectionJobDTO, SfsJobRequestInputBase,
+    : SfsJobAppServiceBase<InjectionIssueJob, InjectionIssueJobDetail, InjectionIssueJobDTO, SfsJobRequestInputBase,
-            InjectionJobCheckInput, InjectionJobEditInput>,
+            InjectionIssueJobCheckInput, InjectionIssueJobEditInput>,
-        IInjectionJobAppService, ITransferLibCallback
+        IInjectionIssueJobAppService, ITransferLibCallback
 {
-    private readonly IInjectionJobManager _injectionJobManager;
+    private readonly IInjectionIssueJobManager _injectionJobManager;
     private readonly ILocationAppService _locationAppService;
     private readonly ITransferLibJobAppService _transferLibJobAppService;
 
-    public InjectionJobAppService(
+    public InjectionIssueJobAppService(
-        IInjectionJobRepository repository, IInjectionJobManager injectionJobManager,
+        IInjectionIssueJobRepository repository, IInjectionIssueJobManager injectionJobManager,
         ILocationAppService locationAppService, ITransferLibJobAppService transferLibJobAppService) : base(repository, injectionJobManager)
     {
         _injectionJobManager = injectionJobManager;
@@ -42,7 +42,7 @@ public class InjectionJobAppService
     }
 
     [HttpPost("add-many")]
-    public override async Task<List<InjectionJobDTO>> CreateManyAsync(List<InjectionJobEditInput> inputs)
+    public override async Task<List<InjectionIssueJobDTO>> CreateManyAsync(List<InjectionIssueJobEditInput> inputs)
     {
         foreach (var input in inputs)
         {
@@ -53,7 +53,7 @@ public class InjectionJobAppService
     }
 
     [HttpPost("")]
-    public override async Task<InjectionJobDTO> CreateAsync(InjectionJobEditInput input)
+    public override async Task<InjectionIssueJobDTO> CreateAsync(InjectionIssueJobEditInput input)
     {
         await CheckMinRowAndSetStatusAsync(input).ConfigureAwait(false);
 
@@ -65,7 +65,7 @@ public class InjectionJobAppService
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    private async Task CheckMinRowAndSetStatusAsync(InjectionJobEditInput input)
+    private async Task CheckMinRowAndSetStatusAsync(InjectionIssueJobEditInput input)
     {
         var jobDetailInputdetail = input.Details.FirstOrDefault();
 
@@ -109,7 +109,7 @@ public class InjectionJobAppService
     [HttpPost("cancel-by-request/{injectionNumber}")]
     public virtual async Task CancelByMaterialRequestAsync(string injectionNumber)
     {
-        var entities = await _repository.GetListAsync(p => p.InjectionRequestNumber == injectionNumber)
+        var entities = await _repository.GetListAsync(p => p.InjectionIssueRequestNumber == injectionNumber)
             .ConfigureAwait(false);
         foreach (var entity in entities)
         {
@@ -130,11 +130,11 @@ public class InjectionJobAppService
     }
 
     [HttpPost("by-request-number/{requestNumber}")]
-    public virtual async Task<List<InjectionJobDTO>> GetByRequestNumberAsync(string requestNumber)
+    public virtual async Task<List<InjectionIssueJobDTO>> GetByRequestNumberAsync(string requestNumber)
     {
-        var entitys = await _repository.GetListAsync(p => p.InjectionRequestNumber == requestNumber)
+        var entitys = await _repository.GetListAsync(p => p.InjectionIssueRequestNumber == requestNumber)
             .ConfigureAwait(false);
-        return ObjectMapper.Map<List<InjectionJob>, List<InjectionJobDTO>>(entitys);
+        return ObjectMapper.Map<List<InjectionIssueJob>, List<InjectionIssueJobDTO>>(entitys);
     }
 
     [HttpPost("Do-Call-Back")]