From d3cbd5a522f94bf0bbd19a8fe34a578c001a2ad4 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 6 Feb 2023 15:44:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=B7=A5=E5=96=AE=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E9=9A=B1=E8=97=8F=20=E5=88=AA=E9=99=A4=E6=8C=89=E9=88=95=202.?= =?UTF-8?q?=20FQC=E6=9F=A5=E8=A9=A2=20=E4=BF=AE=E6=AD=A3=E5=BB=A0=E5=88=A5?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=81=B8=E5=96=AE=E5=88=A4=E6=96=B7=203.=20?= =?UTF-8?q?=E5=B7=A5=E5=96=AE=E4=BF=AE=E6=94=B9=20SOP=E3=80=81KP=E3=80=81?= =?UTF-8?q?=E6=B2=BB=E5=85=B7=20=E5=8A=A0=E5=85=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=BA=E5=93=A1=E6=9B=B4=E6=96=B0Table?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.Web/Controllers/FQCController.cs | 1 + AMESCoreStudio.Web/Controllers/PCSController.cs | 6 ++++++ AMESCoreStudio.Web/Views/PCS/PCS002.cshtml | 14 +++++++------- AMESCoreStudio.WebApi/DTO/AMES/WipKpDto.cs | 11 +++++++++++ AMESCoreStudio.WebApi/DTO/AMES/WipOutfitDto.cs | 11 +++++++++++ AMESCoreStudio.WebApi/DTO/AMES/WipSopDto.cs | 8 ++++++++ 6 files changed, 44 insertions(+), 7 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs index 47d1b8e1..0b0f2b61 100644 --- a/AMESCoreStudio.Web/Controllers/FQCController.cs +++ b/AMESCoreStudio.Web/Controllers/FQCController.cs @@ -186,6 +186,7 @@ namespace AMESCoreStudio.Web.Controllers var result = await _pcsApi.GetFactoryInfo(); var FactoryInfo = new List(); + result = result.Where(w => w.StatusNo == "A").OrderBy(o => o.FactoryID).ToList(); for (int i = 0; i < result.Count; i++) { FactoryInfo.Add(new SelectListItem(result[i].FactoryNo + "-" + result[i].FactoryNameCh, result[i].FactoryID.ToString())); diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs index d76ea0fb..d7bd9188 100644 --- a/AMESCoreStudio.Web/Controllers/PCSController.cs +++ b/AMESCoreStudio.Web/Controllers/PCSController.cs @@ -2811,6 +2811,7 @@ namespace AMESCoreStudio.Web.Controllers { item.WipNo = model.wipInfo.WipNO; item.ItemNo = model.wipAtt.ItemNO; + item.UpdateUserID = UserID; if (item.WipKpID == 0) await _pcsApi.PostWipKp(JsonConvert.SerializeObject(item)); else @@ -2845,6 +2846,7 @@ namespace AMESCoreStudio.Web.Controllers { item.WipNo = model.wipInfo.WipNO; item.ItemNo = model.wipAtt.ItemNO; + item.UpdateUserID = UserID; item.OutfitNo = "."; if (item.WipOutfitID == 0) await _pcsApi.PostWipOutfit(JsonConvert.SerializeObject(item)); @@ -2865,6 +2867,7 @@ namespace AMESCoreStudio.Web.Controllers { item.WipNo = model.wipInfo.WipNO; item.ItemNo = model.wipAtt.ItemNO; + item.UpdateUserID = UserID; if (item.WipSOPID == 0) await _pcsApi.PostWipSop(JsonConvert.SerializeObject(item)); else @@ -3394,6 +3397,7 @@ namespace AMESCoreStudio.Web.Controllers { item.WipNo = model.wipInfo.WipNO; item.ItemNo = model.wipAtt.ItemNO; + item.UpdateUserID = UserID; if (item.WipKpID == 0) await _pcsApi.PostWipKp(JsonConvert.SerializeObject(item)); else @@ -3429,6 +3433,7 @@ namespace AMESCoreStudio.Web.Controllers item.WipNo = model.wipInfo.WipNO; item.ItemNo = model.wipAtt.ItemNO; item.OutfitNo = "."; + item.UpdateUserID = UserID; if (item.WipOutfitID == 0) await _pcsApi.PostWipOutfit(JsonConvert.SerializeObject(item)); else @@ -3448,6 +3453,7 @@ namespace AMESCoreStudio.Web.Controllers { item.WipNo = model.wipInfo.WipNO; item.ItemNo = model.wipAtt.ItemNO; + item.UpdateUserID = UserID; if (item.WipSOPID == 0) await _pcsApi.PostWipSop(JsonConvert.SerializeObject(item)); else diff --git a/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml index d0790560..51dda48c 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml @@ -6,11 +6,11 @@ @inject IHtmlLocalizer sharedLocalizer
@@ -152,8 +152,8 @@ fixed: 'right', templet: function (d) { return '修改\ - 檢視\ - 删除' + 檢視' + //// 删除 } } ] diff --git a/AMESCoreStudio.WebApi/DTO/AMES/WipKpDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/WipKpDto.cs index 3e1f12ef..3b8c42df 100644 --- a/AMESCoreStudio.WebApi/DTO/AMES/WipKpDto.cs +++ b/AMESCoreStudio.WebApi/DTO/AMES/WipKpDto.cs @@ -75,5 +75,16 @@ namespace AMESCoreStudio.WebApi.DTO.AMES public string UnitNoName { get; set; } + /// + /// 更新UserID + /// + + public int? UpdateUserID { get; set; } + + /// + /// 更新時間 + /// + public DateTime? UpdateTime { get; set; } + } } diff --git a/AMESCoreStudio.WebApi/DTO/AMES/WipOutfitDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/WipOutfitDto.cs index 1d561a6e..72d0ba2b 100644 --- a/AMESCoreStudio.WebApi/DTO/AMES/WipOutfitDto.cs +++ b/AMESCoreStudio.WebApi/DTO/AMES/WipOutfitDto.cs @@ -69,5 +69,16 @@ namespace AMESCoreStudio.WebApi.DTO.AMES public string StationName { get; set; } + /// + /// 更新UserID + /// + + public int? UpdateUserID { get; set; } + + /// + /// 更新時間 + /// + public DateTime? UpdateTime { get; set; } + } } diff --git a/AMESCoreStudio.WebApi/DTO/AMES/WipSopDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/WipSopDto.cs index 436c864f..7425d299 100644 --- a/AMESCoreStudio.WebApi/DTO/AMES/WipSopDto.cs +++ b/AMESCoreStudio.WebApi/DTO/AMES/WipSopDto.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; using System.Linq; +using System.Runtime.Serialization; using System.Threading.Tasks; #nullable disable @@ -64,6 +66,12 @@ namespace AMESCoreStudio.WebApi.DTO.AMES public string UnitNoName { get; set; } + /// + /// 更新UserID + /// + + public int? UpdateUserID { get; set; } + /// /// 更新時間 ///