From ad3f6c4d5dbfb0ad54a061bc038878e4abc61475 Mon Sep 17 00:00:00 2001 From: Marvin Date: Fri, 30 Sep 2022 15:08:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B6=E8=B3=87?= =?UTF-8?q?=E6=96=99=E7=B6=AD=E8=AD=B7,=E5=A2=9E=E5=8A=A0=E7=8B=80?= =?UTF-8?q?=E6=85=8B=E6=AC=84=E4=BD=8D=E9=A1=AF=E7=A4=BA=202.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BD=BF=E7=94=A8=E8=80=85=E5=AF=86=E7=A2=BC=E8=AE=8A?= =?UTF-8?q?=E6=9B=B4=203.=E4=BF=AE=E6=94=B9=E5=80=8B=E4=BA=BA=E5=AF=86?= =?UTF-8?q?=E7=A2=BC=E8=AE=8A=E6=9B=B4=204.=E4=BF=AE=E6=94=B9BarcodeItem?= =?UTF-8?q?=E7=9B=B8=E9=97=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/SYSController.cs | 8 ++++---- AMESCoreStudio.Web/Views/SYS/SYS008.cshtml | 15 +++++++++++++++ .../Controllers/AMES/BarcodeItemsController.cs | 18 +++++------------- .../Models/AMES/BarcodeItem.cs | 2 +- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/SYSController.cs b/AMESCoreStudio.Web/Controllers/SYSController.cs index acb131b2..59d11db1 100644 --- a/AMESCoreStudio.Web/Controllers/SYSController.cs +++ b/AMESCoreStudio.Web/Controllers/SYSController.cs @@ -1285,7 +1285,7 @@ namespace AMESCoreStudio.Web.Controllers result = await _sysApi.PutUserInfo(model.UserID, JsonConvert.SerializeObject(model)); - if (!result.Success) + if (result.Success) { var _msg = "修改密碼成功！"; return RedirectToAction("Refresh", "Home", new { msg = _msg }); @@ -1337,11 +1337,11 @@ namespace AMESCoreStudio.Web.Controllers result = await _sysApi.PutUserInfo(model.UserID, JsonConvert.SerializeObject(model)); - if (!result.Success) + if (result.Success) { var _msg = "修改密碼成功！"; - //return RedirectToAction("Refresh", "Home", new { msg = _msg }); - return RedirectToAction("SYS011", "SYS", new { msg = _msg }); + return RedirectToAction("Refresh", "Home", new { msg = _msg }); + //return RedirectToAction("SYS011", "SYS", new { msg = _msg }); } else diff --git a/AMESCoreStudio.Web/Views/SYS/SYS008.cshtml b/AMESCoreStudio.Web/Views/SYS/SYS008.cshtml index 1aa52b6b..765977e4 100644 --- a/AMESCoreStudio.Web/Views/SYS/SYS008.cshtml +++ b/AMESCoreStudio.Web/Views/SYS/SYS008.cshtml @@ -49,6 +49,21 @@ field: 'userCellPhone', title: '手機號碼' }, + { + field: 'userStatusID', + title: '状态', + width: 120, + templet: function (d) { + if (d.userStatusID == 0) + return '未激活' + if (d.userStatusID == 1) + return '正常' + if (d.userStatusID == 2) + return '禁用' + if (d.userStatusID == 3) + return '註銷' + } + }, { field: 'right', width: 200, diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs index 271569ea..04c09b34 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs @@ -45,19 +45,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES var BarcodeItems = await q.ToListAsync(); - - foreach (var data in BarcodeItems) { data.B = _context.BarcodeInfoes.Find(data.BarcodeID); data.I = _context.Items.Find(data.ItemNo); - data.S = _context.RuleStations.Find(data.StationID); + data.S = _context.Stationses.Find(data.StationID); } - - - - return BarcodeItems; //return await _context.BarcodeItems.ToListAsync(); } @@ -103,7 +97,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { data.B = _context.BarcodeInfoes.Find(data.BarcodeID); data.I = _context.Items.Find(data.ItemNo); - data.S = _context.RuleStations.Find(data.StationID); + data.S = _context.Stationses.Find(data.StationID); } if (barcodeItem == null) @@ -138,7 +132,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES //data.Serial = i + 1; data.B = _context.BarcodeInfoes.Find(data.BarcodeID); data.I = _context.Items.Find(data.ItemNo); - data.S = _context.RuleStations.Find(data.StationID); + data.S = _context.Stationses.Find(data.StationID); } if (barcodeItem == null) @@ -165,7 +159,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES if (id != "0") { //製程單位 - q = q.Where(p => p.S.Station.UnitNo.Equals(id)); + q = q.Where(p => p.S.UnitNo.Equals(id)); } //內部條碼 q = q.Where(p => p.B.BarcodeNo.Equals(str)); @@ -176,7 +170,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES //data.Serial = i + 1; data.B = _context.BarcodeInfoes.Find(data.BarcodeID); data.I = _context.Items.Find(data.ItemNo); - data.S = _context.RuleStations.Find(data.StationID); + data.S = _context.Stationses.Find(data.StationID); } if (barcodeItem == null) @@ -343,8 +337,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES q = q.Where(w => w.ItemNo == KPItemNo).ToList(); } - - // 紀錄筆數 result.DataTotal = q.Count(); diff --git a/AMESCoreStudio.WebApi/Models/AMES/BarcodeItem.cs b/AMESCoreStudio.WebApi/Models/AMES/BarcodeItem.cs index e36abfb7..44221c9f 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/BarcodeItem.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/BarcodeItem.cs @@ -114,6 +114,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// /// 站別资料 /// - public virtual AMESCoreStudio.WebApi.Models.BAS.RuleStation S { get; set; } + public virtual AMESCoreStudio.WebApi.Models.BAS.Stations S { get; set; } } }