diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs index 9e0f1760..a09c6aeb 100644 --- a/AMESCoreStudio.Web/Controllers/PCSController.cs +++ b/AMESCoreStudio.Web/Controllers/PCSController.cs @@ -85,7 +85,7 @@ namespace AMESCoreStudio.Web.Controllers if (model.wipInfo.WipScheduleDate == DateTime.MinValue) Msg += model.wipInfo.GetAttributeFrom(nameof(model.wipInfo.WipScheduleDate)).Name + ","; - if (model.wipInfo.UnitNO == "全部") + if (model.wipInfo.UnitNO == "全部" || string.IsNullOrWhiteSpace(model.wipInfo.UnitNO)) Msg += model.wipInfo.GetAttributeFrom(nameof(model.wipInfo.UnitNO)).Name + ","; @@ -157,8 +157,8 @@ namespace AMESCoreStudio.Web.Controllers if (!string.IsNullOrWhiteSpace(model.Engineer) || !string.IsNullOrWhiteSpace(model.PowerMode) || !string.IsNullOrWhiteSpace(model.BiMemo) || - !string.IsNullOrWhiteSpace(model.BiTime) || - model.BiRatio != 0 || + //!string.IsNullOrWhiteSpace(model.BiTime) || + //model.BiRatio != 0 || !string.IsNullOrWhiteSpace(model.Checksum) || !string.IsNullOrWhiteSpace(model.Bios) || !string.IsNullOrWhiteSpace(model.BiosVer) || @@ -211,8 +211,8 @@ namespace AMESCoreStudio.Web.Controllers // 當工單-板卡資訊有填寫任何一個欄位,就要把必填欄位都填寫 if (model.BiRatio != 0 || !string.IsNullOrWhiteSpace(model.BiosRemarks) || - !string.IsNullOrWhiteSpace(model.BiTemperature) || - !string.IsNullOrWhiteSpace(model.BiTime) || + //!string.IsNullOrWhiteSpace(model.BiTemperature) || + //!string.IsNullOrWhiteSpace(model.BiTime) || !string.IsNullOrWhiteSpace(model.BiosRemarks) || !string.IsNullOrWhiteSpace(model.BiosVer) || !string.IsNullOrWhiteSpace(model.BiRemarks) || diff --git a/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml index 53196f65..a2f5b0bb 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml @@ -147,11 +147,12 @@ }, { field: 'right', - width: 140, + width: 200, title: '操作', fixed: 'right', templet: function (d) { return '修改\ + 檢視\ 删除' } } @@ -166,10 +167,10 @@ } function del(obj) { - hg.confirm("确定要删除工單號碼【" + obj.data.wipNO + "】嗎?", function () { + hg.confirm("确定要删除工單號碼【" + obj.data.wipNo + "】嗎?", function () { $.ajax({ url: '/PCS/PCS005D', - data: { id: obj.data.wipNO }, + data: { id: obj.data.wipNo }, type: 'POST', success: function (data) { if (data.success) { @@ -188,6 +189,13 @@ }); } + //通过行tool檢視,lay-event="detail" + function detail(obj) { + if (obj.data.wipID) { + hg.open('檢視工單資料', '/PCS/PCS001R/' + obj.data.wipID, '', '', true); + } + } + //基本数据表格 var table = hg.table.datatable('query', '工單資料修改', '/PCS/PCS005Query/' + unitNo.value, {}, tableCols, {}, true, 'full-100', ['filter', 'print', 'exports']);