diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml index 13695867..997e52b5 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml @@ -571,8 +571,7 @@
- - +
@@ -580,7 +579,7 @@
- +
@@ -618,7 +617,7 @@
- +
@@ -641,7 +640,7 @@
- +
@@ -656,7 +655,7 @@
- +
@@ -671,7 +670,7 @@
- +
@@ -686,7 +685,7 @@
- +
@@ -701,7 +700,7 @@
- +
@@ -964,10 +963,24 @@ query: {}, resArray: 'data', done: function (item) { - $(this.element).closest('div.layui-inline').find('input[id*=' + this.element.id + '_Desc]').val(item.productionMemo); + $(this.element).closest('div.layui-inline').find('input[id*=' + this.element.id + '_Desc]').val(item.meterialDesc); } }); }) + // PowerMode + layui.autocomplete({ + element: '#wipSystem_PowerMode', + display: 'meterialNo', + shortcut: 'modelName', + num: 2, + count: 10, + url: '/PCS/getPLMMeterialAutoComplete', + query: {}, + resArray: 'data', + done: function (item) { + $('#wipSystem_PowerMode_Desc').val(item.productionMemo); + } + }); form.on('select(flow)', function (data) { RuleStation(data.value); diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll index 31e27974..1890e433 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb index fe281926..d8658bc2 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll index ae3f85ad..6e6ebe08 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.exe b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.exe index d2f2f6bb..54632062 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.exe and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.exe differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb index 2e299818..7295ee4b 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.runtimeconfig.dev.json b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.runtimeconfig.dev.json index 2e393e8b..2d16c522 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.runtimeconfig.dev.json +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.runtimeconfig.dev.json @@ -1,9 +1,8 @@ { "runtimeOptions": { "additionalProbingPaths": [ - "C:\\Users\\RayLin\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\RayLin\\.nuget\\packages", - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "C:\\Users\\USER\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\USER\\.nuget\\packages" ] } } \ No newline at end of file diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll index 9e28cab1..4b6f78c3 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb index 3eb2e492..7eadcbf0 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll index 011d7ba1..1f9d8abe 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.exe b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.exe index f79e2f39..87c4046e 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.exe and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.exe differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb index c7d58340..02a83e09 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json index 2e393e8b..2d16c522 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json @@ -1,9 +1,8 @@ { "runtimeOptions": { "additionalProbingPaths": [ - "C:\\Users\\RayLin\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\RayLin\\.nuget\\packages", - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "C:\\Users\\USER\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\USER\\.nuget\\packages" ] } } \ No newline at end of file diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml index fe7c892c..da2cfd03 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -29,11 +29,6 @@ - - - Swagger:隐藏属性 - - @@ -1607,6 +1602,16 @@ + + + + + + + + + + @@ -2147,6 +2152,14 @@ + + + 更新不良現象原因狀態 + + + + + @@ -2337,6 +2350,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 工作群組維護 @@ -2450,6 +2509,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 設備狀態紀錄維護 @@ -2657,6 +2808,25 @@ + + + PLM轉入料號說明 + + + + + + + PLM料號 + + + + + 關鍵字查詢 + + PLM料號 + + @@ -3446,6 +3616,13 @@ 工單號碼 + + + 查詢工單資料Barcode By 條碼前置碼 + + 工單號碼 + + 新增工單資料-條碼Barcode @@ -3544,6 +3721,32 @@ + + + 工單資訊確認 + + + + + 更新工程確認 + + + + + + + 更新製造確認 + + + + + + + 更新生管確認 + + + + 各班別數量資料檔 @@ -3563,6 +3766,22 @@ + + + 良率查詢 + + + + + + + + + + + + + @@ -3623,7 +3842,7 @@ - 工單資本資料 + 更新工單資本資料 @@ -3660,6 +3879,13 @@ + + + 刪除工單KP資訊資料檔 + + + + @@ -3780,6 +4006,39 @@ + + + 工單治具資料檔 + + + + + ByWipNo + + 工單號碼 + + + + + 更新工單治具資料檔 + + + + + + + 新增工單治具資料檔 + + + + + + + 刪除工單治具資料檔 + + + + @@ -3792,6 +4051,11 @@ + + + 工單製程對應SOP資料檔 + + @@ -3804,16 +4068,32 @@ + + + ByWipNo + + 工單號碼 + + - SOP文件查詢 + 新增工單製程對應SOP資料檔 - 料號 - 生產單位 - 檔案名稱 - 狀態 - 建立日期起 - 建立日期迄 + + + + + + 更新工單製程對應SOP資料檔 + + + + + + + 刪除工單製程對應SOP資料檔 + + @@ -6444,9 +6724,9 @@ 工單KP_ID - + - 工單ID + 工單號碼 @@ -6479,14 +6759,14 @@ 長度 - + 生產單位代號 - + - 狀態 A:啟用 S:停用 + 生產單位 @@ -6599,52 +6879,137 @@ 是否有過站 - + - (過站資料)BarCodeCheck Dto + 工單治具資料檔 DTO - + - 工單號碼 + 工單治具ID - + - 工單ID + 工單號碼 - + - 內部條碼 + 料號 - + - 內部條碼ID + 設備編碼 - + - 條碼狀態 M:一般 S:維修 + 設備名稱 - + - 條碼過站狀態 P:Pass F:Fail + 生產單位代號 - + 生產單位 - + - 流程ID + 工單製程對應SOP資料檔 DTO - + + + 工單SOP_ID + + + + + 工單號碼 + + + + + 料號 + + + + + SOP檔案名稱 + + + + + SOP路徑 + + + + + SOP類型 + + + + + 生產單位代號 + + + + + 生產單位 + + + + + (過站資料)BarCodeCheck Dto + + + + + 工單號碼 + + + + + 工單ID + + + + + 內部條碼 + + + + + 內部條碼ID + + + + + 條碼狀態 M:一般 S:維修 + + + + + 條碼過站狀態 P:Pass F:Fail + + + + + 生產單位 + + + + + 流程ID + + + 作業站 @@ -7521,19 +7886,24 @@ 內部序號對應的治具序號明細 + + + 治具區域資料檔 + + 設備種類資料檔 - + - 設備規格資料檔 + 層別資料檔 - + - 廠商資料檔 + 位置資料檔 @@ -7541,11 +7911,26 @@ 治具資料檔 + + + PLM轉入料號說明 + + 設備狀態紀錄資料檔 + + + 工單資訊確認 + + + + + 工單治具資料檔 + + 條碼變更資料表 @@ -10528,6 +10913,11 @@ 責任單位 + + + 状态 + + 不良維修資料檔 @@ -10658,6 +11048,41 @@ 更新日期 + + + 區域資料檔 + + + + + 區域代碼 + + + + + 區域名稱 + + + + + 創建者ID + + + + + 創建日期 + + + + + 更新者ID + + + + + 更新日期 + + 設備種類資料檔 @@ -10950,6 +11375,76 @@ 更新日期 + + + 層別資料檔 + + + + + 區域代碼 + + + + + 層別描述 + + + + + 創建者ID + + + + + 創建日期 + + + + + 更新者ID + + + + + 更新日期 + + + + + 位置資料檔 + + + + + 位置代碼 + + + + + 位置描述 + + + + + 創建者ID + + + + + 創建日期 + + + + + 更新者ID + + + + + 更新日期 + + 設備記錄檔 @@ -11170,6 +11665,56 @@ 修改時間 + + + PLM轉入料號說明 + + + + + 物料 + + + + + 物料描述 + + + + + 機種系列 + + + + + 生產備忘錄 + + + + + 狀態 + + + + + EAN + + + + + 長文 + + + + + 建立日期 + + + + + 更新日期 + + 用户资料表 @@ -12310,6 +12855,46 @@ 更新日期 + + + 工單資訊確認 + + + + + 工單號碼 + + + + + 生管UsesID + + + + + 生管確認時間 + + + + + 製造UserID + + + + + 製造UserID + + + + + 工程確認時間 + + + + + 工程確認時間 + + 各班別數量資料檔 @@ -12560,9 +13145,9 @@ 工單KP_ID - + - 工單ID + 工單號碼 @@ -12600,11 +13185,6 @@ 生產單位代號 - - - 狀態 A:啟用 S:停用 - - 建立UserID @@ -12840,6 +13420,61 @@ 修改日期 + + + 工單治具資料檔 + + + + + 工單治具ID + + + + + 工單號碼 + + + + + 料號 + + + + + 設備編碼 + + + + + 設備名稱 + + + + + 生產單位代號 + + + + + 建立UserID + + + + + 建立日期 + + + + + 更新UserID + + + + + 更新日期 + + 工單條碼規則設定文件檔 @@ -12872,22 +13507,42 @@ - 工單對應SOP文件紀錄 + 工單製程對應SOP資料檔 - + - WIP_ID + 工單SOP_ID - + - MATERIAL_SOP_ID + 工單號碼 - + - 狀態 + 料號 + + + + + SOP檔案名稱 + + + + + SOP路徑 + + + + + SOP類型 + + + + + 生產單位ID @@ -12910,16 +13565,6 @@ 更新日期 - - - 工單資料 - - - - - SOP資料 - - 工單各站數量資料檔 @@ -13145,6 +13790,41 @@ 更新日期 + + + PowerMode_Desc + + + + + BIOS_Desc + + + + + EC_Desc + + + + + FW_Desc + + + + + FW1_Desc + + + + + FW2_Desc + + + + + OS_Desc + + 工單各站數量資料檔 – By TIME diff --git a/AMESCoreStudio.WebApi/.vs/AMESCoreStudio.WebApi/DesignTimeBuild/.dtbcache.v2 b/AMESCoreStudio.WebApi/.vs/AMESCoreStudio.WebApi/DesignTimeBuild/.dtbcache.v2 deleted file mode 100644 index 563bf0e4..00000000 Binary files a/AMESCoreStudio.WebApi/.vs/AMESCoreStudio.WebApi/DesignTimeBuild/.dtbcache.v2 and /dev/null differ diff --git a/AMESCoreStudio.WebApi/.vs/AMESCoreStudio.WebApi/v16/.suo b/AMESCoreStudio.WebApi/.vs/AMESCoreStudio.WebApi/v16/.suo deleted file mode 100644 index 24ec4f87..00000000 Binary files a/AMESCoreStudio.WebApi/.vs/AMESCoreStudio.WebApi/v16/.suo and /dev/null differ diff --git a/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj b/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj index 921fc9ac..9ac72a48 100644 --- a/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj +++ b/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj @@ -16,19 +16,14 @@ + - - - - - - diff --git a/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj.user b/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj.user index 4d3e0e03..3cbbff43 100644 --- a/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj.user +++ b/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj.user @@ -1,16 +1,15 @@  - 650 + 650.4 ApiControllerWithContextScaffolder root/Common/Api - True + False False True - AMESCoreStudio.WebApi.AMESContext False - false + true True D:\jh-ames-git\AMESCoreStudio.WebApi\Properties\PublishProfiles\FolderProfile.pubxml diff --git a/AMESCoreStudio.WebApi/Code/IgnorePropertyAttribute.cs b/AMESCoreStudio.WebApi/Code/IgnorePropertyAttribute.cs deleted file mode 100644 index e2689504..00000000 --- a/AMESCoreStudio.WebApi/Code/IgnorePropertyAttribute.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace AMESCoreStudio.WebApi -{ - /// - /// Swagger:隐藏属性 - /// - [AttributeUsage(AttributeTargets.Property)] - public class IgnorePropertyAttribute : Attribute - { - } -} diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FactoryUnitController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FactoryUnitController.cs deleted file mode 100644 index ff001354..00000000 --- a/AMESCoreStudio.WebApi/Controllers/AMES/FactoryUnitController.cs +++ /dev/null @@ -1,52 +0,0 @@ -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 -{ - - /// - /// - /// - [Route("api/[controller]")] - [ApiController] - public class FactoryUnitController : Controller - { - private readonly AMESContext _context; - - /// - /// - /// - /// - public FactoryUnitController(AMESContext context) - { - _context = context; - } - - /// - /// 獲取產品別資料 - /// - /// - // GET: api/SystemInfoes - [HttpGet] - public async Task>> GetFactoryUnit() - { - IQueryable 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; - } - } -} diff --git a/AMESCoreStudio.WebApi/DTO/LoginDTO.cs b/AMESCoreStudio.WebApi/DTO/LoginDTO.cs index a9281a90..a14f2219 100644 --- a/AMESCoreStudio.WebApi/DTO/LoginDTO.cs +++ b/AMESCoreStudio.WebApi/DTO/LoginDTO.cs @@ -36,13 +36,13 @@ namespace AMESCoreStudio.WebApi /// /// 登錄IP /// - [IgnoreProperty] + //[IgnoreProperty] public string LoginIP { get; set; } = "N/A"; /// /// 报错信息 /// - [IgnoreProperty] + //[IgnoreProperty] public string Msg { get; set; } = ""; } } diff --git a/AMESCoreStudio.WebApi/Startup.cs b/AMESCoreStudio.WebApi/Startup.cs index 133276c0..ae7437b8 100644 --- a/AMESCoreStudio.WebApi/Startup.cs +++ b/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,12 +45,14 @@ 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( - // opt => opt.UseLazyLoadingProxies().UseOracle(Configuration.GetConnectionString("AMESContext"), b => b.UseOracleSQLCompatibility("11"))); + + services.Configure(options => + { + options.SuppressModelStateInvalidFilter = true; + }); services.AddDbContext( - opt => opt.UseLazyLoadingProxies().UseOracle(Configuration.GetConnectionString("AMESContext"), b => b.UseOracleSQLCompatibility("11")) - .UseLoggerFactory(LoggerFactory.Create(builder => builder.AddConsole()))); + opt => opt.UseLazyLoadingProxies().UseOracle(Configuration.GetConnectionString("AMESContext"), b => b.UseOracleSQLCompatibility("11"))); services.AddControllers(); @@ -86,14 +88,6 @@ 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); } /// @@ -114,8 +108,7 @@ namespace AMESCoreStudio.WebApi c.SerializeAsV2 = true; }); - app.UseSwaggerUI(c => - { + app.UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/v1/swagger.json", "AMESCoreStudio v1"); c.RoutePrefix = "amesapi";//øڵ }); diff --git a/AMESCoreStudio.WebApi/appsettings.json b/AMESCoreStudio.WebApi/appsettings.json index cf453c88..4825416a 100644 --- a/AMESCoreStudio.WebApi/appsettings.json +++ b/AMESCoreStudio.WebApi/appsettings.json @@ -7,9 +7,8 @@ } }, "ConnectionStrings": { - "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=1522))(CONNECT_DATA=(SERVICE_NAME=xe)));User Id=JHAMES;Password=AMES666;", - "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;" + "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=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=JHDB)));User Id=JHSYS;Password=ASYS666;" }, "AllowedHosts": "*" } diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll index 9e28cab1..4b6f78c3 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb index 3eb2e492..7eadcbf0 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll index 011d7ba1..1f9d8abe 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.exe b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.exe index f79e2f39..87c4046e 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.exe and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.exe differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb index c7d58340..02a83e09 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json index 2e393e8b..2d16c522 100644 --- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json +++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json @@ -1,9 +1,8 @@ { "runtimeOptions": { "additionalProbingPaths": [ - "C:\\Users\\RayLin\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\RayLin\\.nuget\\packages", - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "C:\\Users\\USER\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\USER\\.nuget\\packages" ] } } \ No newline at end of file diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml index fe7c892c..da2cfd03 100644 --- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -29,11 +29,6 @@ - - - Swagger:隐藏属性 - - @@ -1607,6 +1602,16 @@ + + + + + + + + + + @@ -2147,6 +2152,14 @@ + + + 更新不良現象原因狀態 + + + + + @@ -2337,6 +2350,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 工作群組維護 @@ -2450,6 +2509,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 設備狀態紀錄維護 @@ -2657,6 +2808,25 @@ + + + PLM轉入料號說明 + + + + + + + PLM料號 + + + + + 關鍵字查詢 + + PLM料號 + + @@ -3446,6 +3616,13 @@ 工單號碼 + + + 查詢工單資料Barcode By 條碼前置碼 + + 工單號碼 + + 新增工單資料-條碼Barcode @@ -3544,6 +3721,32 @@ + + + 工單資訊確認 + + + + + 更新工程確認 + + + + + + + 更新製造確認 + + + + + + + 更新生管確認 + + + + 各班別數量資料檔 @@ -3563,6 +3766,22 @@ + + + 良率查詢 + + + + + + + + + + + + + @@ -3623,7 +3842,7 @@ - 工單資本資料 + 更新工單資本資料 @@ -3660,6 +3879,13 @@ + + + 刪除工單KP資訊資料檔 + + + + @@ -3780,6 +4006,39 @@ + + + 工單治具資料檔 + + + + + ByWipNo + + 工單號碼 + + + + + 更新工單治具資料檔 + + + + + + + 新增工單治具資料檔 + + + + + + + 刪除工單治具資料檔 + + + + @@ -3792,6 +4051,11 @@ + + + 工單製程對應SOP資料檔 + + @@ -3804,16 +4068,32 @@ + + + ByWipNo + + 工單號碼 + + - SOP文件查詢 + 新增工單製程對應SOP資料檔 - 料號 - 生產單位 - 檔案名稱 - 狀態 - 建立日期起 - 建立日期迄 + + + + + + 更新工單製程對應SOP資料檔 + + + + + + + 刪除工單製程對應SOP資料檔 + + @@ -6444,9 +6724,9 @@ 工單KP_ID - + - 工單ID + 工單號碼 @@ -6479,14 +6759,14 @@ 長度 - + 生產單位代號 - + - 狀態 A:啟用 S:停用 + 生產單位 @@ -6599,52 +6879,137 @@ 是否有過站 - + - (過站資料)BarCodeCheck Dto + 工單治具資料檔 DTO - + - 工單號碼 + 工單治具ID - + - 工單ID + 工單號碼 - + - 內部條碼 + 料號 - + - 內部條碼ID + 設備編碼 - + - 條碼狀態 M:一般 S:維修 + 設備名稱 - + - 條碼過站狀態 P:Pass F:Fail + 生產單位代號 - + 生產單位 - + - 流程ID + 工單製程對應SOP資料檔 DTO - + + + 工單SOP_ID + + + + + 工單號碼 + + + + + 料號 + + + + + SOP檔案名稱 + + + + + SOP路徑 + + + + + SOP類型 + + + + + 生產單位代號 + + + + + 生產單位 + + + + + (過站資料)BarCodeCheck Dto + + + + + 工單號碼 + + + + + 工單ID + + + + + 內部條碼 + + + + + 內部條碼ID + + + + + 條碼狀態 M:一般 S:維修 + + + + + 條碼過站狀態 P:Pass F:Fail + + + + + 生產單位 + + + + + 流程ID + + + 作業站 @@ -7521,19 +7886,24 @@ 內部序號對應的治具序號明細 + + + 治具區域資料檔 + + 設備種類資料檔 - + - 設備規格資料檔 + 層別資料檔 - + - 廠商資料檔 + 位置資料檔 @@ -7541,11 +7911,26 @@ 治具資料檔 + + + PLM轉入料號說明 + + 設備狀態紀錄資料檔 + + + 工單資訊確認 + + + + + 工單治具資料檔 + + 條碼變更資料表 @@ -10528,6 +10913,11 @@ 責任單位 + + + 状态 + + 不良維修資料檔 @@ -10658,6 +11048,41 @@ 更新日期 + + + 區域資料檔 + + + + + 區域代碼 + + + + + 區域名稱 + + + + + 創建者ID + + + + + 創建日期 + + + + + 更新者ID + + + + + 更新日期 + + 設備種類資料檔 @@ -10950,6 +11375,76 @@ 更新日期 + + + 層別資料檔 + + + + + 區域代碼 + + + + + 層別描述 + + + + + 創建者ID + + + + + 創建日期 + + + + + 更新者ID + + + + + 更新日期 + + + + + 位置資料檔 + + + + + 位置代碼 + + + + + 位置描述 + + + + + 創建者ID + + + + + 創建日期 + + + + + 更新者ID + + + + + 更新日期 + + 設備記錄檔 @@ -11170,6 +11665,56 @@ 修改時間 + + + PLM轉入料號說明 + + + + + 物料 + + + + + 物料描述 + + + + + 機種系列 + + + + + 生產備忘錄 + + + + + 狀態 + + + + + EAN + + + + + 長文 + + + + + 建立日期 + + + + + 更新日期 + + 用户资料表 @@ -12310,6 +12855,46 @@ 更新日期 + + + 工單資訊確認 + + + + + 工單號碼 + + + + + 生管UsesID + + + + + 生管確認時間 + + + + + 製造UserID + + + + + 製造UserID + + + + + 工程確認時間 + + + + + 工程確認時間 + + 各班別數量資料檔 @@ -12560,9 +13145,9 @@ 工單KP_ID - + - 工單ID + 工單號碼 @@ -12600,11 +13185,6 @@ 生產單位代號 - - - 狀態 A:啟用 S:停用 - - 建立UserID @@ -12840,6 +13420,61 @@ 修改日期 + + + 工單治具資料檔 + + + + + 工單治具ID + + + + + 工單號碼 + + + + + 料號 + + + + + 設備編碼 + + + + + 設備名稱 + + + + + 生產單位代號 + + + + + 建立UserID + + + + + 建立日期 + + + + + 更新UserID + + + + + 更新日期 + + 工單條碼規則設定文件檔 @@ -12872,22 +13507,42 @@ - 工單對應SOP文件紀錄 + 工單製程對應SOP資料檔 - + - WIP_ID + 工單SOP_ID - + - MATERIAL_SOP_ID + 工單號碼 - + - 狀態 + 料號 + + + + + SOP檔案名稱 + + + + + SOP路徑 + + + + + SOP類型 + + + + + 生產單位ID @@ -12910,16 +13565,6 @@ 更新日期 - - - 工單資料 - - - - - SOP資料 - - 工單各站數量資料檔 @@ -13145,6 +13790,41 @@ 更新日期 + + + PowerMode_Desc + + + + + BIOS_Desc + + + + + EC_Desc + + + + + FW_Desc + + + + + FW1_Desc + + + + + FW2_Desc + + + + + OS_Desc + + 工單各站數量資料檔 – By TIME diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/appsettings.json b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/appsettings.json index cf453c88..4825416a 100644 --- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/appsettings.json +++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/appsettings.json @@ -7,9 +7,8 @@ } }, "ConnectionStrings": { - "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=1522))(CONNECT_DATA=(SERVICE_NAME=xe)));User Id=JHAMES;Password=AMES666;", - "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;" + "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=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=JHDB)));User Id=JHSYS;Password=ASYS666;" }, "AllowedHosts": "*" } diff --git a/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo b/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo index 6e16a32a..8a2cdb6c 100644 Binary files a/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo and b/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo differ diff --git a/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.exe b/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.exe index 6105861f..88e48e65 100644 Binary files a/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.exe and b/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.exe differ diff --git a/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.pdb b/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.pdb index b1eaadcc..ccc2d56a 100644 Binary files a/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.pdb and b/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.pdb differ diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.CoreCompileInputs.cache b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.CoreCompileInputs.cache index 656a9830..47fe479f 100644 --- a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.CoreCompileInputs.cache +++ b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -2911a070cfcbab9b421c605adc4621bd70e2d537 +1b3c893708ca941b0dd54e78bee183b5991a80bf diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.FileListAbsolute.txt b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.FileListAbsolute.txt index f2b381d9..5b210812 100644 --- a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.FileListAbsolute.txt +++ b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.FileListAbsolute.txt @@ -27,6 +27,8 @@ 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 @@ -46,5 +48,3 @@ 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 diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.GenerateResource.cache b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.GenerateResource.cache index b01b72a6..94749023 100644 Binary files a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.GenerateResource.cache and b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.GenerateResource.cache differ diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.exe b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.exe index 6105861f..88e48e65 100644 Binary files a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.exe and b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.exe differ diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.pdb b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.pdb index b1eaadcc..ccc2d56a 100644 Binary files a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.pdb and b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.pdb differ diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 34d9d250..f447bf42 100644 Binary files a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index e69f3919..ed911d8b 100644 Binary files a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ