diff --git a/AMESCoreStudio.Web/Controllers/KCSController.cs b/AMESCoreStudio.Web/Controllers/KCSController.cs index 03267dbc..59a10db5 100644 --- a/AMESCoreStudio.Web/Controllers/KCSController.cs +++ b/AMESCoreStudio.Web/Controllers/KCSController.cs @@ -21,6 +21,21 @@ namespace AMESCoreStudio.Web.Controllers _kcsApi = kcsApi; } + private async Task GetMaxClassGroup() + { + var result = await _kcsApi.GetMACInfo("DESC"); + + if (result.Count == 0) + { + ViewBag.MaxClassGroup = ""; + } + else + { + ViewBag.MaxClassGroup = result[0].ClassGroup; + } + + } + private async Task GetItemType() { var ItemTypeList = new List(); @@ -53,6 +68,116 @@ namespace AMESCoreStudio.Web.Controllers ViewBag.SNIntervalList = SNIntervalList; } + #region KCS001 MAC資料維護相關 + + public IActionResult KCS001() + { + return View(); + } + + //新增頁面 + public async Task KCS001C() + { + await GetMaxClassGroup(); + + return View(); + } + + //修改页面 + [HttpGet] + public async Task KCS001UAsync(string id) + { + var result = await _kcsApi.GetMACInfo(id); + + if (result.Count == 0) + { + return View(); + } + return View(result[0]); + } + + public async Task KCS001DAsync(string id) + { + var result = await _kcsApi.DeleteMACInfo(id); + return Json(new Result() { success = true, msg = "" }); + } + + //頁面提交，id=0 添加，id>0 修改 + [HttpPost] + public async Task KCS001CSaveAsync(MACInfo model) + { + if (ModelState.IsValid) + { + IResultModel result; + + result = await _kcsApi.PostMACInfo(JsonConvert.SerializeObject(model)); + + + if (result.Success) + { + var _msg = "添加成功！"; + return RedirectToAction("Refresh", "Home", new { msg = _msg }); + } + else + { + if (result.Errors.Count > 0) + { + ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg); + } + else + { + ModelState.AddModelError("error", result.Msg); + } + } + } + return View("KCS001C", model); + } + + public async Task KCS001USaveAsync(MACInfo model) + { + if (ModelState.IsValid) + { + IResultModel result; + + result = await _kcsApi.PutMACInfo(model.Class + "," + model.ClassGroup, JsonConvert.SerializeObject(model)); + + if (result.Success) + { + var _msg = "修改成功！"; + return RedirectToAction("Refresh", "Home", new { msg = _msg }); + } + else + { + if (result.Errors.Count > 0) + { + ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg); + } + else + { + ModelState.AddModelError("error", result.Msg); + } + } + } + return View("KCS001U", model); + } + + [ResponseCache(Duration = 0)] + [HttpGet] + public async Task GetMACInfoesAsync(int page = 1, int limit = 10) + { + var result_total = await _kcsApi.GetMACInfoes(0, limit); + var result = await _kcsApi.GetMACInfoes(page, limit); + + if (result.Count > 0) + { + return Json(new Table() { code = 0, msg = "", data = result, count = result_total.Count }); + } + + return Json(new Table() { count = 0, data = null }); + } + + #endregion + #region KCS002序號料號維護相關 public IActionResult KCS002() @@ -141,7 +266,7 @@ namespace AMESCoreStudio.Web.Controllers } } } - return View("PPS002U", model); + return View("KCS002U", model); } [ResponseCache(Duration = 0)] @@ -249,7 +374,7 @@ namespace AMESCoreStudio.Web.Controllers } } } - return View("PPS004U", model); + return View("KCS004U", model); } [ResponseCache(Duration = 0)] @@ -363,7 +488,7 @@ namespace AMESCoreStudio.Web.Controllers } } } - return View("PPS006U", model); + return View("KCS006U", model); } [ResponseCache(Duration = 0)] diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IKCS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IKCS.cs index 1dd5c89a..b5f22270 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/IKCS.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/IKCS.cs @@ -12,6 +12,45 @@ namespace AMESCoreStudio.Web [JsonReturn] public interface IKCS:IHttpApi { + #region KCS001 MAC資料維護 + + /// + /// 新增MAC資料 + /// + /// + [WebApiClient.Attributes.HttpPost("api/MACInfoes")] + ITask> PostMACInfo([FromBody, RawJsonContent] string model); + + /// + /// 更新MAC資料 + /// + /// + [WebApiClient.Attributes.HttpPut("api/MACInfoes/{id}")] + ITask> PutMACInfo(string id, [FromBody, RawJsonContent] string model); + + /// + /// 刪除MAC資料 + /// + /// + [WebApiClient.Attributes.HttpDelete("api/MACInfoes/{id}")] + ITask> DeleteMACInfo(string id); + + /// + /// 根據ID獲取指定MAC資料 + /// + /// + [WebApiClient.Attributes.HttpGet("api/MACInfoes/{id}")] + ITask> GetMACInfo(string id); + + /// + /// 獲取MAC資料 + /// + /// + [WebApiClient.Attributes.HttpGet("api/MACInfoes")] + ITask> GetMACInfoes(int page = 1, int limit = 10); + + #endregion + #region KCS002 序號料號維護 /// diff --git a/AMESCoreStudio.Web/Views/Home/Framework.cshtml b/AMESCoreStudio.Web/Views/Home/Framework.cshtml index 7ff45a52..e610b0b3 100644 --- a/AMESCoreStudio.Web/Views/Home/Framework.cshtml +++ b/AMESCoreStudio.Web/Views/Home/Framework.cshtml @@ -217,6 +217,9 @@ 組件控管模組
    +
  • + MAC資料維護 +
  • 序號-料號維護
    • diff --git a/AMESCoreStudio.Web/Views/KCS/KCS001.cshtml b/AMESCoreStudio.Web/Views/KCS/KCS001.cshtml new file mode 100644 index 00000000..ea8e96fd --- /dev/null +++ b/AMESCoreStudio.Web/Views/KCS/KCS001.cshtml @@ -0,0 +1,115 @@ +@{ + ViewData["Title"] = "MAC資料維護"; + Layout = "~/Views/Shared/_AMESLayout.cshtml"; +} + +
    +
    +
    +
    +
    @ViewBag.Title
    +
    +
    +
    +
    +
    +
    +
    + +@section Scripts{ + +} \ No newline at end of file diff --git a/AMESCoreStudio.Web/Views/KCS/KCS001C.cshtml b/AMESCoreStudio.Web/Views/KCS/KCS001C.cshtml new file mode 100644 index 00000000..3420e02d --- /dev/null +++ b/AMESCoreStudio.Web/Views/KCS/KCS001C.cshtml @@ -0,0 +1,121 @@ +@model AMESCoreStudio.WebApi.Models.AMES.MACInfo + + +@{ ViewData["Title"] = "KCS001C"; + Layout = "~/Views/Shared/_FormLayout.cshtml"; } + + + + +
    +
    +
    +
    + +
    + + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + +
    +
    + + +
    +
    + + +
    +
    + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    + @Html.ValidationMessage("error") +
    + +
    + +
    +
    +
    + +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); + await Html.RenderPartialAsync("_FileinputScriptsPartial"); } + + + + +} + diff --git a/AMESCoreStudio.Web/Views/KCS/KCS001U.cshtml b/AMESCoreStudio.Web/Views/KCS/KCS001U.cshtml new file mode 100644 index 00000000..603a97c1 --- /dev/null +++ b/AMESCoreStudio.Web/Views/KCS/KCS001U.cshtml @@ -0,0 +1,117 @@ +@model AMESCoreStudio.WebApi.Models.AMES.MACInfo + + +@{ ViewData["Title"] = "KCS001U"; + Layout = "~/Views/Shared/_FormLayout.cshtml"; } + + + + +
    +
    +
    +
    + +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + +
    +
    + + +
    +
    + + +
    +
    + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    + @Html.ValidationMessage("error") +
    + +
    + +
    +
    +
    + +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); + await Html.RenderPartialAsync("_FileinputScriptsPartial"); } + + + + +} + diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/MACInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/MACInfoesController.cs new file mode 100644 index 00000000..b989591b --- /dev/null +++ b/AMESCoreStudio.WebApi/Controllers/AMES/MACInfoesController.cs @@ -0,0 +1,224 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using AMESCoreStudio.WebApi; +using AMESCoreStudio.WebApi.Models.AMES; +using AMESCoreStudio.CommonTools.Result; + +namespace AMESCoreStudio.WebApi.Controllers.AMES +{ + /// + /// MAC資料維護 + /// + [Route("api/[controller]")] + [ApiController] + public class MACInfoesController : ControllerBase + { + private readonly AMESContext _context; + + /// + /// + /// + /// + public MACInfoesController(AMESContext context) + { + _context = context; + } + + /// + /// + /// + /// + // GET: api/MACInfoes + [HttpGet] + public async Task>> GetMACInfo(int page=1,int limit=10) + { + IQueryable q = _context.MACInfoes; + if (page > 0) + { + q = q.OrderBy(p => p.Class + p.ClassGroup).Skip((page - 1) * limit).Take(limit); + } + else + { + q = q.OrderBy(p => p.Class + p.ClassGroup); + } + + var macInfo = await q.ToListAsync(); + return macInfo; + } + + /// + /// + /// + /// + /// + // GET: api/MACInfoes/5 + [HttpGet("{id}")] + public async Task>> GetMACInfo(string id) + { + IQueryable q = _context.MACInfoes; + + if (id.StartsWith("DESC")) + { + q = q.OrderByDescending(p => p.ClassGroup); + } + else + { + string[] param = id.Split(','); + string classNo = param[0]; + string groupNo = param[1]; + + q = q.Where(p => p.Class.Equals(classNo) && p.ClassGroup.Equals(groupNo)); + } + var macInfo = await q.ToListAsync(); + + if (macInfo == null) + { + return NotFound(); + } + + return macInfo; + } + + /// + /// + /// + /// + /// + /// + // PUT: api/MACInfoes/5 + // To protect from overposting attacks, enable the specific properties you want to bind to, for + // more details, see https://go.microsoft.com/fwlink/?linkid=2123754. + [HttpPut("{id}")] + public async Task> PutMACInfo(string id, [FromBody] MACInfo macInfo) + { + ResultModel result = new ResultModel(); + + string[] param = id.Split(','); + string classNo = param[0]; + string groupNo = param[1]; + + macInfo.UpdateDate = DateTime.Now; + macInfo.UpdateUserID = 0; + + if (classNo != macInfo.Class) + { + result.Success = false; + result.Msg = "組件代碼錯誤"; + return result; + } + + if (groupNo != macInfo.ClassGroup) + { + result.Success = false; + result.Msg = "組件群组代碼錯誤"; + return result; + } + + _context.Entry(macInfo).State = EntityState.Modified; + + try + { + await _context.SaveChangesAsync(); + } + catch (DbUpdateConcurrencyException) + { + if (!MACInfoExists(classNo,groupNo)) + { + result.Success = false; + result.Msg = "组件资料錯誤"; + return result; + } + else + { + throw; + } + } + + result.Success = true; + result.Msg = "OK"; + return result; + } + + /// + /// + /// + /// + /// + // POST: api/MACInfoes + // To protect from overposting attacks, enable the specific properties you want to bind to, for + // more details, see https://go.microsoft.com/fwlink/?linkid=2123754. + [HttpPost] + public async Task> PostMACInfo([FromBody] MACInfo macInfo) + { + ResultModel result = new ResultModel(); + + macInfo.CreateDate = DateTime.Now; + macInfo.CreateUserID = 0; + + _context.MACInfoes.Add(macInfo); + try + { + await _context.SaveChangesAsync(); + } + catch (DbUpdateException) + { + if (MACInfoExists(macInfo.Class,macInfo.ClassGroup)) + { + result.Success = false; + result.Msg = "資料重複"; + return result; + } + else + { + throw; + } + } + + result.Success = true; + result.Msg = "OK"; + return result; + } + + /// + /// + /// + /// + /// + // DELETE: api/MACInfoes/5 + [HttpDelete("{id}")] + public async Task> DeleteMACInfo(string id) + { + ResultModel result = new ResultModel(); + + string[] param = id.Split(','); + string classNo = param[0]; + string groupNo = param[1]; + + var macInfo = await _context.MACInfoes.Where(p => p.Class == classNo && p.ClassGroup == groupNo).FirstOrDefaultAsync(); + if (macInfo == null) + { + result.Success = false; + result.Msg = "資料不存在"; + return result; + } + + _context.MACInfoes.Remove(macInfo); + await _context.SaveChangesAsync(); + + result.Success = true; + result.Msg = "OK"; + return result; + } + + + private bool MACInfoExists(string classNo,string groupNo) + { + return _context.MACInfoes.Any(e => e.Class == classNo && e.ClassGroup == groupNo); + } + } +} diff --git a/AMESCoreStudio.WebApi/Models/AMES/MACInfo.cs b/AMESCoreStudio.WebApi/Models/AMES/MACInfo.cs new file mode 100644 index 00000000..9875e196 --- /dev/null +++ b/AMESCoreStudio.WebApi/Models/AMES/MACInfo.cs @@ -0,0 +1,179 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; + +namespace AMESCoreStudio.WebApi.Models.AMES +{ + /// + /// MAC資料表 + /// + [Table("C_PARAMETER_INI", Schema = "JHAMES")] + public class MACInfo + { + /// + /// 机种 + /// + + [Column("CLASS")] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "机种")] + [StringLength(20, ErrorMessage = "{0},不能大于{1}")] + [DataMember] + public string Class { get; set; } + + /// + /// 單板MAC數 + /// + [Column("QTY")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "單板MAC數")] + public int Qty { get; set; } + + /// + /// 最大值 + /// + [Key] + [Column("MAX")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "最大值")] + [StringLength(10, ErrorMessage = "{0},不能大于{1}")] + public string Max { get; set; } + + /// + /// 最小值 + /// + [Column("MIN")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "最小值")] + [StringLength(10, ErrorMessage = "{0},不能大于{1}")] + public string Min { get; set; } + + /// + /// 當前值 + /// + [Column("VALUE")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "當前值")] + [StringLength(10, ErrorMessage = "{0},不能大于{1}")] + public string Value { get; set; } + + /// + /// 首碼 + /// + [Column("TITLE")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "首碼")] + [StringLength(10, ErrorMessage = "{0},不能大于{1}")] + public string Title { get; set; } + + /// + /// 狀態 + /// + [Column("STATUS")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "狀態")] + public int Status { get; set; } + + /// + /// 組代碼 + /// + [Column("CLASS_GROUP")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "組代碼")] + [StringLength(2, ErrorMessage = "{0},不能大于{1}")] + public string ClassGroup { get; set; } + + /// + /// 安全量 + /// + [Column("SAFE_QTY")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "安全量")] + public int SafeQty { get; set; } + + /// + /// 實際量 + /// + [Column("FACT_QTY")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "實際量")] + public int FactQty { get; set; } + + /// + /// 客戶標記 + /// + [Column("CUSTOMER_FLAG")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "客戶標記")] + [StringLength(30, ErrorMessage = "{0},不能大于{1}")] + public string CustomerFlag { get; set; } + + + /// + /// 列印方式 + /// + [Column("PRINT_TYPE")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "列印方式")] + [StringLength(2, ErrorMessage = "{0},不能大于{1}")] + public string PrintType { get; set; } + + /// + /// 標籤描述 + /// + [Column("LABEL_DESC")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "標籤描述")] + [StringLength(100, ErrorMessage = "{0},不能大于{1}")] + public string LabelDesc { get; set; } + + /// + /// 建立者 + /// + [Column("CREATE_USERID")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "建立者")] + public decimal CreateUserID { get; set; } = 0; + + /// + /// 建立時間 + /// + [Column("CREATE_DATE")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "建立時間")] + public DateTime CreateDate { get; set; } = DateTime.Now; + + /// + /// 更新者 + /// + [Column("UPDATE_USERID")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "建立者")] + public decimal UpdateUserID { get; set; } = 0; + + /// + /// 修改時間 + /// + [Column("UPDATE_DATE")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "修改時間")] + public DateTime UpdateDate { get; set; } = DateTime.Now; + } +} diff --git a/AMESCoreStudio.WebApi/Models/AMESContext.cs b/AMESCoreStudio.WebApi/Models/AMESContext.cs index 21678f0d..c494ee0e 100644 --- a/AMESCoreStudio.WebApi/Models/AMESContext.cs +++ b/AMESCoreStudio.WebApi/Models/AMESContext.cs @@ -95,7 +95,7 @@ namespace AMESCoreStudio.WebApi modelBuilder.Entity().HasOne(r => r.Dept).WithMany().HasForeignKey(r => r.DeptID).IsRequired(); modelBuilder.Entity().HasOne(r => r.Unit).WithMany().HasForeignKey(r => r.UnitNo).IsRequired(); - + modelBuilder.Entity().HasKey(c => new { c.Class, c.ClassGroup }); } /// @@ -313,6 +313,11 @@ namespace AMESCoreStudio.WebApi /// 組件類別資料 /// public DbSet Items { get; set; } + + /// + /// MAC資料 + /// + public DbSet MACInfoes { get; set; } } }