1.修改用戶資料維護,增加狀態欄位顯示

2.修改使用者密碼變更
3.修改個人密碼變更
4.修改BarcodeItem相關

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

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,

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();
 

AMESCoreStudio.WebApi/Models/AMES/BarcodeItem.cs

@@ -114,6 +114,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 站別资料
         /// </summary>
-        public virtual AMESCoreStudio.WebApi.Models.BAS.RuleStation S { get; set; }
+        public virtual AMESCoreStudio.WebApi.Models.BAS.Stations S { get; set; }
     }
 }