JHSYS
/
AMES
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1. 錫膏程式上傳

PTD
Ray 2 years ago
parent
ee21bdfbc6
commit
83ed59ce25
7 changed files with 105 additions and 118 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      AMESCoreStudio.Web/Controllers/PCBController.cs
  2. 16
      AMESCoreStudio.Web/HttpApis/AMES/IPCB.cs
  3. 37
      AMESCoreStudio.Web/Views/PCB/PCB014.cshtml
  4. 119
      AMESCoreStudio.Web/Views/PCB/PCB014C.cshtml
  5. 10
      AMESCoreStudio.Web/Views/PCB/PCB014U.cshtml
  6. 5
      AMESCoreStudio.WebApi/Controllers/AMES/SolderPasteInfoController.cs
  7. 14
      AMESCoreStudio.WebApi/Models/AMES/SolderPasteInfo.cs

22
AMESCoreStudio.Web/Controllers/PCBController.cs
View File

@ -220,16 +220,14 @@ namespace AMESCoreStudio.Web.Controllers
return View();
}
public async Task<IActionResult> PCB014QueryAsync(string steelPlateNo, string pcbPartNo
, string side, string status, int page = 0, int limit = 10)
public async Task<IActionResult> PCB014QueryAsync(string solderPasteNo, string status, int page = 0, int limit = 10)
{
//IResultModel<SteelPlateInfoDto> result = await _pcbApi.GetSolderPasteInfoQuery(steelPlateNo: steelPlateNo, pcbPartNo: pcbPartNo
//, side: side, status: status, page: page, limit: limit);
IResultModel<SolderPasteInfoDto> result = await _pcbApi.GetSolderPasteInfoQuery(solderPasteNo: solderPasteNo, status: status, page: page, limit: limit);
//if (result.Data.Count() != 0)
//{
// return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
//}
if (result.Data.Count() != 0)
{
return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
}
return Json(new Table() { count = 0, data = null });
}
@ -249,12 +247,12 @@ namespace AMESCoreStudio.Web.Controllers
//頁面提交，id=0 添加，id>0 修改
[HttpPost]
public async Task<IActionResult> PCB014Async(SteelPlateInfo model)
public async Task<IActionResult> PCB014Async(SolderPasteInfo model)
{
if (ModelState.IsValid)
{
IResultModel result;
if (model.SteelPlateID == 0)
if (model.SolderPasteID == 0)
{
model.CreateUserID = GetLogInUserID();
model.CreateDate = DateTime.Now;
@ -271,7 +269,7 @@ namespace AMESCoreStudio.Web.Controllers
if (result.Success)
{
var _msg = model.SteelPlateID == 0 ? "新增成功！" : "修改成功！";
var _msg = model.SolderPasteID == 0 ? "新增成功！" : "修改成功！";
return RedirectToAction("Refresh", "Home", new { msg = _msg });
}
else
@ -281,7 +279,7 @@ namespace AMESCoreStudio.Web.Controllers
}
}
if (model.SteelPlateID == 0)
if (model.SolderPasteID == 0)
{
return View("PCB014C", model);
}

16
AMESCoreStudio.Web/HttpApis/AMES/IPCB.cs
View File

@ -516,42 +516,40 @@ namespace AMESCoreStudio.Web
#region PCB014 錫膏使用管控
/// <summary>
/// 鋼板資料查詢
/// 錫膏資料查詢
/// </summary>
/// <param name="steelPlateNo">鋼板編號</param>
/// <param name="pcbPartNo">PCB板號</param>
/// <param name="side">正背面</param>
/// <param name="solderPasteNo">錫膏編號</param>
/// <param name="status">狀態</param>
/// <param name="page">頁數</param>
/// <param name="limit">筆數</param>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/SolderPasteInfo/SolderPasteInfoQuery")]
ITask<ResultModel<SolderPasteInfoDto>> GetSolderPasteInfoQuery(string steelPlateNo = null, string pcbPartNo = null
ITask<ResultModel<SolderPasteInfoDto>> GetSolderPasteInfoQuery(string solderPasteNo = null, string pcbPartNo = null
, string side = null, string status = null, int page = 0, int limit = 10);
/// <summary>
/// 新增鋼板資料
/// 新增錫膏資料
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPost("api/SolderPasteInfo")]
ITask<ResultModel<SolderPasteInfo>> PostSolderPasteInfo([FromBody, RawJsonContent] string model);
/// <summary>
/// 更新鋼板資料
/// 更新錫膏資料
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPut("api/SolderPasteInfo")]
ITask<ResultModel<SolderPasteInfo>> PutSolderPasteInfo([FromBody, RawJsonContent] string model);
/// <summary>
/// 查詢鋼板資料 ID
/// 查詢錫膏資料 ID
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/SolderPasteInfo/{id}")]
ITask<SolderPasteInfo> GetSolderPasteInfo(int id);
/// <summary>
/// 查詢鋼板資料 By No
/// 查詢錫膏資料 By No
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/SolderPasteInfo/ByNo/{id}")]

37
AMESCoreStudio.Web/Views/PCB/PCB014.cshtml
View File

@ -45,29 +45,9 @@
<div class="layui-form-item">
<div class="layui-col-sm3">
<div class="layui-inline">
<label class="layui-form-label" style="width:60px">鋼板編號:</label>
<label class="layui-form-label" style="width:60px">錫膏編號:</label>
<div class="layui-input-inline" style="width:150px">
<input id="steelPlateNo" name="steelPlateNo" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input">
</div>
</div>
</div>
<div class="layui-col-sm3">
<div class="layui-inline">
<label class="layui-form-label" style="width:60px">PCB板號:</label>
<div class="layui-input-inline" style="width:150px">
<input id="pcbPartNo" name="pcbPartNo" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input">
</div>
</div>
</div>
<div class="layui-col-sm2">
<div class="layui-inline">
<label class="layui-form-label" style="width:50px">正背面:</label>
<div class="layui-input-inline" style="width:80px">
<select id="Side" lay-filter="Side" name="Side" class="">
<option value="">全部</option>
<option value="11">B/背面</option>
<option value="12">A/正面</option>
</select>
<input id="solderPasteNo" name="solderPasteNo" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input">
</div>
</div>
</div>
@ -148,17 +128,20 @@
{
field: 'receiptDate',
title: '收貨日期',
sort: true
sort: true,
templet: '<div>{{ layui.util.toDateString(d.receiptDate, "yyyy/MM/dd") }}</div>'
},
{
field: 'manufactoringDate',
title: '製造日期',
sort: true
sort: true,
templet: '<div>{{ layui.util.toDateString(d.manufactoringDate, "yyyy/MM/dd") }}</div>'
},
{
field: 'effectiveDate',
title: '有效日期',
sort: true
sort: true,
templet: '<div>{{ layui.util.toDateString(d.effectiveDate, "yyyy/MM/dd") }}</div>'
},
{
field: 'statusName',
@ -176,8 +159,8 @@
]];
//通过行tool编辑，lay-event="edit"
function edit(obj) {
if (obj.data.steelPlateID) {
hg.open('修改錫膏基本資料', '/PCB/PCB014U?id=' + obj.data.steelPlateID, 700, 500);
if (obj.data.solderPasteID) {
hg.open('修改錫膏基本資料', '/PCB/PCB014U?id=' + obj.data.solderPasteID, 700, 500);
}
}

119
AMESCoreStudio.Web/Views/PCB/PCB014C.cshtml
View File

@ -1,7 +1,9 @@
@model AMESCoreStudio.WebApi.Models.AMES.SolderPasteInfo
@{ Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
@{
Layout = "~/Views/Shared/_AMESLayout.cshtml";
}
<style>
.control-label {
@ -10,85 +12,82 @@
</style>
<div class="layui-card">
<div class="layui-form">
<div class="col-sm-12">
<form enctype="multipart/form-data" method="post" asp-action="PCB014" class="layui-form">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="layui-form-item">
<label class="layui-form-label">錫膏編號</label>
<div class="layui-input-inline">
<input asp-for="SolderPasteNo" class="layui-input" autocomplete="off" placeholder="請輸入錫膏編號" />
<span asp-validation-for="SolderPasteNo" class="layui-bg-red"></span>
</div>
<div class="col-sm-12">
<form enctype="multipart/form-data" method="post" asp-action="PCB014" class="layui-form">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="layui-form-item">
<label class="layui-form-label">錫膏編號</label>
<div class="layui-input-inline">
<input asp-for="SolderPasteNo" class="layui-input" autocomplete="off" placeholder="請輸入錫膏編號" />
<span asp-validation-for="SolderPasteNo" class="layui-bg-red"></span>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">規格描述</label>
<div class="layui-input-inline">
<input asp-for="Description" class="layui-input" autocomplete="off" placeholder="請輸入規格描述" />
<span asp-validation-for="Description" class="layui-bg-red"></span>
</div>
<div class="layui-form-item">
<label class="layui-form-label">規格描述</label>
<div class="layui-input-inline">
<input asp-for="Description" class="layui-input" autocomplete="off" placeholder="請輸入規格描述" />
<span asp-validation-for="Description" class="layui-bg-red"></span>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">收貨日期</label>
<div class="layui-input-inline">
<input asp-for="ReceiptDate" class="layui-input"/>
<span asp-validation-for="ReceiptDate" class="layui-bg-red"></span>
</div>
<div class="layui-form-item">
<label class="layui-form-label">收貨日期</label>
<div class="layui-input-inline">
<input asp-for="ReceiptDate" class="layui-input" readonly="" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">有效日期</label>
<div class="layui-input-inline">
<input asp-for="EffectiveDate" class="layui-input"/>
<span asp-validation-for="EffectiveDate" class="layui-bg-red"></span>
</div>
<div class="layui-form-item">
<label class="layui-form-label">有效日期</label>
<div class="layui-input-inline">
<input asp-for="EffectiveDate" class="layui-input" readonly="" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">製造日期</label>
<div class="layui-input-inline">
<input asp-for="ManufactoringDate" class="layui-input"/>
<span asp-validation-for="ManufactoringDate" class="layui-bg-red"></span>
</div>
<div class="layui-form-item">
<label class="layui-form-label">製造日期</label>
<div class="layui-input-inline">
<input asp-for="ManufactoringDate" class="layui-input" readonly="" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">狀態</label>
<div class="layui-input-inline">
<input type="radio" asp-for="Status" value="1" title="有效" checked>
<input type="radio" asp-for="Status" value="0" title="失效">
</div>
<div class="layui-form-item">
<label class="layui-form-label">狀態</label>
<div class="layui-input-inline">
<input type="radio" asp-for="Status" value="1" title="有效" checked>
<input type="radio" asp-for="Status" value="0" title="失效">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">備註</label>
<div class="layui-input-block">
<input asp-for="Remark" class="layui-input" />
</div>
<div class="layui-form-item">
<label class="layui-form-label">備註</label>
<div class="layui-input-block">
<input asp-for="Remark" class="layui-input" />
</div>
</div>
<span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
<div class="layui-row" style="text-align:center">
<div class="layui-col-md12">
<input type="submit" value="儲存" class="layui-btn" />
</div>
<span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
<div class="layui-row" style="text-align:center">
<div class="layui-col-md12">
<input type="submit" value="儲存" class="layui-btn" />
</div>
</form>
</div>
</div>
</form>
</div>
</div>
@section Scripts {
@{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
@{
await Html.RenderPartialAsync("_ValidationScriptsPartial");
await Html.RenderPartialAsync("_FileinputScriptsPartial");
}
<script type="text/javascript">
layui.use(['form', 'laydate', 'autocomplete'], function () {
layui.use(['form', 'laydate'], function () {
var form = layui.form,
laydate = layui.laydate;
laydate = layui.laydate
laydate.render({
elem: '#ReceiptDate'
@ -108,13 +107,15 @@
, format: 'yyyy/MM/dd'
, theme: 'grid'
});
}
});
$(document).ready(function () {
var error = '@Html.ValidationMessage("error")';
if ($(error).text() != '') {
parent.hg.msg(error);
}
});
</script>

10
AMESCoreStudio.Web/Views/PCB/PCB014U.cshtml
View File

@ -19,7 +19,7 @@
<div class="layui-form-item">
<label class="layui-form-label">錫膏編號</label>
<div class="layui-input-inline">
<input asp-for="SolderPasteNo" class="layui-input" autocomplete="off" placeholder="請輸入錫膏編號" />
<input asp-for="SolderPasteNo" class="layui-input" autocomplete="off" placeholder="請輸入錫膏編號" readonly="" />
<span asp-validation-for="SolderPasteNo" class="layui-bg-red"></span>
</div>
</div>
@ -87,9 +87,9 @@
await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
<script type="text/javascript">
layui.use(['form', 'laydate', 'autocomplete'], function () {
layui.use(['form', 'laydate'], function () {
var form = layui.form,
laydate = layui.laydate;
laydate = layui.laydate
laydate.render({
elem: '#ReceiptDate'
@ -109,13 +109,15 @@
, format: 'yyyy/MM/dd'
, theme: 'grid'
});
}
});
$(document).ready(function () {
var error = '@Html.ValidationMessage("error")';
if ($(error).text() != '') {
parent.hg.msg(error);
}
});
</script>

5
AMESCoreStudio.WebApi/Controllers/AMES/SolderPasteInfoController.cs
View File

@ -51,15 +51,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// 錫膏資料查詢
/// </summary>
/// <param name="solderPasteNo">錫膏編號</param>
/// <param name="pcbPartNo">PCB板號</param>
/// <param name="side">正背面</param>
/// <param name="status">狀態</param>
/// <param name="page">頁數</param>
/// <param name="limit">筆數</param>
/// <returns></returns>
[HttpGet("SolderPasteInfoQuery")]
public async Task<ResultModel<SolderPasteInfoDto>> GetSolderPasteInfo(string solderPasteNo, string pcbPartNo, string side
, string status, int page = 0, int limit = 10)
public async Task<ResultModel<SolderPasteInfoDto>> GetSolderPasteInfo(string solderPasteNo , string status, int page = 0, int limit = 10)
{
var q = await _context.SolderPasteInfos.ToListAsync();

14
AMESCoreStudio.WebApi/Models/AMES/SolderPasteInfo.cs
View File

@ -13,6 +13,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
/// 錫膏基本資料檔
/// </summary>
[Table("SOLDER_PASTE_INFO", Schema = "JHAMES")]
[DataContract]
public partial class SolderPasteInfo
{
/// <summary>
@ -48,7 +49,10 @@ namespace AMESCoreStudio.WebApi.Models.AMES
/// </summary>
[DataMember]
[Display(Name = "收貨日期")]
[Column("RECEIPT_DATE", TypeName = "DATE")]
[Column("RECEIPT_DATE")]
[Required(ErrorMessage = "{0},不能空白")]
[DataType(DataType.Text), DisplayFormat(DataFormatString = "{0:yyyy/MM/dd}", ApplyFormatInEditMode = true)]
public DateTime ReceiptDate { get; set; }
/// <summary>
@ -56,7 +60,9 @@ namespace AMESCoreStudio.WebApi.Models.AMES
/// </summary>
[DataMember]
[Display(Name = "製造日期")]
[Column("MANUFACTORING_DATE", TypeName = "DATE")]
[Column("MANUFACTORING_DATE")]
[Required(ErrorMessage = "{0},不能空白")]
[DataType(DataType.Text), DisplayFormat(DataFormatString = "{0:yyyy/MM/dd}", ApplyFormatInEditMode = true)]
public DateTime ManufactoringDate { get; set; }
/// <summary>
@ -64,7 +70,9 @@ namespace AMESCoreStudio.WebApi.Models.AMES
/// </summary>
[DataMember]
[Display(Name = "有效日期")]
[Column("EFFECTIVE_DATE", TypeName = "DATE")]
[Column("EFFECTIVE_DATE")]
[Required(ErrorMessage = "{0},不能空白")]
[DataType(DataType.Text), DisplayFormat(DataFormatString = "{0:yyyy/MM/dd}", ApplyFormatInEditMode = true)]
public DateTime EffectiveDate { get; set; }
/// <summary>

Write Preview
Loading…
Cancel
Save