From 6a9d57603acaa692175c4db70e14b14736fbcb09 Mon Sep 17 00:00:00 2001
From: "boxu.zheng" <boxu.zheng@ccwin-in.com>
Date: Wed, 17 Apr 2024 11:45:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Incoming/InjectionMoldingRequestReader.cs        | 12 ++++++------
 .../IInjectionIssueRequestAppService.cs              |  6 ++++++
 .../InjectionRequests/IInjectionRequestAppService.cs | 10 +++-------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs
index d4a3618f6..66509c613 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs
@@ -73,7 +73,7 @@ public class InjectionMoldingRequestReader : IReader
         {
             // 获取注塑叫料任务数量
             var count = await _injectionRequest.GetCountAsync().ConfigureAwait(false);
-            List<InjectionRequestEditInput> joblist = new List<InjectionRequestEditInput>();
+            List<InjectionIssueRequestEditInput> joblist = new List<InjectionIssueRequestEditInput>();
             if (count == 0)
             {
                 // 调用 ReaderCameraApi 方法获取摄像头信息
@@ -88,21 +88,21 @@ public class InjectionMoldingRequestReader : IReader
                 ////将摄像头信息转换为注塑叫料明细任务数据
                 //cameraList = System.Text.Json.JsonSerializer.Deserialize<List<InjectionRequest>>(camera);
                 //测试数据
-                var cameraList = new List<InjectionRequest>()
+                var cameraList = new List<InjectionIssueRequest>()
                 {
-                  new InjectionRequest() { ItemCode = "THILDD0A542AG", ToLocCode = "ZSXB2", Qty = 100 },
+                  new InjectionIssueRequest() { ItemCode = "THILDD0A542AG", ToLocCode = "ZSXB2", Qty = 100 },
                  };
-                InjectionRequestEditInput input = new InjectionRequestEditInput();
+                InjectionIssueRequestEditInput input = new InjectionIssueRequestEditInput();
                 input.Worker = "Vision";
                 input.Type = "Vision";
                 input.AutoSubmit = true;
                 input.ActiveDate = DateTime.Now;
                 input.UseOnTheWayLocation = false;
                 input.Remark = "视觉叫料";
-                List<InjectionRequestDetailInput> injectionRequestDetails = new List<InjectionRequestDetailInput>();
+                List<InjectionIssueRequestDetailInput> injectionRequestDetails = new List<InjectionIssueRequestDetailInput>();
                 foreach (var job in cameraList)
                 {
-                    var detailInput = new InjectionRequestDetailInput()
+                    var detailInput = new InjectionIssueRequestDetailInput()
                     {
                         ItemCode = job.ItemCode,
                         ToLocationCode = job.ToLocCode,
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/IInjectionIssueRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/IInjectionIssueRequestAppService.cs
index 2ddf7b647..09159fa09 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/IInjectionIssueRequestAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/IInjectionIssueRequestAppService.cs
@@ -10,4 +10,10 @@ public interface IInjectionIssueRequestAppService
 
 {
     Task<InjectionIssueRequestDTO> CreateAndHandleAsync(InjectionIssueRequestEditInput input);
+
+    /// <summary>
+    /// 获取已完成的叫料单数量
+    /// </summary>
+    /// <returns></returns>
+    Task<long> GetCountAsync();
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/IInjectionRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/IInjectionRequestAppService.cs
index 2d58fcee2..33405e298 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/IInjectionRequestAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/IInjectionRequestAppService.cs
@@ -1,17 +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();
-
-
 }