Revert "1.修改不良原因英文描述非必填"

This reverts commit f273249fe9.

AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.runtimeconfig.dev.json

@@ -1,8 +1,9 @@
 {
   "runtimeOptions": {
     "additionalProbingPaths": [
-      "C:\\Users\\USER\\.dotnet\\store\\|arch|\\|tfm|",
+      "C:\\Users\\RayLin\\.dotnet\\store\\|arch|\\|tfm|",
-      "C:\\Users\\USER\\.nuget\\packages"
+      "C:\\Users\\RayLin\\.nuget\\packages",
+      "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
     ]
   }
 }

AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json

@@ -1,8 +1,9 @@
 {
   "runtimeOptions": {
     "additionalProbingPaths": [
-      "C:\\Users\\USER\\.dotnet\\store\\|arch|\\|tfm|",
+      "C:\\Users\\RayLin\\.dotnet\\store\\|arch|\\|tfm|",
-      "C:\\Users\\USER\\.nuget\\packages"
+      "C:\\Users\\RayLin\\.nuget\\packages",
+      "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
     ]
   }
 }

AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj

@@ -16,14 +16,19 @@
   <ItemGroup>
     <Compile Remove="Controllers\AMES\FactoryInfosController.cs" />
     <Compile Remove="Controllers\AMES\FactoryUnitController.cs" />
-    <Compile Remove="Controllers\AMES\FactoryUnitsController.cs" />
     <Compile Remove="Controllers\AMES\LineInfosController.cs" />
+    <Compile Remove="Controllers\AMES\OutfitAreaInfoesController.cs" />
+    <Compile Remove="Controllers\AMES\OutfitLevelInfoesController.cs" />
+    <Compile Remove="Controllers\AMES\OutfitSiteInfoesController.cs" />
     <Compile Remove="DTO\AccountDTO.cs" />
     <Compile Remove="Models\Account.cs" />
     <Compile Remove="Models\AMES\ClassInfo.cs" />
     <Compile Remove="Models\AMES\FactoryInfo.cs" />
     <Compile Remove="Models\AMES\FactoryUnit.cs" />
     <Compile Remove="Models\AMES\LineInfo.cs" />
+    <Compile Remove="Models\AMES\OutfitAreaInfo.cs" />
+    <Compile Remove="Models\AMES\OutfitLevelInfo.cs" />
+    <Compile Remove="Models\AMES\OutfitSiteInfo.cs" />
     <Compile Remove="Models\AMES\RepairResponsibleUnits.cs" />
   </ItemGroup>
 

AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj.user

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <WebStackScaffolding_ControllerDialogWidth>650.4</WebStackScaffolding_ControllerDialogWidth>
+    <WebStackScaffolding_ControllerDialogWidth>650</WebStackScaffolding_ControllerDialogWidth>
     <Controller_SelectedScaffolderID>ApiControllerWithContextScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/Api</Controller_SelectedScaffolderCategoryPath>
-    <WebStackScaffolding_IsLayoutPageSelected>False</WebStackScaffolding_IsLayoutPageSelected>
+    <WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
     <WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
     <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
+    <WebStackScaffolding_LayoutPageFile />
     <WebStackScaffolding_DbContextTypeFullName>AMESCoreStudio.WebApi.AMESContext</WebStackScaffolding_DbContextTypeFullName>
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
-    <ShowAllFiles>true</ShowAllFiles>
+    <ShowAllFiles>false</ShowAllFiles>
     <WebStackScaffolding_IsViewGenerationSelected>True</WebStackScaffolding_IsViewGenerationSelected>
     <NameOfLastUsedPublishProfile>D:\jh-ames-git\AMESCoreStudio.WebApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>

AMESCoreStudio.WebApi/Code/IgnorePropertyAttribute.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace AMESCoreStudio.WebApi
+{
+    /// <summary>
+    /// Swagger：隐藏属性
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property)]
+    public class IgnorePropertyAttribute : Attribute
+    {
+    }
+}

AMESCoreStudio.WebApi/Controllers/AMES/FactoryUnitController.cs

@@ -0,0 +1,52 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using AMESCoreStudio.WebApi.Models.AMES;
+
+namespace AMESCoreStudio.WebApi.Controllers.AMES
+{
+
+    /// <summary>
+    /// 
+    /// </summary>
+    [Route("api/[controller]")]
+    [ApiController]
+    public class FactoryUnitController : Controller
+    {
+        private readonly AMESContext _context;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="context"></param>
+        public FactoryUnitController(AMESContext context)
+        {
+            _context = context;
+        }
+
+        /// <summary>
+        /// 獲取產品別資料
+        /// </summary>
+        /// <returns></returns>
+        // GET: api/SystemInfoes
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<FactoryUnit>>> GetFactoryUnit()
+        {
+            IQueryable<FactoryUnit> q = _context.FactoryUnits;
+
+            q = q.OrderBy(p => p.UnitNO);
+
+            //q = q.OrderByDescending(p => p.SystemID);
+
+            var FactoryUnit = await q.ToListAsync();
+
+            //return await _context.SystemInfoes.ToListAsync();
+
+            return FactoryUnit;
+        }
+    }
+}

AMESCoreStudio.WebApi/DTO/LoginDTO.cs

@@ -36,13 +36,13 @@ namespace AMESCoreStudio.WebApi
         /// <summary>
         /// 登錄IP
         /// </summary>
-        //[IgnoreProperty]
+        [IgnoreProperty]
         public string LoginIP { get; set; } = "N/A";
 
         /// <summary>
         /// 报错信息
         /// </summary>
-        //[IgnoreProperty]
+        [IgnoreProperty]
         public string Msg { get; set; } = "";
     }
 }

AMESCoreStudio.WebApi/Startup.cs

@@ -11,11 +11,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
-
 using System.IO;
 using System.Reflection;
 using Swashbuckle.AspNetCore.Swagger;
 using Microsoft.OpenApi.Models;
+using System.Text.Json.Serialization;
 
 namespace AMESCoreStudio.WebApi
 {
@@ -45,14 +45,12 @@ namespace AMESCoreStudio.WebApi
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-
+            //services.AddDbContext<AMESContext>(
-            services.Configure<ApiBehaviorOptions>(options =>
+            //    opt => opt.UseLazyLoadingProxies().UseOracle(Configuration.GetConnectionString("AMESContext"), b => b.UseOracleSQLCompatibility("11")));
-            {
-                options.SuppressModelStateInvalidFilter = true;
-            });
 
             services.AddDbContext<AMESContext>(
-                opt => opt.UseLazyLoadingProxies().UseOracle(Configuration.GetConnectionString("AMESContext"), b => b.UseOracleSQLCompatibility("11")));
+    opt => opt.UseLazyLoadingProxies().UseOracle(Configuration.GetConnectionString("AMESContext"), b => b.UseOracleSQLCompatibility("11"))
+    .UseLoggerFactory(LoggerFactory.Create(builder => builder.AddConsole())));
 
             services.AddControllers();
 
@@ -88,6 +86,14 @@ namespace AMESCoreStudio.WebApi
             {
                 options.SuppressModelStateInvalidFilter = true;
             });
+
+            //services.AddControllers().AddJsonOptions(x =>
+            //     x.JsonSerializerOptions..ReferenceHandler = ReferenceHandler.Preserve.Ignore);
+            //services.AddControllers().AddNewtonsoftJson(x =>
+            //x.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore);
+
+            //services.AddControllers().AddNewtonsoftJson(x =>
+            //x.SerializerSettings.Formatting = Newtonsoft.Json.Formatting.Indented);
         }
 
         /// <summary>
@@ -108,7 +114,8 @@ namespace AMESCoreStudio.WebApi
                 c.SerializeAsV2 = true;
             });
 
-            app.UseSwaggerUI(c => {
+            app.UseSwaggerUI(c =>
+            {
                 c.SwaggerEndpoint("/swagger/v1/swagger.json", "AMESCoreStudio v1");
                 c.RoutePrefix = "amesapi";//ÉèÖøù½Úµã·ÃÎÊ
             });

AMESCoreStudio.WebApi/appsettings.json

@@ -7,8 +7,9 @@
     }
   },
   "ConnectionStrings": {
-    "AMESContext1": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.188.1)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=xe)));User Id=JHAMES;Password=JHAMES;",
+    "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=1522))(CONNECT_DATA=(SERVICE_NAME=xe)));User Id=JHAMES;Password=AMES666;",
-    "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=JHDB)));User Id=JHSYS;Password=ASYS666;"
+    "AMESContext1": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=system;Password=admin;"
+    //"AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=cpadb)));User Id=JHSYS;Password=ASYS666;"
   },
   "AllowedHosts": "*"
 }

AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json

@@ -1,8 +1,9 @@
 {
   "runtimeOptions": {
     "additionalProbingPaths": [
-      "C:\\Users\\USER\\.dotnet\\store\\|arch|\\|tfm|",
+      "C:\\Users\\RayLin\\.dotnet\\store\\|arch|\\|tfm|",
-      "C:\\Users\\USER\\.nuget\\packages"
+      "C:\\Users\\RayLin\\.nuget\\packages",
+      "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
     ]
   }
 }

AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/appsettings.json

@@ -7,8 +7,9 @@
     }
   },
   "ConnectionStrings": {
-    "AMESContext1": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.188.1)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=xe)));User Id=JHAMES;Password=JHAMES;",
+    "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=1522))(CONNECT_DATA=(SERVICE_NAME=xe)));User Id=JHAMES;Password=AMES666;",
-    "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=JHDB)));User Id=JHSYS;Password=ASYS666;"
+    "AMESContext1": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=system;Password=admin;"
+    //"AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=cpadb)));User Id=JHSYS;Password=ASYS666;"
   },
   "AllowedHosts": "*"
 }

其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-1b3c893708ca941b0dd54e78bee183b5991a80bf
+2911a070cfcbab9b421c605adc4621bd70e2d537

其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.FileListAbsolute.txt

@@ -27,8 +27,6 @@ D:\Ray_Work\AMES\其他專案資料\AMES_AP\AMES_AP\bin\Debug\Newtonsoft.Json.dl
 D:\Ray_Work\AMES\其他專案資料\AMES_AP\AMES_AP\bin\Debug\System.Net.Http.Formatting.dll
 D:\Ray_Work\AMES\其他專案資料\AMES_AP\AMES_AP\bin\Debug\Newtonsoft.Json.xml
 D:\Ray_Work\AMES\其他專案資料\AMES_AP\AMES_AP\bin\Debug\System.Net.Http.Formatting.xml
-D:\Ray_Work\AMES\其他專案資料\AMES_AP\AMES_AP\obj\Debug\AMES_AP.Form1.resources
-D:\Ray_Work\AMES\其他專案資料\AMES_AP\AMES_AP\obj\Debug\AMES_AP.InHouse.resources
 C:\Users\USER\Desktop\MES\AMES0916\其他專案資料\AMES_AP\AMES_AP\bin\Debug\AMES_AP.exe.config
 C:\Users\USER\Desktop\MES\AMES0916\其他專案資料\AMES_AP\AMES_AP\bin\Debug\AMES_AP.exe
 C:\Users\USER\Desktop\MES\AMES0916\其他專案資料\AMES_AP\AMES_AP\bin\Debug\AMES_AP.pdb
@@ -48,3 +46,5 @@ C:\Users\USER\Desktop\MES\AMES0916\其他專案資料\AMES_AP\AMES_AP\obj\Debug\
 C:\Users\USER\Desktop\MES\AMES0916\其他專案資料\AMES_AP\AMES_AP\obj\Debug\AMES_AP.exe
 C:\Users\USER\Desktop\MES\AMES0916\其他專案資料\AMES_AP\AMES_AP\obj\Debug\AMES_AP.pdb
 C:\Users\USER\Desktop\MES\AMES0916\其他專案資料\AMES_AP\AMES_AP\obj\Debug\AMES_AP.csproj.AssemblyReference.cache
+D:\Ray_Work\AMES\其他專案資料\AMES_AP\AMES_AP\obj\Debug\AMES_AP.Form1.resources
+D:\Ray_Work\AMES\其他專案資料\AMES_AP\AMES_AP\obj\Debug\AMES_AP.InHouse.resources