diff --git a/AMESCoreStudio.Web/Views/QRS/QRS028A.cshtml b/AMESCoreStudio.Web/Views/QRS/QRS028A.cshtml index e58c5a1d..e47c0cd8 100644 --- a/AMESCoreStudio.Web/Views/QRS/QRS028A.cshtml +++ b/AMESCoreStudio.Web/Views/QRS/QRS028A.cshtml @@ -39,53 +39,65 @@ { field: 'wipNO', title: '工單', + width: 130, sort: true }, { field: 'itemNO', - title: '成品料號' + title: '成品料號', + width: 100 }, { field: 'extraBarcodeNo', title: '出貨序號', + width: 100, sort: true }, { field: 'barcodeNo', title: '生產序號', + width: 130, sort: true }, { field: 'stationName', - title: '站別' + title: '站別', + width: 100 }, { field: 'lineDesc', - title: '線別' + title: '線別', + width: 100 }, { field: 'status1', - title: '規格描述' + title: '規格描述', + width: 80 }, { field: 'status2', - title: '執行狀態' + title: '執行狀態', + width: 80 }, { - field: 'inputDate', + field: 'inputDateHMS', + width: 160, title: '過站時間' }, { field: 'werksNO', - title: '廠別' + title: '廠別', + width: 80 }, { field: 'userNo', - title: '人員工號' + title: '人員工號', + width: 100 }, { field: 'userName', - title: '人員名稱' + title: '人員名稱', + width: 100 }] ]; diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs index b2556793..9bf74e9a 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs @@ -344,6 +344,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES Status1 = q1.RuleStatus.Equals("P") ? "PASS" : q9.NGReasonNo + "-" + q9.NGReasonDesc, //Status1 = q1.RuleStatus.Equals("P") ? "PASS" : "NGTEST", Status2 = q1.RuleStatus.Equals("P") ? "GOOD" : "NG", + InputDateHMS = q1.InputDate.ToString("yyyy-MM-dd HH:mm:ss"), q1.InputDate, q3.WerksNO, q7.UserNo,