Compare commits

..

12 Commits

4 changed files with 31 additions and 21 deletions

View File

@@ -8,7 +8,7 @@
"dev:frontend": "cd frontend && npm run dev", "dev:frontend": "cd frontend && npm run dev",
"dev:dbgen": " drizzle-kit generate --config=drizzle-dev.config.ts", "dev:dbgen": " drizzle-kit generate --config=drizzle-dev.config.ts",
"dev:dbmigrate": " drizzle-kit migrate --config=drizzle-dev.config.ts", "dev:dbmigrate": " drizzle-kit migrate --config=drizzle-dev.config.ts",
"build": "npm run build:server && npm run build:frontend && npm run build:iisNet && npm run zipServer && npm run dev", "build": "npm run build:server && npm run build:frontend && npm run zipServer",
"build:server": "rimraf dist && tsc --build && npm run copy:scripts && xcopy server\\services\\notifications\\utils\\views\\ dist\\server\\services\\notifications\\utils\\views\\ /E /I /Y", "build:server": "rimraf dist && tsc --build && npm run copy:scripts && xcopy server\\services\\notifications\\utils\\views\\ dist\\server\\services\\notifications\\utils\\views\\ /E /I /Y",
"build:frontend": "cd frontend && npm run build", "build:frontend": "cd frontend && npm run build",
"build:iisNet": "rimraf dotnetwrapper\\bin && xcopy frontend\\dist dotnetwrapper\\wwwroot /E /I /Y && cd dotnetwrapper && dotnet publish lst-wrapper.csproj --configuration Release --output ../prodBuild", "build:iisNet": "rimraf dotnetwrapper\\bin && xcopy frontend\\dist dotnetwrapper\\wwwroot /E /I /Y && cd dotnetwrapper && dotnet publish lst-wrapper.csproj --configuration Release --output ../prodBuild",
@@ -36,7 +36,7 @@
} }
}, },
"admConfig": { "admConfig": {
"build": 471, "build": 481,
"oldBuild": "backend-0.1.3.zip" "oldBuild": "backend-0.1.3.zip"
}, },
"devDependencies": { "devDependencies": {

View File

@@ -38,6 +38,7 @@ const ignoreList = [
//misc files //misc files
"jsTesting", "jsTesting",
"dotnetwrapper", "dotnetwrapper",
"prodBuild",
]; ];
const shouldIgnore = (itemPath: any) => { const shouldIgnore = (itemPath: any) => {

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",

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)