From 6910550de769dce04b1045f96ab19cf7b8d1ef8c Mon Sep 17 00:00:00 2001 From: Blake Matthes Date: Mon, 1 Sep 2025 11:08:16 -0500 Subject: [PATCH] fix(main material check): corrections to properly ignore pkg during color checks --- .../ocp/controller/materials/mainMaterial.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/server/services/ocp/controller/materials/mainMaterial.ts b/server/services/ocp/controller/materials/mainMaterial.ts index c47f660..e9bb500 100644 --- a/server/services/ocp/controller/materials/mainMaterial.ts +++ b/server/services/ocp/controller/materials/mainMaterial.ts @@ -64,7 +64,7 @@ export const isMainMatStaged = async (lot: any) => { const mainMateiral = res.filter((n: any) => n.IsMainMaterial); - if (mainMateiral[0]?.noMaterialShortage === "no") { + if (mainMateiral[0]?.noMaterialShortage === "noMM") { isStaged = { message: `Main material: ${mainMateiral[0].MaterialHumanReadableId} - ${mainMateiral[0].MaterialDescription}: is not staged for ${lot.lot} `, success: false, @@ -77,7 +77,11 @@ export const isMainMatStaged = async (lot: any) => { if (checkColorSetting[0].value === "1") { const autoConsumeColor = res.filter( - (n: any) => !n.IsMainMaterial && !n.isManual + (n: any) => + !n.IsMainMaterial && + !n.isManual && + n.noPKGShortage !== "pkgGood" && + n.noPKGShortage !== "noPkg" ); if ( autoConsumeColor.some( @@ -100,7 +104,11 @@ export const isMainMatStaged = async (lot: any) => { // // for manual consume color const manualConsumeColor = res.filter( - (n: any) => !n.IsMainMaterial && n.isManual + (n: any) => + !n.IsMainMaterial && + n.isManual && + n.noPKGShortage !== "pkgGood" && + n.noPKGShortage !== "noPkg" ); if ( manualConsumeColor.some(