Browse Source

1.新增KCS006組件類別維護

PTD
marvinhong 3 years ago
parent
commit
76e8496907
  1. 148
      AMESCoreStudio.Web/Controllers/KCSController.cs
  2. 39
      AMESCoreStudio.Web/HttpApis/AMES/IKCS.cs
  3. 3
      AMESCoreStudio.Web/Views/Home/Framework.cshtml
  4. 100
      AMESCoreStudio.Web/Views/KCS/KCS006.cshtml
  5. 63
      AMESCoreStudio.Web/Views/KCS/KCS006C.cshtml
  6. 63
      AMESCoreStudio.Web/Views/KCS/KCS006U.cshtml
  7. 192
      AMESCoreStudio.WebApi/Controllers/AMES/ItemsController.cs
  8. 58
      AMESCoreStudio.WebApi/Models/AMES/Items.cs
  9. 5
      AMESCoreStudio.WebApi/Models/AMESContext.cs

148
AMESCoreStudio.Web/Controllers/KCSController.cs

@ -5,6 +5,8 @@ using AMESCoreStudio.Web.Models;
using Newtonsoft.Json; using Newtonsoft.Json;
using AMESCoreStudio.WebApi.Models.AMES; using AMESCoreStudio.WebApi.Models.AMES;
using AMESCoreStudio.CommonTools.Result; using AMESCoreStudio.CommonTools.Result;
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc.Rendering;
namespace AMESCoreStudio.Web.Controllers namespace AMESCoreStudio.Web.Controllers
{ {
@ -19,6 +21,38 @@ namespace AMESCoreStudio.Web.Controllers
_kcsApi = kcsApi; _kcsApi = kcsApi;
} }
private async Task GetItemType()
{
var ItemTypeList = new List<SelectListItem>();
ItemTypeList.Add(new SelectListItem("一般組件", "NP"));
ItemTypeList.Add(new SelectListItem("KeyParts", "KP"));
ItemTypeList.Add(new SelectListItem("組件確認", "CO"));
ItemTypeList.Add(new SelectListItem("測試配備", "TQ"));
ItemTypeList.Add(new SelectListItem("系統組件", "NI"));
ItemTypeList.Add(new SelectListItem("前段組件", "A"));
ItemTypeList.Add(new SelectListItem("後段組件", "B"));
ViewBag.ItemTypeList = ItemTypeList;
}
private async Task GetSNInterval()
{
var SNIntervalList = new List<SelectListItem>();
SNIntervalList.Add(new SelectListItem("不管控", "N"));
SNIntervalList.Add(new SelectListItem("管控", "Y"));
ViewBag.SNIntervalList = SNIntervalList;
}
#region KCS002序號料號維護相關 #region KCS002序號料號維護相關
public IActionResult KCS002() public IActionResult KCS002()
@ -234,5 +268,119 @@ namespace AMESCoreStudio.Web.Controllers
} }
#endregion #endregion
#region KCS006組件類別資料維護相關
public IActionResult KCS006()
{
return View();
}
//新增頁面
public async Task<IActionResult> KCS006C()
{
await GetItemType();
await GetSNInterval();
return View();
}
//修改页面
[HttpGet]
public async Task<IActionResult> KCS006UAsync(string id)
{
await GetItemType();
await GetSNInterval();
var result = await _kcsApi.GetItems(id);
if (result.Count == 0)
{
return View();
}
return View(result[0]);
}
public async Task<IActionResult> KCS006DAsync(string id)
{
var result = await _kcsApi.DeleteItems(id);
return Json(new Result() { success = true, msg = "" });
}
//頁面提交,id=0 添加,id>0 修改
[HttpPost]
public async Task<IActionResult> KCS006CSaveAsync(Items model)
{
if (ModelState.IsValid)
{
IResultModel result;
result = await _kcsApi.PostItems(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("KCS006C", model);
}
public async Task<IActionResult> KCS006USaveAsync(Items model)
{
if (ModelState.IsValid)
{
IResultModel result;
result = await _kcsApi.PutItems(model.ItemNo, 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("PPS006U", model);
}
[ResponseCache(Duration = 0)]
[HttpGet]
public async Task<IActionResult> GetItemsAsync(int page = 1, int limit = 10)
{
var result_total = await _kcsApi.GetItems(0, limit);
var result = await _kcsApi.GetItems(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
} }
} }

39
AMESCoreStudio.Web/HttpApis/AMES/IKCS.cs

@ -89,5 +89,44 @@ namespace AMESCoreStudio.Web
ITask<List<KPLink>> GetKPLinks(int page = 1, int limit = 10); ITask<List<KPLink>> GetKPLinks(int page = 1, int limit = 10);
#endregion #endregion
#region KCS006 組件類別維護
/// <summary>
/// 新增組件類別
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPost("api/Items")]
ITask<ResultModel<Items>> PostItems([FromBody, RawJsonContent] string model);
/// <summary>
/// 更新組件類別
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPut("api/Items/{id}")]
ITask<ResultModel<Items>> PutItems(string id, [FromBody, RawJsonContent] string model);
/// <summary>
/// 刪除組件類別
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpDelete("api/Items/{id}")]
ITask<ResultModel<Items>> DeleteItems(string id);
/// <summary>
/// 根據ID獲取指定組件類別資料
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/Items/{id}")]
ITask<List<Items>> GetItems(string id);
/// <summary>
/// 獲取組件類別資料
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/Items")]
ITask<List<Items>> GetItems(int page = 1, int limit = 10);
#endregion
} }
} }

3
AMESCoreStudio.Web/Views/Home/Framework.cshtml

@ -223,6 +223,9 @@
<li class="sub-tab" hg-title="組件料號序號維護" hg-nav="/KCS/KCS004"> <li class="sub-tab" hg-title="組件料號序號維護" hg-nav="/KCS/KCS004">
<a><i class="fa fa-comment-o fa-fw"></i><cite>組件料號序號維護</cite></a> <a><i class="fa fa-comment-o fa-fw"></i><cite>組件料號序號維護</cite></a>
</li> </li>
<li class="sub-tab" hg-title="組件類別維護" hg-nav="/KCS/KCS006">
<a><i class="fa fa-comment-o fa-fw"></i><cite>組件類別維護</cite></a>
</li>
</ul> </ul>
</li> </li>
<li> <li>

100
AMESCoreStudio.Web/Views/KCS/KCS006.cshtml

@ -0,0 +1,100 @@
@{
ViewData["Title"] = "組件類別維護";
Layout = "~/Views/Shared/_AMESLayout.cshtml";
}
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-form">
<div class="layui-form-item ">
<div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
</div>
</div>
</div>
<div class="layui-card-body">
<table class="layui-hide" id="test" lay-filter="test"></table>
</div>
</div>
@section Scripts{
<script type="text/javascript">
//监听表单提交事件
hg.form.onsubmit('querysubmit', function (data) {
table && table.reload(data);
});
var tableCols = [[
{
field: 'itemNo',
width: 200,
title: '組件代碼'
},
{
field: 'itemName',
title: '組件名稱'
},
{
field: 'itemType',
width: 200,
title: '組件類別'
},
{
field: 'snInterval',
width: 200,
title: '組件區間管控'
},
{
field: 'right',
width: 200,
title: '操作',
fixed: 'right',
templet: function (d) {
return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a> <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">删除</a>'
}
}]
];
//通过行tool编辑,lay-event="edit"
function edit(obj) {
if (obj.data.itemNo) {
hg.open('修改組件類別', '/KCS/KCS006U/' + obj.data.itemNo, 640,480);
}
}
//通过行tool删除,lay-event="del"
function del(obj) {
if (obj.data.itemNo) {
hg.confirm("組件類別:" + obj.data.itemNo + "," + obj.data.itemName + ",确定要删除吗?", function () {
$.ajax({
url: '/KCS/KCS006D',
data: { id: obj.data.itemNo },
type: 'POST',
success: function (data) {
if (data.success) {
obj.del(); //只删本地数据
hg.msghide("删除成功!");
}
else {
hg.msg(data.msg);
}
},
error: function () {
hg.msg("网络请求失败!");
}
});
});
}
}
var toolbar = [{
text: '新增',
layuiicon: '&#xe608;',
class: 'layui-btn-normal',
handler: function () {
hg.open('新增組件類別', '/KCS/KCS006C', 640, 480);
}
}
];
//基本数据表格
var table = hg.table.datatable('test', '組件類別維護', '/KCS/GetItems', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
</script>
}

63
AMESCoreStudio.Web/Views/KCS/KCS006C.cshtml

@ -0,0 +1,63 @@
@model AMESCoreStudio.WebApi.Models.AMES.Items
@{ ViewData["Title"] = "KCS006C";
Layout = "~/Views/Shared/_FormLayout.cshtml"; }
<style>
.control-label {
justify-content: flex-end !important;
}
</style>
<div class="row">
<div class="col-sm-12">
<form enctype="multipart/form-data" method="post" asp-action="KCS006CSave">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="form-group form-inline my-sm-1">
<label asp-for="ItemNo" class="control-label col-sm-3"></label>
<input asp-for="ItemNo" class="form-control col-sm-9" placeholder="請輸入組件代碼" />
<span asp-validation-for="ItemNo" class="text-danger offset-sm-3 my-sm-1"></span>
</div>
<div class="form-group form-inline my-sm-1">
<label asp-for="ItemName" class="control-label col-sm-3"></label>
<input asp-for="ItemName" class="form-control col-sm-9" placeholder="請輸入組件名稱" />
<span asp-validation-for="ItemName" class="text-danger offset-sm-3 my-sm-1"></span>
</div>
<div class="form-group form-inline my-sm-1">
<label asp-for="ItemType" class="control-label col-sm-3"></label>
<select asp-for="ItemType" asp-items="@ViewBag.ItemTypeList" class="custom-select col-sm-9"></select>
<span asp-validation-for="ItemType" class="text-danger offset-sm-3 my-sm-1"></span>
</div>
<div class="form-group form-inline my-sm-1">
<label asp-for="SNInterval" class="control-label col-sm-3"></label>
<select asp-for="SNInterval" asp-items="@ViewBag.SNIntervalList" class="custom-select col-sm-9"></select>
<span asp-validation-for="SNInterval" class="text-danger offset-sm-3 my-sm-1"></span>
</div>
<span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
<div class="form-group">
<input type="submit" value="保存" class="btn btn-primary offset-sm-3" />
</div>
</form>
</div>
</div>
@section Scripts {
@{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
<script type="text/javascript">
$(document).ready(function () {
var error = '@Html.ValidationMessage("error")';
if ($(error).text() != '') {
parent.hg.msg(error);
}
});
</script>
}

63
AMESCoreStudio.Web/Views/KCS/KCS006U.cshtml

@ -0,0 +1,63 @@
@model AMESCoreStudio.WebApi.Models.AMES.Items
@{ ViewData["Title"] = "KCS006U";
Layout = "~/Views/Shared/_FormLayout.cshtml"; }
<style>
.control-label {
justify-content: flex-end !important;
}
</style>
<div class="row">
<div class="col-sm-12">
<form enctype="multipart/form-data" method="post" asp-action="KCS006USave">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="form-group form-inline my-sm-1">
<label asp-for="ItemNo" class="control-label col-sm-3"></label>
<input asp-for="ItemNo" class="form-control col-sm-9" placeholder="請輸入組件代碼" readonly="readonly" />
<span asp-validation-for="ItemNo" class="text-danger offset-sm-3 my-sm-1"></span>
</div>
<div class="form-group form-inline my-sm-1">
<label asp-for="ItemName" class="control-label col-sm-3"></label>
<input asp-for="ItemName" class="form-control col-sm-9" placeholder="請輸入組件名稱" />
<span asp-validation-for="ItemName" class="text-danger offset-sm-3 my-sm-1"></span>
</div>
<div class="form-group form-inline my-sm-1">
<label asp-for="ItemType" class="control-label col-sm-3"></label>
<select asp-for="ItemType" asp-items="@ViewBag.ItemTypeList" class="custom-select col-sm-9"></select>
<span asp-validation-for="ItemType" class="text-danger offset-sm-3 my-sm-1"></span>
</div>
<div class="form-group form-inline my-sm-1">
<label asp-for="SNInterval" class="control-label col-sm-3"></label>
<select asp-for="SNInterval" asp-items="@ViewBag.SNIntervalList" class="custom-select col-sm-9"></select>
<span asp-validation-for="SNInterval" class="text-danger offset-sm-3 my-sm-1"></span>
</div>
<span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
<div class="form-group">
<input type="submit" value="保存" class="btn btn-primary offset-sm-3" />
</div>
</form>
</div>
</div>
@section Scripts {
@{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
<script type="text/javascript">
$(document).ready(function () {
var error = '@Html.ValidationMessage("error")';
if ($(error).text() != '') {
parent.hg.msg(error);
}
});
</script>
}

192
AMESCoreStudio.WebApi/Controllers/AMES/ItemsController.cs

@ -0,0 +1,192 @@
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
{
/// <summary>
///
/// </summary>
[Route("api/[controller]")]
[ApiController]
public class ItemsController : ControllerBase
{
private readonly AMESContext _context;
/// <summary>
///
/// </summary>
/// <param name="context"></param>
public ItemsController(AMESContext context)
{
_context = context;
}
/// <summary>
///
/// </summary>
/// <returns></returns>
// GET: api/Items
[HttpGet]
public async Task<ActionResult<IEnumerable<Items>>> GetItems(int page=1,int limit=10)
{
IQueryable<Items> q = _context.Items;
if (page > 0)
{
q = q.OrderBy(p => p.ItemNo).Skip((page - 1) * limit).Take(limit);
}
else
{
q = q.OrderBy(p => p.ItemNo);
}
var items = await q.ToListAsync();
return items;
}
/// <summary>
///
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
// GET: api/Items/5
[HttpGet("{id}")]
public async Task<ActionResult<IEnumerable<Items>>> GetItems(string id)
{
IQueryable<Items> q = _context.Items;
q = q.Where(p => p.ItemNo.Equals(id));
var items = await q.ToListAsync();
if (items == null)
{
return NotFound();
}
return items;
}
/// <summary>
///
/// </summary>
/// <param name="id"></param>
/// <param name="items"></param>
/// <returns></returns>
// PUT: api/Items/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<ResultModel<Items>> PutItems(string id,[FromBody] Items items)
{
ResultModel<Items> result = new ResultModel<Items>();
if (id != items.ItemNo)
{
result.Success = false;
result.Msg = "組件代碼錯誤";
return result;
}
_context.Entry(items).State = EntityState.Modified;
try
{
await _context.SaveChangesAsync();
}
catch (DbUpdateConcurrencyException)
{
if (!ItemsExists(id))
{
result.Success = false;
result.Msg = "組件代碼不存在";
return result;
}
else
{
throw;
}
}
result.Success = true;
result.Msg = "OK";
return result;
}
/// <summary>
///
/// </summary>
/// <param name="items"></param>
/// <returns></returns>
// POST: api/Items
// 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<ResultModel<Items>> PostItems([FromBody] Items items)
{
ResultModel<Items> result = new ResultModel<Items>();
_context.Items.Add(items);
try
{
await _context.SaveChangesAsync();
}
catch (DbUpdateException)
{
if (ItemsExists(items.ItemNo))
{
result.Success = false;
result.Msg = "組件代碼重複";
return result;
}
else
{
throw;
}
}
result.Success = true;
result.Msg = "OK";
return result;
}
/// <summary>
///
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
// DELETE: api/Items/5
[HttpDelete("{id}")]
public async Task<ResultModel<Items>> DeleteItems(string id)
{
ResultModel<Items> result = new ResultModel<Items>();
var items = await _context.Items.FindAsync(id);
if (items == null)
{
result.Success = false;
result.Msg = "組件代碼不存在";
return result;
}
_context.Items.Remove(items);
await _context.SaveChangesAsync();
result.Success = true;
result.Msg = "OK";
return result;
}
private bool ItemsExists(string id)
{
return _context.Items.Any(e => e.ItemNo == id);
}
}
}

58
AMESCoreStudio.WebApi/Models/AMES/Items.cs

@ -0,0 +1,58 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Runtime.Serialization;
namespace AMESCoreStudio.WebApi.Models.AMES
{
/// <summary>
/// 組件類別资料表
/// </summary>
[Table("ITEMS", Schema = "JHAMES")]
[DataContract]
public class Items
{
/// <summary>
/// 組件代碼
/// </summary>
[Key]
[Column("ITEM_NO")]
[Required(ErrorMessage = "{0},不能空白")]
[Display(Name = "組件代碼")]
[StringLength(4, ErrorMessage = "{0},不能大于{1}")]
[DataMember]
public string ItemNo { get; set; }
/// <summary>
/// 組件名稱
/// </summary>
[Column("ITEM_NAME")]
[Required(ErrorMessage = "{0},不能空白")]
[Display(Name = "組件名稱")]
[StringLength(50, ErrorMessage = "{0},不能大于{1}")]
[DataMember]
public string ItemName { get; set; }
/// <summary>
/// 組件類別
/// </summary>
[Column("ITEM_TYPE")]
[DataMember]
[Required(ErrorMessage = "{0},不能空白")]
[Display(Name = "組件類別")]
[StringLength(2, ErrorMessage = "{0},不能大于{1}")]
public string ItemType { get; set; }
/// <summary>
/// 組件區間管控
/// </summary>
[Column("SN_INTERVAL")]
[DataMember]
[Required(ErrorMessage = "{0},不能空白")]
[Display(Name = "組件區間管控")]
[StringLength(1, ErrorMessage = "{0},不能大于{1}")]
public string SNInterval { get; set; }
}
}

5
AMESCoreStudio.WebApi/Models/AMESContext.cs

@ -308,6 +308,11 @@ namespace AMESCoreStudio.WebApi
/// 組件料號序號資料 /// 組件料號序號資料
/// </summary> /// </summary>
public DbSet<KPLink> KPLinks { get; set; } public DbSet<KPLink> KPLinks { get; set; }
/// <summary>
/// 組件類別資料
/// </summary>
public DbSet<Items> Items { get; set; }
} }
} }

Loading…
Cancel
Save