Browse Source

修正標工查詢問題

PTD
Shani 3 years ago
parent
commit
d096344e65
  1. 2
      AMESCoreStudio.Web/Views/WHS/WHS003.cshtml
  2. 246
      AMESCoreStudio.Web/Views/WHS/WHS005.cshtml
  3. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll
  4. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb
  5. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll
  6. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb
  7. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll
  8. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb
  9. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll
  10. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb
  11. 29
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
  12. 5
      AMESCoreStudio.WebApi/Controllers/AMES/StandardWorkTimesController.cs
  13. BIN
      AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll
  14. BIN
      AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb
  15. BIN
      AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll
  16. BIN
      AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb
  17. 29
      AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml

2
AMESCoreStudio.Web/Views/WHS/WHS003.cshtml

@ -1,5 +1,5 @@
@{
ViewData["Title"] = "標準工時資料查詢";
ViewData["Title"] = "標準工時資料維護";
Layout = "~/Views/Shared/_AMESLayout.cshtml";
}

246
AMESCoreStudio.Web/Views/WHS/WHS005.cshtml

@ -1,92 +1,51 @@
@{
ViewData["Title"] = "標準工時資料查詢";
Layout = "~/Views/Shared/_AMESLayout.cshtml";
}
<!DOCTYPE html>
<div class="layui-card" id="userinfo">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
</div>
<div class="layui-card-body">
<form class="layui-form" action="" lay-filter="info">
<div class="form-inline ">
<div class="layui-form-item">
<div class="layui-input-inline">
<label class="control-label col-sm-3">请選擇單位名稱</label>
<div class="layui-input-inline" width:680px;>
<select id="unit" lay-event="unit" lay-filter="unit" lay-submit asp-items="@ViewBag.FactoryUnit">
</select>
</div>
<input id="unitId" type="hidden" name="unitId" />
<div class="layui-form">
<div class="layui-form-item">
<div class="layui-inline" style="margin-right:0px;">
<label class="layui-inline layui-form-label" style="width:80px;">製程單位</label>
<div class="layui-input-inline" style="width: 90px; margin-right: 5px;">
<select style="width:90px;" lay-filter="unitNo" lay-submit id="unitNo" name="unitNo" asp-items="@ViewBag.FactoryUnit">
</select>
</div>
<div class="layui-input-inline">
<label class="control-label col-sm-3">料號</label>
<input style="width:280px;" type="text" name="modelname" placeholder="请输入" autocomplete="off" class="layui-input">
<input id="unitId" type="hidden" name="unitId" />
<label class="layui-inline layui-form-label" style="width:80px;">線別</label>
<div class="layui-input-inline" style="width:120px;">
<select name="lineID" id="lineID" lay-filter="lineID" lay-search>
<option value=""> —請選擇線別— </option>
</select>
<input type="hidden" id="line" name="line" />
</div>
</div>
</div>
<div class="form-inline">
<div class="layui-form-item">
<label class="control-label col-sm-3">線別</label>
<div id="demo1" width:400px;></div>
<div class="layui-inline" style="margin-right:5px;">
<label class="layui-inline layui-form-label">料號</label>
<div class="layui-input-inline">
<input type="text" name="modelname" id="modelname" placeholder="请输入料號" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-inline">
<div class="layui-form-item">
<button id="btnSearch" class="layui-btn tt" lay-filter="submitBtn">查詢</button>
<div class="layui-inline" style="margin-left:0px;">
<button id="btnSearch" class="layui-btn tt">
<i class="layui-icon">&#xe615;</i>搜索
</button>
</div>
</div>
</form>
</div>
<div class="layui-inline">
<button type="button" id="btnAdd" class="layui-btn layui-btn-normal layui-btn-sm"><i class="layui-icon">&#xe654;</i>新增</button>
</div>
<table class="layui-hide" id="test" lay-filter="test"></table>
</div>
</div>
@section Scripts{
<!-- layui css -->
<link rel="stylesheet" type="text/css" href="https://www.layuicdn.com/layui-v2.5.6/css/layui.css" />
<!-- layui js -->
<script src="https://www.layuicdn.com/layui-v2.5.6/layui.js"></script>
<!-- 下载地址 https://gitee.com/maplemei/xm-select/attach_files/591517/download/xm-select-v1.2.2.zip -->
<script src="https://maplemei.gitee.io/xm-select/xm-select.js" type="text/javascript" charset="utf-8"></script>
<script>
layui.use(['table','jquery', 'form', 'laydate'], function () {
var $ = layui.$;
var form = layui.form,
layer = layui.layer;
var table = layui.table;
//请注释掉下方 监听表单的 代码
form.on('submit(submitBtn)', function (data) {
console.log("reload");
//打印表单数据
//table.reload('test', {
// url: '/WHS/GetStandardWorkTimes005/',
// where: {
// u: $("#unit").val(),
// l: data.field.xmselectName,
// i: data.field.modelname
// }
//});
tt(data);
return false;//阻止默认表单提交行为
});
});
var options = {
el: '#demo1',
name: 'xmselectName',//表单的name属性
layVerify: 'required',//必填项
//layVerType: 'tips',//提示类型 同layui
tips: '請選擇站別',
toolbar: {//工具条,全选,清空,反选,自定义
show: true,
list: [
'ALL',
'CLEAR',
]
},
data: [],
};
var demo1 = xmSelect.render(options)
<script type="text/javascript">
var tableCols = [[
{
field: 'standardID',
@ -152,49 +111,126 @@
field: 'machineCT',
title: '操機數',
}
//,{
// field: 'center',
// width: 200,
// title: '操作',
// templet: function (item) {
// var btn = '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a>';
// btn += ' <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">刪除</a>';
// return btn
// }
//}
]];
var toolbar = [{
text: '新增',
layuiicon: '&#xe608;',
class: 'layui-btn-normal',
handler: function () {
hg.open('新增每日工時資料', '/WHS/WHS006C', 480, 480);
//通过行tool编辑,lay-event="del"
function del(obj) {
if (obj.data.standardID) {
var str;
str = "刪除";
hg.confirm("系統:" + obj.data.standardID + ",確定要" + str + "嗎?", function () {
$.ajax({
url: '/WHS/WHS003D',
data: { id: obj.data.standardID },
type: 'POST',
success: function (res) {
if (res.success) {
obj.del(); //只删本地数据
hg.msghide(str + "成功!", {
icon: 6
});
layui.table.reload('test', { page: { curr: $(".layui-laypage-em").next().html() } })
}
else {
hg.msg(data.msg);
}
},
error: function () {
hg.msg("网络请求失败!");
}
});
});
}
}
//通过行tool删除,lay-event="edit"
function edit(obj) {
if (obj.data.standardID) {
hg.open('修改標準工時', '/WHS/WHS003U/' + obj.data.standardID, 480, 480);
}
}
];
var table;
setTimeout(function () {
console.log("setTimeout");
////搜索
$('#btnSearch').click(function () {
hg.msghide("刷新数据!");
tt();
});
layui.use(['form', 'layer', 'laydate'], function () {
form = layui.form;
form.on('select(unitNo)', function (data) {
var data = $("#unitNo").val();
getLineInfoes(data);
});
});
function getLineInfoes(data) {
$.ajax({
url: '/BAS/GetLineInfoesList',
method: 'get',
dataType: 'JSON',
success: function (data) {
var res = data;
demo1.update({
data: res.data,
autoRow: true,
})
console.log("setTimeoutsuccess");
url: "/BAS/GetLineInfoByUnit",
dataType: 'json',
data: { id: data },
contentType: "application/json",
type: 'get',
success: function (result) {
if (result.data) {
$("#lineID").empty();//清空下拉框的值
$('#lineID').append(new Option("全部", "-99"));// 下拉選單裡新增元素
$.each(result.data, function (index, item) {
$('#lineID').append(new Option(item.lineDesc, item.lineID));// 下拉選單裡新增元素
});
}
else {
$("#lineID").empty();//清空下拉框的值
$('#lineID').append(new Option("無選項", "-99"));// 下拉選單裡新增元素
}
layui.form.render("select");//重新渲染 固定寫法
}
});
}, 100);
$(function () {
console.log("Start");
tt(null);
};
////搜索
$('#querysubmit').click(function () {
hg.msghide("刷新数据!");
tt();
});
function tt(data) {
console.log("tt");
var iNO = "", uNO = "", iID = "";
if (data) {
iNO = data.field.modelname;
uNO = $("#unit").val();
lID = data.field.xmselectName;
//新增
$('#btnAdd').click(function () {
var unit = $("#unitNo").val();
var lineID = $('#lineID').val();
if (lineID) {
hg.open('新增標準工時', '/WHS/WHS003C?unit=' + unit + "&lineID=" + lineID, 480, 480);
}
table = hg.table.datatable('query', '每日工時資料維護', '/WHS/GetStandardWorkTimes005?'
+ 'u=' + uNO + '&l=' + lNO + '&i=' + iNO
else {
alert("請選擇線別!!");
}
});
var table;
$(function () {
tt();
});
//基本数据表格
function tt() {
var unit = $("#unitNo").val();
var lineID = $('#lineID').val();
var keywords = $('#modelname').val();
table = hg.table.datatable('test', '標準工時資料', '/WHS/GetStandardWorkTimes2?u=' + unit + '&l=' + lineID + '&i=' + keywords
, {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
};
}
</script>
}

BIN
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll

Binary file not shown.

BIN
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb

Binary file not shown.

BIN
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll

Binary file not shown.

BIN
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb

Binary file not shown.

BIN
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll

Binary file not shown.

BIN
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb

Binary file not shown.

BIN
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll

Binary file not shown.

BIN
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb

Binary file not shown.

29
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml

@ -72,6 +72,13 @@
<param name="id">BarcodeID</param>
<returns></returns>
</member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeChangeController.GetBarcodeChangeByBarcodeNo(System.String)">
<summary>
條碼變更資料表 by BarcodeNo 查詢新舊條碼
</summary>
<param name="id">BarcodeID</param>
<returns></returns>
</member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeChangeController.GetBarcodeChangeByBarcodeID(System.Int32)">
<summary>
條碼變更資料表 by id
@ -443,6 +450,12 @@
<param name="wipID">工單ID</param>
<returns></returns>
</member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeStationController.GetBarcodeStationPCS019Query(System.String,System.String,System.String,System.Int32,System.Int32)">
<summary>
條碼漏刷查詢
</summary>
<returns></returns>
</member>
<member name="T:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeStatusController">
<summary>
條碼狀態維護
@ -2285,9 +2298,9 @@
<param name="no"></param>
<returns></returns>
</member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgInfoController.GetNgInfoByBarcodeNoFromPCS009(System.String)">
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgInfoController.GetNgInfoByBarcodeNoFromPCS009(System.Int32)">
<summary>
ByWipNo
ByBarcodeID
</summary>
<param name="id"></param>
<returns></returns>
@ -6727,11 +6740,21 @@
條碼ID
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.BarcodeNOOld">
<member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.BarcodeNoOld">
<summary>
舊條碼序號
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.BarcodeNoNew">
<summary>
新條碼序號
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.ChangeType">
<summary>
置換類型 生產序號:P 出貨序號:E
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.CreateUserID">
<summary>
建立者

5
AMESCoreStudio.WebApi/Controllers/AMES/StandardWorkTimesController.cs

@ -157,9 +157,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
if (u!="Null")
queryResult = queryResult.Where(p => p.UnitNo.Equals(u));
if(i!="Null")
queryResult = queryResult.Where(p => p.LineID.ToString() == l);
queryResult = queryResult.Where(p => p.ItemNo == i);
//queryResult = queryResult.Where(p => p.LineID.ToString() == l);
var standardWorkTime = await q.ToListAsync();
var standardWorkTime = await q.ToListAsync();
if (standardWorkTime == null)
{

BIN
AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll

Binary file not shown.

BIN
AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb

Binary file not shown.

BIN
AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll

Binary file not shown.

BIN
AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb

Binary file not shown.

29
AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml

@ -72,6 +72,13 @@
<param name="id">BarcodeID</param>
<returns></returns>
</member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeChangeController.GetBarcodeChangeByBarcodeNo(System.String)">
<summary>
條碼變更資料表 by BarcodeNo 查詢新舊條碼
</summary>
<param name="id">BarcodeID</param>
<returns></returns>
</member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeChangeController.GetBarcodeChangeByBarcodeID(System.Int32)">
<summary>
條碼變更資料表 by id
@ -443,6 +450,12 @@
<param name="wipID">工單ID</param>
<returns></returns>
</member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeStationController.GetBarcodeStationPCS019Query(System.String,System.String,System.String,System.Int32,System.Int32)">
<summary>
條碼漏刷查詢
</summary>
<returns></returns>
</member>
<member name="T:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeStatusController">
<summary>
條碼狀態維護
@ -2285,9 +2298,9 @@
<param name="no"></param>
<returns></returns>
</member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgInfoController.GetNgInfoByBarcodeNoFromPCS009(System.String)">
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgInfoController.GetNgInfoByBarcodeNoFromPCS009(System.Int32)">
<summary>
ByWipNo
ByBarcodeID
</summary>
<param name="id"></param>
<returns></returns>
@ -6727,11 +6740,21 @@
條碼ID
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.BarcodeNOOld">
<member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.BarcodeNoOld">
<summary>
舊條碼序號
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.BarcodeNoNew">
<summary>
新條碼序號
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.ChangeType">
<summary>
置換類型 生產序號:P 出貨序號:E
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.CreateUserID">
<summary>
建立者

Loading…
Cancel
Save