diff --git a/AMESCoreStudio.Web/Controllers/BASController.cs b/AMESCoreStudio.Web/Controllers/BASController.cs index 0103944c..83752293 100644 --- a/AMESCoreStudio.Web/Controllers/BASController.cs +++ b/AMESCoreStudio.Web/Controllers/BASController.cs @@ -86,7 +86,7 @@ namespace AMESCoreStudio.Web.Controllers var result = await _basApi.GetMailGroups(); var MailGroupItems = new List(); - MailGroupItems.Add(new SelectListItem("全部", "0")); + //MailGroupItems.Add(new SelectListItem("全部", "0")); for (int i = 0; i < result.Count; i++) { @@ -183,7 +183,7 @@ namespace AMESCoreStudio.Web.Controllers var result = await _basApi.GetFlowRulesByUnit(unit_no); var item = new List(); - item.Add(new SelectListItem("全部", "0")); + //item.Add(new SelectListItem("全部", "0")); for (int i = 0; i < result.Count; i++) { item.Add(new SelectListItem(result[i].FlowRuleName, result[i].FlowRuleID.ToString())); diff --git a/AMESCoreStudio.Web/Controllers/WHSController.cs b/AMESCoreStudio.Web/Controllers/WHSController.cs index 23d0befe..85d2f3b1 100644 --- a/AMESCoreStudio.Web/Controllers/WHSController.cs +++ b/AMESCoreStudio.Web/Controllers/WHSController.cs @@ -31,30 +31,6 @@ namespace AMESCoreStudio.Web.Controllers _ppsApi = ppsApi; } - private async Task GetResponseDeptList() - { - var result = await _basApi.GetRepairResponsibleUnitses(); - - var ResponseDeptList = new List(); - - for (int i = 0; i < result.Count; i++) - { - ResponseDeptList.Add(new SelectListItem(result[i].RRDesc, result[i].RRID.ToString())); - } - ViewBag.ResponseDeptList = ResponseDeptList; - } - private async Task GetSectionList() - { - var result = await _basApi.GetFactoryUnits(); - - var SectionList = new List(); - - for (int i = 0; i < result.Count; i++) - { - SectionList.Add(new SelectListItem(result[i].UnitName, result[i].UnitNo.ToString())); - } - ViewBag.SectionList = SectionList; - } private async Task GetErrorGroupList() { var result = await _ppsApi.GetErrorGroups(); @@ -67,17 +43,7 @@ namespace AMESCoreStudio.Web.Controllers //} ViewBag.ErrorGroupList = ErrorGroupList; } - private async Task GetErrorClassList(string no) - { - var result = await _ppsApi.GetErrorClassesByGroup(no); - var ErrorClassList = new List(); - for (int i = 0; i < result.Count; i++) - { - ErrorClassList.Add(new SelectListItem(result[i].ClassName, result[i].ClassNo.ToString())); - } - ViewBag.ErrorClassList = ErrorClassList; - } #region private void GetFlagList() @@ -237,6 +203,24 @@ namespace AMESCoreStudio.Web.Controllers ViewBag.ClassList = ClassItems; } + private async Task GetStationListByUnit(string unit) + { + var result = await _basApi.GetStationses(); + + var StationItems = new List(); + StationItems.Add(new SelectListItem("N/A", "0")); + for (int i = 0; i < result.Count; i++) + { + if(result[i].UnitNo==unit) + StationItems.Add(new SelectListItem(result[i].StationName, result[i].StationID.ToString())); + } + if(StationItems.Count==0) + StationItems.Add(new SelectListItem("N/A", "")); + + ViewBag.StationList = StationItems; + } + + #endregion #region WHS001工作群組維護相關 @@ -466,10 +450,12 @@ namespace AMESCoreStudio.Web.Controllers //新增頁面 public async Task WHS003C(string unit,string lineID) { - await GetStationList(); + await GetStationListByUnit(unit); + var result = await _basApi.GetFactoryUnit(unit); //await GetMFGType(); ViewBag.LineID = lineID; ViewBag.UnitNo = unit; + ViewBag.FactoryU = result[0].UnitName; GetSideList(); return View(); } @@ -622,6 +608,8 @@ namespace AMESCoreStudio.Web.Controllers await GetStationList(); //班別 GetClassList(); + //部門 + await GetDeptList2(); return View(); } @@ -635,9 +623,9 @@ namespace AMESCoreStudio.Web.Controllers //製程單位 await GetFactoryUnitsList3(); //線別 - await GetLineList2(); + //await GetLineList2(); //站別 - await GetStationList(); + //await GetStationList(); //班別 GetClassList(); @@ -734,7 +722,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetWorkManPowersByQueryAsync(string fid, string uid, string lid, string cID, string sID, string uNo, string sd, string ed) + public async Task GetWorkManPowersByQueryAsync(string fid, string uid, string lid, string cID, string sID, string uNo, string dID, string sd, string ed) { if (fid == null) { @@ -760,6 +748,10 @@ namespace AMESCoreStudio.Web.Controllers { uNo = "*"; } + if (dID == null) + { + dID = "*"; + } if (sd == null) { sd = System.DateTime.Now.AddDays(-1).ToString(); @@ -770,7 +762,7 @@ namespace AMESCoreStudio.Web.Controllers } //var result = await _whsApi.GetWorkManPowersByQuery( factoryid, unitid, lineid, classID, stationID, userNo, sdate, edate); - var result = await _whsApi.GetWorkManPowersByQuery(fid, uid, lid, cID, sID, uNo, sd, ed); + var result = await _whsApi.GetWorkManPowersByQuery(fid, uid, lid, cID, sID, uNo , dID, sd, ed); if (result.Count > 0) { return Json(new Table() { code = 0, msg = "", data = result, count = result.Count }); @@ -951,9 +943,12 @@ namespace AMESCoreStudio.Web.Controllers await GetStationList(); //班別 GetClassList(); - //其他部門 + //判定單位部門 await GetDeptList(); - + //負責人 + //內部/外部 + //EXCEPTION_Class + //EXCEPTION_CODE await GetErrorGroupList(); return View(); @@ -1052,23 +1047,23 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetExceptionWorktimeByQueryAsync(string factoryid, string unitid, string lineid, string deptid, string sdate, string edate) + public async Task GetExceptionWorktimeByQueryAsync(string factoryNo, string unitNo, string lineID, string deptID, string sdate, string edate) { - if (factoryid == null) + if (factoryNo == null) { - factoryid = "*"; + factoryNo = "*"; } - if (unitid == null) + if (unitNo == null) { - unitid = "*"; + unitNo = "*"; } - if (lineid == null) + if (lineID == null) { - lineid = "*"; + lineID = "*"; } - if (deptid == null) + if (deptID == null) { - deptid = "*"; + deptID = "*"; } if (sdate == null || edate == null) { @@ -1078,7 +1073,7 @@ namespace AMESCoreStudio.Web.Controllers - var result = await _whsApi.GetExceptionWorktimeOlineByQuery(factoryid, unitid, lineid, deptid, sdate, edate); + var result = await _whsApi.GetExceptionWorktimeOlineByQuery(factoryNo, unitNo, lineID, deptID, sdate, edate); if (result.Count > 0) @@ -1088,6 +1083,101 @@ namespace AMESCoreStudio.Web.Controllers return Json(new Table() { count = 0, data = null }); } + public async Task GetWipAttAsync(string id) + { + + var result = await _pcsApi.GetWipAtt(id); + + + if (result != null) + { + return Json(new Table() { code = 0, msg = "", data = result, count = 1 }); + } + + return Json(new Table() { count = 0, data = null }); + } + public async Task GetCountTimesAsync(string id) + { + string sTime, eTime; + var timeArr = id.Split("%"); + sTime = timeArr[0]; + eTime = timeArr[1]; + sTime = sTime.Replace("T", " "); + eTime = eTime.Replace("T", " "); + System.DateTime dateValue1, dateValue2; + var result = 0.0; + if (System.DateTime.TryParse(sTime, out dateValue1) && System.DateTime.TryParse(eTime, out dateValue2)) + { + if (dateValue2 < dateValue1) + { + return Json(new Table() { count = 0, msg = "起始時間大於結束時間!!!", data = null }); + } + else + { + result = new System.TimeSpan(dateValue2.Ticks - dateValue1.Ticks).TotalMinutes; + return Json(new Table() { code = 0, msg = "", data = result, count = 1 }); + } + } + else + { + return Json(new Table() { count = 0, msg = "時間格是有誤!!", data = null }); + + } + + #region old + //var timeArr = id.Split(":"); + //sHour = timeArr[0]; + //sMin = timeArr[1]; + //eHour = timeArr[2]; + //eMin = timeArr[3]; + + //string sHour, sMin, eHour, eMin; + //var timeArr = id.Split(":"); + //sHour = timeArr[0]; + //sMin = timeArr[1]; + //eHour = timeArr[2]; + //eMin = timeArr[3]; + + + // int dateValue,hour=0,min=0; + + // if (int.TryParse(sHour, out dateValue) && int.TryParse(eHour, out dateValue) && int.TryParse(sMin, out dateValue) && int.TryParse(eMin, out dateValue)) + // { + // if (int.Parse(eHour) > int.Parse(sHour)) + // { + // hour = int.Parse(eHour) - int.Parse(sHour) - 1; + + // min = (60 - int.Parse(sMin)) + int.Parse(eMin); + + // } + // else if (int.Parse(eHour) == int.Parse(sHour)) + // { + // hour = 0; + // if (int.Parse(sMin) >= int.Parse(sHour)) + // { + // return Json(new Table() { count = 0, data = null }); + // } + // else + // { + // min = (60 - int.Parse(sMin)) + int.Parse(eMin); + // } + // } + // else + // { + // return Json(new Table() { count = 0, data = null }); + // } + // } + // else { + + // return Json(new Table() { count = 0, data = null }); + // } + + // var result =hour*60+min; + + //return Json(new Table() { code = 0, msg = "", data = result, count = 1 }); + #endregion + + } #endregion diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs index 99276454..d0b73fb6 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs @@ -183,8 +183,8 @@ namespace AMESCoreStudio.Web /// 查詢每日工時 /// /// - [WebApiClient.Attributes.HttpGet("api/WorkManPowers/Query/{factoryid}/{unitid}/{lineid}/{classID}/{stationID}/{userNo}/{sdate}/{edate}")] - ITask> GetWorkManPowersByQuery(string factoryid, string unitid, string lineid, string classID, string stationID, string userNo, string sdate, string edate); + [WebApiClient.Attributes.HttpGet("api/WorkManPowers/Query/{factoryid}/{unitid}/{lineid}/{classID}/{stationID}/{userNo}/{deptID}/{sdate}/{edate}")] + ITask> GetWorkManPowersByQuery(string factoryid, string unitid, string lineid, string classID, string stationID, string userNo, string deptID, string sdate, string edate); #endregion diff --git a/AMESCoreStudio.Web/Views/BAS/BAS016.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS016.cshtml index 09c6b82b..6511148b 100644 --- a/AMESCoreStudio.Web/Views/BAS/BAS016.cshtml +++ b/AMESCoreStudio.Web/Views/BAS/BAS016.cshtml @@ -42,7 +42,9 @@
- +
diff --git a/AMESCoreStudio.Web/Views/BAS/BAS016C.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS016C.cshtml index 4b44fcce..37c65c9a 100644 --- a/AMESCoreStudio.Web/Views/BAS/BAS016C.cshtml +++ b/AMESCoreStudio.Web/Views/BAS/BAS016C.cshtml @@ -28,7 +28,9 @@
- +
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS003.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS003.cshtml index fbb92823..0e4d16ab 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS003.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS003.cshtml @@ -141,59 +141,67 @@ cols: [ { field: 'standardID', - width: 60, title: '#', sort: true }, { field: 'unitNo', - width: 50, title: '單位代號' }, { - field: 'lineID', - Width: 50, - title: '線別' + field: 'lineInfo', + title: '線別', + templet: function (d) { + var line; + if (d.lineInfo) + line = d.lineInfo["lineDesc"]; + else + line = "N/A"; + + return line ; + } }, { - field: 'stationID', - Width: 50, - title: '站別' + field: 'stations', + title: '站別', + templet: function (d) { + var station; + if (d.stations) + station = d.stations["stationName"]; + else + station = "N/A"; + + return station; + + } }, { field: 'itemNo', title: '料號', - }, { field: 'side', title: '正背面', - width: 10 }, { field: 'opcnt', title: '作業人數', - minwidth: 5 }, { field: 'firstTime', title: '首件產出時間(分)', - width: 5 }, { field: 'totalCT', title: 'C/T(分)', - width: 5 }, { field: 'ct', title: '節拍時間', - }, { field: 'machineCT', title: '操機數', - }, { field: 'center', diff --git a/AMESCoreStudio.Web/Views/WHS/WHS003C.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS003C.cshtml index 5989e240..9da6379e 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS003C.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS003C.cshtml @@ -28,6 +28,10 @@ +
+ + +
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS005.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS005.cshtml index 781ad22e..7abd8dce 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS005.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS005.cshtml @@ -70,12 +70,31 @@ title: '單位代號' }, { - field: 'lineID', - title: '線別' + field: 'lineInfo', + title: '線別', + templet: function (d) { + var line; + if (d.lineInfo) + line = d.lineInfo["lineDesc"]; + else + line = "N/A"; + + return line; + } }, { - field: 'StationID', - title: '線別' + field: 'stations', + title: '站別', + templet: function (d) { + var station; + if (d.stations) + station = d.stations["stationName"]; + else + station = "N/A"; + + return station; + + } }, { field: 'itemNo', diff --git a/AMESCoreStudio.Web/Views/WHS/WHS006.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS006.cshtml index 271a1467..b14f6daf 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS006.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS006.cshtml @@ -51,7 +51,7 @@
@**@ - +
+
+
- +
+
+
+
+
+ +
+ +
+
+
+
+
@@ -223,10 +237,50 @@ title: '#', sort: true }, + { + field: 'u', + width: 100, + title: '部門', + templet: function (d) { + var tt = ""; + console.info(d); + console.info(d.u); + if (d.u == null) { + tt = "N/A"; + } + else { + $.ajax({ + url: "/SYS/GetDeptInfoes", + dataType: 'json', + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + var count = 0; + $.each(result.data, function (index, item) { + if (item.deptID == d.deptID) { + tt = item.deptName; + count = count + 1; + } + }); + if (count == 1) { + tt = tt; + } + else { + tt = ""; + } + } + } + }); + + } + return tt + } + }, { field: 'userNo', title: '員工工號', - width: 200, + width: 100, sort: true }, { @@ -329,22 +383,25 @@ //check("#check_unitNo"); }); function tt() { - console.log("tt"); + //console.log("tt"); //基本数据表格 - var fNO = "", uNO = "", lID = "", cID = "", sID = "", usNO = ""; + var fNO = "", uNO = "", lID = "", cID = "", sID = "", usNO = "", dID=""; if ($("#check_factoryNo").prop("checked")) - fNO = $("#factoryNo").val(); + fNO = $("#factoryNo").val(); if ($("#check_unitNo").prop("checked")) - uNO = $("#unitNo").val(); + uNO = $("#unitNo").val(); if ($("#check_lineid").prop("checked")) - lID = $("#lineID").val(); + lID = $("#lineID").val(); if ($("#check_classID").prop("checked")) - cID = $("#classID").val(); + cID = $("#classID").val(); if ($("#check_stationID").prop("checked")) - sID = $("#stationID").val(); + sID = $("#stationID").val(); if ($("#check_userNo").prop("checked")) - usNO = $("#userNo").val(); + usNO = $("#userNo").val(); + if ($("#check_deptID").prop("checked")) + dID = $("#deptID").val(); + table = hg.table.datatable('query', '每日工時資料維護', '/WHS/GetWorkManPowersByQuery?' + 'fid=' + fNO + '&uid=' + uNO + '&lid=' + lID + '&cID=' + cID + '&sID=' + sID + '&uNo=' + usNO + '&sd='+ $("#dateStr").val() + '&ed='+ $("#dateEnd").val() // + 'factoryid=' + fNO + '&unitid=' + uNO + '&lineid=' + lID + '&classID=' + cID + '&stationID=' + sID + '&userNo=' + usNO + '&sd=' + $("#dateStr").val() + '&edate=' + $("#dateEnd").val() @@ -354,12 +411,12 @@ function check(str) { if ($(str).prop("checked")) { - alert("選中"); + //alert("選中"); $('#lineID').removeAttr("disabled"); form.render(); } else { - alert("沒有選中"); + //alert("沒有選中"); $('#lineID').attr("disabled", "disabled"); $('select[name=lineID]').attr("disabled", true); form.render(); diff --git a/AMESCoreStudio.Web/Views/WHS/WHS006C.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS006C.cshtml index ea63bf09..85e3b619 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS006C.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS006C.cshtml @@ -20,12 +20,12 @@
- +
- +
@@ -35,18 +35,21 @@
- +
- +
- @@ -105,6 +108,110 @@ parent.hg.msg(error); } }); + + $("#UnitNo").change(function () { + var data = $("#UnitNo").val(); + getStationses(data); + getLineInfoes(data); + }); + + $("#UserNo").blur(function () { + var data = $("#UserNo").val(); + console.log(data); + + getUserName(data); + //$("input").css("background-color", "#D6D6FF"); + }); + + function getStationses(data) { + $.ajax({ + url: "/BAS/GetStationses", + dataType: 'json', + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + $("#Station").empty(); + $('#Station').append(new Option("請選擇", "")); + var count = 0; + $.each(result.data, function (index, item) { + if (item.unitNo == data) { + $('#Station').append(new Option(item.stationName, item.stationID)); + count = count + 1; + } + }); + if (count == 0) { + $("#Station").empty(); + $('#Station').append(new Option("無選項", "")); + } + } + else { + $("#Station").empty(); + $('#Station').append(new Option("無選項", "")); + } + layui.form.render("select"); + } + }); + }; + function getLineInfoes(data) { + $.ajax({ + url: "/BAS/GetLineInfoes", + dataType: 'json', + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + + $("#Line").empty(); + $('#Line').append(new Option("請選擇", "")); + var count = 0; + $.each(result.data, function (index, item) { + if (item.unitNo == data) { //修改等號 + $('#Line').append(new Option(item.lineDesc, item.lineID));//修改參數 + count = count + 1; + } + }); + if (count == 0) { + $("#Line").empty(); + $('#Line').append(new Option("無選項", "")) + } + } + else { + $("#Line").empty(); + $('#Line').append(new Option("無選項", "")); + } + layui.form.render("select"); + } + }); + }; + function getUserName(data) { + $.ajax({ + url: "/SYS/GetUserInfoes", + dataType: 'json', + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + console.info(result.data); + var name = ""; + var count = 0; + $.each(result.data, function (index, item) { + if (item.userNo == data) { + name = item.userName; + count = count + 1; + } + }); + if (count == 1) { + $("#UserName").val(name); + } + else { + alert('請確認工號是否正確!!!'); + } + } + layui.form.render("select"); + } + }); + }; diff --git a/AMESCoreStudio.Web/Views/WHS/WHS006U.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS006U.cshtml index 78c6ec76..50859c94 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS006U.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS006U.cshtml @@ -41,14 +41,13 @@
-
-
@@ -113,6 +112,74 @@ }); + $("#UnitNo").change(function () { + var data = $("#UnitNo").val(); + getStationses(data); + getLineInfoes(data); + }); + + function getStationses(data) { + $.ajax({ + url: "/BAS/GetStationses", + dataType: 'json', + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + $("#Station").empty(); + $('#Station').append(new Option("請選擇", "")); + var count = 0; + $.each(result.data, function (index, item) { + if (item.unitNo == data) { + $('#Station').append(new Option(item.stationName, item.stationID)); + count = count + 1; + } + }); + if (count == 0) { + $("#Station").empty(); + $('#Station').append(new Option("無選項", "")); + } + } + else { + $("#Station").empty(); + $('#Station').append(new Option("無選項", "")); + } + layui.form.render("select"); + } + }); + }; + function getLineInfoes(data) { + $.ajax({ + url: "/BAS/GetLineInfoes", + dataType: 'json', + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + + $("#Line").empty(); + $('#Line').append(new Option("請選擇", "")); + var count = 0; + $.each(result.data, function (index, item) { + if (item.unitNo == data) { //修改等號 + $('#Line').append(new Option(item.lineDesc, item.lineID));//修改參數 + count = count + 1; + } + }); + if (count == 0) { + $("#Line").empty(); + $('#Line').append(new Option("無選項", "")) + } + } + else { + $("#Line").empty(); + $('#Line').append(new Option("無選項", "")); + } + layui.form.render("select"); + } + }); + }; + diff --git a/AMESCoreStudio.Web/Views/WHS/WHS008C.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS008C.cshtml index 36a9d7e9..504ead40 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS008C.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS008C.cshtml @@ -55,12 +55,12 @@
- +
- +
@@ -124,6 +124,8 @@ $("#OtherDeptI").attr("disabled", false); } else { + getStationses(data, "#StationIDI"); + getLineInfoes(data, "#LineIDI"); $("#LineIDI").val(0); $("#StationIDI").val(0); $("#LineIDI").attr("disabled", false); @@ -138,17 +140,118 @@ if (data == "0") { $("#LineIDO").attr("disabled", true); $("#StationIDO").attr("disabled", true); - $("#v").val(0); + $("#OtherDeptO").val(0); $("#OtherDeptO").attr("disabled", false); } else { + getStationses(data, "#StationIDO"); + getLineInfoes(data, "#LineIDO"); $("#LineIDO").val(0); $("#StationIDO").val(0); $("#LineIDO").attr("disabled", false); $("#StationIDO").attr("disabled", false); $("#OtherDeptO").attr("disabled", true); + var data = $("#UnitNo").val(); } }); + + $("#UserNo").blur(function () { + var data = $("#UserNo").val(); + console.log(data); + + getUserName(data); + //$("input").css("background-color", "#D6D6FF"); + }); + + function getStationses(data, option) { + $.ajax({ + url: "/BAS/GetStationses", + dataType: 'json', + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + $(option).empty(); + $(option).append(new Option("請選擇", "")); + var count = 0; + $.each(result.data, function (index, item) { + if (item.unitNo == data) { + $(option).append(new Option(item.stationName, item.stationID)); + count = count + 1; + } + }); + if (count == 0) { + $(option).empty(); + $(option).append(new Option("無選項", "")); + } + } + else { + $(option).empty(); + $(option).append(new Option("無選項", "")); + } + layui.form.render("select"); + } + }); + }; + function getLineInfoes(data,option) { + $.ajax({ + url: "/BAS/GetLineInfoes", + dataType: 'json', + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + + $(option).empty(); + $(option).append(new Option("請選擇", "")); + var count = 0; + $.each(result.data, function (index, item) { + if (item.unitNo == data) { //修改等號 + $(option).append(new Option(item.lineDesc, item.lineID));//修改參數 + count = count + 1; + } + }); + if (count == 0) { + $(option).empty(); + $(option).append(new Option("無選項", "")) + } + } + else { + $(option).empty(); + $(option).append(new Option("無選項", "")); + } + layui.form.render("select"); + } + }); + }; + function getUserName(data) { + $.ajax({ + url: "/SYS/GetUserInfoes", + dataType: 'json', + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + console.info(result.data); + var name = ""; + var count = 0; + $.each(result.data, function (index, item) { + if (item.userNo == data) { + name = item.userName; + count = count + 1; + } + }); + if (count == 1) { + $("#UserName").val(name); + } + else { + alert('請確認工號是否正確!!!'); + } + } + layui.form.render("select"); + } + }); + }; diff --git a/AMESCoreStudio.Web/Views/WHS/WHS008U.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS008U.cshtml index 2be9c74b..a4144db1 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS008U.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS008U.cshtml @@ -62,12 +62,12 @@
- +
- +
@@ -131,7 +131,7 @@ var type = $("#type").val(); - console.log(type); + //console.log(type); if (type == "i") { $("#UnitNoOShow").attr("disabled", true); $("#LineIDOShow").attr("disabled", true); @@ -156,6 +156,8 @@ $("#OtherDeptIShow").attr("disabled", false); } else { + getStationses(data, "#LineIDIShow"); + getLineInfoes(data, "#StationIDIShow"); $("#LineIDIShow").val(0); $("#StationIDIShow").val(0); $("#LineIDIShow").attr("disabled", false); @@ -174,6 +176,8 @@ $("#OtherDeptOShow").attr("disabled", false); } else { + getStationses(data, "#LineIDOShow"); + getLineInfoes(data, "#StationIDOShow"); $("#LineIDOShow").val(0); $("#StationIDOShow").val(0); $("#LineIDOShow").attr("disabled", false); @@ -206,7 +210,103 @@ var data = $("#OtherDeptOShow").val(); $("#OtherDeptO").val(data); }); + $("#UserNo").blur(function () { + var data = $("#UserNo").val(); + console.log(data); + getUserName(data); + //$("input").css("background-color", "#D6D6FF"); + }); + + function getStationses(data, option) { + $.ajax({ + url: "/BAS/GetStationses", + dataType: 'json', + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + $(option).empty(); + $(option).append(new Option("請選擇", "")); + var count = 0; + $.each(result.data, function (index, item) { + if (item.unitNo == data) { + $(option).append(new Option(item.stationName, item.stationID)); + count = count + 1; + } + }); + if (count == 0) { + $(option).empty(); + $(option).append(new Option("無選項", "")); + } + } + else { + $(option).empty(); + $(option).append(new Option("無選項", "")); + } + layui.form.render("select"); + } + }); + }; + function getLineInfoes(data, option) { + $.ajax({ + url: "/BAS/GetLineInfoes", + dataType: 'json', + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + + $(option).empty(); + $(option).append(new Option("請選擇", "")); + var count = 0; + $.each(result.data, function (index, item) { + if (item.unitNo == data) { //修改等號 + $(option).append(new Option(item.lineDesc, item.lineID));//修改參數 + count = count + 1; + } + }); + if (count == 0) { + $(option).empty(); + $(option).append(new Option("無選項", "")) + } + } + else { + $(option).empty(); + $(option).append(new Option("無選項", "")); + } + layui.form.render("select"); + } + }); + }; + function getUserName(data) { + $.ajax({ + url: "/SYS/GetUserInfoes", + dataType: 'json', + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + console.info(result.data); + var name = ""; + var count = 0; + $.each(result.data, function (index, item) { + if (item.userNo == data) { + name = item.userName; + count = count + 1; + } + }); + if (count == 1) { + $("#UserName").val(name); + } + else { + alert('請確認工號是否正確!!!'); + } + } + layui.form.render("select"); + } + }); + }; diff --git a/AMESCoreStudio.Web/Views/WHS/WHS009.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS009.cshtml index d9c7c795..512b40df 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS009.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS009.cshtml @@ -43,6 +43,7 @@
@@ -65,7 +66,7 @@
-
@@ -75,7 +76,7 @@
-
@@ -89,17 +90,17 @@
- +
～
- +
-
@@ -117,44 +118,38 @@ form = layui.form; laydate = layui.laydate; laydate.render({ - elem: '#dateStr' + elem: '#sdate' , trigger: 'click' , format: 'yyyy/MM/dd' , theme: 'grid' }); laydate.render({ - elem: '#dateEnd' + elem: '#edate' , trigger: 'click' , format: 'yyyy/MM/dd' , theme: 'grid' }); - //form.on('select(unit)', function (data) { - // $("#unitNo").val(data.value); - // //roleName = data.elem[data.elem.selectedIndex].text; - // var qs = $('button[lay-filter="querysubmit"]'); - // qs.click(); - // - // //hg.msghide("刷新数据！"); - // //table && table.reload(); - // - //}); }); - /* - hg.form.on('select(role)', function (data) { - alert(data.value); - }); - */ + ////搜索 + $('#querysubmit').click(function () { + console.log('#btnSearch'); + var factoryNo = $("#factoryNo").val(); + if (factoryNo) { + hg.msghide("刷新数据！"); + tt(); + } + else { + alert("請選擇廠別!!!!"); + } + return false; - //监听表单提交事件 - hg.form.onsubmit('querysubmit', function (data) { - hg.msghide("重新載入資料.."); - table && table.reload(data); }); + var tableCols = [[ { field: 'exceptionDate', @@ -253,7 +248,24 @@ } ]; //基本数据表格 - var table = hg.table.datatable('query', '異常工時資料維護', '/WHS/GetExceptionWorktimeByQuery', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); - // var table = hg.table.datatable('test', '條碼狀態維護', '/PCS/GetWipInfo', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); + //var table = hg.table.datatable('query', '異常工時資料維護', '/WHS/GetExceptionWorktimeByQuery', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); + var table; + $(function () { + tt(); + }); + function tt() { + //基本数据表格 + var fNO = "", uNO = "", lID = "", dID = ""; + + fNO = $("#factoryNo").val(); + uNO = $("#unitNo").val(); + lID = $("#lineID").val(); + dID = $("#deptID").val(); + + + table = hg.table.datatable('query', '異常工時資料維護', '/WHS/GetExceptionWorktimeByQuery?' + + 'factoryNo=' + fNO + '&unitNo=' + uNO + '&lineID=' + lID + '&deptID=' + dID + '&sdate=' + $("#sdate").val() + '&edate=' + $("#edate").val() + , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); + }; // var table = hg.table.datatable('test', '條碼狀態維護', '/PCS/GetWipInfo', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); } diff --git a/AMESCoreStudio.Web/Views/WHS/WHS009C.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS009C.cshtml index 4a65efa6..041b9533 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS009C.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS009C.cshtml @@ -17,7 +17,7 @@ - +
@@ -59,11 +59,22 @@
- @*//少異常類別*@ - @*//少類別編號*@ +
+ + +
+
+ + +
- @@ -72,7 +83,7 @@ - +
@@ -86,7 +97,7 @@
- +
@@ -96,24 +107,24 @@
- +
- +
-
- - - - -
+ +
+
+ + +
@@ -121,7 +132,7 @@
- +
@@ -163,40 +174,196 @@ } }); - $("#UnitNoI").change(function () { - console.log("#UnitNoI"); - var data = $("#UnitNoI").val(); - if (data == "0") { - $("#LineIDI").attr("disabled", true); - $("#StationIDI").attr("disabled", true); - $("#OtherDeptI").val(0); - $("#OtherDeptI").attr("disabled", false); + $("#ExceptionType").change(function () { + var data = $("#ExceptionType").val(); + //console.info(data); + getExceptionNo(data); + }); + $("#ExceptionClass").change(function () { + var data = $("#ExceptionClass").val(); + //console.info(data); + getExceptionNo(data); + }); + $("#DecideDept").change(function () { + var data = $("#DecideDept").val(); + //console.info(data); + getUserInfoes(data); + }); + $('#searchItemNo').click(function () { + var data = $("#WipNo").val(); + if (data) { + $.ajax({ + url: "/WHS/GetWipAtt", + dataType: 'json', + data: { id: data }, + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + //console.info(result.data);//確認itemNO/modelNO + $("#ModelNo").val(result.data.modelNO); + } + else { + alert("查無資料,請確認工單是否正確！"); + } + } + }); + } else { + alert("請填寫工單！"); } - else { - $("#LineIDI").val(0); - $("#StationIDI").val(0); - $("#LineIDI").attr("disabled", false); - $("#StationIDI").attr("disabled", false); - $("#OtherDeptI").attr("disabled", true); + + }); + $('#countTime').click(function () { + var data = ""; + var data1 = $("#StartTime").val(); + var data2 = $("#EndTime").val(); + console.log(data1 +"countTime" + data2); + if (data1 && data2) { + data = data1 + "%" + data2; + $.ajax({ + url: "/WHS/GetCountTimes", + dataType: 'json', + data: { id: data}, + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + $("#Time").val(result.data); + } + else { + alert(result.msg); + //alert("請確認時間區間填寫是否正確！"); + } + } + }); + } else { + alert("請填寫時間區間！"); } + }); - $("#UnitNoO").change(function () { - console.log("#UnitNoO"); - var data = $("#UnitNoO").val(); - if (data == "0") { - $("#LineIDO").attr("disabled", true); - $("#StationIDO").attr("disabled", true); - $("#v").val(0); - $("#OtherDeptO").attr("disabled", false); - } - else { - $("#LineIDO").val(0); - $("#StationIDO").val(0); - $("#LineIDO").attr("disabled", false); - $("#StationIDO").attr("disabled", false); - $("#OtherDeptO").attr("disabled", true); - } + function getUserInfoes(data) { + $.ajax({ + url: "/SYS/GetUserInfoes", + dataType: 'json', + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + $("#DecideUser").empty(); + $('#DecideUser').append(new Option("請選擇", "")); + var count = 0; + $.each(result.data, function (index, item) { + if (item.deptID == data) { + $('#DecideUser').append(new Option(item.userName, item.userID)); + count = count + 1; + } + }); + if (count == 0) { + $("#DecideUser").empty(); + $('#DecideUser').append(new Option("無選項", "")); + } + } + else { + $("#DecideUser").empty(); + $('#DecideUser').append(new Option("無選項", "")); + } + layui.form.render("select"); + } + }); + }; + function getExceptionClass(data) { + $.ajax({ + url: "/PPS/GetExceptionClasses", + dataType: 'json', + //data: { id: data }, + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + $("#ExceptionClass").empty(); + var count = 0; + $.each(result.data, function (index, item) { + if (item.exceptionGroupNo == data) {//修改等號 EXCEPTION_GROUP_NO + $('#ExceptionClass').append(new Option(item.exceptionClassName, item.exceptionClassNo));//修改參數 + count = count + 1; + } + }); + if (count == 0) { + $("#ExceptionClass").empty(); + $('#ExceptionClass').append(new Option("無選項", "")); + $("#ExceptionNo").empty();//? + $('#ExceptionNo').append(new Option("無選項", ""));//? + } + } + else { + $("#ExceptionClass").empty(); + $('#ExceptionClass').append(new Option("無選項", "")); + $("#ExceptionNo").empty();//? + $('#ExceptionNo').append(new Option("無選項", ""));//? + } + layui.form.render("select"); + } + }); + }; + function getExceptionNo(data) { + $.ajax({ + url: "/PPS/GetExceptionCodes", + dataType: 'json', + //data: { id: data }, + contentType: "application/json", + type: 'get', + success: function (result) { + if (result.data) { + + $("#ExceptionNo").empty(); + $('#ExceptionNo').append(new Option("請選擇", "")); + var count = 0; + $.each(result.data, function (index, item) { + if (item.exceptionClassNo == data) { //修改等號 + $('#ExceptionNo').append(new Option(item.exceptionDescCh, item.exceptionNo));//修改參數 + count = count + 1; + } + }); + if (count == 0) { + $("#ExceptionNo").empty(); + $('#ExceptionNo').append(new Option("無選項", "")) + } + } + else { + $("#ExceptionNo").empty(); + $('#ExceptionNo').append(new Option("無選項", "")); + } + layui.form.render("select"); + } + }); + }; + + layui.use(['laydate'], function () { + //form = layui.form; + laydate = layui.laydate; + laydate.render({ + elem: '#StartTime' + , trigger: 'click' + , type: 'datetime' + , format: 'yyyy-MM-dd HH:mm' + , theme: 'grid' + }); + laydate.render({ + elem: '#EndTime' + , trigger: 'click' + , type: 'datetime' + , format: 'yyyy-MM-dd HH:mm' + , theme: 'grid' + }); + + + //form.on('select(unitNo)', function (data) { + // var data = $("#unitNo").val(); + // //console.info(data); + // getLineInfoes(data); + //}); + }); diff --git a/AMESCoreStudio.Web/Views/WHS/WHS009U.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS009U.cshtml index 6e7866dd..b4ae4eab 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS009U.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS009U.cshtml @@ -1,5 +1,7 @@ -@model AMESCoreStudio.WebApi.Models.AMES.SupportUser -@{ ViewData["Title"] = "WHS008U"; +@model AMESCoreStudio.WebApi.Models.AMES.ExceptionWorktime + + +@{ ViewData["Title"] = "WHS009U"; Layout = "~/Views/Shared/_FormLayout.cshtml"; }
-
+
- + - - - - - - - - - - + +
+
+ + + +
- - - + + +
- - - + + +
- +
- - - + + + +
+
+ + + +
+
+ + + +
+
+ + +
+
+ +
- - - + + +
- - - + + + + @**@
- - - + + +
- - - + + +
- - - + + +
- - - + + +
- - - + + +
- - - + + +
- - - + + + + @**@
- - - + + +
- +
+ + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
@Html.ValidationMessage("error")
-
@@ -114,100 +167,179 @@ await Html.RenderPartialAsync("_FileinputScriptsPartial"); } diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll index 088265b9..b7d63e20 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb index ade0de19..271b152b 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll index 2078f550..66a6512d 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb index 612b0fd7..2ecec2ef 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll index bf926ef4..7a802aab 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb index 04d3a40f..7b78ca49 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll index 63a81ecb..9c3bac7d 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb index db1940c2..deb16236 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml index edcd8571..ea75d212 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -62,7 +62,7 @@ - 工廠资料维护 + 條碼變更資料表 @@ -91,7 +91,7 @@ - + 更新條碼资料 @@ -234,6 +234,33 @@ + + + 條碼鎖定資料表 + + + + + 條碼鎖定資料表 by BarCodeID + + BarCodeID + + + + + 條碼過站資料檔 + + + + + + + 內務條碼ID + 工單ID + 流程站別ID + + + 條碼狀態維護 @@ -280,6 +307,59 @@ + + + 條碼狀態維護 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 機種C/T資料維護 @@ -710,6 +790,13 @@ + + + + + + + @@ -756,6 +843,13 @@ ItemID + + + 料號基本資料檔 to ItemNO + + 料號 + + 新增料號基本資料檔 @@ -786,7 +880,7 @@ - + 料號基本資料檔 to ItemID @@ -814,6 +908,79 @@ + + + 料號治具資訊資料檔 + + + + + 建構式 + + + + + 查詢料號治具資訊資料檔 + + + + + + + + + + + + 料號基本資料檔 to ItemID + + ItemID + + + + + 料號站別工項資料檔 + + + + + 料號站別工項資料檔 by ItemID + + ItemID + + + + + 料號属性代碼基本檔 + + + + + + 料號属性代碼基本檔資料 + + + + + + 料號属性代碼基本檔 + + MatPropertyID + + + + + 新增料號属性代碼基本檔 + + + + + + + 更新料號属性代碼基本檔 + + + @@ -934,6 +1101,11 @@ + + + 測試不良基本資料檔 + + 不良現象原因代碼維護 @@ -1599,18 +1771,18 @@ - + - + - + 獲取產品別資料 @@ -1832,8 +2004,15 @@ - 工單投產纪錄資料文件 + SOPFile資料查詢 + + + + + + SOPFile資料查詢 by ID + @@ -2060,7 +2239,7 @@ - + 每日工時查詢Query @@ -2070,6 +2249,7 @@ + @@ -2096,6 +2276,89 @@ + + + 過站判斷 + + + + + + + + + + + 判斷工單狀態 + + 工單號碼 + 生產單位 + 站別 + 線別 + 流程 + + + + + 內部序號查詢工單號碼 + + 內部序號 + Success:true or false + + + + 內部序號查詢目前生產單位 + + 內部序號 + Success:true or false + + + + 內部序號查詢目前站別 + + 內部序號 + Success:true or false + + + + 內部序號是否鎖定 + + 內部序號 + Success:true or false + + + + 內部序號是否報廢 + + 內部序號 + Success:true or false + + + + 確認工單狀態 + + 工單號碼 + 生產單位 + 流程 + 站別 + 線別 + + + + + 內部序號是否被鎖定 + + 工單號碼 + 內部序號 + + + + + 內部序號找BarCodeID + + + 0:找不到 + 班別资料维护 @@ -2914,6 +3177,15 @@ + + + 根據系統ID獲取該系統模組資料 + + + + + + @@ -2960,6 +3232,15 @@ + + + 根據模組ID獲取該模組功能資料 + + + + + + @@ -3000,7 +3281,7 @@ - + @@ -3052,11 +3333,13 @@ - + 根据角色ID获取该角色模组资料 + + @@ -3105,11 +3388,13 @@ - + 根据角色ID获取该角色功能资料 + + @@ -3152,10 +3437,12 @@ - + 獲取系統資料 + + @@ -3198,7 +3485,7 @@ - + @@ -3250,7 +3537,7 @@ - + 根据用户ID获取该用户角色资料 @@ -3747,6 +4034,12 @@ + + + + + + @@ -3792,12 +4085,6 @@ - - - - - - @@ -4109,11 +4396,51 @@ 無效工時在線收集資料 + + + 條碼類別資料檔 + + + + + 料號属性代碼基本檔 + + 條碼组件變更資料 + + + 料號站別工項資料檔 + + + + + 料號治具資訊資料檔 + + + + + 條碼鎖定資料表 + + + + + 檔案用途 條碼工單資料檔 + + + + + 測試不良基本資料檔 + + + + + 測試不良基本資料檔 + + 條碼變更資料表 @@ -4161,47 +4488,47 @@ - + 條碼狀態代碼 - + 客戶條碼 - + 存放位置ID - + 條碼過站位置 - + 條碼過站狀態 - + 工單ID - + 包装箱號 - + 系统狀態 - + 條碼流程狀態 @@ -4219,6 +4546,16 @@ 修改時間 + + + 工單資料 + + + + + 流程站別資料 + + 條碼组件資料檔 @@ -4414,24 +4751,154 @@ 解鎖時間 - + - 條碼狀態資料表 + 條碼過站資料檔 - + - 條碼狀態代碼 + 內部條碼ID - + - 條碼狀態描述 + 工單ID - + - 用户资料表 + 流程站別ID + + + + + 規則狀態值 + + + + + 投入日期 + + + + + 系统狀態 + + + + + 線别ID + + + + + 站别的次數 + + + + + 過站次數（不限定工單） + + + + + 建立者 + + + + + 建立時間 + + + + + 條碼狀態資料表 + + + + + 條碼狀態代碼 + + + + + 條碼狀態描述 + + + + + 條碼類別資料檔 + + + + + 條碼類別ID + + + + + 類別代碼 + + + + + 類別描述 + + + + + 當前值 + + + + + 創建者ID + + + + + 創建日期 + + + + + 更新者ID + + + + + 更新日期 + + + + + 檔案用途 條碼工單資料檔 + + + + + 內部條碼ID + + + + + 工單ID + + + + + 建立者 + + + + + 建立時間 + + + + + 修改時間 @@ -4924,111 +5391,6 @@ 修改日期 - - - 用户资料表 - - - - - 廠別ID - - - - - 廠別中文名稱 - - - - - 廠別英文名稱 - - - - - 電話 - - - - - 傳真 - - - - - 地址 - - - - - 地區 - - - - - - - - - - 建立者 - - - - - 建立日期 - - - - - 修改日期 - - - - - 廠別代碼 - - - - - 區域 - - - - - - - - - - 廠別狀態 - - - - - 用户资料表 - - - - - - - - - - - - - - - - - - - - - - 組件類別资料表 @@ -5094,61 +5456,6 @@ 修改時間 - - - 用户资料表 - - - - - 部門代碼 - - - - - 線別代碼 - - - - - 線別說明 - - - - - 樓層 - - - - - 生產單位 - - - - - 工單ID - - - - - 建立者 - - - - - 線別狀態(A:Active/S:Stop) - - - - - 建立日期 - - - - - 修改日期 - - MAC資料表 @@ -5359,6 +5666,161 @@ 工單機種資料 + + + 料號治具資訊資料檔 + + + + + 料號治具ID + + + + + 料號ID + + + + + 治具NO + + + + + 站(前段) + + + + + 流程站別編號 + + + + + 建立UserID + + + + + 建立日期 + + + + + 更新UserID + + + + + 更新日期 + + + + + 料號主檔 + + + + + 料號站別工項資料檔 + + + + + 料號站別工項ID + + + + + 料號ID + + + + + 生產單位 + + + + + 流程站別編號 + + + + + 站(前段) + + + + + 工項名稱 + + + + + 工項描述 + + + + + 工項順序 + + + + + 建立UserID + + + + + 建立日期 + + + + + 更新UserID + + + + + 更新日期 + + + + + 料號主檔 + + + + + 料號属性代碼基本檔 + + + + + 料號属性代碼 + + + + + 料號属性描述 + + + + + 料號属性類型 + + + + + 附加屬性類型 + + + + + 附加屬性描述 + + 用户资料表 @@ -5409,6 +5871,126 @@ 不良現象名稱 + + + 測試不良基本資料檔 + + + + + 測試不良ID + + + + + 測試種類代碼 + + + + + 測試員代號 + + + + + 治具代號 + + + + + 測試程試代號/名稱 + + + + + 設備代號 + + + + + 測試總點數 + + + + + 不良總點數 + + + + + 開始測試時間 + + + + + 結束測試時間 + + + + + 測試狀態(F-FAIL) + + + + + 內部條碼ID + + + + + 流程站別ID + + + + + 工單ID + + + + + 處理狀態(0:尚未維修處理, 1:已維修處理, 2:誤判) + + + + + 不良現象原因代碼 + + + + + 不良代碼指向的下一站ID + + + + + 不良時的組件數量 + + + + + 不良備註 + + + + + 創建者ID + + + + + 創建日期 + + + + + 更新者ID + + + + + 更新日期 + + 不良代码资料表 @@ -5734,6 +6316,16 @@ 修改日期 + + + 線別 + + + + + 站別 + + 重工標準工時資料 @@ -5811,7 +6403,7 @@ - 援入部門 + 援入單位 @@ -5821,7 +6413,7 @@ - 援出部門 + 援出單位 @@ -6359,14 +6951,19 @@ 客戶料號 + + + 生產單位 + + 工單資料-標籤 - + - WIP_ID + WIP_NO @@ -6414,16 +7011,6 @@ 更新日期 - - - 工單資料 - - - - - SOP資料 - - 工單鎖定資料檔 @@ -6806,7 +7393,7 @@ - FINE_PACKAGE + 是否為精包裝Y/N @@ -7024,6 +7611,11 @@ 修改日期 + + + 人員 + + 站别資料 diff --git a/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj b/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj index 7c3b9358..a354489a 100644 --- a/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj +++ b/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj @@ -19,6 +19,10 @@ + + + + diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs index 38ec5438..b99f38f5 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs @@ -265,18 +265,19 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { await _context.SaveChangesAsync(); + result.Success = true; + result.Msg = "OK"; + return result; } - catch (DbUpdateConcurrencyException) + catch (DbUpdateConcurrencyException ex) { - - throw; + result.Success = false; + result.Msg = ex.Message; + return result; + //throw; } - - result.Success = true; - result.Msg = "OK"; - return result; } /// diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/StandardWorkTimesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/StandardWorkTimesController.cs index d1607d3f..428517b3 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/StandardWorkTimesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/StandardWorkTimesController.cs @@ -43,6 +43,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES var standardWorkTime = await q.ToListAsync(); + foreach (var data in standardWorkTime) + { + data.LineInfo = _context.LineInfoes.Find(data.LineID); + data.Stations = _context.Stationses.Find(data.StationID); + } + return standardWorkTime; } @@ -64,6 +70,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { return NotFound(); } + foreach (var data in standardWorkTime) + { + data.LineInfo = _context.LineInfoes.Find(data.LineID); + data.Stations = _context.Stationses.Find(data.StationID); + } return standardWorkTime; } @@ -108,6 +119,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { return NotFound(); } + foreach (var data in standardWorkTime) + { + data.LineInfo = _context.LineInfoes.Find(data.LineID); + data.Stations = _context.Stationses.Find(data.StationID); + } return standardWorkTime; } @@ -147,6 +163,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { return NotFound(); } + foreach (var data in standardWorkTime) + { + data.LineInfo = _context.LineInfoes.Find(data.LineID); + data.Stations = _context.Stationses.Find(data.StationID); + } return standardWorkTime; } diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WorkManPowersController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WorkManPowersController.cs index 15838e2a..7cbfc48a 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WorkManPowersController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WorkManPowersController.cs @@ -42,6 +42,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES q = q.OrderBy(p => p.PowerID); var workManPower = await q.ToListAsync(); + foreach (var data in workManPower) + { + var tt = _context.UserInfoes.Where(m => m.UserNo == data.UserNo).FirstOrDefaultAsync(); + data.U = tt.Result; + //data.UserInfo = _context.UserInfoes.Find(data.UserNo); + //data.DeptInfo = _context.DeptInfoes.Find(data.UserInfo.DeptID); + } return workManPower; } @@ -64,6 +71,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { return NotFound(); } + foreach (var data in workManPower) + { + //data.UserInfo = _context.UserInfoes.Find(data.UserNo); + var tt = _context.UserInfoes.Where(m => m.UserNo == data.UserNo).FirstOrDefaultAsync(); + data.U = tt.Result; + //data.UserInfo = _context.UserInfoes.Find(data.UserNo); + } return workManPower; } @@ -77,12 +91,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// /// /// + /// /// /// /// // GET: api/ExceptionWorktimeOnlines/5 - [HttpGet("Query/{factoryid}/{unitid}/{lineid}/{classID}/{stationID}/{userNo}/{sdate}/{edate}")] - public async Task>> GetWorkManPowerByQuery(string factoryid, string unitid, string lineid, string classID, string stationID, string userNo, string sdate, string edate) + [HttpGet("Query/{factoryid}/{unitid}/{lineid}/{classID}/{stationID}/{userNo}/{deptID}/{sdate}/{edate}")] + public async Task>> GetWorkManPowerByQuery(string factoryid, string unitid, string lineid, string classID, string stationID, string userNo, string deptID, string sdate, string edate) { IQueryable q = _context.WorkManPowers; if (factoryid != "*") @@ -97,6 +112,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES q = q.Where(p => p.StationID.Equals(stationID)); if (userNo != "*") q = q.Where(p => p.UserNo.Equals(userNo)); + if (deptID != "*") + q = q.Where(p => p.U.DeptID.Equals(deptID)); DateTime dateValue; @@ -118,14 +135,20 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES } - var exceptionWorktime = await q.ToListAsync(); + var workManPower = await q.ToListAsync(); - if (exceptionWorktime == null) + if (workManPower == null) { return NotFound(); } + foreach (var data in workManPower) + { + var tt = _context.UserInfoes.Where(m => m.UserNo == data.UserNo).FirstOrDefaultAsync(); + data.U = tt.Result; + //data.U = _context.UserInfoes.Find(data.UserNo); + } - return exceptionWorktime; + return workManPower; } diff --git a/AMESCoreStudio.WebApi/Models/AMES/FactoryUnit.cs b/AMESCoreStudio.WebApi/Models/AMES/FactoryUnit.cs index 735f911c..a5c463f4 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/FactoryUnit.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/FactoryUnit.cs @@ -6,14 +6,14 @@ using System.Runtime.Serialization; namespace AMESCoreStudio.WebApi.Models.AMES { /// - /// 生產單位別 + /// 用户资料表 /// [Table("FACTORY_UNIT", Schema = "JHAMES")] [DataContract] public class FactoryUnit { /// - /// 生產單位代碼 + /// /// [Key] [Column("UNIT_NO")] @@ -21,7 +21,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES public string UnitNO { get; set; } /// - /// 生產單位名稱 + /// /// [Column("UNIT_NAME")] [DataMember] @@ -30,7 +30,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES public string UnitName { get; set; } /// - /// 生產單位簡碼 + /// /// [Column("UNIT_CODE")] [DataMember] @@ -45,16 +45,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES [DataMember] [Required(ErrorMessage = "{0},不能空白")] [Display(Name = "")] - public int SEQ { get; set; } = 1; - - /// - /// 狀態 - /// - [Column("STATUS_NO")] - [DataMember] - [Required(ErrorMessage = "{0},不能空白")] - [Display(Name = "狀態")] - public string StatusNo { get; set; } = "A"; + public decimal SEQ { get; set; } } } diff --git a/AMESCoreStudio.WebApi/Models/AMES/StandardWorkTime.cs b/AMESCoreStudio.WebApi/Models/AMES/StandardWorkTime.cs index 5a219aca..0f4b779c 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/StandardWorkTime.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/StandardWorkTime.cs @@ -2,6 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Runtime.Serialization; +using AMESCoreStudio.WebApi.Models.BAS; namespace AMESCoreStudio.WebApi.Models.AMES { @@ -140,7 +141,16 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Display(Name = "修改日期")] public DateTime UpdateDate { get; set; } - + /// + /// 線別 + /// + public virtual LineInfo LineInfo { get; set; } + + /// + /// 站別 + /// + public virtual Stations Stations { get; set; } + } } \ No newline at end of file diff --git a/AMESCoreStudio.WebApi/Models/AMES/SupportUser.cs b/AMESCoreStudio.WebApi/Models/AMES/SupportUser.cs index 0166e0f7..91685879 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/SupportUser.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/SupportUser.cs @@ -49,11 +49,11 @@ namespace AMESCoreStudio.WebApi.Models.AMES public string UserNane { get; set; } /// - /// 援入部門 + /// 援入單位 /// [Column("UNIT_NO_I")] [DataMember] - [Display(Name = "援入部門")] + [Display(Name = "援入單位")] public string UnitNoI { get; set; } /// @@ -65,11 +65,11 @@ namespace AMESCoreStudio.WebApi.Models.AMES public string OtherDeptI { get; set; } /// - /// 援出部門 + /// 援出單位 /// [Column("UNIT_NO_O")] [DataMember] - [Display(Name = "援出部門")] + [Display(Name = "援出單位")] public string UnitNoO { get; set; } /// diff --git a/AMESCoreStudio.WebApi/Models/AMES/WorkManPower.cs b/AMESCoreStudio.WebApi/Models/AMES/WorkManPower.cs index 3198a1c2..23fad5bf 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/WorkManPower.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/WorkManPower.cs @@ -178,7 +178,13 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Display(Name = "修改日期")] public DateTime UpdateDate { get; set; } - + + /// + /// 人員 + /// + public virtual AMESCoreStudio.WebApi.Models.SYS.UserInfo U { get; set; } + + } } \ No newline at end of file diff --git a/AMESCoreStudio.WebApi/Models/AMESContext.cs b/AMESCoreStudio.WebApi/Models/AMESContext.cs index 1a5d222b..107c5688 100644 --- a/AMESCoreStudio.WebApi/Models/AMESContext.cs +++ b/AMESCoreStudio.WebApi/Models/AMESContext.cs @@ -65,6 +65,14 @@ namespace AMESCoreStudio.WebApi modelBuilder.Entity().HasOne(r => r.Module).WithMany().HasForeignKey(r => r.ModuleID).IsRequired(); + modelBuilder.Entity().HasOne(r => r.Stations).WithMany().HasForeignKey(r => r.StationID).IsRequired(); + modelBuilder.Entity().HasOne(r => r.LineInfo).WithMany().HasForeignKey(r => r.LineID).IsRequired(); + + modelBuilder.Entity().HasKey(c => new { c.UserNo}); + modelBuilder.Entity().HasOne(r => r.U).WithMany().HasForeignKey(r => r.UserNo).IsRequired(); + //modelBuilder.Entity().HasOne(r => r.DeptInfo).WithMany().HasForeignKey(r => r.UserNo).IsRequired(); + + } /// diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll index bf926ef4..7a802aab 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb index 04d3a40f..7b78ca49 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll index 63a81ecb..9c3bac7d 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb index db1940c2..deb16236 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml index edcd8571..ea75d212 100644 --- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -62,7 +62,7 @@ - 工廠资料维护 + 條碼變更資料表 @@ -91,7 +91,7 @@ - + 更新條碼资料 @@ -234,6 +234,33 @@ + + + 條碼鎖定資料表 + + + + + 條碼鎖定資料表 by BarCodeID + + BarCodeID + + + + + 條碼過站資料檔 + + + + + + + 內務條碼ID + 工單ID + 流程站別ID + + + 條碼狀態維護 @@ -280,6 +307,59 @@ + + + 條碼狀態維護 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 機種C/T資料維護 @@ -710,6 +790,13 @@ + + + + + + + @@ -756,6 +843,13 @@ ItemID + + + 料號基本資料檔 to ItemNO + + 料號 + + 新增料號基本資料檔 @@ -786,7 +880,7 @@ - + 料號基本資料檔 to ItemID @@ -814,6 +908,79 @@ + + + 料號治具資訊資料檔 + + + + + 建構式 + + + + + 查詢料號治具資訊資料檔 + + + + + + + + + + + + 料號基本資料檔 to ItemID + + ItemID + + + + + 料號站別工項資料檔 + + + + + 料號站別工項資料檔 by ItemID + + ItemID + + + + + 料號属性代碼基本檔 + + + + + + 料號属性代碼基本檔資料 + + + + + + 料號属性代碼基本檔 + + MatPropertyID + + + + + 新增料號属性代碼基本檔 + + + + + + + 更新料號属性代碼基本檔 + + + @@ -934,6 +1101,11 @@ + + + 測試不良基本資料檔 + + 不良現象原因代碼維護 @@ -1599,18 +1771,18 @@ - + - + - + 獲取產品別資料 @@ -1832,8 +2004,15 @@ - 工單投產纪錄資料文件 + SOPFile資料查詢 + + + + + + SOPFile資料查詢 by ID + @@ -2060,7 +2239,7 @@ - + 每日工時查詢Query @@ -2070,6 +2249,7 @@ + @@ -2096,6 +2276,89 @@ + + + 過站判斷 + + + + + + + + + + + 判斷工單狀態 + + 工單號碼 + 生產單位 + 站別 + 線別 + 流程 + + + + + 內部序號查詢工單號碼 + + 內部序號 + Success:true or false + + + + 內部序號查詢目前生產單位 + + 內部序號 + Success:true or false + + + + 內部序號查詢目前站別 + + 內部序號 + Success:true or false + + + + 內部序號是否鎖定 + + 內部序號 + Success:true or false + + + + 內部序號是否報廢 + + 內部序號 + Success:true or false + + + + 確認工單狀態 + + 工單號碼 + 生產單位 + 流程 + 站別 + 線別 + + + + + 內部序號是否被鎖定 + + 工單號碼 + 內部序號 + + + + + 內部序號找BarCodeID + + + 0:找不到 + 班別资料维护 @@ -2914,6 +3177,15 @@ + + + 根據系統ID獲取該系統模組資料 + + + + + + @@ -2960,6 +3232,15 @@ + + + 根據模組ID獲取該模組功能資料 + + + + + + @@ -3000,7 +3281,7 @@ - + @@ -3052,11 +3333,13 @@ - + 根据角色ID获取该角色模组资料 + + @@ -3105,11 +3388,13 @@ - + 根据角色ID获取该角色功能资料 + + @@ -3152,10 +3437,12 @@ - + 獲取系統資料 + + @@ -3198,7 +3485,7 @@ - + @@ -3250,7 +3537,7 @@ - + 根据用户ID获取该用户角色资料 @@ -3747,6 +4034,12 @@ + + + + + + @@ -3792,12 +4085,6 @@ - - - - - - @@ -4109,11 +4396,51 @@ 無效工時在線收集資料 + + + 條碼類別資料檔 + + + + + 料號属性代碼基本檔 + + 條碼组件變更資料 + + + 料號站別工項資料檔 + + + + + 料號治具資訊資料檔 + + + + + 條碼鎖定資料表 + + + + + 檔案用途 條碼工單資料檔 + + + + + 測試不良基本資料檔 + + + + + 測試不良基本資料檔 + + 條碼變更資料表 @@ -4161,47 +4488,47 @@ - + 條碼狀態代碼 - + 客戶條碼 - + 存放位置ID - + 條碼過站位置 - + 條碼過站狀態 - + 工單ID - + 包装箱號 - + 系统狀態 - + 條碼流程狀態 @@ -4219,6 +4546,16 @@ 修改時間 + + + 工單資料 + + + + + 流程站別資料 + + 條碼组件資料檔 @@ -4414,24 +4751,154 @@ 解鎖時間 - + - 條碼狀態資料表 + 條碼過站資料檔 - + - 條碼狀態代碼 + 內部條碼ID - + - 條碼狀態描述 + 工單ID - + - 用户资料表 + 流程站別ID + + + + + 規則狀態值 + + + + + 投入日期 + + + + + 系统狀態 + + + + + 線别ID + + + + + 站别的次數 + + + + + 過站次數（不限定工單） + + + + + 建立者 + + + + + 建立時間 + + + + + 條碼狀態資料表 + + + + + 條碼狀態代碼 + + + + + 條碼狀態描述 + + + + + 條碼類別資料檔 + + + + + 條碼類別ID + + + + + 類別代碼 + + + + + 類別描述 + + + + + 當前值 + + + + + 創建者ID + + + + + 創建日期 + + + + + 更新者ID + + + + + 更新日期 + + + + + 檔案用途 條碼工單資料檔 + + + + + 內部條碼ID + + + + + 工單ID + + + + + 建立者 + + + + + 建立時間 + + + + + 修改時間 @@ -4924,111 +5391,6 @@ 修改日期 - - - 用户资料表 - - - - - 廠別ID - - - - - 廠別中文名稱 - - - - - 廠別英文名稱 - - - - - 電話 - - - - - 傳真 - - - - - 地址 - - - - - 地區 - - - - - - - - - - 建立者 - - - - - 建立日期 - - - - - 修改日期 - - - - - 廠別代碼 - - - - - 區域 - - - - - - - - - - 廠別狀態 - - - - - 用户资料表 - - - - - - - - - - - - - - - - - - - - - - 組件類別资料表 @@ -5094,61 +5456,6 @@ 修改時間 - - - 用户资料表 - - - - - 部門代碼 - - - - - 線別代碼 - - - - - 線別說明 - - - - - 樓層 - - - - - 生產單位 - - - - - 工單ID - - - - - 建立者 - - - - - 線別狀態(A:Active/S:Stop) - - - - - 建立日期 - - - - - 修改日期 - - MAC資料表 @@ -5359,6 +5666,161 @@ 工單機種資料 + + + 料號治具資訊資料檔 + + + + + 料號治具ID + + + + + 料號ID + + + + + 治具NO + + + + + 站(前段) + + + + + 流程站別編號 + + + + + 建立UserID + + + + + 建立日期 + + + + + 更新UserID + + + + + 更新日期 + + + + + 料號主檔 + + + + + 料號站別工項資料檔 + + + + + 料號站別工項ID + + + + + 料號ID + + + + + 生產單位 + + + + + 流程站別編號 + + + + + 站(前段) + + + + + 工項名稱 + + + + + 工項描述 + + + + + 工項順序 + + + + + 建立UserID + + + + + 建立日期 + + + + + 更新UserID + + + + + 更新日期 + + + + + 料號主檔 + + + + + 料號属性代碼基本檔 + + + + + 料號属性代碼 + + + + + 料號属性描述 + + + + + 料號属性類型 + + + + + 附加屬性類型 + + + + + 附加屬性描述 + + 用户资料表 @@ -5409,6 +5871,126 @@ 不良現象名稱 + + + 測試不良基本資料檔 + + + + + 測試不良ID + + + + + 測試種類代碼 + + + + + 測試員代號 + + + + + 治具代號 + + + + + 測試程試代號/名稱 + + + + + 設備代號 + + + + + 測試總點數 + + + + + 不良總點數 + + + + + 開始測試時間 + + + + + 結束測試時間 + + + + + 測試狀態(F-FAIL) + + + + + 內部條碼ID + + + + + 流程站別ID + + + + + 工單ID + + + + + 處理狀態(0:尚未維修處理, 1:已維修處理, 2:誤判) + + + + + 不良現象原因代碼 + + + + + 不良代碼指向的下一站ID + + + + + 不良時的組件數量 + + + + + 不良備註 + + + + + 創建者ID + + + + + 創建日期 + + + + + 更新者ID + + + + + 更新日期 + + 不良代码资料表 @@ -5734,6 +6316,16 @@ 修改日期 + + + 線別 + + + + + 站別 + + 重工標準工時資料 @@ -5811,7 +6403,7 @@ - 援入部門 + 援入單位 @@ -5821,7 +6413,7 @@ - 援出部門 + 援出單位 @@ -6359,14 +6951,19 @@ 客戶料號 + + + 生產單位 + + 工單資料-標籤 - + - WIP_ID + WIP_NO @@ -6414,16 +7011,6 @@ 更新日期 - - - 工單資料 - - - - - SOP資料 - - 工單鎖定資料檔 @@ -6806,7 +7393,7 @@ - FINE_PACKAGE + 是否為精包裝Y/N @@ -7024,6 +7611,11 @@ 修改日期 + + + 人員 + + 站别資料