diff --git a/AMESCoreStudio.Web/Views/WHS/WHS003C.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS003C.cshtml index 9da6379e..7bdd8483 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS003C.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS003C.cshtml @@ -25,7 +25,7 @@
- +
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS009C.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS009C.cshtml index 2f7406fe..59e130ec 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS009C.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS009C.cshtml @@ -31,7 +31,7 @@
-
@@ -42,7 +42,7 @@
- @@ -242,6 +242,12 @@ } }); + $("#UnitNo").change(function () { + var data = $("#UnitNo").val(); + //console.info(data); + getLines(data); + getStations(data); + }); function getUserInfoes(data) { $.ajax({ @@ -340,6 +346,66 @@ } }); }; + function getLines(data) { + $.ajax({ + url: "/BAS/GetLineInfoes", + dataType: 'json', + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + $("#LineID").empty(); + $('#LineID').append(new Option("請選擇", "")); + var count = 0; + $.each(result.data, function (index, item) { + if (item.unitNo == data) { + $('#LineID').append(new Option(item.lineDesc, item.lineID)); + count = count + 1; + } + }); + if (count == 0) { + $("#LineID").empty(); + $('#LineID').append(new Option("無選項", "")); + } + } + else { + $("#LineID").empty(); + $('#LineID').append(new Option("無選項", "")); + } + layui.form.render("select"); + } + }); + }; + function getStations(data) { + $.ajax({ + url: "/BAS/GetStationses", + dataType: 'json', + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + $("#StationID").empty(); + $('#StationID').append(new Option("請選擇", "")); + var count = 0; + $.each(result.data, function (index, item) { + if (item.unitNo == data) { + $('#StationID').append(new Option(item.stationName, item.stationID)); + count = count + 1; + } + }); + if (count == 0) { + $("#StationID").empty(); + $('#StationID').append(new Option("無選項", "")); + } + } + else { + $("#StationID").empty(); + $('#StationID').append(new Option("無選項", "")); + } + layui.form.render("select"); + } + }); + }; layui.use(['laydate'], function () { //form = layui.form; 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 154fa5b1..dc2d715d 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 dcd2ff42..b2406ff4 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 8a85f440..9f430d81 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.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb index 117abea8..d4683b9f 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.WebApi.Views.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll index b4de95e9..82057d33 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 38499cb8..0616febf 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 094175aa..76f05619 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.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb index 29eb02db..d2613940 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.xml b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml index 556e22eb..846a80ca 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -2199,6 +2199,13 @@ + + + ByWipNo + + + + @@ -4263,6 +4270,25 @@ + + + 工單序號退回紀錄 + + + + + 更新工單序號退回紀錄 + + + + + + + 新增工單序號退回紀錄 + + + + @@ -12395,6 +12421,51 @@ 更新日期 + + + 工單序號退回紀錄 + + + + + ID + + + + + 工單號碼 + + + + + 指定過站 RuleStation + + + + + 返回過站 RuleStation + + + + + 返回類型 P:單站退回 A:通過退回 + + + + + 備註 + + + + + 建立UserID + + + + + 建立日期 + + 工單條碼規則設定文件檔 @@ -14945,6 +15016,61 @@ 更新日期 + + + 不良維修 Dto + + + + + 流程站 + + + + + 不良代碼 + + + + + 不良代碼說明 + + + + + 零件位置 + + + + + 處理狀態(0:尚未維修處理, 1:已維修處理, 2:誤判) + + + + + 維修代碼 + + + + + 維修代碼說明 + + + + + 維修說明 + + + + + 回覆人員 + + + + + 回覆日期 + + MaterialKpDtp Select Dto @@ -16934,6 +17060,11 @@ 樣本序號取得記錄資料表 + + + 工單序號退回紀錄 + + diff --git a/AMESCoreStudio.WebApi/Models/AMES/StandardWorkTime.cs b/AMESCoreStudio.WebApi/Models/AMES/StandardWorkTime.cs index 0f4b779c..e95e043a 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/StandardWorkTime.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/StandardWorkTime.cs @@ -63,8 +63,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Column("FIRST_TIME")] [DataMember] [Display(Name = "首件產出時間(分)")] - [Required(ErrorMessage = "{0},不能空白")] - public decimal FirstTime { get; set; } + public decimal? FirstTime { get; set; } /// /// CT @@ -81,8 +80,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Column("CT")] [DataMember] [Display(Name = "節拍時間(分)")] - [Required(ErrorMessage = "{0},不能空白")] - public decimal CT { get; set; } + public decimal? CT { get; set; } /// /// 操機數 @@ -90,8 +88,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Column("MACHINE_CNT")] [DataMember] [Display(Name = "操機數(台/人)")] - [Required(ErrorMessage = "{0},不能空白")] - public decimal MachineCT { get; set; } + public decimal? MachineCT { get; set; } /// /// 正背面 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 b4de95e9..82057d33 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 38499cb8..0616febf 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 094175aa..76f05619 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.pdb b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb index 29eb02db..d2613940 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.xml b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml index 556e22eb..846a80ca 100644 --- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -2199,6 +2199,13 @@ + + + ByWipNo + + + + @@ -4263,6 +4270,25 @@ + + + 工單序號退回紀錄 + + + + + 更新工單序號退回紀錄 + + + + + + + 新增工單序號退回紀錄 + + + + @@ -12395,6 +12421,51 @@ 更新日期 + + + 工單序號退回紀錄 + + + + + ID + + + + + 工單號碼 + + + + + 指定過站 RuleStation + + + + + 返回過站 RuleStation + + + + + 返回類型 P:單站退回 A:通過退回 + + + + + 備註 + + + + + 建立UserID + + + + + 建立日期 + + 工單條碼規則設定文件檔 @@ -14945,6 +15016,61 @@ 更新日期 + + + 不良維修 Dto + + + + + 流程站 + + + + + 不良代碼 + + + + + 不良代碼說明 + + + + + 零件位置 + + + + + 處理狀態(0:尚未維修處理, 1:已維修處理, 2:誤判) + + + + + 維修代碼 + + + + + 維修代碼說明 + + + + + 維修說明 + + + + + 回覆人員 + + + + + 回覆日期 + + MaterialKpDtp Select Dto @@ -16934,6 +17060,11 @@ 樣本序號取得記錄資料表 + + + 工單序號退回紀錄 + +