diff --git a/AMESCoreStudio.Web/Controllers/PTDController.cs b/AMESCoreStudio.Web/Controllers/PTDController.cs index f0710944..f1d49708 100644 --- a/AMESCoreStudio.Web/Controllers/PTDController.cs +++ b/AMESCoreStudio.Web/Controllers/PTDController.cs @@ -264,6 +264,12 @@ namespace AMESCoreStudio.Web.Controllers } List RecordTypes = await _pcsApi.GetRecordTypeInfo(); + var allRecordType = new[] { "653", "632", "261", "101R", "201", "202", "291", "292", "601", "601DB", "657" }; + var filtered = from o in RecordTypes + where allRecordType.Contains(o.ID) + select o; + + RecordTypes = filtered.ToList(); var SelectListItem = new List(); @@ -563,6 +569,12 @@ namespace AMESCoreStudio.Web.Controllers } List RecordTypes = await _pcsApi.GetRecordTypeInfo(); + var allRecordType = new[] { "101", "601", "631", "633", "951" }; + var filtered = from o in RecordTypes + where allRecordType.Contains(o.ID) + select o; + + RecordTypes = filtered.ToList(); var SelectListItem = new List(); @@ -619,6 +631,12 @@ namespace AMESCoreStudio.Web.Controllers } List RecordTypes = await _pcsApi.GetRecordTypeInfo(); + var allRecordType = new[] { "101", "601", "631", "633", "951" }; + var filtered = from o in RecordTypes + where allRecordType.Contains(o.ID) + select o; + + RecordTypes = filtered.ToList(); var SelectListItem = new List(); diff --git a/AMESCoreStudio.Web/Views/PTD/PTD007.cshtml b/AMESCoreStudio.Web/Views/PTD/PTD007.cshtml index 7c250bcf..39435beb 100644 --- a/AMESCoreStudio.Web/Views/PTD/PTD007.cshtml +++ b/AMESCoreStudio.Web/Views/PTD/PTD007.cshtml @@ -147,6 +147,7 @@ page: false, limit: 2000 }); + $("#rowCount").html("目前勾選項次 0 項,數量共 0 pcs"); } else { layer.msg('扣帳失敗,原因:' + result.data.msg, { icon: 2 }); } diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs index 734daea2..f1c7ad4c 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs @@ -3260,6 +3260,10 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no); } } } + else if (recordType == "101" || recordType == "292") //101、292可能沒有前身資訊 + { + bolChkFlow = true; + } } } @@ -4134,6 +4138,10 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no); } } } + else if (Data.RecordTypeID == "101" || Data.RecordTypeID == "292") //101、292可能沒有前身資訊 + { + bolChkFlow = true; + } } } if (!bolChkFlow)