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

1.

PTD
ray 3 years ago
parent
bc5619757e
commit
277f8ad83f
5 changed files with 108 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      AMESCoreStudio.Web/Controllers/FQCController.cs
  2. 131
      AMESCoreStudio.Web/Views/FQC/FQC009C.cshtml
  3. 2
      AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
  4. 14
      AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
  5. 2
      AMESCoreStudio.WebApi/DTO/AMES/QcItemDto.cs

7
AMESCoreStudio.Web/Controllers/FQCController.cs
View File

@ -943,16 +943,15 @@ namespace AMESCoreStudio.Web.Controllers
} }
[HttpPost] [HttpPost]
public ActionResult FQC009CAsync(string ids , string itemNo) public ActionResult FQC009CAsync(string ids, string itemNo)
{ {
return View(); return View();
} }
[HttpGet] [HttpGet]
public async Task<IActionResult> FQC009ItemQueryAsync(int groupID = 0, int page = 0, int limit = 10) public async Task<IActionResult> FQC009ItemQueryAsync(int groupID = 0, int page = 0, int limit = 1, string itemID = null)
{ {
var result = await _fqcApi.GetQcItemQuery(groupID, page, limit); var result = await _fqcApi.GetQcItemQuery(groupID, 0, limit);
if (result.Data.Count() != 0) if (result.Data.Count() != 0)
{ {
return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal }); return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });

131
AMESCoreStudio.Web/Views/FQC/FQC009C.cshtml
View File

@ -1,7 +1,7 @@
@model AMESCoreStudio.WebApi.Models.AMES.QcGroup @model AMESCoreStudio.WebApi.Models.AMES.QcGroup
@{ ViewData["Title"] = "FQC009C"; @{ ViewData["Title"] = "料號檢驗工項新增";
Layout = "~/Views/Shared/_AMESLayout.cshtml"; } Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
<style> <style>
@ -11,30 +11,38 @@
</style> </style>
<div class="layui-card"> <div class="layui-card">
<div class="row"> <div class="layui-card-header">
<div class="layui-form"> <div class="layui-form">
<div class="text-danger"></div> <div class="layui-form-item ">
<div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
<div class="layui-form-item"> <div class="layui-inline">
<label class="layui-form-label">料號</label> <label class="layui-form-label">料號:</label>
<div class="layui-input-block"> <div class="layui-input-inline">
<input name="itemNo" class="layui-input" autocomplete="off" placeholder="請輸入料號" /> <input id="itemNo" name="itemNo" autocomplete="off" class="layui-input" placeholder="請輸入料號">
</div>
</div> </div>
</div> <div class="layui-inline layui-show-xs-block">
<button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
<div class="layui-card-body"> <i class="layui-icon layui-icon-sm">&#xe615;</i>
<table class="layui-hide" id="tableQuery" name="tableQuery" lay-filter="tableQuery"></table> </button>
</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> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="layui-card-body">
<span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
<table class="layui-hide" id="tableQuery" name="tableQuery" lay-filter="tableQuery"></table>
</div>
</div> </div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm layui-btn" lay-event="add"><i class="layui-icon">&#xe640;</i>保存</button>
</div>
</script>
@section Scripts { @section Scripts {
@{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
@ -42,6 +50,9 @@
<script type="text/javascript"> <script type="text/javascript">
hg.form.onsubmit('querysubmit', function (data) {
tableIns.reload(data);
});
layui.use(['form', 'table'], function () { layui.use(['form', 'table'], function () {
//记录当前页数据的临时变量 //记录当前页数据的临时变量
@ -51,35 +62,68 @@
table = layui.table; table = layui.table;
form = layui.form; form = layui.form;
@*table.render({ //其它参数在此省略 //方法級渲染
var tableIns = table.render({ //其它参数在此省略
elem: '#tableQuery', elem: '#tableQuery',
url: "@Url.Action("FQC009ItemQuery", "FQC")", url: "@Url.Action("FQC009ItemQuery", "FQC")",
title: '檢驗工項', title: '檢驗工項',
id:'itemID', id:'itemID',
page: false, //开启分页 page: false, //开启分页
toolbar: Toolbar, toolbar: '#toolbarDemo',
limits: [20, 50, 100], limits: [20, 50, 100],
defaultToolbar: ['filter', 'print', 'exports'], defaultToolbar: ['filter', 'print', 'exports'],
cols: tableCols cols: tableCols,
//done: function (res, curr, count) { done: function (res, curr, count) {
// //如果是异步请求数据方式，res即为你接口返回的信息。 //在快取中找到PM_CODE ,然後設定data表格中的選中狀態
// id_lists = res.data; //迴圈所有資料，找出對應關係，設定checkbox選中狀態
// //记录当前也选中的chechbox个数(判断全选使用的) for (var i = 0; i < res.data.length; i++) {
// var len = 0; if (res.data[i].check) {
// //遍历当前页数据，对比已选中项中的 id //這裡才是真正的有效勾選
// for (var index = 0; index < id_lists.length; index++) { res.data[i]["LAY_CHECKED"] = 'true';
// if (layui.data('checked', id_lists[index]['itemID'])) { //找到對應資料改變勾選樣式，呈現出選中效果
// //逐个判断是否选中，如果已经选中就改变选中模式 var index = res.data[i]['LAY_TABLE_INDEX'];
// var i = id_lists[index]['LAY_TABLE_INDEX']; $('.layui-table tr[data-index=' + index + '] input[type="checkbox"]').prop('checked', true);
// var checkbox = $('.layui-table tr[data-index=' + i + '] input[type="checkbox"]'); $('.layui-table tr[data-index=' + index + '] input[type="checkbox"]').next().addClass('layui-form-checked');
// checkbox.prop('checked', true); }
// checkbox.next().addClass('layui-form-checked'); }
// //为了设置全选的 }
// len++; });
// }
// } //触发事件
//} table.on('toolbar(tableQuery)', function (obj) {
});*@ var checkStatus = table.checkStatus(obj.config.id);
if (obj.event == 'add') {
if (checkStatus && checkStatus.data.length > 0) {
console.log(checkStatus.data.map(function (x) { return x.itemID }).join(','))
hg.confirm("確定要綁定有勾選的檢驗工項嗎？", function () {
$.ajax({
url: '/FQC/FQC009C',
data: { 'ids': checkStatus.data.map(function (x) { return x.itemID }).join(','), 'itemNo': 'aaa' },
type: 'POST',
success: function (data) {
if (data.success) {
hg.msg('保存成功！');
//重载表格数据
table && table.reload();
}
else {
//hg.msg(data.msg);
hg.msg('保存失败！');
}
},
error: function () {
hg.msg("网络请求失败！");
}
});
});
} else {
hg.msg('请勾選要綁定的檢驗工項，再執行！');
}
}
});
/** /**
* 复选框的点击事件 * 复选框的点击事件
* 主要操作为： * 主要操作为：
@ -139,7 +183,8 @@
} }
}); });
//监听表单提交事件
////监听表单提交事件 ////监听表单提交事件
//hg.form.onsubmit('querysubmit', function (data) { //hg.form.onsubmit('querysubmit', function (data) {
@ -179,7 +224,7 @@
hg.confirm("確定要綁定有勾選的檢驗工項嗎？", function () { hg.confirm("確定要綁定有勾選的檢驗工項嗎？", function () {
$.ajax({ $.ajax({
url: '/FQC/FQC009C', url: '/FQC/FQC009C',
data: { 'ids': obj.checkstatus.data.map(function (x) { return x.itemID }), 'itemNo':'aaa' }, data: { 'ids': obj.checkstatus.data.map(function (x) { return x.itemID }).join(','), 'itemNo':'aaa' },
type: 'POST', type: 'POST',
success: function (data) { success: function (data) {
if (data.success) { if (data.success) {
@ -205,7 +250,7 @@
} }
]; ];
//基本数据表格 //基本数据表格
var tableQuery = hg.table.datatable('tableQuery', '檢驗工項', '/FQC/FQC009ItemQuery', {}, tableCols, Toolbar, false, 'full-100', ['filter', 'print', 'exports']); //var tableQuery = hg.table.datatable('tableQuery', '檢驗工項', '/FQC/FQC009ItemQuery', {}, tableCols, Toolbar, false, 'full-100', ['filter', 'print', 'exports']);
</script> </script>

2
AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
View File

@ -131,7 +131,7 @@
<fieldset class="layui-elem-field layui-field-title"> <fieldset class="layui-elem-field layui-field-title">
<legend style="color: #e18917">刷讀條碼</legend> <legend style="color: #e18917">刷讀條碼</legend>
</fieldset> </fieldset>
<div class="layui-form-item"> <div class="layui-form-item" style="background-color: #acdbe36b">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">刷讀條碼：</label> <label class="layui-form-label">刷讀條碼：</label>
<div class="layui-input-inline"> <div class="layui-input-inline">

14
AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
View File

@ -112,6 +112,20 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
bool burnIn = false; bool burnIn = false;
#endregion #endregion
#region 判斷UserID
if (barCodeCheckDto.userID != 0)
{
if (_context.UserInfoes.Where(w => w.UserID == barCodeCheckDto.userID).Count() == 0)
{
resultModel.Success = false;
resultModel.Msg = "找不到UserID【" + barCodeCheckDto.userID + "】資料";
return resultModel;
}
}
#endregion
// 抓流程ID // 抓流程ID
var q_wipinfo = await wipInfosController.GetWipInfoByWipNo(barCodeCheckDto.wipNo); var q_wipinfo = await wipInfosController.GetWipInfoByWipNo(barCodeCheckDto.wipNo);
barCodeCheckDto.flowRule = q_wipinfo.Value.Where(w => w.UnitNO == barCodeCheckDto.unitNo).FirstOrDefault().FlowRuleID; barCodeCheckDto.flowRule = q_wipinfo.Value.Where(w => w.UnitNO == barCodeCheckDto.unitNo).FirstOrDefault().FlowRuleID;

2
AMESCoreStudio.WebApi/DTO/AMES/QcItemDto.cs
View File

@ -57,5 +57,7 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
/// 更新日期 /// 更新日期
/// </summary> /// </summary>
public DateTime? UpdateDate { get; set; } = DateTime.Now; public DateTime? UpdateDate { get; set; } = DateTime.Now;
public bool check {get;set;}= false;
} }
} }

Write Preview
Loading…
Cancel
Save