From 4e9a3fd3f81d6cc1bcc3a0d513e7930a736bdbd0 Mon Sep 17 00:00:00 2001 From: yiru Date: Fri, 19 Sep 2025 08:06:41 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=A0=B1=E5=B7=A5?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=99=20=E6=95=98=E8=BF=B0=20=E6=94=B9?= =?UTF-8?q?=E7=82=BA=E5=A0=B1=E5=B7=A5=E7=AB=99=E5=88=A5=202=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A0=B1=E5=B7=A5=E7=AB=99=E5=88=A5=E3=80=81?= =?UTF-8?q?=E5=A0=B1=E5=B7=A5=E7=B7=9A=E5=88=A5=E3=80=81=E5=A0=B1=E5=B7=A5?= =?UTF-8?q?=E7=94=9F=E7=94=A2=E5=96=AE=E4=BD=8D=E4=BF=AE=E6=94=B9=E8=B3=87?= =?UTF-8?q?=E6=96=99=E6=99=82=20Working=5Funit=5Fid=20=E4=B8=8D=E8=A6=8B?= =?UTF-8?q?=E7=9A=84=E5=95=8F=E9=A1=8C=203=E3=80=81=E6=A8=99=E6=BA=96?= =?UTF-8?q?=E5=B7=A5=E6=99=82=E5=82=99=E8=A8=BB=E6=94=B9=E7=82=BA=E9=9D=9E?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.Web/Controllers/WHSController.cs | 2 +- AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs | 2 +- .../ViewModels/WHS/WHS025ViewModel.cs | 1 - AMESCoreStudio.Web/Views/WHS/WHS022U.cshtml | 3 ++- AMESCoreStudio.Web/Views/WHS/WHS023U.cshtml | 1 + AMESCoreStudio.Web/Views/WHS/WHS024.cshtml | 16 ++++++++-------- AMESCoreStudio.Web/Views/WHS/WHS024U.cshtml | 1 + AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml | 1 + .../Models/AMES/WorkingStation.cs | 14 +++++++------- 9 files changed, 22 insertions(+), 19 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/WHSController.cs b/AMESCoreStudio.Web/Controllers/WHSController.cs index ba74b9d..6f2d442 100644 --- a/AMESCoreStudio.Web/Controllers/WHSController.cs +++ b/AMESCoreStudio.Web/Controllers/WHSController.cs @@ -3338,7 +3338,7 @@ namespace AMESCoreStudio.Web.Controllers #endregion - #region WHS024報工工作站基本資料相關 + #region WHS024報工站別基本資料相關 public async Task WHS024() { diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs index fe7ab1c..bb2d93f 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs @@ -785,7 +785,7 @@ namespace AMESCoreStudio.Web #endregion - #region WHS024 報工工作站基本資料 + #region WHS024 報工站別基本資料 /// /// 新增報工線別基本資料 /// diff --git a/AMESCoreStudio.Web/ViewModels/WHS/WHS025ViewModel.cs b/AMESCoreStudio.Web/ViewModels/WHS/WHS025ViewModel.cs index 4f2f7ad..0833008 100644 --- a/AMESCoreStudio.Web/ViewModels/WHS/WHS025ViewModel.cs +++ b/AMESCoreStudio.Web/ViewModels/WHS/WHS025ViewModel.cs @@ -50,7 +50,6 @@ namespace AMESCoreStudio.Web.ViewModels.WHS [Display(Name = "作業機台數")] public int MachineCnt { get; set; } - [Required(ErrorMessage = "{0},不能空白")] [Display(Name = "備註")] public string Remark { get; set; } diff --git a/AMESCoreStudio.Web/Views/WHS/WHS022U.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS022U.cshtml index c283720..fa06362 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS022U.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS022U.cshtml @@ -32,7 +32,8 @@
- + +
@Html.ValidationMessage("error") diff --git a/AMESCoreStudio.Web/Views/WHS/WHS023U.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS023U.cshtml index 5b190f2..e6c6a44 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS023U.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS023U.cshtml @@ -16,6 +16,7 @@
+ diff --git a/AMESCoreStudio.Web/Views/WHS/WHS024.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS024.cshtml index 20be83e..7a07fee 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS024.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS024.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "報工工作站基本資料"; + ViewData["Title"] = "報工站別基本資料"; Layout = "~/Views/Shared/_AMESLayout.cshtml"; } @@ -49,11 +49,11 @@ { field: 'workingStationName', width: 300, - title: '報工工作站別名稱' + title: '報工站別名稱' }, { field: 'workingStationDesc', - title: '報工工作站敘述', + title: '報工站別敘述', }, { field: 'typeNo', @@ -86,7 +86,7 @@ //通过行tool編輯，lay-event="edit" function edit(obj) { if (obj.data.workingStationID) { - hg.open('修改報工工作站', '/WHS/WHS024U/' + obj.data.workingStationID, 640,480); + hg.open('修改報工站別', '/WHS/WHS024U/' + obj.data.workingStationID, 640,480); } } @@ -96,7 +96,7 @@ str = '停用'; else str = '啟用'; - hg.confirm("報工工作站別名稱：" + obj.data.workingStationName + "，確定要" + str + "嗎?", function () { + hg.confirm("報工站別名稱：" + obj.data.workingStationName + "，確定要" + str + "嗎?", function () { $.ajax({ url: '/WHS/WHS024D', data: { id: obj.data.workingStationID }, @@ -124,7 +124,7 @@ layuiicon: '', class: 'layui-btn-normal', handler: function () { - hg.open('新增報工工作站別', '/WHS/WHS024C', 640, 480); + hg.open('新增報工站別', '/WHS/WHS024C', 640, 480); } } @@ -143,9 +143,9 @@ //基本資料表格 function tt() { var unit = $("#unitNo").val(); - table = hg.table.datatable('test', '報工工作站別維護', '/WHS/GetWorkingStations?id=' + unit + table = hg.table.datatable('test', '報工站別維護', '/WHS/GetWorkingStations?id=' + unit , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); } - // var table = hg.table.datatable('test', '報工工作站別維護', '/WHS/GetWorkingStations', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); + // var table = hg.table.datatable('test', '報工站別維護', '/WHS/GetWorkingStations', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); } \ No newline at end of file diff --git a/AMESCoreStudio.Web/Views/WHS/WHS024U.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS024U.cshtml index 8c69121..c9a708c 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS024U.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS024U.cshtml @@ -16,6 +16,7 @@
+ diff --git a/AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml index 5918755..ab57411 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml @@ -15,6 +15,7 @@
+ diff --git a/AMESCoreStudio.WebApi/Models/AMES/WorkingStation.cs b/AMESCoreStudio.WebApi/Models/AMES/WorkingStation.cs index 9132c33..725e3e3 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/WorkingStation.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/WorkingStation.cs @@ -5,35 +5,35 @@ using System.Runtime.Serialization; namespace AMESCoreStudio.WebApi.Models.AMES { /// - /// 報工工作站基本資料 + /// 報工站別基本資料 /// [Table("WORKING_STATIONS", Schema = "JHAMES")] public class WorkingStation { /// - /// 報工工作站ID + /// 報工站別ID /// [Key] [Column("WORKING_STATION_ID")] [DataMember] - [Display(Name = "報工工作站ID")] + [Display(Name = "報工站別ID")] public int WorkingStationID { get; set; } /// - /// 報工工作站名稱 + /// 報工站別名稱 /// [Column("WORKING_STATION_NAME")] [DataMember] [Required(ErrorMessage = "{0} 不能空白")] - [Display(Name = "報工工作站名稱")] + [Display(Name = "報工站別名稱")] public string WorkingStationName { get; set; } /// - /// 報工工作站敘述 + /// 報工站別敘述 /// [Column("WORKING_STATION_DESC")] [DataMember] [Required(ErrorMessage = "{0} 不能空白")] - [Display(Name = "報工工作站敘述")] + [Display(Name = "報工站別敘述")] public string WorkingStationDesc { get; set; } /// /// 報工生產單位代碼