fix(quality request): bug fixes

lots of bug fixes plug 2 new counters, quality inspect time and warehouse return time
This commit is contained in:
2025-11-12 20:22:21 -06:00
parent fef0303cd6
commit 6f632ecd68
17 changed files with 4986 additions and 316 deletions

View File

@@ -5,13 +5,13 @@ meta {
} }
get { get {
url: {{url}}/lst/old/api/eom/histinv?month=2025-11-01 url: {{url}}/lst/old/api/eom/histinv?month=2025/11/1
body: none body: none
auth: inherit auth: inherit
} }
params:query { params:query {
month: 2025-11-01 month: 2025/11/1
} }
settings { settings {

View File

@@ -0,0 +1,16 @@
meta {
name: materialPerDay
type: http
seq: 2
}
get {
url: {{urlv2}}/api/notify/materialperday
body: none
auth: inherit
}
settings {
encodeUrl: true
timeout: 0
}

View File

@@ -0,0 +1,25 @@
meta {
name: Add pallet
type: http
seq: 2
}
post {
url: {{url}}/lst/old/api/quality/newrequest
body: json
auth: inherit
}
body:json {
{
"username": "matthes01",
"runningNr": 618302,
"palletStatusText":"return" // returned will be the only allowed key
//"moveTo": "hold area" //hold area, rework, inspection
}
}
settings {
encodeUrl: true
timeout: 0
}

View File

@@ -0,0 +1,16 @@
meta {
name: Get Pallets
type: http
seq: 1
}
get {
url: {{url}}/lst/old/api/quality/getrequest
body: none
auth: inherit
}
settings {
encodeUrl: true
timeout: 0
}

View File

@@ -0,0 +1,8 @@
meta {
name: Quality
seq: 7
}
auth {
mode: inherit
}

View File

@@ -5,11 +5,16 @@ meta {
} }
get { get {
url: url: {{url}}/lst/api/user/me
body: none body: none
auth: inherit auth: bearer
}
auth:bearer {
token: jpHHbLNGJRpUMvfrVOYmhbJL2Ux0arse
} }
settings { settings {
encodeUrl: true encodeUrl: true
timeout: 0
} }

View File

@@ -0,0 +1,20 @@
meta {
name: otacheck
type: http
seq: 3
}
get {
url: http://10.193.0.56:4000/api/mobile/updates
body: none
auth: inherit
}
headers {
expo-runtime-version: 1.0.0
}
settings {
encodeUrl: true
timeout: 0
}

View File

@@ -0,0 +1 @@
ALTER TABLE "qualityRequest" ADD COLUMN "qualityDurationToInspect" integer;

View File

@@ -0,0 +1 @@
ALTER TABLE "qualityRequest" ADD COLUMN "returnDurationToInspect" integer;

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -519,6 +519,20 @@
"when": 1760708711258, "when": 1760708711258,
"tag": "0073_bumpy_dust", "tag": "0073_bumpy_dust",
"breakpoints": true "breakpoints": true
},
{
"idx": 74,
"version": "7",
"when": 1762966327361,
"tag": "0074_overconfident_may_parker",
"breakpoints": true
},
{
"idx": 75,
"version": "7",
"when": 1762983466464,
"tag": "0075_tan_unicorn",
"breakpoints": true
} }
] ]
} }

View File

@@ -25,6 +25,8 @@ export const qualityRequest = pgTable(
warehouseMovedTo: text("warehouseMovedTo"), warehouseMovedTo: text("warehouseMovedTo"),
locationMovedTo: text("locationMovedTo"), locationMovedTo: text("locationMovedTo"),
durationToMove: integer("durationToMove"), durationToMove: integer("durationToMove"),
qualityDurationToInspect: integer("qualityDurationToInspect"),
returnDurationToInspect: integer("returnDurationToInspect"),
locationDropOff: text("locationDropOff"), locationDropOff: text("locationDropOff"),
palletStatus: integer("palletStatus"), palletStatus: integer("palletStatus"),
palletStatusText: text("palletStatusText"), palletStatusText: text("palletStatusText"),

View File

@@ -1,171 +1,180 @@
import { differenceInMinutes } from "date-fns";
import { eq, sql } from "drizzle-orm"; import { eq, sql } from "drizzle-orm";
import { db } from "../../../../database/dbclient.js"; import { db } from "../../../../database/dbclient.js";
import { qualityRequest } from "../../../../database/schema/qualityRequest.js"; import { qualityRequest } from "../../../../database/schema/qualityRequest.js";
import { timeZoneFix } from "../../../globalUtils/timeZoneFix.js";
import { tryCatch } from "../../../globalUtils/tryCatch.js"; import { tryCatch } from "../../../globalUtils/tryCatch.js";
import { query } from "../../sqlServer/prodSqlServer.js"; import { query } from "../../sqlServer/prodSqlServer.js";
import { qrequestQuery } from "../../sqlServer/querys/quality/request.js"; import { qrequestQuery } from "../../sqlServer/querys/quality/request.js";
import { timeZoneFix } from "../../../globalUtils/timeZoneFix.js";
export const addNewPallet = async (data: any, user: string) => { export const addNewPallet = async (data: any) => {
/** /**
* Post new pallets * Post new pallets
*/ */
if (parseInt(data.runningNr) <= 0) { if (parseInt(data.runningNr) <= 0) {
return { return {
sucess: false, success: false,
message: "Please add a valid running number.", message: "Please add a valid running number.",
}; };
} }
const updateQuery = qrequestQuery.replaceAll( const updateQuery = qrequestQuery.replaceAll(
"[runningNumber]", "[runningNumber]",
data.runningNr data.runningNr,
); );
const { data: c, error: ce } = await tryCatch( const { data: c, error: ce } = await tryCatch(
db db
.select() .select()
.from(qualityRequest) .from(qualityRequest)
.where(eq(qualityRequest.runningNr, data.runningNr)) .where(eq(qualityRequest.runningNr, data.runningNr)),
); );
if (ce) { if (ce) {
return { return {
success: false, success: false,
message: "There was an error getting the quality request", message: "There was an error getting the quality request",
data: ce, data: ce,
}; };
} }
const palletData: any = c; const palletData: any = c;
// if the pallet exist then tell the user to check on it // if the pallet exist then tell the user to check on it
if ( const pStatus = [1, 4, 6];
(palletData && palletData[0]?.palletStatus === 1) || if (palletData && pStatus.includes(palletData[0]?.palletStatus)) {
palletData[0]?.palletStatus === 4 return {
) { success: false,
return { message: `Running number ${data.runningNr} is already pending or reactivated please follow up with the warehouse team on status to be moved.`,
success: false, };
message: `Running number ${data.runningNr} is already pending or reactivated please follow up with the warehouse team on status to be moved.`, }
};
}
if (palletData.length > 0) { // update the existing pallet if already in the system
try { if (palletData.length > 0) {
// get the pallet info from stock try {
const { data: pa, error: pe } = await tryCatch( // get the pallet info from stock
query(updateQuery, "quality request") const { data: pa, error: pe } = await tryCatch(
); query(updateQuery, "quality request"),
const p: any = pa; );
if (pe) { const p: any = pa ? pa.data : [];
return { if (pe) {
success: false, return {
message: "There was an error getting the pallet from stock", success: false,
data: pe, message: "There was an error getting the pallet from stock",
}; data: pe,
} };
const pData = { }
warehouseAtRequest: p[0].warehouseAtRequest, const pData = {
locationAtRequest: p[0].locationAtRequest, warehouseAtRequest: p[0].warehouseAtRequest,
warehouseMovedTo: null, locationAtRequest: p[0].locationAtRequest,
locationMovedTo: null, warehouseMovedTo: null,
palletStatus: 4, locationMovedTo: null,
durationToMove: 0, palletStatus: data.palletStatusText === "return" ? 6 : 4,
palletStatusText: "reactivated", //durationToMove: 0,
palletRequest: palletData[0].palletStatus + 1, palletStatusText:
upd_user: user, data.palletStatusText === "return" ? "return" : "reactivated",
upd_date: new Date(timeZoneFix()), qualityDurationToInspect:
}; data.palletStatusText === "return"
? differenceInMinutes(new Date(Date.now()), p[0].lastMove)
: 0,
locationDropOff:
data.palletStatusText === "return" ? "Return to warhouse" : "",
palletRequest: palletData[0].palletStatus + 1,
upd_user: data.user,
upd_date: sql`NOW()`,
};
const { data: u, error } = await tryCatch( const { data: u, error } = await tryCatch(
db db
.update(qualityRequest) .update(qualityRequest)
.set(pData) .set(pData)
.where(eq(qualityRequest.runningNr, data.runningNr)) .where(eq(qualityRequest.runningNr, data.runningNr)),
); );
if (error) { if (error) {
return { return {
success: false, success: false,
message: `Running number: ${data.runningNr} encountered and error reactivated.`, message: `Running number: ${data.runningNr} encountered and error reactivated.`,
data: error, data: error,
}; };
} }
if (data) { if (data) {
return { return {
success: true, success: true,
message: `Running number: ${data.runningNr} was just reactivated.`, message: `Running number: ${data.runningNr} was just reactivated.`,
data: u, data: u,
}; };
} }
} catch (error) { } catch (error) {
return { console.log(error);
success: false, return {
message: success: false,
"There was an error updating the pallet in quality request", message: "There was an error updating the pallet in quality request",
data: error, data: error,
}; };
} }
} }
// add new pallet // add new pallet
try { try {
const { data: px, error: pe } = await tryCatch( const { data: px, error: pe } = await tryCatch(
query(updateQuery, "quality request") query(updateQuery, "quality request"),
); );
const p: any = px;
if (p.length === 0) {
return {
success: false,
message: `Running Number ${data.runningNr} dose not exist in stock.`,
};
}
if (pe) { const p: any = px ? px.data : [];
return { if (p.length === 0) {
success: false, return {
message: "There was an error getting the pallet from stock", success: false,
data: pe, message: `Running Number ${data.runningNr} dose not exist in stock, please check the running number and try again.`,
}; };
} }
const nData = { if (pe) {
article: p[0].article, return {
description: p[0].description, success: false,
runningNr: p[0].runningNr, message: "There was an error getting the pallet from stock",
lotNr: p[0].lotNr, data: pe,
warehouseAtRequest: p[0].warehouseAtRequest, };
locationAtRequest: p[0].locationAtRequest, }
locationDropOff: data.moveTo, console.log(p);
palletStatus: 1, const nData = {
palletStatusText: "pending", article: p[0].article,
palletRequest: 1, description: p[0].description,
add_user: user, runningNr: p[0].runningNr,
upd_user: user, lotNr: p[0].lotNr,
}; warehouseAtRequest: p[0].warehouseAtRequest,
locationAtRequest: p[0].locationAtRequest,
locationDropOff: data.moveTo,
palletStatus: 1,
palletStatusText: "pending",
palletRequest: 1,
add_user: data.user,
upd_user: data.user,
};
const { data: u, error } = await tryCatch( const { data: u, error } = await tryCatch(
db.insert(qualityRequest).values(nData) db.insert(qualityRequest).values(nData).onConflictDoNothing(),
); );
if (error) { if (error) {
return { return {
success: false, success: false,
message: `Running number: ${data.runningNr} encountered and error reactivated.`, message: `Running number: ${data.runningNr} encountered and error reactivated.`,
data: error, data: error,
}; };
} }
if (data) { if (data) {
return { return {
success: true, success: true,
message: `Running number: ${data.runningNr} was just added.`, message: `Running number: ${data.runningNr} was just added.`,
data: u, data: u,
}; };
} }
} catch (error) { } catch (error) {
return { console.log(error);
success: false, return {
message: "There was an error adding the pallet in quality request", success: false,
data: error, message: "There was an error adding the pallet in quality request",
}; data: error,
} };
}
}; };

View File

@@ -1,110 +1,127 @@
import { eq, inArray } from "drizzle-orm"; import { differenceInMinutes } from "date-fns";
import { eq, inArray, sql } from "drizzle-orm";
import { db } from "../../../../database/dbclient.js"; import { db } from "../../../../database/dbclient.js";
import { qualityRequest } from "../../../../database/schema/qualityRequest.js"; import { qualityRequest } from "../../../../database/schema/qualityRequest.js";
import { delay } from "../../../globalUtils/delay.js";
import { timeZoneFix } from "../../../globalUtils/timeZoneFix.js";
import { tryCatch } from "../../../globalUtils/tryCatch.js"; import { tryCatch } from "../../../globalUtils/tryCatch.js";
import { createLog } from "../../logger/logger.js"; import { createLog } from "../../logger/logger.js";
import { qrequestQuery } from "../../sqlServer/querys/quality/request.js";
import { query } from "../../sqlServer/prodSqlServer.js"; import { query } from "../../sqlServer/prodSqlServer.js";
import { differenceInMinutes } from "date-fns"; import { qrequestQuery } from "../../sqlServer/querys/quality/request.js";
import { timeZoneFix } from "../../../globalUtils/timeZoneFix.js";
export const qualityCycle = async () => { export const qualityCycle = async () => {
/** /**
* Cycles the pallets in the quality request to see whats been moved or changed. * Cycles the pallets in the quality request to see whats been moved or changed.
*/ */
const warehouse = [1, 4, 5];
// pallet request check interval 5min check to start // pallet request check interval 5min check to start
//setInterval(async () => { setInterval(
// create the date stuff async () => {
const currentTime = new Date(Date.now()); // create the date stuff
const currentTime = new Date(Date.now());
// pull in all current pallets from our db // pull in all current pallets from our db
const { data, error } = await tryCatch( const { data, error } = await tryCatch(
db db
.select() .select()
.from(qualityRequest) .from(qualityRequest)
.where(inArray(qualityRequest.palletStatus, [1, 4, 5])) .where(inArray(qualityRequest.palletStatus, [1, 4, 5, 6])),
); );
if (error) { if (error) {
createLog( createLog(
"error", "error",
"lst", "lst",
"quality", "quality",
`There was an error getting quality request data: ${error}` `There was an error getting quality request data: ${error}`,
); );
return { return {
success: false, success: false,
message: "There was an error getting quality request data", message: "There was an error getting quality request data",
}; };
} }
const lstQData: any = data; const lstQData: any = data;
// get the pallets that currentStat is moved // get the pallets that currentStat is moved
// const res = await runQuery(palletMoveCheck, "palletCheck"); // const res = await runQuery(palletMoveCheck, "palletCheck");
if (lstQData.length != 0) { if (lstQData.length != 0) {
for (let i = 0; i < lstQData.length; i++) { for (let i = 0; i < lstQData.length; i++) {
// run the pallet query we will compare the data. // run the pallet query we will compare the data.
// console.log(lstQData[i]); // console.log(lstQData[i]);
//update query with plant token //update query with plant token
// change the update the pallet number // update the the pallet number
const qPalletNumber = qrequestQuery.replaceAll( const qPalletNumber = qrequestQuery.replaceAll(
"[runningNumber]", "[runningNumber]",
lstQData[i].runningNr lstQData[i].runningNr,
); );
const queryData: any = await query( const queryData: any = await query(
qPalletNumber, qPalletNumber,
"Quality update check" "Quality update check",
); );
let prodData: any = let prodData: any =
queryData?.data.length === 0 ? [] : queryData.data; queryData?.data.length === 0 ? [] : queryData.data;
if ( if (
lstQData[i]?.locationAtRequest != prodData[0]?.locationAtRequest lstQData[i]?.locationAtRequest != prodData[0]?.locationAtRequest
) { ) {
// time to do the pallet update stuff // time to do the pallet update stuff
const qDataPost = { const qDataPost = {
warehouseMovedTo: prodData[0]?.warehouseAtRequest, warehouseMovedTo: prodData[0]?.warehouseAtRequest,
locationMovedTo: prodData[0]?.locationAtRequest, locationMovedTo: prodData[0]?.locationAtRequest,
durationToMove: differenceInMinutes( // how ling did it take the warhouse to originally move the pallet
timeZoneFix(), durationToMove: warehouse.includes(lstQData[i].palletStatus)
lstQData[i].upd_date ? differenceInMinutes(
), new Date(Date.now()),
palletStatus: 2, lstQData[i].upd_date,
palletStatusText: "moved", )
upd_date: new Date(timeZoneFix()), : lstQData[i].durationToMove,
upd_user: "LST_System", // how long did it take warehouse to move the pallet back agian
}; returnDurationToInspect:
lstQData[i].palletStatus === 7
? differenceInMinutes(
new Date(Date.now()),
lstQData[i].upd_date,
)
: lstQData[i].qualityDurationToInspect,
palletStatus: 2,
palletStatusText: "moved",
upd_date: sql`NOW()`,
upd_user: "LST_System",
};
const updatePallet = await db const updatePallet = await db
.update(qualityRequest) .update(qualityRequest)
.set(qDataPost) .set(qDataPost)
.where(eq(qualityRequest.runningNr, lstQData[i].runningNr)); .where(eq(qualityRequest.runningNr, lstQData[i].runningNr));
createLog( createLog(
"info", "info",
"lst", "lst",
"quality", "quality",
`Pallet ${lstQData[i].runningNr} was updated` `Pallet ${lstQData[i].runningNr} was updated`,
); );
} else { } else {
createLog( createLog(
"debug", "info",
"lst", "lst",
"quality", "quality",
`Pallet ${ `Pallet ${
lstQData[i].runningNr lstQData[i].runningNr
} has not been moved yet it has been pending for ${differenceInMinutes( } has not been moved yet it has been pending for ${differenceInMinutes(
timeZoneFix(), new Date(Date.now()),
lstQData[i].upd_date lstQData[i].upd_date,
)} min(s)` )} min(s)`,
); );
} }
} }
} else { await delay(150);
createLog("debug", "lst", "quality", "nothing to update"); } else {
} createLog("info", "lst", "quality", "nothing to update");
//}, 5 * 60 * 1000); // every 5 min }
},
5 * 60 * 1000,
); // every 5 min
}; };

View File

@@ -5,35 +5,37 @@ import postReq from "./route/postNewRequest.js";
// pallet status data. // pallet status data.
export const statusOptions = [ export const statusOptions = [
{ name: "pending", uid: "1" }, { name: "pending", uid: "1" },
{ name: "moved", uid: "2" }, { name: "moved", uid: "2" },
{ name: "removed", uid: "3" }, { name: "removed", uid: "3" },
{ name: "reactivated", uid: "4" }, { name: "reactivated", uid: "4" },
{ name: "canceled", uid: "5" }, { name: "canceled", uid: "5" },
{ name: "return", uid: "6" },
{ name: "readyToReturn", uid: "7" },
]; ];
const app = new OpenAPIHono(); const app = new OpenAPIHono();
const routes = [request, postReq] as const; const routes = [request, postReq] as const;
const appRoutes = routes.forEach((route) => { const appRoutes = routes.forEach((route) => {
app.route("/quality", route); app.route("/quality", route);
}); });
app.all("/quality/*", (c) => { app.all("/quality/*", (c) => {
return c.json({ return c.json({
success: false, success: false,
message: "You have encounters a quality route that dose not exist.", message: "You have encounters a quality route that dose not exist.",
}); });
}); });
/** /**
* Initial and run the cycle up for checking the pallet moves for quality * Initial and run the cycle up for checking the pallet moves for quality
*/ */
setTimeout(() => { setTimeout(() => {
qualityCycle(); qualityCycle();
}, 1000 * 5); }, 1000 * 5);
setInterval(() => { setInterval(() => {
qualityCycle(); qualityCycle();
}, 1000 * 60); }, 1000 * 60);
export default app; export default app;

View File

@@ -1,74 +1,72 @@
// an external way to creating logs // an external way to creating logs
import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi"; import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
import { verify } from "hono/jwt";
import { apiHit } from "../../../globalUtils/apiHits.js";
import { responses } from "../../../globalUtils/routeDefs/responses.js"; import { responses } from "../../../globalUtils/routeDefs/responses.js";
import { getRequest } from "../controller/getRequests.js";
import { tryCatch } from "../../../globalUtils/tryCatch.js"; import { tryCatch } from "../../../globalUtils/tryCatch.js";
import { authMiddleware } from "../../auth/middleware/authMiddleware.js"; import { authMiddleware } from "../../auth/middleware/authMiddleware.js";
import { addNewPallet } from "../controller/addNewPallet.js"; import { addNewPallet } from "../controller/addNewPallet.js";
import { verify } from "hono/jwt"; import { getRequest } from "../controller/getRequests.js";
import { apiHit } from "../../../globalUtils/apiHits.js";
const app = new OpenAPIHono({ strict: false }); const app = new OpenAPIHono({ strict: false });
const Body = z.object({ const Body = z.object({
runningNr: z.number().openapi({ example: 1528 }), runningNr: z.number().openapi({ example: 1528 }),
moveTo: z.string().openapi({ example: "rework" }), moveTo: z.string().optional().openapi({ example: "rework" }),
}); });
app.openapi( app.openapi(
createRoute({ createRoute({
tags: ["quality"], tags: ["quality"],
summary: "Returns all pallets requested", summary: "Returns all pallets requested",
method: "post", method: "post",
path: "/newrequest", path: "/newrequest",
middleware: authMiddleware, middleware: authMiddleware,
request: { request: {
body: { body: {
content: { content: {
"application/json": { schema: Body }, "application/json": { schema: Body },
}, },
}, },
}, },
responses: responses(), responses: responses(),
}), }),
async (c) => { async (c) => {
const authHeader = c.req.header("Authorization"); // const authHeader = c.req.header("Authorization");
const token = authHeader?.split("Bearer ")[1] || ""; // const token = authHeader?.split("Bearer ")[1] || "";
const payload = await verify(token, process.env.JWT_SECRET!); // const payload = await verify(token, process.env.JWT_SECRET!);
const user: any = payload.user; // const user: any = payload.user;
const { data: b, error: e } = await tryCatch(c.req.json()); const { data: b, error: e } = await tryCatch(c.req.json());
apiHit(c, { endpoint: "/newrequest", lastBody: b }); apiHit(c, { endpoint: "/newrequest", lastBody: b });
if (e) { if (e) {
return c.json({ return c.json({
success: false, success: false,
message: "Missing Data", message: "Missing Data",
}); });
} }
const body: any = b; const body: any = b;
// console.log(body); // console.log(body);
// if (!body.runningNr) { // if (!body.runningNr) {
// return c.json({ // return c.json({
// success: false, // success: false,
// message: "Missing mandatory data.", // message: "Missing mandatory data.",
// }); // });
// } // }
const { data, error } = await tryCatch( const { data, error } = await tryCatch(addNewPallet(body));
addNewPallet(body, user?.username)
);
if (error) { if (error) {
return c.json({ return c.json({
success: false, success: false,
message: "There was an error adding the new pallet", message: "There was an error adding the new pallet",
}); });
} }
return c.json({ return c.json({
success: data?.success, success: data?.success,
message: data?.message, message: data?.message,
data: data?.data, data: data?.data,
}); });
} },
); );
export default app; export default app;