From c275f8ff051d506ee4f7898dd7a0afd9223712dc Mon Sep 17 00:00:00 2001
From: zhaoxinyu <89237069@qq.com>
Date: Mon, 15 Apr 2024 17:27:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8E=A5=E5=8F=A3=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=8B=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Incoming/InjectionMoldingRequestReader.cs          | 10 +++++++++-
 .../InjectionMoldingTaskAgentModule.cs                 |  8 ++++----
 .../serilogsettings.json                               |  4 ++--
 .../Enums/Store/EnumIssueType.cs                       |  8 ++++++++
 4 files changed, 23 insertions(+), 7 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 a4cf337f7..c1f1dc94c 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
@@ -64,7 +64,15 @@ public class InjectionMoldingRequestReader : IReader
                 Action = "<>",
                 Column = "RequestStatus",
                 Logic = EnumFilterLogic.And.ToString(),
-                Value = ((int)EnumRequestStatus.Completed).ToString()
+                Value = (EnumRequestStatus.Completed).ToString()
+            };
+            jobCondition.Condition.Filters.Add(filter);
+            filter = new Filter()
+            {
+                Action = "==",
+                Column = "Type",
+                Logic = EnumFilterLogic.And.ToString(),
+                Value = "Vision"
             };
             jobCondition.Condition.Filters.Add(filter);
             var jobs = await _injectionRequest.GetAllListByFilterAsync(jobCondition).ConfigureAwait(false);
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentModule.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentModule.cs
index 285b11d99..3508f367c 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentModule.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/InjectionMoldingTaskAgentModule.cs
@@ -37,8 +37,8 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent;
     typeof(StoreApplicationContractsModule),
     typeof(InventoryApplicationContractsModule),
     typeof(LabelApplicationContractsModule),
-    typeof(DataExchangeDomainModule),
-    typeof(DataExchangeEntityFrameworkCoreModule),
+    //typeof(DataExchangeDomainModule),
+    //typeof(DataExchangeEntityFrameworkCoreModule),
     //typeof(DataExchangeDomainFawtygMesModule),
     //typeof(DataExchangeEntityFrameworkCoreFawtygModule),
      typeof(AbpAccountApplicationContractsModule)
@@ -80,9 +80,9 @@ public class InjectionMoldingTaskAgentModule : AbpModule
         var configuration = context.Services.GetConfiguration();
         var env = context.Services.GetSingletonInstance<IHostEnvironment>();
 
-        context.SetConsoleTitleOfConsoleApp("MesAgent", env.EnvironmentName);
+        context.SetConsoleTitleOfConsoleApp("InjectionAgent", env.EnvironmentName);
 
-        ConfigureDbContext();
+        //ConfigureDbContext();
 
         ConfigureOptions(configuration);
 
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/serilogsettings.json b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/serilogsettings.json
index c07a351db..d8e55694c 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/serilogsettings.json
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/serilogsettings.json
@@ -16,7 +16,7 @@
             {
               "Name": "File",
               "Args": {
-                "path": "..//Logs//MesAgent//MesAgent_.log",
+                "path": "..//Logs//InjectionAgent//InjectionAgent_.log",
                 "rollingInterval": "Day",
                 "fileSizeLimitBytes": "52428800",
                 "rollOnFileSizeLimit": "true",
@@ -36,4 +36,4 @@
     ],
     "Enrich": [ "FromLogContext", "WithMachineName", "WithProcessId", "WithThreadId" ]
   }
-}
\ No newline at end of file
+}
diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumIssueType.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumIssueType.cs
index 42dcf1439..fb4faedca 100644
--- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumIssueType.cs
+++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumIssueType.cs
@@ -18,4 +18,12 @@ public enum EnumIssueType
     /// 按数量 叫料
     /// </summary>
     Qty=2,
+
+
+    /// <summary>
+    /// 按视觉 叫料
+    /// </summary>
+    Vision = 3,
+
+
 }