解决冲突

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

@@ -55,6 +55,13 @@ public class InjectionMoldingRequestReader : IReader
     }
     
 
+    
+
+        
+
+
+
+
 /// <summary>
 /// 读取注塑叫料任务
 /// </summary>
@@ -62,7 +69,6 @@ public class InjectionMoldingRequestReader : IReader
 
     public virtual async Task<List<IncomingFromExternal>> ReadAsync()
     {  
-        
         try
         {
             // 获取注塑叫料任务数量
@@ -71,28 +77,21 @@ public class InjectionMoldingRequestReader : IReader
             if (count == 0)
             {
                 // 调用 ReaderCameraApi 方法获取摄像头信息
-
+                //string camera = await ReaderCameraApi().ConfigureAwait(false);
-
+                //List<InjectionRequest> cameraList = new List<InjectionRequest>();
-                string camera = await ReaderCameraApi().ConfigureAwait(false);
+                //if (camera == "Error occured")
-
-                List<InjectionIssueRequest> cameraList = new List<InjectionIssueRequest>();
-
-                if (camera == "Error occured")
-                {
-                    // 记录错误日志并返回空列表
-                    _logger.LogInformation($"没有读取到摄像头信息{DateTime.Now},请检查网络");
-                    return new List<IncomingFromExternal>();
-                }
-                //将摄像头信息转换为注塑叫料明细任务数据
-                cameraList = System.Text.Json.JsonSerializer.Deserialize<List<InjectionRequest>>(camera);
-
-                //测试数据
-                //var cameraList = new List<InjectionRequest>()
                 //{
-                //  new InjectionRequest() { ItemCode = "THILDD0A542AG", ToLocCode = "ZSXB2", Qty = 100 },
+                //    // 记录错误日志并返回空列表
-
+                //    _logger.LogInformation($"没有读取到摄像头信息{DateTime.Now},请检查网络");
-                // };
+                //    return new List<IncomingFromExternal>();
-
+                //}
+                ////将摄像头信息转换为注塑叫料明细任务数据
+                //cameraList = System.Text.Json.JsonSerializer.Deserialize<List<InjectionRequest>>(camera);
+                //测试数据
+                var cameraList = new List<InjectionRequest>()
+                {
+                  new InjectionRequest() { ItemCode = "THILDD0A542AG", ToLocCode = "ZSXB2", Qty = 100 },
+                 };
                 InjectionRequestEditInput input = new InjectionRequestEditInput();
                 input.Worker = "Vision";
                 input.Type = "Vision";
@@ -105,7 +104,6 @@ public class InjectionMoldingRequestReader : IReader
                 {
                     var detailInput = new InjectionRequestDetailInput()
                     {
-
                         ItemCode = job.ItemCode,
                         ToLocationCode = job.ToLocCode,
                         Qty = job.Qty,
@@ -209,6 +207,7 @@ public class InjectionMoldingRequestReader : IReader
         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/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs

@@ -315,7 +315,7 @@ public class InjectionIssueRequestAppService : SfsStoreRequestAppServiceBase<Inj
     public async Task<int> GetCountAsync()
     {
         //枚举类型查不到改成SQL查询
-       var query = _repository.GetDbSet().FromSqlRaw(" select * from Store_InjectionRequest where Type='Vision' and RequestStatus<>'Completed'");
+       var query = _repository.GetDbSet().FromSqlRaw(" select * from Store_InjectionIssueRequest where Type='Vision' and RequestStatus<>'Completed'");
        return await query.CountAsync().ConfigureAwait(false);
     }