diff --git a/AMESCoreStudio.Web/Controllers/BASController.cs b/AMESCoreStudio.Web/Controllers/BASController.cs index d6a088d2..3b45e9ed 100644 --- a/AMESCoreStudio.Web/Controllers/BASController.cs +++ b/AMESCoreStudio.Web/Controllers/BASController.cs @@ -116,6 +116,55 @@ namespace AMESCoreStudio.Web.Controllers ViewBag.TestTypeList = TestTypeItems; } + private async Task GetFlowRuleList() + { + var result = await _basApi.GetFlowRules(); + + var FlowRuleItems = new List(); + FlowRuleItems.Add(new SelectListItem("N/A", "0")); + for (int i = 0; i < result.Count; i++) + { + FlowRuleItems.Add(new SelectListItem(result[i].UnitNo + result[i].FlowRuleName, result[i].FlowRuleID.ToString())); + } + ViewBag.FlowRuleList = FlowRuleItems; + } + + private async Task GetStationList() + { + var result = await _basApi.GetStationses(); + + var StationItems = new List(); + for (int i = 0; i < result.Count; i++) + { + StationItems.Add(new SelectListItem(result[i].UnitNo + result[i].StationName, result[i].StationID.ToString())); + } + ViewBag.StationList = StationItems; + } + + private async Task GetRuleStationList(int id) + { + var result = await _basApi.GetRuleStationsByFlow(id); + + var RuleStationItems = new List(); + for (int i = 0; i < result.Count; i++) + { + RuleStationItems.Add(new SelectListItem(result[i].Station.UnitNo + result[i].Station.StationName, result[i].RuleStationID.ToString())); + } + ViewBag.RuleStationList = RuleStationItems; + } + + private async Task GetNextStationList(int id) + { + var result = await _basApi.GetRuleStationsByFlow(id); + + var NextStationItems = new List(); + for (int i = 0; i < result.Count; i++) + { + NextStationItems.Add(new SelectListItem(result[i].Station.UnitNo + result[i].Station.StationName, result[i].StationID.ToString())); + } + ViewBag.NextStationList = NextStationItems; + } + #endregion #region BAS001工廠资料维护相关 @@ -784,6 +833,416 @@ namespace AMESCoreStudio.Web.Controllers #endregion + #region BAS009流程資料維護相關 + + public async Task BAS009() + { + await GetFactoryUnitList(); + + return View(); + } + + //新增頁面 + public async Task BAS009C(string id) + { + await GetFactoryUnitList(); + + var model = new FlowRule(); + if (id != null) + { + if (id != "") + { + model.UnitNo = id; + } + } + + return View(model); + } + + //修改页面 + [HttpGet] + public async Task BAS009UAsync(int id) + { + await GetFactoryUnitList(); + + var result = await _basApi.GetFlowRule(id); + + if (result.Count == 0) + { + return View(); + } + return View(result[0]); + } + + public async Task BAS009DAsync(int id) + { + var result = await _basApi.DeleteFlowRule(id); + return Json(new Result() { success = true, msg = "" }); + } + + public async Task BAS009DAllAsync(int[] ids) + { + if (ids.Length > 0) + { + var result = await _basApi.DeleteFlowRule(ids[0]); + for (int i = 1; i < ids.Length; i++) + { + result = await _basApi.DeleteFlowRule(ids[i]); + } + + return Json(new Result() { success = true, msg = "" }); + } + else + { + return Json(new Result() { success = false, msg = "" }); + } + + } + + //頁面提交，id=0 添加，id>0 修改 + [HttpPost] + public async Task BAS009SaveAsync(FlowRule model) + { + if (ModelState.IsValid) + { + IResultModel result; + if (model.FlowRuleID == 0) + { + result = await _basApi.PostFlowRule(JsonConvert.SerializeObject(model)); + } + else + { + result = await _basApi.PutFlowRule(model.FlowRuleID, JsonConvert.SerializeObject(model)); + } + + if (!result.Success) + { + var _msg = model.FlowRuleID == 0 ? "添加成功！" : "修改成功！"; + 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); + } + } + } + if (model.FlowRuleID == 0) + { + return View("BAS009C", model); + } + return View("BAS009U", model); + } + + [ResponseCache(Duration = 0)] + [HttpGet] + public async Task GetFlowRulesAsync() + { + var result = await _basApi.GetFlowRules(); + + if (result.Count > 0) + { + return Json(new Table() { code = 0, msg = "", data = result, count = result.Count }); + } + + return Json(new Table() { count = 0, data = null }); + } + + [ResponseCache(Duration = 0)] + [HttpGet] + public async Task GetFlowRulesByUnitAsync(string unitNo) + { + if (unitNo == null) + { + unitNo = "0"; + } + var result = await _basApi.GetFlowRulesByUnit(unitNo); + + if (result.Count > 0) + { + return Json(new Table() { code = 0, msg = "", data = result, count = result.Count }); + } + + return Json(new Table() { count = 0, data = null }); + } + + #endregion + + #region BAS010流程站別維護相關 + + public async Task BAS010() + { + await GetFlowRuleList(); + + return View(); + } + + //新增頁面 + public async Task BAS010C(int id) + { + await GetFlowRuleList(); + await GetStationList(); + + ViewBag.FlowRuleID = id; + + var model = new RuleStation(); + if (id > 0) + { + model.FlowRuleID = id; + } + + return View(model); + } + + //修改页面 + [HttpGet] + public async Task BAS010UAsync(int id) + { + await GetFlowRuleList(); + await GetStationList(); + + var result = await _basApi.GetRuleStation(id); + + if (result.Count == 0) + { + return View(); + } + return View(result[0]); + } + + public async Task BAS010DAsync(int id) + { + var result = await _basApi.DeleteRuleStation(id); + return Json(new Result() { success = true, msg = "" }); + } + + public async Task BAS010DAllAsync(int[] ids) + { + if (ids.Length > 0) + { + var result = await _basApi.DeleteRuleStation(ids[0]); + for (int i = 1; i < ids.Length; i++) + { + result = await _basApi.DeleteRuleStation(ids[i]); + } + + return Json(new Result() { success = true, msg = "" }); + } + else + { + return Json(new Result() { success = false, msg = "" }); + } + + } + + //頁面提交，id=0 添加，id>0 修改 + [HttpPost] + public async Task BAS010SaveAsync(RuleStation model) + { + if (ModelState.IsValid) + { + IResultModel result; + if (model.RuleStationID == 0) + { + result = await _basApi.PostRuleStation(JsonConvert.SerializeObject(model)); + } + else + { + result = await _basApi.PutRuleStation(model.RuleStationID, JsonConvert.SerializeObject(model)); + } + + if (!result.Success) + { + var _msg = model.RuleStationID == 0 ? "添加成功！" : "修改成功！"; + 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); + } + } + } + if (model.RuleStationID == 0) + { + return View("BAS010C", model); + } + return View("BAS010U", model); + } + + [ResponseCache(Duration = 0)] + [HttpGet] + public async Task GetRuleStationsAsync() + { + var result = await _basApi.GetRuleStations(); + + if (result.Count > 0) + { + return Json(new Table() { code = 0, msg = "", data = result, count = result.Count }); + } + + return Json(new Table() { count = 0, data = null }); + } + + [ResponseCache(Duration = 0)] + [HttpGet] + public async Task GetRuleStationsByFlowAsync(int id) + { + var result = await _basApi.GetRuleStationsByFlow(id); + + if (result.Count > 0) + { + return Json(new Table() { code = 0, msg = "", data = result, count = result.Count }); + } + + return Json(new Table() { count = 0, data = null }); + } + + #endregion + + #region BAS011流程站別規則維護相關 + + public async Task BAS011() + { + await GetFlowRuleList(); + + return View(); + } + + //新增頁面 + public async Task BAS011C(int id) + { + await GetFlowRuleList(); + await GetRuleStationList(id); + await GetNextStationList(id); + + return View(); + } + + //修改页面 + [HttpGet] + public async Task BAS011UAsync(int id) + { + await GetFlowRuleList(); + var result2 = await _basApi.GetRuleStation(id); + int flowId = result2[0].FlowRuleID; + await GetRuleStationList(flowId); + await GetNextStationList(flowId); + + var result = await _basApi.GetRules(id); + + if (result.Count == 0) + { + return View(); + } + return View(result[0]); + } + + public async Task BAS011DAsync(int id) + { + var result = await _basApi.DeleteRules(id); + return Json(new Result() { success = true, msg = "" }); + } + + public async Task BAS011DAllAsync(int[] ids) + { + if (ids.Length > 0) + { + var result = await _basApi.DeleteRules(ids[0]); + for (int i = 1; i < ids.Length; i++) + { + result = await _basApi.DeleteRules(ids[i]); + } + + return Json(new Result() { success = true, msg = "" }); + } + else + { + return Json(new Result() { success = false, msg = "" }); + } + + } + + //頁面提交，id=0 添加，id>0 修改 + [HttpPost] + public async Task BAS011SaveAsync(Rules model) + { + if (ModelState.IsValid) + { + IResultModel result; + if (model.CreateDate == System.DateTime.MinValue) + { + result = await _basApi.PostRules(JsonConvert.SerializeObject(model)); + } + else + { + result = await _basApi.PutRules(model.RuleStationID, JsonConvert.SerializeObject(model)); + } + + if (!result.Success) + { + var _msg = model.CreateDate == System.DateTime.MinValue ? "添加成功！" : "修改成功！"; + 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); + } + } + } + if (model.CreateDate == System.DateTime.MinValue) + { + return View("BAS011C", model); + } + return View("BAS011U", model); + } + + [ResponseCache(Duration = 0)] + [HttpGet] + public async Task GetRulesesAsync() + { + var result = await _basApi.GetRuleses(); + + if (result.Count > 0) + { + return Json(new Table() { code = 0, msg = "", data = result, count = result.Count }); + } + + return Json(new Table() { count = 0, data = null }); + } + + [ResponseCache(Duration = 0)] + [HttpGet] + public async Task GetRulesesByFlowAsync(int flowId) + { + var result = await _basApi.GetRulesesByFlow(flowId); + + if (result.Count > 0) + { + return Json(new Table() { code = 0, msg = "", data = result, count = result.Count }); + } + + return Json(new Table() { count = 0, data = null }); + } + + #endregion + #region BAS014責任單位资料维护相关 public IActionResult BAS014() diff --git a/AMESCoreStudio.Web/HttpApis/IBAS.cs b/AMESCoreStudio.Web/HttpApis/IBAS.cs index 60360e8e..c812d599 100644 --- a/AMESCoreStudio.Web/HttpApis/IBAS.cs +++ b/AMESCoreStudio.Web/HttpApis/IBAS.cs @@ -291,6 +291,144 @@ namespace AMESCoreStudio.Web #endregion + #region BAS009流程資料維護相關 + + /// + /// 新增流程 + /// + /// + [WebApiClient.Attributes.HttpPost("api/FlowRules")] + ITask> PostFlowRule([FromBody, RawJsonContent] string model); + + /// + /// 更新流程 + /// + /// + [WebApiClient.Attributes.HttpPut("api/FlowRules/{id}")] + ITask> PutFlowRule(int id, [FromBody, RawJsonContent] string model); + + /// + /// 刪除流程 + /// + /// + [WebApiClient.Attributes.HttpDelete("api/FlowRules/{id}")] + ITask> DeleteFlowRule(int id); + + /// + /// 根據ID獲取指定流程資料 + /// + /// + [WebApiClient.Attributes.HttpGet("api/FlowRules/{id}")] + ITask> GetFlowRule(int id); + + /// + /// 獲取流程資料 + /// + /// + [WebApiClient.Attributes.HttpGet("api/FlowRules")] + ITask> GetFlowRules(); + + /// + /// 根据製程單位獲取流程資料 + /// + /// + [WebApiClient.Attributes.HttpGet("api/FlowRules/Unit/{no}")] + ITask> GetFlowRulesByUnit(string no); + + #endregion + + #region BAS010流程資料維護相關 + + /// + /// 新增流程站別 + /// + /// + [WebApiClient.Attributes.HttpPost("api/RuleStations")] + ITask> PostRuleStation([FromBody, RawJsonContent] string model); + + /// + /// 更新流程站別 + /// + /// + [WebApiClient.Attributes.HttpPut("api/RuleStations/{id}")] + ITask> PutRuleStation(int id, [FromBody, RawJsonContent] string model); + + /// + /// 刪除流程站別 + /// + /// + [WebApiClient.Attributes.HttpDelete("api/RuleStations/{id}")] + ITask> DeleteRuleStation(int id); + + /// + /// 根據ID獲取指定流程站別資料 + /// + /// + [WebApiClient.Attributes.HttpGet("api/RuleStations/{id}")] + ITask> GetRuleStation(int id); + + /// + /// 獲取流程站別資料 + /// + /// + [WebApiClient.Attributes.HttpGet("api/RuleStations")] + ITask> GetRuleStations(); + + /// + /// 根据流程ID獲取流程站別資料 + /// + /// + [WebApiClient.Attributes.HttpGet("api/RuleStations/Flow/{id}")] + ITask> GetRuleStationsByFlow(int id); + + #endregion + + #region BAS011流程規則維護相關 + + /// + /// 新增流程規則 + /// + /// + [WebApiClient.Attributes.HttpPost("api/Rules")] + ITask> PostRules([FromBody, RawJsonContent] string model); + + /// + /// 更新流程站別 + /// + /// + [WebApiClient.Attributes.HttpPut("api/Rules/{id}")] + ITask> PutRules(int id, [FromBody, RawJsonContent] string model); + + /// + /// 刪除流程站別 + /// + /// + [WebApiClient.Attributes.HttpDelete("api/Rules/{id}")] + ITask> DeleteRules(int id); + + /// + /// 根據ID獲取指定流程站別資料 + /// + /// + [WebApiClient.Attributes.HttpGet("api/Rules/{id}")] + ITask> GetRules(int id); + + /// + /// 獲取流程站別資料 + /// + /// + [WebApiClient.Attributes.HttpGet("api/Rules")] + ITask> GetRuleses(); + + /// + /// 根据流程ID獲取流程站別資料 + /// + /// + [WebApiClient.Attributes.HttpGet("api/Rules/Flow/{id}")] + ITask> GetRulesesByFlow(int id); + + #endregion + #region BAS014責任單位資料維護相關 /// diff --git a/AMESCoreStudio.Web/Views/BAS/BAS009.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS009.cshtml new file mode 100644 index 00000000..a25ec9c1 --- /dev/null +++ b/AMESCoreStudio.Web/Views/BAS/BAS009.cshtml @@ -0,0 +1,199 @@ +@{ + ViewData["Title"] = "流程資料管理"; + Layout = "~/Views/Shared/_AMESLayout.cshtml"; +} + + + +
+
+
+
+
@ViewBag.Title
+
+
+
+ +
+ +
+ +
+
+
+
+ +
+
+
+
+
+
+
+
+ +@section Scripts{ + +} \ No newline at end of file diff --git a/AMESCoreStudio.Web/Views/BAS/BAS009C.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS009C.cshtml new file mode 100644 index 00000000..8a675265 --- /dev/null +++ b/AMESCoreStudio.Web/Views/BAS/BAS009C.cshtml @@ -0,0 +1,71 @@ +@model AMESCoreStudio.WebApi.Models.BAS.FlowRule + + +@{ ViewData["Title"] = "BAS009C"; + Layout = "~/Views/Shared/_FormLayout.cshtml"; } + + + +
+
+
+
+ + +
+ + + +
+
+ + + +
+
+ + + +
+
+ +
+
+ + +
+
+ + +
+
+ +
+ @Html.ValidationMessage("error") +
+ +
+ +
+
+
+ +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); + await Html.RenderPartialAsync("_FileinputScriptsPartial"); } + + + + +} diff --git a/AMESCoreStudio.Web/Views/BAS/BAS009U.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS009U.cshtml new file mode 100644 index 00000000..337cab21 --- /dev/null +++ b/AMESCoreStudio.Web/Views/BAS/BAS009U.cshtml @@ -0,0 +1,73 @@ +@model AMESCoreStudio.WebApi.Models.BAS.FlowRule + +@{ + ViewData["Title"] = "BAS009U"; + Layout = "~/Views/Shared/_FormLayout.cshtml"; +} + + + +
+
+
+
+ + + + +
+ + + +
+
+ + + +
+
+ + + +
+
+ +
+
+ + +
+
+ + +
+
+ +
+
+ +
+ +
+
+
+ +@section Scripts { + @{ + await Html.RenderPartialAsync("_ValidationScriptsPartial"); + await Html.RenderPartialAsync("_FileinputScriptsPartial"); + } + + +} diff --git a/AMESCoreStudio.Web/Views/BAS/BAS010.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS010.cshtml new file mode 100644 index 00000000..9eaea35a --- /dev/null +++ b/AMESCoreStudio.Web/Views/BAS/BAS010.cshtml @@ -0,0 +1,206 @@ +@{ + ViewData["Title"] = "流程站別管理"; + Layout = "~/Views/Shared/_AMESLayout.cshtml"; +} + + + +
+
+
+
+
@ViewBag.Title
+
+
+
+ +
+ +
+ +
+
+
+
+ +
+
+
+
+
+
+
+
+ +@section Scripts{ + +} \ No newline at end of file diff --git a/AMESCoreStudio.Web/Views/BAS/BAS010C.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS010C.cshtml new file mode 100644 index 00000000..4dcf1ab3 --- /dev/null +++ b/AMESCoreStudio.Web/Views/BAS/BAS010C.cshtml @@ -0,0 +1,76 @@ +@model AMESCoreStudio.WebApi.Models.BAS.RuleStation + + +@{ ViewData["Title"] = "BAS010C"; + Layout = "~/Views/Shared/_FormLayout.cshtml"; } + + + +
+
+
+
+ + +
+ + + +
+
+ + + +
+
+ + + +
+
+ +
+
+ + +
+
+ + +
+
+ +
+
+ + + +
+ @Html.ValidationMessage("error") +
+ +
+ +
+
+
+ +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); + await Html.RenderPartialAsync("_FileinputScriptsPartial"); } + + + + +} diff --git a/AMESCoreStudio.Web/Views/BAS/BAS010U.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS010U.cshtml new file mode 100644 index 00000000..35e14ff2 --- /dev/null +++ b/AMESCoreStudio.Web/Views/BAS/BAS010U.cshtml @@ -0,0 +1,77 @@ +@model AMESCoreStudio.WebApi.Models.BAS.RuleStation + +@{ + ViewData["Title"] = "BAS010U"; + Layout = "~/Views/Shared/_FormLayout.cshtml"; +} + + + +
+
+
+
+ + + +
+ + + +
+
+ + + +
+
+ + + +
+
+ +
+
+ + +
+
+ + +
+
+ +
+
+ + + +
+
+ +
+ +
+
+
+ +@section Scripts { + @{ + await Html.RenderPartialAsync("_ValidationScriptsPartial"); + await Html.RenderPartialAsync("_FileinputScriptsPartial"); + } + + +} diff --git a/AMESCoreStudio.Web/Views/BAS/BAS011.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS011.cshtml new file mode 100644 index 00000000..288bc2f1 --- /dev/null +++ b/AMESCoreStudio.Web/Views/BAS/BAS011.cshtml @@ -0,0 +1,206 @@ +@{ + ViewData["Title"] = "流程站別規則管理"; + Layout = "~/Views/Shared/_AMESLayout.cshtml"; +} + + + +
+
+
+
+
@ViewBag.Title
+
+
+
+ +
+ +
+ +
+
+
+
+ +
+
+
+
+
+
+
+
+ +@section Scripts{ + +} \ No newline at end of file diff --git a/AMESCoreStudio.Web/Views/BAS/BAS011C.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS011C.cshtml new file mode 100644 index 00000000..d1081d51 --- /dev/null +++ b/AMESCoreStudio.Web/Views/BAS/BAS011C.cshtml @@ -0,0 +1,75 @@ +@model AMESCoreStudio.WebApi.Models.BAS.Rules + + +@{ ViewData["Title"] = "BAS011C"; + Layout = "~/Views/Shared/_FormLayout.cshtml"; } + + + +
+
+
+
+ +
+ + + +
+
+ + + +
+
+ +
+
+ + +
+
+ + +
+
+ +
+
+ + + +
+
+ + + +
+ @Html.ValidationMessage("error") +
+ +
+ +
+
+
+ +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); + await Html.RenderPartialAsync("_FileinputScriptsPartial"); } + + + + +} diff --git a/AMESCoreStudio.Web/Views/BAS/BAS011U.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS011U.cshtml new file mode 100644 index 00000000..ad80c321 --- /dev/null +++ b/AMESCoreStudio.Web/Views/BAS/BAS011U.cshtml @@ -0,0 +1,77 @@ +@model AMESCoreStudio.WebApi.Models.BAS.Rules + +@{ + ViewData["Title"] = "BAS010U"; + Layout = "~/Views/Shared/_FormLayout.cshtml"; +} + + + +
+
+
+
+ + + +
+ + + +
+
+ + + +
+
+ +
+
+ + +
+
+ + +
+
+ +
+
+ + + +
+
+ + + +
+
+ +
+ +
+
+
+ +@section Scripts { + @{ + await Html.RenderPartialAsync("_ValidationScriptsPartial"); + await Html.RenderPartialAsync("_FileinputScriptsPartial"); + } + + +} diff --git a/AMESCoreStudio.Web/Views/Home/Framework.cshtml b/AMESCoreStudio.Web/Views/Home/Framework.cshtml index 18ec02ab..dbf4501b 100644 --- a/AMESCoreStudio.Web/Views/Home/Framework.cshtml +++ b/AMESCoreStudio.Web/Views/Home/Framework.cshtml @@ -120,10 +120,10 @@
  • - + 基本資料模組 -
      +
      • 工廠資料維護
        • @@ -145,6 +145,15 @@
      • 站別資料維護
        • +
      • + 流程資料維護 +
        • +
      • + 流程站別維護 +
        • +
      • + 流程規則資料維護 +
      • 責任單位資料維護
        • diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/FlowRulesController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/FlowRulesController.cs new file mode 100644 index 00000000..c6f1c079 --- /dev/null +++ b/AMESCoreStudio.WebApi/Controllers/BAS/FlowRulesController.cs @@ -0,0 +1,191 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using AMESCoreStudio.WebApi.Models.BAS; + +namespace AMESCoreStudio.WebApi.Controllers.BAS +{ + /// + /// 流程資料維護 + /// + [Route("api/[controller]")] + [ApiController] + public class FlowRulesController : ControllerBase + { + private readonly AMESContext _context; + + /// + /// + /// + /// + public FlowRulesController(AMESContext context) + { + _context = context; + } + + /// + /// + /// + /// + // GET: api/FlowRules + [HttpGet] + public async Task>> GetFlowRule() + { + IQueryable q = _context.FlowRules; + + q.OrderBy(p => p.UnitNo + p.FlowRuleName); + + var flowRule = await q.ToListAsync(); + + if (flowRule == null) + { + return NotFound(); + } + + return flowRule; + //return await _context.FlowRule.ToListAsync(); + } + + /// + /// 根据製程單位代碼NO獲取該製程流程資料 + /// + /// + /// + // GET: api/FlowRules/Unit/S + [HttpGet("Unit/{no}")] + public async Task>> GetFlowRuleByUnit(string no) + { + IQueryable q = _context.FlowRules; + + if (no != null) + { + if (no != "") + { + q = q.Where(p => p.UnitNo.Equals(no)); + } + } + q.OrderBy(p => p.FlowRuleName); + + var flowRule = await q.ToListAsync(); + + if (flowRule == null) + { + return NotFound(); + } + + return flowRule; + } + + /// + /// 根據流程ID獲取指定單一資料 + /// + /// + /// + // GET: api/FlowRules/5 + [HttpGet("{id}")] + public async Task>> GetFlowRule(int id) + { + IQueryable q = _context.FlowRules; + + q = q.Where(p => p.FlowRuleID.Equals(id)); + + var flowRule = await q.ToListAsync(); + + if (flowRule == null) + { + return NotFound(); + } + + return flowRule; + } + + /// + /// 更新流程資料 + /// + /// + /// + /// + // PUT: api/FlowRules/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> PutFlowRule(int id, [FromBody] FlowRule flowRule) + { + if (id != flowRule.FlowRuleID) + { + return BadRequest(); + } + + _context.Entry(flowRule).State = EntityState.Modified; + flowRule.UpdateDate = DateTime.Now; + + try + { + await _context.SaveChangesAsync(); + } + catch (DbUpdateConcurrencyException) + { + if (!FlowRuleExists(id)) + { + return NotFound(); + } + else + { + throw; + } + } + + return flowRule; + } + + /// + /// 新增流程資料 + /// + /// + /// + // POST: api/FlowRules + // 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> PostFlowRule([FromBody] FlowRule flowRule) + { + Helper helper = new Helper(_context); + flowRule.FlowRuleID = helper.GetIDKey("FLOW_RULE_ID").Result; + flowRule.CreateDate = DateTime.Now; + + _context.FlowRules.Add(flowRule); + await _context.SaveChangesAsync(); + + return CreatedAtAction("GetFlowRule", new { id = flowRule.FlowRuleID }, flowRule); + } + + /// + /// 刪除流程資料 + /// + /// + /// + // DELETE: api/FlowRules/5 + [HttpDelete("{id}")] + public async Task> DeleteFlowRule(int id) + { + var flowRule = await _context.FlowRules.FindAsync(id); + if (flowRule == null) + { + return NotFound(); + } + + _context.FlowRules.Remove(flowRule); + await _context.SaveChangesAsync(); + + return flowRule; + } + + private bool FlowRuleExists(int id) + { + return _context.FlowRules.Any(e => e.FlowRuleID == id); + } + } +} diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs new file mode 100644 index 00000000..3bc2a4db --- /dev/null +++ b/AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs @@ -0,0 +1,211 @@ +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.BAS; + +namespace AMESCoreStudio.WebApi.Controllers.BAS +{ + /// + /// 流程站別資料維護 + /// + [Route("api/[controller]")] + [ApiController] + public class RuleStationsController : ControllerBase + { + private readonly AMESContext _context; + + /// + /// + /// + /// + public RuleStationsController(AMESContext context) + { + _context = context; + } + + /// + /// 獲取全部流程站別資料 + /// + /// + // GET: api/RuleStations + [HttpGet] + public async Task>> GetRuleStation() + { + IQueryable q = _context.RuleStations; + + q.OrderBy(p => p.FlowRuleID + p.Sequence); + + var ruleStation = await q.ToListAsync(); + + foreach (var data in ruleStation) + { + data.Station = _context.Stationses.Where(p1 => p1.StationID.Equals(data.StationID)).FirstOrDefault(); + } + + if (ruleStation == null) + { + return NotFound(); + } + + return ruleStation; + } + + /// + /// 根據流程ID獲取該流程站別資料 + /// + /// + /// + // GET: api/RuleStations/Flow/5 + [HttpGet("Flow/{id}")] + public async Task>> GetRuleStationByFlow(int id) + { + IQueryable q = _context.RuleStations; + + if (id > 0) + { + q = q.Where(p => p.FlowRuleID.Equals(id)); + } + q.OrderBy(p => p.Sequence); + + + try + { + var ruleStation = await q.ToListAsync(); + + foreach (var data in ruleStation) + { + data.Station = _context.Stationses.Where(p1 => p1.StationID.Equals(data.StationID)).FirstOrDefault(); + } + + if (ruleStation == null) + { + return NotFound(); + } + + return ruleStation; + } + catch (Exception e1) + { + string msg = e1.Message; + } + + return NotFound(); + + + } + + /// + /// 根據流程站別ID獲取指定單一資料 + /// + /// + /// + // GET: api/RuleStations/5 + [HttpGet("{id}")] + public async Task>> GetRuleStation(int id) + { + IQueryable q = _context.RuleStations; + + q = q.Where(p => p.RuleStationID.Equals(id)); + + var ruleStation = await q.ToListAsync(); + + if (ruleStation == null) + { + return NotFound(); + } + + return ruleStation; + } + + /// + /// 更新流程站別資料 + /// + /// + /// + /// + // PUT: api/RuleStations/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> PutRuleStation(int id, [FromBody] RuleStation ruleStation) + { + if (id != ruleStation.RuleStationID) + { + return BadRequest(); + } + + _context.Entry(ruleStation).State = EntityState.Modified; + ruleStation.UpdateDate = DateTime.Now; + + try + { + await _context.SaveChangesAsync(); + } + catch (DbUpdateConcurrencyException) + { + if (!RuleStationExists(id)) + { + return NotFound(); + } + else + { + throw; + } + } + + return ruleStation; + } + + /// + /// 新增流程站別資料 + /// + /// + /// + // POST: api/RuleStations + // 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> PostRuleStation([FromBody] RuleStation ruleStation) + { + Helper helper = new Helper(_context); + ruleStation.RuleStationID = helper.GetIDKey("RULE_STATION_ID").Result; + ruleStation.CreateDate = DateTime.Now; + + _context.RuleStations.Add(ruleStation); + await _context.SaveChangesAsync(); + + return CreatedAtAction("GetRuleStation", new { id = ruleStation.RuleStationID }, ruleStation); + } + + /// + /// 刪除流程站別資料 + /// + /// + /// + // DELETE: api/RuleStations/5 + [HttpDelete("{id}")] + public async Task> DeleteRuleStation(int id) + { + var ruleStation = await _context.RuleStations.FindAsync(id); + if (ruleStation == null) + { + return NotFound(); + } + + _context.RuleStations.Remove(ruleStation); + await _context.SaveChangesAsync(); + + return ruleStation; + } + + private bool RuleStationExists(int id) + { + return _context.RuleStations.Any(e => e.RuleStationID == id); + } + } +} diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/RulesController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/RulesController.cs new file mode 100644 index 00000000..ebdae173 --- /dev/null +++ b/AMESCoreStudio.WebApi/Controllers/BAS/RulesController.cs @@ -0,0 +1,214 @@ +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.BAS; + +namespace AMESCoreStudio.WebApi.Controllers.BAS +{ + /// + /// 流程規則資料維護 + /// + [Route("api/[controller]")] + [ApiController] + public class RulesController : ControllerBase + { + private readonly AMESContext _context; + + /// + /// + /// + /// + public RulesController(AMESContext context) + { + _context = context; + } + + /// + /// 獲取全部流程規則資料 + /// + /// + // GET: api/Rules + [HttpGet] + public async Task>> GetRules() + { + IQueryable q = _context.Ruleses; + q.OrderBy(p => p.RuleStationID + p.RuleSeq); + + var rules = await q.ToListAsync(); + + foreach (var data in rules) + { + data.NextStation = _context.Stationses.Find(data.NextStationID); + } + + if (rules == null) + { + return NotFound(); + } + + return rules; + } + + /// + /// 根據流程ID獲取流程規則資料 + /// + /// + // GET: api/Rules/Flow/5 + [HttpGet("Flow/{id}")] + public async Task>> GetRulesByFlow(int id) + { + var query = from q1 in _context.Ruleses + join q2 in _context.RuleStations on q1.RuleStationID equals q2.RuleStationID + join q3 in _context.Stationses on q1.NextStationID equals q3.StationID + where q2.FlowRuleID.Equals(id) + select new { + q1.RuleStationID, + q1.RuleSeq, + CurrStationId = q2.StationID, + NextStationId = q3.StationID + }; + query.OrderBy(p => p.RuleStationID + p.RuleSeq); + + var qdata = await query.ToListAsync(); + int[] list = new int[qdata.Count]; + int[] list1 = new int[qdata.Count]; + int[] list2 = new int[qdata.Count]; + for (int i=0;i q = _context.Ruleses; + q = q.Where(p=>list.Contains(p.RuleStationID)); + var rules = await q.ToListAsync(); + + for(int j=0;j p1.StationID.Equals(list1[j])).FirstOrDefault(); + rules[j].RuleDesc = _context.Stationses.Where(p1 => p1.StationID.Equals(list1[j])).FirstOrDefault().StationName; + rules[j].NextStation = _context.Stationses.Where(p1 => p1.StationID.Equals(list2[j])).FirstOrDefault(); + } + + if (rules == null) + { + return NotFound(); + } + + return rules; + } + + /// + /// 根據流程站別ID查詢指定單一資料 + /// + /// + /// + // GET: api/Rules/5 + [HttpGet("{id}")] + public async Task>> GetRules(int id) + { + IQueryable q = _context.Ruleses; + + q = q.Where(p => p.RuleStationID.Equals(id)); + + var rules = await q.ToListAsync(); + + if (rules == null) + { + return NotFound(); + } + + return rules; + } + + /// + /// 更新流程規則資料 + /// + /// + /// + /// + // PUT: api/Rules/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> PutRules(int id, [FromBody]Rules rules) + { + if (id != rules.RuleStationID) + { + return BadRequest(); + } + + _context.Entry(rules).State = EntityState.Modified; + rules.UpdateDate = DateTime.Now; + + try + { + await _context.SaveChangesAsync(); + } + catch (DbUpdateConcurrencyException) + { + if (!RulesExists(id)) + { + return NotFound(); + } + else + { + throw; + } + } + + return rules; + } + + /// + /// 新增流程規則資料 + /// + /// + /// + // POST: api/Rules + // 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> PostRules([FromBody] Rules rules) + { + rules.CreateDate = DateTime.Now; + + _context.Ruleses.Add(rules); + await _context.SaveChangesAsync(); + + return CreatedAtAction("GetRules", new { id = rules.RuleStationID }, rules); + } + + /// + /// 刪除流程規則資料 + /// + /// + /// + // DELETE: api/Rules/5 + [HttpDelete("{id}")] + public async Task> DeleteRules(int id) + { + var rules = await _context.Ruleses.FindAsync(id); + if (rules == null) + { + return NotFound(); + } + + _context.Ruleses.Remove(rules); + await _context.SaveChangesAsync(); + + return rules; + } + + private bool RulesExists(int id) + { + return _context.Ruleses.Any(e => e.RuleStationID == id); + } + } +} diff --git a/AMESCoreStudio.WebApi/Models/BAS/FlowRule.cs b/AMESCoreStudio.WebApi/Models/BAS/FlowRule.cs new file mode 100644 index 00000000..b273a5b6 --- /dev/null +++ b/AMESCoreStudio.WebApi/Models/BAS/FlowRule.cs @@ -0,0 +1,102 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; + +namespace AMESCoreStudio.WebApi.Models.BAS +{ + /// + /// 流程資料 + /// + [Table("FLOW_RULE", Schema = "JHAMES")] + public class FlowRule + { + /// + /// 流程編號 + /// + [Key] + [Column("FLOW_RULE_ID")] + [DataMember] + public int FlowRuleID { get; set; } + + /// + /// 流程名稱 + /// + [Column("FLOW_RULE_NAME")] + [DataMember] + [Display(Name = "流程名稱")] + [Required(ErrorMessage = "{0},不能空白")] + [StringLength(50, ErrorMessage = "{0},不能大于{1}")] + public string FlowRuleName { get; set; } + + /// + /// 流程描述 + /// + [Column("FLOW_RULE_DESC")] + [DataMember] + [Display(Name = "流程描述")] + [Required(ErrorMessage = "{0},不能空白")] + [StringLength(200, ErrorMessage = "{0},不能大于{1}")] + public string FlowRuleDesc { get; set; } + + /// + /// 流程狀態 + /// + [Column("FLOW_STATUS")] + [Display(Name = "流程狀態")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [StringLength(1, ErrorMessage = "{0},不能大于{1}")] + public string FlowStatus { get; set; } = "A"; + + /// + /// 系統標記 + /// + [Column("SYS_TYPE")] + [DataMember] + [Display(Name = "系統標記")] + [Required(ErrorMessage = "{0},不能空白")] + [StringLength(1, ErrorMessage = "{0},不能大于{1}")] + public string SysType { get; set; } = "U"; + + + /// + /// 生產單位代碼 + /// + [Column("UNIT_NO")] + [DataMember] + [Display(Name = "生產單位代碼")] + [Required(ErrorMessage = "{0},不能空白")] + [StringLength(1, ErrorMessage = "{0},不能大于{1}")] + public string UnitNo { get; set; } + + /// + /// 流程類型 + /// + [Column("FLOW_TYPE")] + [Display(Name = "流程類型")] + [DataMember] + public string FlowType { get; set; } + + /// + /// 建立人員 + /// + [Column("CREATE_USERID")] + [DataMember] + public int CreateUserId { get; set; } + + /// + /// 建立時間 + /// + [Column("CREATE_DATE")] + [DataMember] + public DateTime CreateDate { get; set; } + + /// + /// 修改時間 + /// + [Column("UPDATE_DATE")] + public DateTime UpdateDate { get; set; } + + } +} diff --git a/AMESCoreStudio.WebApi/Models/BAS/RuleStation.cs b/AMESCoreStudio.WebApi/Models/BAS/RuleStation.cs new file mode 100644 index 00000000..05adbf54 --- /dev/null +++ b/AMESCoreStudio.WebApi/Models/BAS/RuleStation.cs @@ -0,0 +1,90 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; + +namespace AMESCoreStudio.WebApi.Models.BAS +{ + /// + /// 流程站別資料 + /// + [Table("RULE_STATION", Schema = "JHAMES")] + public class RuleStation + { + /// + /// 流程站別編號 + /// + [Key] + [Column("RULE_STATION_ID")] + [DataMember] + public int RuleStationID { get; set; } + + /// + /// 流程編號 + /// + [Column("FLOW_RULE_ID")] + [Display(Name = "流程編號")] + [DataMember] + public int FlowRuleID { get; set; } + + /// + /// 站別編號 + /// + [Column("STATION_ID")] + [Display(Name = "站別編號")] + [DataMember] + public int StationID { get; set; } + + /// + /// 站別描述 + /// + [Column("STATION_DESC")] + [DataMember] + [Display(Name = "站別描述")] + [Required(ErrorMessage = "{0},不能空白")] + [StringLength(200, ErrorMessage = "{0},不能大于{1}")] + public string StationDesc { get; set; } + + /// + /// 站別順序 + /// + [Column("SEQUENCE")] + [DataMember] + [Display(Name = "站別順序")] + [Required(ErrorMessage = "{0},不能空白")] + public int Sequence { get; set; } + + /// + /// 站別類型 + /// + [Column("STATION_TYPE")] + [Display(Name = "站別類型")] + [DataMember] + public string StationType { get; set; } + + /// + /// 建立人員 + /// + [Column("CREATE_USERID")] + [DataMember] + public int CreateUserId { get; set; } + + /// + /// 建立時間 + /// + [Column("CREATE_DATE")] + [DataMember] + public DateTime CreateDate { get; set; } + + /// + /// 修改時間 + /// + [Column("UPDATE_DATE")] + public DateTime UpdateDate { get; set; } + + /// + /// 站別资料 + /// + public virtual Stations Station { get; set; } + } +} diff --git a/AMESCoreStudio.WebApi/Models/BAS/Rules.cs b/AMESCoreStudio.WebApi/Models/BAS/Rules.cs new file mode 100644 index 00000000..f1a8dc0c --- /dev/null +++ b/AMESCoreStudio.WebApi/Models/BAS/Rules.cs @@ -0,0 +1,88 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; + +namespace AMESCoreStudio.WebApi.Models.BAS +{ + /// + /// 流程站別規則資料 + /// + [Table("RULES", Schema = "JHAMES")] + public class Rules + { + /// + /// 流程站別編號 + /// + [Key] + [Column("RULE_STATION_ID")] + [Display(Name = "流程站別編號")] + [DataMember] + public int RuleStationID { get; set; } + + /// + /// 規則描述 + /// + [Column("RULE_DESC")] + [DataMember] + [Display(Name = "規則描述")] + [Required(ErrorMessage = "{0},不能空白")] + [StringLength(200, ErrorMessage = "{0},不能大于{1}")] + public string RuleDesc { get; set; } + + /// + /// 規則狀態 + /// + [Column("RULE_STATUS")] + [Display(Name = "規則狀態")] + [DataMember] + public string RuleStatus { get; set; } + + /// + /// 下一站別編號 + /// + [Column("NEXT_STATION_ID")] + [Display(Name = "下一站別編號")] + [DataMember] + public int NextStationID { get; set; } + + /// + /// 規則順序 + /// + [Column("RULE_SEQ")] + [DataMember] + [Display(Name = "規則順序")] + [Required(ErrorMessage = "{0},不能空白")] + public int RuleSeq { get; set; } + + /// + /// 建立人員 + /// + [Column("CREATE_USERID")] + [DataMember] + public int CreateUserId { get; set; } + + /// + /// 建立時間 + /// + [Column("CREATE_DATE")] + [DataMember] + public DateTime CreateDate { get; set; } + + /// + /// 修改時間 + /// + [Column("UPDATE_DATE")] + public DateTime UpdateDate { get; set; } + + /// + /// 当前站別资料 + /// + //public virtual Stations CurrStation { get; set; } + + /// + /// 下一站別资料 + /// + public virtual Stations NextStation { get; set; } + } +}