fix(lot transfer): changes to make it so the reprint and return do not happen instantly

This commit is contained in:
2025-12-02 15:24:10 -06:00
parent a3dba6cc9d
commit ac27a286c0
2 changed files with 107 additions and 90 deletions

View File

@@ -1,7 +1,7 @@
import axios from "axios"; import axios from "axios";
import { createLog } from "../services/logger/logger.js";
import { prodEndpointCreation } from "./createUrl.js"; import { prodEndpointCreation } from "./createUrl.js";
import { tryCatch } from "./tryCatch.js"; import { tryCatch } from "./tryCatch.js";
import { createLog } from "../services/logger/logger.js";
type bodyData = any; type bodyData = any;
@@ -9,11 +9,13 @@ type Data = {
endpoint: string; endpoint: string;
data: bodyData[]; data: bodyData[];
}; };
export const runProdApi = async (data: Data) => { /**
/** *
* Detachs a silo * @param data
* @param timeoutDelay
* @returns
*/ */
export const runProdApi = async (data: Data) => {
let url = await prodEndpointCreation(data.endpoint); let url = await prodEndpointCreation(data.endpoint);
const { data: d, error } = await tryCatch( const { data: d, error } = await tryCatch(
@@ -22,7 +24,7 @@ export const runProdApi = async (data: Data) => {
"X-API-Key": process.env.TEC_API_KEY || "", "X-API-Key": process.env.TEC_API_KEY || "",
"Content-Type": "application/json", "Content-Type": "application/json",
}, },
}) }),
); );
let e = error as any; let e = error as any;
@@ -33,11 +35,11 @@ export const runProdApi = async (data: Data) => {
"error", "error",
"lst", "lst",
"logistics", "logistics",
`Not autorized: ${JSON.stringify(e.response?.data)}` `Not authorized: ${JSON.stringify(e.response?.data)}`,
); );
const data = { const data = {
success: false, success: false,
message: `Not autorized: ${JSON.stringify(e.response?.data)}`, message: `Not authorized: ${JSON.stringify(e.response?.data)}`,
data: { data: {
status: e.response?.status, status: e.response?.status,
statusText: e.response?.statusText, statusText: e.response?.statusText,
@@ -51,13 +53,13 @@ export const runProdApi = async (data: Data) => {
"lst", "lst",
"logistics", "logistics",
`There was an error processing the endpoint: ${JSON.stringify( `There was an error processing the endpoint: ${JSON.stringify(
e.response?.data e.response?.data,
)}` )}`,
); );
return { return {
success: false, success: false,
message: `There was an error processing the endpoint: ${JSON.stringify( message: `There was an error processing the endpoint: ${JSON.stringify(
e.response?.data e.response?.data,
)}`, )}`,
data: { data: {
status: e.response?.status, status: e.response?.status,

View File

@@ -3,6 +3,7 @@ import { eq } from "drizzle-orm";
import { success } from "zod/v4"; import { success } from "zod/v4";
import { db } from "../../../../../database/dbclient.js"; import { db } from "../../../../../database/dbclient.js";
import { printerData } from "../../../../../database/schema/printers.js"; import { printerData } from "../../../../../database/schema/printers.js";
import { delay } from "../../../../globalUtils/delay.js";
import { runProdApi } from "../../../../globalUtils/runProdApi.js"; import { runProdApi } from "../../../../globalUtils/runProdApi.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";
@@ -158,7 +159,7 @@ export const lotMaterialTransfer = async (data: NewLotData) => {
}; };
} }
let timeoutTrans: number = data.type === "lot" ? 30 : 10; let timeoutTrans: number = data.type === "lot" ? 5 : 5;
// get the barcode, and layoutID from the running number // get the barcode, and layoutID from the running number
const { data: label, error: labelError } = (await tryCatch( const { data: label, error: labelError } = (await tryCatch(
query( query(
@@ -278,13 +279,10 @@ export const lotMaterialTransfer = async (data: NewLotData) => {
}; };
//console.log(matReturnData); //console.log(matReturnData);
const { data: matReturn, error: matReturError } = (await tryCatch(
runProdApi({ // set a delay for when we try to return the label
endpoint:
"/public/v1.0/IssueMaterial/ReturnPartiallyConsumedManualMaterial", const matReturn = await returnMaterial(matReturnData);
data: [matReturnData],
}),
)) as any;
if (!matReturn.success) { if (!matReturn.success) {
createLog( createLog(
@@ -305,12 +303,12 @@ export const lotMaterialTransfer = async (data: NewLotData) => {
barcode: label?.data[0].Barcode, barcode: label?.data[0].Barcode,
}; };
const delay = const delayTimer =
data.type === "lot" data.type === "lot"
? timeoutTrans * 1000 ? timeoutTrans * 1000
: target.getTime() - now.getTime(); : target.getTime() - now.getTime();
const transfer = await transferMaterial(delay, data, consumeLot, newQty); const transfer = await transferMaterial(delayTimer, data, consumeLot, newQty);
if (!transfer.success) { if (!transfer.success) {
return { return {
@@ -340,6 +338,22 @@ export const lotMaterialTransfer = async (data: NewLotData) => {
} }
}; };
const returnMaterial = async (matReturnData: any) => {
console.log("Getting ready to Returning Materials");
await delay(5 * 1000);
console.log("doing the return");
const { data: matReturn, error: matReturError } = (await tryCatch(
runProdApi({
endpoint:
"/public/v1.0/IssueMaterial/ReturnPartiallyConsumedManualMaterial",
data: [matReturnData],
}),
)) as any;
if (matReturError) return matReturError;
return matReturn;
};
const transferMaterial = async ( const transferMaterial = async (
delay: number, delay: number,
data: any, data: any,
@@ -347,12 +361,13 @@ const transferMaterial = async (
newQty: any, newQty: any,
) => { ) => {
//console.log(data); //console.log(data);
console.log("Transferring the material");
if (pendingJobs.has(data.runningNumber)) { if (pendingJobs.has(data.runningNumber)) {
createLog( createLog(
"error", "error",
"materials", "materials",
"ocp", "ocp",
`${data.runningNumber} is pending to be transfered already`, `${data.runningNumber} is pending to be transferred already`,
); );
return { return {
success: false, success: false,