Compare commits
32 Commits
96814c1115
...
04eb2e3e14
| Author | SHA1 | Date | |
|---|---|---|---|
| 04eb2e3e14 | |||
| 90fb0d364d | |||
| e6e1cecce3 | |||
| 73aa95a693 | |||
| b9f19095cb | |||
| dcb56d4274 | |||
| bc1821132e | |||
| 2551d6c907 | |||
| adf0880659 | |||
| 5149de3199 | |||
| c71b514d9a | |||
| 9254e52808 | |||
| b8c028a6c1 | |||
| 529e922485 | |||
| 5201012235 | |||
| abe53b8f5d | |||
| 836f3e294b | |||
| 96abef762b | |||
| 2c227f9428 | |||
| 46647687dc | |||
| cb01ef1af1 | |||
| b3b5fcec65 | |||
| 3a4dc47a36 | |||
| 63177b523e | |||
| e1cad027d2 | |||
| c1cc355f4f | |||
| 5ed67f3fc0 | |||
| 57e82d2360 | |||
| 9395ec6cd4 | |||
| 0475bb30f9 | |||
| 6843368c36 | |||
| 335ea2deca |
4
.vscode/settings.json
vendored
4
.vscode/settings.json
vendored
@@ -1,6 +1,8 @@
|
|||||||
{
|
{
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
||||||
|
"workbench.colorTheme": "Default Dark+",
|
||||||
|
"prettier.tabWidth": 4,
|
||||||
|
"terminal.integrated.env.windows": {},
|
||||||
"editor.formatOnSave": true,
|
"editor.formatOnSave": true,
|
||||||
"[javascript]": {
|
"[javascript]": {
|
||||||
"editor.formatOnSave": true
|
"editor.formatOnSave": true
|
||||||
|
|||||||
@@ -41,10 +41,9 @@ export default function OcmeCycleCount() {
|
|||||||
setCounting(true);
|
setCounting(true);
|
||||||
toast.success(`Cycle count started`);
|
toast.success(`Cycle count started`);
|
||||||
try {
|
try {
|
||||||
const res = await axios.post("/ocme/api/v1/cycleCount", data, {
|
const res = await axios.post("/ocme/api/v1/cyclecount", data, {
|
||||||
headers: { Authorization: `Bearer ${token}` },
|
headers: { Authorization: `Bearer ${token}` },
|
||||||
});
|
});
|
||||||
console.log(data);
|
|
||||||
toast.success(res.data.message);
|
toast.success(res.data.message);
|
||||||
setData(res.data.data);
|
setData(res.data.data);
|
||||||
setCounting(false);
|
setCounting(false);
|
||||||
@@ -55,7 +54,6 @@ export default function OcmeCycleCount() {
|
|||||||
reset();
|
reset();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-row w-screen">
|
<div className="flex flex-row w-screen">
|
||||||
<div className="m-2 w-5/6">
|
<div className="m-2 w-5/6">
|
||||||
@@ -69,13 +67,16 @@ export default function OcmeCycleCount() {
|
|||||||
<div className="m-2 flex flex-row">
|
<div className="m-2 flex flex-row">
|
||||||
<Input
|
<Input
|
||||||
placeholder="enter lane: L064"
|
placeholder="enter lane: L064"
|
||||||
className={errors.lane ? "border-red-500" : ""}
|
className={
|
||||||
|
errors.lane ? "border-red-500" : ""
|
||||||
|
}
|
||||||
aria-invalid={!!errors.lane}
|
aria-invalid={!!errors.lane}
|
||||||
{...register("lane", {
|
{...register("lane", {
|
||||||
required: true,
|
required: true,
|
||||||
minLength: {
|
minLength: {
|
||||||
value: 3,
|
value: 3,
|
||||||
message: "The lane is too short!",
|
message:
|
||||||
|
"The lane is too short!",
|
||||||
},
|
},
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
@@ -89,20 +90,30 @@ export default function OcmeCycleCount() {
|
|||||||
fieldState: {},
|
fieldState: {},
|
||||||
//formState,
|
//formState,
|
||||||
}) => (
|
}) => (
|
||||||
<Select onValueChange={onChange}>
|
<Select
|
||||||
|
onValueChange={onChange}
|
||||||
|
>
|
||||||
<SelectTrigger className="w-[180px]">
|
<SelectTrigger className="w-[180px]">
|
||||||
<SelectValue placeholder="Select name or id" />
|
<SelectValue placeholder="Select name or id" />
|
||||||
</SelectTrigger>
|
</SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
<SelectItem value="name">Name</SelectItem>
|
<SelectItem value="name">
|
||||||
<SelectItem value="laneId">Lane ID</SelectItem>
|
Name
|
||||||
|
</SelectItem>
|
||||||
|
<SelectItem value="laneId">
|
||||||
|
Lane ID
|
||||||
|
</SelectItem>
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<Button className="m-2" type="submit" disabled={counting}>
|
<Button
|
||||||
|
className="m-2"
|
||||||
|
type="submit"
|
||||||
|
disabled={counting}
|
||||||
|
>
|
||||||
{counting ? (
|
{counting ? (
|
||||||
<span>Counting...</span>
|
<span>Counting...</span>
|
||||||
) : (
|
) : (
|
||||||
@@ -126,7 +137,7 @@ export default function OcmeCycleCount() {
|
|||||||
<TableHead>Result</TableHead>
|
<TableHead>Result</TableHead>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
</TableHeader>
|
</TableHeader>
|
||||||
{data?.length === 0 ? (
|
{data.length === 0 ? (
|
||||||
<TableBody>
|
<TableBody>
|
||||||
{Array(10)
|
{Array(10)
|
||||||
.fill(0)
|
.fill(0)
|
||||||
@@ -161,9 +172,11 @@ export default function OcmeCycleCount() {
|
|||||||
</TableBody>
|
</TableBody>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
{data?.map((i: any) => {
|
{data.map((i: any) => {
|
||||||
let classname = ``;
|
let classname = ``;
|
||||||
if (i.info === "Quality Check Required") {
|
if (
|
||||||
|
i.info === "Quality Check Required"
|
||||||
|
) {
|
||||||
classname = `bg-red-500`;
|
classname = `bg-red-500`;
|
||||||
}
|
}
|
||||||
if (i.info === "Sent to Inv") {
|
if (i.info === "Sent to Inv") {
|
||||||
@@ -171,28 +184,44 @@ export default function OcmeCycleCount() {
|
|||||||
}
|
}
|
||||||
return (
|
return (
|
||||||
<TableRow key={i.runningNumber}>
|
<TableRow key={i.runningNumber}>
|
||||||
<TableCell className={`font-medium ${classname}`}>
|
<TableCell
|
||||||
|
className={`font-medium ${classname}`}
|
||||||
|
>
|
||||||
{i.alpla_laneID}
|
{i.alpla_laneID}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell className={`font-medium ${classname}`}>
|
<TableCell
|
||||||
|
className={`font-medium ${classname}`}
|
||||||
|
>
|
||||||
{i.alpla_laneDescription}
|
{i.alpla_laneDescription}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell className={`font-medium ${classname}`}>
|
<TableCell
|
||||||
|
className={`font-medium ${classname}`}
|
||||||
|
>
|
||||||
{i.Article}
|
{i.Article}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell className={`font-medium ${classname}`}>
|
<TableCell
|
||||||
|
className={`font-medium ${classname}`}
|
||||||
|
>
|
||||||
{i.alpla_laneDescription}
|
{i.alpla_laneDescription}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell className={`font-medium ${classname}`}>
|
<TableCell
|
||||||
|
className={`font-medium ${classname}`}
|
||||||
|
>
|
||||||
{i.runningNumber}
|
{i.runningNumber}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell className={`font-medium ${classname}`}>
|
<TableCell
|
||||||
|
className={`font-medium ${classname}`}
|
||||||
|
>
|
||||||
{i.ocme}
|
{i.ocme}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell className={`font-medium ${classname}`}>
|
<TableCell
|
||||||
|
className={`font-medium ${classname}`}
|
||||||
|
>
|
||||||
{i.stock}
|
{i.stock}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell className={`font-medium ${classname}`}>
|
<TableCell
|
||||||
|
className={`font-medium ${classname}`}
|
||||||
|
>
|
||||||
{i.info}
|
{i.info}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"admConfig": {
|
"admConfig": {
|
||||||
"build": 54,
|
"build": 76,
|
||||||
"oldBuild": "backend-0.1.3.zip"
|
"oldBuild": "backend-0.1.3.zip"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
@@ -39,7 +39,10 @@ createLog("info", "LST", "server", `Server is installed: ${installed}`);
|
|||||||
const app = new OpenAPIHono({ strict: false });
|
const app = new OpenAPIHono({ strict: false });
|
||||||
|
|
||||||
// middle ware
|
// middle ware
|
||||||
|
if (process.env.NODE_ENV === "development") {
|
||||||
app.use("*", logger());
|
app.use("*", logger());
|
||||||
|
}
|
||||||
|
|
||||||
app.use(
|
app.use(
|
||||||
"*",
|
"*",
|
||||||
cors({
|
cors({
|
||||||
@@ -54,15 +57,15 @@ app.use(
|
|||||||
|
|
||||||
// Middleware to normalize route case
|
// Middleware to normalize route case
|
||||||
// app.use("*", async (c, next) => {
|
// app.use("*", async (c, next) => {
|
||||||
// const lowercasedUrl = c.req.url.toLowerCase();
|
// // const lowercasedUrl = c.req.url.toLowerCase();
|
||||||
// //console.log("Incoming Request:", c.req.url, c.req.method);
|
// console.log("Incoming Request:", c.req.url, c.req.method);
|
||||||
// // If the URL is already lowercase, continue as usual
|
// // // If the URL is already lowercase, continue as usual
|
||||||
// if (c.req.url === lowercasedUrl) {
|
// // if (c.req.url === lowercasedUrl) {
|
||||||
// await next();
|
// await next();
|
||||||
// }
|
// // }
|
||||||
|
|
||||||
// // Otherwise, re-route internally
|
// // // Otherwise, re-route internally
|
||||||
// return c.redirect(lowercasedUrl, 308); // 308 preserves the HTTP method
|
// // return c.redirect(lowercasedUrl, 308); // 308 preserves the HTTP method
|
||||||
// });
|
// });
|
||||||
|
|
||||||
app.doc("/api/ref", {
|
app.doc("/api/ref", {
|
||||||
|
|||||||
@@ -4,12 +4,26 @@ import { db } from "../../database/dbclient.js";
|
|||||||
import { serverData } from "../../database/schema/serverData.js";
|
import { serverData } from "../../database/schema/serverData.js";
|
||||||
import { eq, sql } from "drizzle-orm";
|
import { eq, sql } from "drizzle-orm";
|
||||||
import { createLog } from "../services/logger/logger.js";
|
import { createLog } from "../services/logger/logger.js";
|
||||||
|
import { spawn } from "child_process";
|
||||||
|
import { getAppInfo } from "../globalUtils/appInfo.js";
|
||||||
|
import { db } from "../../database/dbclient.js";
|
||||||
|
import { serverData } from "../../database/schema/serverData.js";
|
||||||
|
import { eq, sql } from "drizzle-orm";
|
||||||
|
import { createLog } from "../services/logger/logger.js";
|
||||||
|
|
||||||
type UpdateServerResponse = {
|
type UpdateServerResponse = {
|
||||||
success: boolean;
|
success: boolean;
|
||||||
message: string;
|
message: string;
|
||||||
|
success: boolean;
|
||||||
|
message: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const updateServer = async (
|
||||||
|
devApp: string,
|
||||||
|
server: string | null
|
||||||
|
): Promise<UpdateServerResponse> => {
|
||||||
|
const app = await getAppInfo(devApp);
|
||||||
|
const serverInfo = await db
|
||||||
export const updateServer = async (
|
export const updateServer = async (
|
||||||
devApp: string,
|
devApp: string,
|
||||||
server: string | null
|
server: string | null
|
||||||
@@ -33,7 +47,32 @@ export const updateServer = async (
|
|||||||
"Looks like you are missing the plant token or have entered an incorrect one please try again.",
|
"Looks like you are missing the plant token or have entered an incorrect one please try again.",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
if (serverInfo.length === 0) {
|
||||||
|
createLog(
|
||||||
|
"error",
|
||||||
|
"lst",
|
||||||
|
"serverUpdater",
|
||||||
|
`Looks like you are missing the plant token or have entered an incorrect one please try again.`
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
message:
|
||||||
|
"Looks like you are missing the plant token or have entered an incorrect one please try again.",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (serverInfo[0].isUpgrading) {
|
||||||
|
createLog(
|
||||||
|
"error",
|
||||||
|
"lst",
|
||||||
|
"serverUpdater",
|
||||||
|
`Looks like ${serverInfo[0].plantToken} is upgrading already you cant do this again.`
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
message: `Looks like ${serverInfo[0].plantToken} is upgrading already you cant do this again.`,
|
||||||
|
};
|
||||||
|
}
|
||||||
if (serverInfo[0].isUpgrading) {
|
if (serverInfo[0].isUpgrading) {
|
||||||
createLog(
|
createLog(
|
||||||
"error",
|
"error",
|
||||||
@@ -77,8 +116,15 @@ export const updateServer = async (
|
|||||||
,
|
,
|
||||||
];
|
];
|
||||||
|
|
||||||
console.log(args);
|
return new Promise(async (resolve, reject) => {
|
||||||
|
const process = spawn("powershell", args);
|
||||||
|
// change the server to upgradeing
|
||||||
|
await db
|
||||||
|
.update(serverData)
|
||||||
|
.set({ isUpgrading: true })
|
||||||
|
.where(eq(serverData.plantToken, server?.toLowerCase() ?? ""));
|
||||||
|
//let stdout = "";
|
||||||
|
//let stderr = "";
|
||||||
return new Promise(async (resolve, reject) => {
|
return new Promise(async (resolve, reject) => {
|
||||||
const process = spawn("powershell", args);
|
const process = spawn("powershell", args);
|
||||||
// change the server to upgradeing
|
// change the server to upgradeing
|
||||||
@@ -89,6 +135,12 @@ export const updateServer = async (
|
|||||||
//let stdout = "";
|
//let stdout = "";
|
||||||
//let stderr = "";
|
//let stderr = "";
|
||||||
|
|
||||||
|
// Collect stdout data
|
||||||
|
process.stdout.on("data", (data) => {
|
||||||
|
const output = data.toString().trim();
|
||||||
|
createLog("info", "lst", "serverUpdater", `${output}`);
|
||||||
|
//onData(output);
|
||||||
|
});
|
||||||
// Collect stdout data
|
// Collect stdout data
|
||||||
process.stdout.on("data", (data) => {
|
process.stdout.on("data", (data) => {
|
||||||
const output = data.toString().trim();
|
const output = data.toString().trim();
|
||||||
@@ -96,6 +148,12 @@ export const updateServer = async (
|
|||||||
//onData(output);
|
//onData(output);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Collect stderr data
|
||||||
|
process.stderr.on("data", (data) => {
|
||||||
|
const output = data.toString().trim();
|
||||||
|
createLog("info", "lst", "serverUpdater", `${output}`);
|
||||||
|
//onData(output);
|
||||||
|
});
|
||||||
// Collect stderr data
|
// Collect stderr data
|
||||||
process.stderr.on("data", (data) => {
|
process.stderr.on("data", (data) => {
|
||||||
const output = data.toString().trim();
|
const output = data.toString().trim();
|
||||||
@@ -103,6 +161,13 @@ export const updateServer = async (
|
|||||||
//onData(output);
|
//onData(output);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Handle process close
|
||||||
|
process.on("close", async (code) => {
|
||||||
|
if (code === 0) {
|
||||||
|
// if (count >= servers) {
|
||||||
|
// //onClose(`Server completed with code: ${code}`);
|
||||||
|
// }
|
||||||
|
createLog("info", "lst", "serverUpdater", `${server}`);
|
||||||
// Handle process close
|
// Handle process close
|
||||||
process.on("close", async (code) => {
|
process.on("close", async (code) => {
|
||||||
if (code === 0) {
|
if (code === 0) {
|
||||||
@@ -111,6 +176,26 @@ export const updateServer = async (
|
|||||||
// }
|
// }
|
||||||
createLog("info", "lst", "serverUpdater", `${server}`);
|
createLog("info", "lst", "serverUpdater", `${server}`);
|
||||||
|
|
||||||
|
//update the last build.
|
||||||
|
try {
|
||||||
|
await db
|
||||||
|
.update(serverData)
|
||||||
|
.set({ lastUpdated: sql`NOW()`, isUpgrading: false })
|
||||||
|
.where(eq(serverData.plantToken, server?.toLowerCase() ?? ""));
|
||||||
|
createLog(
|
||||||
|
"info",
|
||||||
|
"lst",
|
||||||
|
"serverUpdater",
|
||||||
|
`${server?.toLowerCase()}, has been updated and can now be used again.`
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
createLog(
|
||||||
|
"error",
|
||||||
|
"lst",
|
||||||
|
"serverUpdater",
|
||||||
|
`There was an error updating the last time the server was updated: ${error}`
|
||||||
|
);
|
||||||
|
}
|
||||||
//update the last build.
|
//update the last build.
|
||||||
try {
|
try {
|
||||||
await db
|
await db
|
||||||
@@ -132,6 +217,12 @@ export const updateServer = async (
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
resolve({
|
||||||
|
success: true,
|
||||||
|
message: `${server?.toLowerCase()}, has been updated and can now be used again.`,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
const errorMessage = `Process exited with code ${code}`;
|
||||||
resolve({
|
resolve({
|
||||||
success: true,
|
success: true,
|
||||||
message: `${server?.toLowerCase()}, has been updated and can now be used again.`,
|
message: `${server?.toLowerCase()}, has been updated and can now be used again.`,
|
||||||
@@ -139,6 +230,9 @@ export const updateServer = async (
|
|||||||
} else {
|
} else {
|
||||||
const errorMessage = `Process exited with code ${code}`;
|
const errorMessage = `Process exited with code ${code}`;
|
||||||
|
|
||||||
|
// if (count >= servers) {
|
||||||
|
// //onClose(code);
|
||||||
|
// }
|
||||||
// if (count >= servers) {
|
// if (count >= servers) {
|
||||||
// //onClose(code);
|
// //onClose(code);
|
||||||
// }
|
// }
|
||||||
@@ -149,6 +243,12 @@ export const updateServer = async (
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
reject({
|
||||||
|
success: false,
|
||||||
|
message: `${server?.toLowerCase()}, Has encounted an error while updating.`,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// Handle errors with the process itself
|
// Handle errors with the process itself
|
||||||
process.on("error", (error) => {
|
process.on("error", (error) => {
|
||||||
@@ -157,11 +257,31 @@ export const updateServer = async (
|
|||||||
reject(error);
|
reject(error);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
// Handle errors with the process itself
|
||||||
|
process.on("error", (error) => {
|
||||||
|
//onError(err.message);
|
||||||
|
createLog("error", "lst", "serverUpdater", `${error}`);
|
||||||
|
reject(error);
|
||||||
|
});
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
export async function processAllServers(devApp: string) {
|
export async function processAllServers(devApp: string) {
|
||||||
const servers = await db.select().from(serverData);
|
const servers = await db.select().from(serverData);
|
||||||
|
const servers = await db.select().from(serverData);
|
||||||
|
|
||||||
|
createLog(
|
||||||
|
"info",
|
||||||
|
"lst",
|
||||||
|
"serverUpdater",
|
||||||
|
`Running the update on all servers`
|
||||||
|
);
|
||||||
|
let count = 1;
|
||||||
|
for (const server of servers) {
|
||||||
|
try {
|
||||||
|
const updateToServer = await updateServer(devApp, server.plantToken);
|
||||||
|
createLog("info", "lst", "serverUpdater", `${server.sName} was updated.`);
|
||||||
|
count = count + 1;
|
||||||
createLog(
|
createLog(
|
||||||
"info",
|
"info",
|
||||||
"lst",
|
"lst",
|
||||||
@@ -186,4 +306,15 @@ export async function processAllServers(devApp: string) {
|
|||||||
//return {success: false, message: `Error updating ${server.sName}: ${error.message}`};
|
//return {success: false, message: `Error updating ${server.sName}: ${error.message}`};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//return {success: true, message: `${server.sName} was updated.`, data: updateToServer};
|
||||||
|
} catch (error: any) {
|
||||||
|
createLog(
|
||||||
|
"info",
|
||||||
|
"lst",
|
||||||
|
"serverUpdater",
|
||||||
|
`Error updating ${server.sName}: ${error.message}`
|
||||||
|
);
|
||||||
|
//return {success: false, message: `Error updating ${server.sName}: ${error.message}`};
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,17 +7,31 @@ import {eq} from "drizzle-orm";
|
|||||||
export const getInfo = async () => {
|
export const getInfo = async () => {
|
||||||
let ocmeInfo: any = [];
|
let ocmeInfo: any = [];
|
||||||
try {
|
try {
|
||||||
ocmeInfo = await db.select().from(ocmeData).where(eq(ocmeData.pickedUp, false));
|
ocmeInfo = await db
|
||||||
|
.select()
|
||||||
|
.from(ocmeData)
|
||||||
|
.where(eq(ocmeData.pickedUp, false));
|
||||||
|
|
||||||
// add in the time difference
|
// add in the time difference
|
||||||
ocmeInfo = ocmeInfo.map((o: any) => {
|
ocmeInfo = ocmeInfo.map((o: any) => {
|
||||||
const now = new Date(Date.now());
|
const now = new Date(Date.now());
|
||||||
const diff = differenceInMinutes(now, o.add_Date!);
|
//const strippedDate = o.add_Date.replace("Z", "");
|
||||||
|
const diff = differenceInMinutes(now, o.add_Date);
|
||||||
return { ...o, waitingFor: diff };
|
return { ...o, waitingFor: diff };
|
||||||
});
|
});
|
||||||
createLog("info", "ocme", "ocme", `There are ${ocmeInfo.length} pallet(s) to be picked up.`);
|
createLog(
|
||||||
|
"info",
|
||||||
|
"ocme",
|
||||||
|
"ocme",
|
||||||
|
`There are ${ocmeInfo.length} pallet(s) to be picked up.`
|
||||||
|
);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
createLog("error", "ocme", "ocme", "There was an error trying to retrive the ocmeInfo.");
|
createLog(
|
||||||
|
"error",
|
||||||
|
"ocme",
|
||||||
|
"ocme",
|
||||||
|
"There was an error trying to retrive the ocmeInfo."
|
||||||
|
);
|
||||||
throw Error("There was an error trying to retrive the.");
|
throw Error("There was an error trying to retrive the.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,12 @@ import { createSSCC } from "../../../globalUtils/createSSCC.js";
|
|||||||
import { createLog } from "../../logger/logger.js";
|
import { createLog } from "../../logger/logger.js";
|
||||||
import { query } from "../../sqlServer/prodSqlServer.js";
|
import { query } from "../../sqlServer/prodSqlServer.js";
|
||||||
import { labelData } from "../../sqlServer/querys/materialHelpers/labelInfo.js";
|
import { labelData } from "../../sqlServer/querys/materialHelpers/labelInfo.js";
|
||||||
|
import { db } from "../../../../database/dbclient.js";
|
||||||
|
import { ocmeData } from "../../../../database/schema/ocme.js";
|
||||||
|
import { createSSCC } from "../../../globalUtils/createSSCC.js";
|
||||||
|
import { createLog } from "../../logger/logger.js";
|
||||||
|
import { query } from "../../sqlServer/prodSqlServer.js";
|
||||||
|
import { labelData } from "../../sqlServer/querys/materialHelpers/labelInfo.js";
|
||||||
|
|
||||||
export const postLabelData = async (data: any) => {
|
export const postLabelData = async (data: any) => {
|
||||||
console.log(data);
|
console.log(data);
|
||||||
@@ -41,8 +47,8 @@ export const postLabelData = async (data: any) => {
|
|||||||
const newPost = {
|
const newPost = {
|
||||||
sscc: newData.sscc ? newData.sscc : await createSSCC(newData.runningNr),
|
sscc: newData.sscc ? newData.sscc : await createSSCC(newData.runningNr),
|
||||||
runningNr: newData.runningNr,
|
runningNr: newData.runningNr,
|
||||||
completed: newData.completed,
|
completed: newData.completed ? newData.completed : true,
|
||||||
lineNum: label[0].machineLocation,
|
lineNum: label[0]?.machineLocation,
|
||||||
areaFrom: newData.areaFrom,
|
areaFrom: newData.areaFrom,
|
||||||
pickedUp: false,
|
pickedUp: false,
|
||||||
};
|
};
|
||||||
@@ -50,18 +56,27 @@ export const postLabelData = async (data: any) => {
|
|||||||
const enterNewData = await db
|
const enterNewData = await db
|
||||||
.insert(ocmeData)
|
.insert(ocmeData)
|
||||||
.values(newPost)
|
.values(newPost)
|
||||||
.returning({ sscc: ocmeData.sscc });
|
.returning({
|
||||||
|
sscc: ocmeData.sscc,
|
||||||
|
runningNr: ocmeData.runningNr,
|
||||||
|
areaFrom: ocmeData.areaFrom,
|
||||||
|
lineNum: ocmeData.lineNum,
|
||||||
|
completed: ocmeData.completed,
|
||||||
|
pickedUp: ocmeData.pickedUp,
|
||||||
|
});
|
||||||
|
|
||||||
|
//console.log(enterNewData);
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
message: "Data was posted to ocme info",
|
message: "Data was posted to ocme info",
|
||||||
data: enterNewData,
|
data: enterNewData,
|
||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
//console.log(error);
|
||||||
return {
|
return {
|
||||||
success: false,
|
success: false,
|
||||||
message: "Data was posted to ocme info",
|
message: "Data was posted to ocme info",
|
||||||
data: newPost,
|
data: [],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
49
server/services/ocme/controller/triggerCamera.ts
Normal file
49
server/services/ocme/controller/triggerCamera.ts
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
import net from "net";
|
||||||
|
import { db } from "../../../../database/dbclient.js";
|
||||||
|
import { settings } from "../../../../database/schema/settings.js";
|
||||||
|
import { eq } from "drizzle-orm";
|
||||||
|
import { createLog } from "../../logger/logger.js";
|
||||||
|
|
||||||
|
export const triggerScanner = async () => {
|
||||||
|
const camera = new net.Socket();
|
||||||
|
let setting = await db
|
||||||
|
.select()
|
||||||
|
.from(settings)
|
||||||
|
.where(eq(settings.name, "zebraScanners"));
|
||||||
|
if (setting.length === 0) {
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
message: "Looks like the setting is missing.",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
const scannerData = JSON.parse(setting[0]?.value);
|
||||||
|
let data = scannerData.filter((n: any) => n.name === "wrapper1");
|
||||||
|
let port = data[0].port;
|
||||||
|
console.log(data);
|
||||||
|
createLog(
|
||||||
|
"info",
|
||||||
|
"wrapperScanner",
|
||||||
|
"ocme",
|
||||||
|
`End of line Camera was triggered`
|
||||||
|
);
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
camera.connect(port, data[0].ip, async () => {
|
||||||
|
createLog("info", "wrapperScanner", "ocme", `Triggered`);
|
||||||
|
camera.write("TRIGGER", "utf8");
|
||||||
|
camera.end();
|
||||||
|
resolve({ success: true, message: "Camera was triggered." });
|
||||||
|
});
|
||||||
|
|
||||||
|
camera.on("error", (error) => {
|
||||||
|
createLog("error", "wrapperScanner", "ocme", `${error}`);
|
||||||
|
resolve({
|
||||||
|
success: false,
|
||||||
|
message: `There was an error triggering the camera: ${JSON.stringify(
|
||||||
|
error
|
||||||
|
)}`,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
resolve({ success: true, message: "Camera was triggered." });
|
||||||
|
});
|
||||||
|
};
|
||||||
@@ -11,10 +11,19 @@ import {serve} from "@hono/node-server";
|
|||||||
import { createLog } from "../logger/logger.js";
|
import { createLog } from "../logger/logger.js";
|
||||||
import { db } from "../../../database/dbclient.js";
|
import { db } from "../../../database/dbclient.js";
|
||||||
import { settings } from "../../../database/schema/settings.js";
|
import { settings } from "../../../database/schema/settings.js";
|
||||||
|
import manualTrigger from "./route/triggerCamera.js";
|
||||||
|
|
||||||
const app = new OpenAPIHono();
|
const app = new OpenAPIHono();
|
||||||
const port = process.env.OCME_PORT;
|
const port = process.env.OCME_PORT;
|
||||||
const routes = [getInfo, postRunningNr, postsscc, pickedup, getShipments, cycleCount] as const;
|
const routes = [
|
||||||
|
getInfo,
|
||||||
|
postRunningNr,
|
||||||
|
postsscc,
|
||||||
|
pickedup,
|
||||||
|
getShipments,
|
||||||
|
cycleCount,
|
||||||
|
manualTrigger,
|
||||||
|
] as const;
|
||||||
const setting = await db.select().from(settings);
|
const setting = await db.select().from(settings);
|
||||||
|
|
||||||
const isActive = setting.filter((n) => n.name === "ocmeService");
|
const isActive = setting.filter((n) => n.name === "ocmeService");
|
||||||
@@ -23,7 +32,10 @@ const appRoutes = routes.forEach((route) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
app.all("/api/v1/*", (c) => {
|
app.all("/api/v1/*", (c) => {
|
||||||
return c.json({success: false, message: "you have encounted an ocme route that dose not exist."});
|
return c.json({
|
||||||
|
success: false,
|
||||||
|
message: "you have encounted an ocme route that dose not exist.",
|
||||||
|
});
|
||||||
});
|
});
|
||||||
if (port && isActive[0]?.value === "1") {
|
if (port && isActive[0]?.value === "1") {
|
||||||
serve(
|
serve(
|
||||||
@@ -33,7 +45,12 @@ if (port && isActive[0]?.value === "1") {
|
|||||||
hostname: "0.0.0.0",
|
hostname: "0.0.0.0",
|
||||||
},
|
},
|
||||||
(info) => {
|
(info) => {
|
||||||
createLog("info", "LST", "server", `Ocme section is listening on http://${info.address}:${info.port}`);
|
createLog(
|
||||||
|
"info",
|
||||||
|
"LST",
|
||||||
|
"server",
|
||||||
|
`Ocme section is listening on http://${info.address}:${info.port}`
|
||||||
|
);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,77 +1,18 @@
|
|||||||
import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
|
import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
|
||||||
import { getInfo } from "../controller/getInfo.js";
|
import { getInfo } from "../controller/getInfo.js";
|
||||||
import { apiHit } from "../../../globalUtils/apiHits.js";
|
import { apiHit } from "../../../globalUtils/apiHits.js";
|
||||||
|
import { responses } from "../../../globalUtils/routeDefs/responses.js";
|
||||||
|
|
||||||
const app = new OpenAPIHono({ strict: false });
|
const app = new OpenAPIHono({ strict: false });
|
||||||
|
|
||||||
const AddSetting = z.object({
|
|
||||||
name: z.string().openapi({ example: "server" }),
|
|
||||||
value: z.string().openapi({ example: "localhost" }),
|
|
||||||
description: z
|
|
||||||
.string()
|
|
||||||
.openapi({ example: "The server we are going to connect to" }),
|
|
||||||
roles: z.string().openapi({ example: "admin" }),
|
|
||||||
module: z.string().openapi({ example: "production" }),
|
|
||||||
});
|
|
||||||
|
|
||||||
app.openapi(
|
app.openapi(
|
||||||
createRoute({
|
createRoute({
|
||||||
tags: ["ocme"],
|
tags: ["ocme"],
|
||||||
summary: "Get all current info",
|
summary: "Get all current info",
|
||||||
method: "get",
|
method: "get",
|
||||||
path: "/getInfo",
|
path: "/getInfo",
|
||||||
request: {
|
|
||||||
body: {
|
responses: responses(),
|
||||||
content: {
|
|
||||||
"application/json": { schema: AddSetting },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
responses: {
|
|
||||||
200: {
|
|
||||||
content: {
|
|
||||||
"application/json": {
|
|
||||||
schema: z.object({
|
|
||||||
success: z.boolean().openapi({ example: true }),
|
|
||||||
message: z.string().openapi({ example: "Starter" }),
|
|
||||||
data: z.array(z.object({})).optional().openapi({ example: [] }),
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
description: "Response message",
|
|
||||||
},
|
|
||||||
400: {
|
|
||||||
content: {
|
|
||||||
"application/json": {
|
|
||||||
schema: z.object({
|
|
||||||
success: z.boolean().openapi({ example: false }),
|
|
||||||
message: z
|
|
||||||
.string()
|
|
||||||
.optional()
|
|
||||||
.openapi({ example: "Internal Server error" }),
|
|
||||||
data: z.array(z.object({})).optional().openapi({ example: [] }),
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
description: "Internal Server Error",
|
|
||||||
},
|
|
||||||
// 401: {
|
|
||||||
// content: {
|
|
||||||
// "application/json": {
|
|
||||||
// schema: z.object({message: z.string().optional().openapi({example: "Unauthenticated"})}),
|
|
||||||
// },
|
|
||||||
// },
|
|
||||||
// description: "Unauthorized",
|
|
||||||
// },
|
|
||||||
// 500: {
|
|
||||||
// content: {
|
|
||||||
// "application/json": {
|
|
||||||
// schema: z.object({message: z.string().optional().openapi({example: "Internal Server error"})}),
|
|
||||||
// },
|
|
||||||
// },
|
|
||||||
// description: "Internal Server Error",
|
|
||||||
// },
|
|
||||||
},
|
|
||||||
}),
|
}),
|
||||||
async (c) => {
|
async (c) => {
|
||||||
// make sure we have a vaid user being accessed thats really logged in
|
// make sure we have a vaid user being accessed thats really logged in
|
||||||
|
|||||||
@@ -8,7 +8,10 @@ const app = new OpenAPIHono();
|
|||||||
const PostRunningNr = z.object({
|
const PostRunningNr = z.object({
|
||||||
sscc: z.string().optional().openapi({ example: "00090103830005710997" }),
|
sscc: z.string().optional().openapi({ example: "00090103830005710997" }),
|
||||||
runningNr: z.string().optional().openapi({ example: "localhost" }),
|
runningNr: z.string().optional().openapi({ example: "localhost" }),
|
||||||
areaFrom: z.string().optional().openapi({example: "The server we are going to connect to"}),
|
areaFrom: z
|
||||||
|
.string()
|
||||||
|
.optional()
|
||||||
|
.openapi({ example: "The server we are going to connect to" }),
|
||||||
completed: z.boolean().optional().openapi({ example: true }),
|
completed: z.boolean().optional().openapi({ example: true }),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -17,7 +20,7 @@ app.openapi(
|
|||||||
tags: ["ocme"],
|
tags: ["ocme"],
|
||||||
summary: "Post New running number to be picked up.",
|
summary: "Post New running number to be picked up.",
|
||||||
method: "post",
|
method: "post",
|
||||||
path: "/postsscc",
|
path: "/postSSCC",
|
||||||
request: {
|
request: {
|
||||||
body: {
|
body: {
|
||||||
content: {
|
content: {
|
||||||
@@ -46,7 +49,10 @@ app.openapi(
|
|||||||
"application/json": {
|
"application/json": {
|
||||||
schema: z.object({
|
schema: z.object({
|
||||||
success: z.boolean().openapi({ example: false }),
|
success: z.boolean().openapi({ example: false }),
|
||||||
message: z.string().optional().openapi({example: "Internal Server error"}),
|
message: z
|
||||||
|
.string()
|
||||||
|
.optional()
|
||||||
|
.openapi({ example: "Internal Server error" }),
|
||||||
data: z.array(z.object({})).optional().openapi({ example: [] }),
|
data: z.array(z.object({})).optional().openapi({ example: [] }),
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
@@ -77,9 +83,23 @@ app.openapi(
|
|||||||
const data = await c.req.json();
|
const data = await c.req.json();
|
||||||
apiHit(c, { endpoint: "api/ocme/postRunningNumber", lastBody: data });
|
apiHit(c, { endpoint: "api/ocme/postRunningNumber", lastBody: data });
|
||||||
const postPallet = await postLabelData(data);
|
const postPallet = await postLabelData(data);
|
||||||
return c.json({success: postPallet.success, message: postPallet.message, data: postPallet.data ?? []}, 200);
|
return c.json(
|
||||||
|
{
|
||||||
|
success: postPallet.success,
|
||||||
|
message: postPallet.message,
|
||||||
|
data: postPallet.data ?? [],
|
||||||
|
},
|
||||||
|
200
|
||||||
|
);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return c.json({success: false, message: "There was an error getting ocmeInfo data", data: error}, 400);
|
return c.json(
|
||||||
|
{
|
||||||
|
success: false,
|
||||||
|
message: "There was an error getting ocmeInfo data",
|
||||||
|
data: error,
|
||||||
|
},
|
||||||
|
400
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|||||||
25
server/services/ocme/route/triggerCamera.ts
Normal file
25
server/services/ocme/route/triggerCamera.ts
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
|
||||||
|
import { getInfo } from "../controller/getInfo.js";
|
||||||
|
import { apiHit } from "../../../globalUtils/apiHits.js";
|
||||||
|
import { responses } from "../../../globalUtils/routeDefs/responses.js";
|
||||||
|
import { triggerScanner } from "../controller/triggerCamera.js";
|
||||||
|
|
||||||
|
const app = new OpenAPIHono({ strict: false });
|
||||||
|
|
||||||
|
app.openapi(
|
||||||
|
createRoute({
|
||||||
|
tags: ["ocme"],
|
||||||
|
summary: "Triggers the camera at the end of the dyco.",
|
||||||
|
method: "get",
|
||||||
|
path: "/manualCameraTrigger",
|
||||||
|
responses: responses(),
|
||||||
|
}),
|
||||||
|
async (c) => {
|
||||||
|
// make sure we have a vaid user being accessed thats really logged in
|
||||||
|
apiHit(c, { endpoint: "api/auth/register" });
|
||||||
|
const manualTrigger = await triggerScanner();
|
||||||
|
console.log(manualTrigger);
|
||||||
|
return c.json({ success: true, message: "Manual triggered" });
|
||||||
|
}
|
||||||
|
);
|
||||||
|
export default app;
|
||||||
@@ -18,18 +18,28 @@ export const wrapperStuff = async (tagData: TagData[]) => {
|
|||||||
tagStuff(tagData);
|
tagStuff(tagData);
|
||||||
} else {
|
} else {
|
||||||
const tagdata = await tagStuff(tagData);
|
const tagdata = await tagStuff(tagData);
|
||||||
|
if (!tagData) {
|
||||||
|
createLog("error", "rfid", "rfid", `No tagData was grabbed.`);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* we want to make sure this pallet came from a line as its last spot if not we need to have a manual check.
|
* we want to make sure this pallet came from a line as its last spot if not we need to have a manual check.
|
||||||
*/
|
*/
|
||||||
const station3 = tagdata.some((n: any) => n.lastareaIn.includes("line3"));
|
if (
|
||||||
|
!Array.isArray(tagdata) &&
|
||||||
|
tagdata?.some((n: any) => n.lastareaIn.includes("line3"))
|
||||||
|
) {
|
||||||
|
createLog("error", "rfid", "rfid", `Data passed over is not an array.`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const station3 = tagdata; //?.some((n: any) => n.lastareaIn.includes("line3"));
|
||||||
|
|
||||||
if (!station3) {
|
if (!station3) {
|
||||||
createLog(
|
createLog(
|
||||||
"error",
|
"error",
|
||||||
"rfid",
|
"rfid",
|
||||||
"rfid",
|
"rfid",
|
||||||
`${tagdata.tag}, Did not come from a line please check the pallet and manually print the label.`
|
`${tagdata[0].tag}, Did not come from a line please check the pallet and manually print the label.`
|
||||||
);
|
);
|
||||||
|
|
||||||
// when we manually run again we want to make sure we read from the 3rd antenna this way we do not get the wrong info.
|
// when we manually run again we want to make sure we read from the 3rd antenna this way we do not get the wrong info.
|
||||||
@@ -38,9 +48,19 @@ export const wrapperStuff = async (tagData: TagData[]) => {
|
|||||||
|
|
||||||
// check if a running number exists
|
// check if a running number exists
|
||||||
if (station3.runningNumber) {
|
if (station3.runningNumber) {
|
||||||
createLog("info", "rfid", "rfid", `Reprint label ${station3.runningNumber}`);
|
createLog(
|
||||||
|
"info",
|
||||||
|
"rfid",
|
||||||
|
"rfid",
|
||||||
|
`Reprint label ${station3.runningNumber}`
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
createLog("info", "rfid", "rfid", `A new labels will be created and linked to this ${tagdata.tag} tag`);
|
createLog(
|
||||||
|
"info",
|
||||||
|
"rfid",
|
||||||
|
"rfid",
|
||||||
|
`A new labels will be created and linked to this ${tagdata.tag} tag`
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -31,9 +31,17 @@ export const startTCPServer = () => {
|
|||||||
socket.on("data", (data: Buffer) => {
|
socket.on("data", (data: Buffer) => {
|
||||||
console.log("Received:", data.toString());
|
console.log("Received:", data.toString());
|
||||||
const parseData = data.toString("utf-8").trimEnd().split(" ");
|
const parseData = data.toString("utf-8").trimEnd().split(" ");
|
||||||
|
// hb from the scanners
|
||||||
if (parseData[0] === "HB") {
|
if (parseData[0] === "HB") {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// alert from the printers
|
||||||
|
if (parseData[0] === "ALERT:" || parseData[0] === "ALERT") {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// from the wrapper send the data
|
||||||
postLabelData(parseData);
|
postLabelData(parseData);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user