cowch/lstV2
1
0
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

revert(mainmaterial): reverted changes to check for machine needing mm

Browse Source
This commit is contained in:
Blake Matthes
2025-07-18 06:40:15 -05:00
parent 16b710dc91
commit c224e30b8d
2 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
server/services/ocp/controller/materials/mainMaterial.ts
View File

@@ -8,26 +8,26 @@ export const isMainMatStaged = async (lot: any) => {
// make staged false by deefault and error logged if theres an issue // make staged false by deefault and error logged if theres an issue
let isStaged = false; let isStaged = false;
const { data, error } = (await tryCatch( // const { data, error } = (await tryCatch(
query( // query(
machineCheck.replace("where Active = 1 and [Location] = [loc]", ""), // machineCheck.replace("where Active = 1 and [Location] = [loc]", ""),
"check machine needs mm" // "check machine needs mm"
) // )
)) as any; // )) as any;
const machine = data.data.filter( // const machine = data.data.filter(
(m: any) => m.HumanReadableId === lot.machineID // (m: any) => m.HumanReadableId === lot.machineID
); // );
// we have a check on ksc side to ignore the tetra machine for now as its not updating in 2.0 // // we have a check on ksc side to ignore the tetra machine for now as its not updating in 2.0
if (!machine.StagingMainMaterialMandatory) { // if (!machine.StagingMainMaterialMandatory) {
createLog( // createLog(
"info", // "info",
"mainMaterial", // "mainMaterial",
"ocp", // "ocp",
`The machine dose not require mm to print and book in.` // `The machine dose not require mm to print and book in.`
); // );
return true; // return true;
} // }
// strangly the lot is not always sending over in slc so adding this in for now to see what line is cauing this issue // strangly the lot is not always sending over in slc so adding this in for now to see what line is cauing this issue
if (!lot) { if (!lot) {
@@ -61,6 +61,10 @@ export const isMainMatStaged = async (lot: any) => {
if (res[0].Staged >= 1) { if (res[0].Staged >= 1) {
isStaged = true; isStaged = true;
} }
// if (res[0].noShortage === "good") {
// isStaged = true;
// }
} catch (err) { } catch (err) {
createLog( createLog(
"error", "error",

5
server/services/sqlServer/querys/ocp/mainMaterial.ts
View File

@@ -6,6 +6,11 @@ SELECT lot.ProductionLotHumanReadableId,
else 0 end as Staged, else 0 end as Staged,
x.ProvidedAmount as Provided, x.ProvidedAmount as Provided,
x.EffectiveConsumption as consumption, x.EffectiveConsumption as consumption,
x.TotalDemand as totalNeeded,
/* remaining needed to complete the lot */
x.TotalDemand - x.EffectiveConsumption as remainingNeeded,
/* do we have enough staged or scanned to the lot? */
case when (case when x.ProvidedAmount <> 0 then x.ProvidedAmount else x.EffectiveConsumption end) > x.TotalDemand then 'good' else 'bad' end as noShortage ,
x.IsManualProcess as isManual, x.IsManualProcess as isManual,
MaterialHumanReadableId MaterialHumanReadableId
FROM [test1_AlplaPROD2.0_Read].[issueMaterial].[MaterialDemand] x (nolock) FROM [test1_AlplaPROD2.0_Read].[issueMaterial].[MaterialDemand] x (nolock)