Browse Source

1. 加入NG時呼叫警報

2. 修改FQC抽驗=>新增檢驗工項儲存後沒關閉畫面
PTD
Ray 3 years ago
parent
commit
3b62975b56
  1. 1
      AMESCoreStudio.Web/Views/FQC/FQC007A.cshtml
  2. 2
      AMESCoreStudio.Web/Views/FQC/FQC008.cshtml
  3. 5
      AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs

1
AMESCoreStudio.Web/Views/FQC/FQC007A.cshtml

@ -77,6 +77,7 @@
success: function (data) { success: function (data) {
if (data.success) { if (data.success) {
parent.hg.msg('儲存成功!'); parent.hg.msg('儲存成功!');
hg.close();
//重载表格数据 //重载表格数据
//initQuery(data); //initQuery(data);
} }

2
AMESCoreStudio.Web/Views/FQC/FQC008.cshtml

@ -220,7 +220,7 @@
{ {
title: '操作', title: '操作',
align: 'center', align: 'center',
width: 75, width: 80,
templet: function (d) { templet: function (d) {
return '<a class="layui-btn layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a>' return '<a class="layui-btn layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a>'
} }

5
AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs

@ -532,7 +532,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
if (!result_NgInfo.Success) if (!result_NgInfo.Success)
{ {
Msg += "NgInfo_Error:" + result_NgInfo.Msg + "<br/>"; Msg += "NgInfo_Error:" + result_NgInfo.Msg + "<br/>";
} }
// 判斷是否為第一站 // 判斷是否為第一站
@ -890,6 +889,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
result.Msg = result_NgComponent.Msg; result.Msg = result_NgComponent.Msg;
return result; return result;
} }
// 累計預警
WipAlarmsController wipAlarmsController = new WipAlarmsController(_context);
await wipAlarmsController.PostWipAlarm4ErrorCode(barCodeCheckDto.wipNo, NGNo.inputData.Replace("$", ""));
} }
} }
return result; return result;

Loading…
Cancel
Save