Merge branch 'main' of https://git.tuffraid.net/cowch/lstV2

frontend/src/components/ocme/ocmeCycleCount.tsx

@@ -2,10 +2,23 @@ import {toast} from "sonner";
 import { LstCard } from "../extendedUI/LstCard";
 import { Button } from "../ui/button";
 import { Input } from "../ui/input";
-import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "../ui/table";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from "../ui/table";
 import { Skeleton } from "../ui/skeleton";
 //import CycleCountLog from "./CycleCountLog";
-import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from "../ui/select";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "../ui/select";
 import { Controller, useForm } from "react-hook-form";
 import axios from "axios";
 import { useState } from "react";
@@ -28,9 +41,10 @@ export default function OcmeCycleCount() {
     setCounting(true);
     toast.success(`Cycle count started`);
     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}` },
       });
+      console.log(data);
       toast.success(res.data.message);
       setData(res.data.data);
       setCounting(false);
@@ -41,11 +55,14 @@ export default function OcmeCycleCount() {
       reset();
     }
   };
+
   return (
     <div className="flex flex-row w-screen">
       <div className="m-2 w-5/6">
         <LstCard>
-                    <p className="ml-2">Please enter the name or laneID you want to cycle count.</p>
+          <p className="ml-2">
+            Please enter the name or laneID you want to cycle count.
+          </p>
           <div>
             <form onSubmit={handleSubmit(onSubmit)}>
               <div className="flex justify-between">
@@ -86,7 +103,11 @@ export default function OcmeCycleCount() {
                   </div>
                 </div>
                 <Button className="m-2" type="submit" disabled={counting}>
-                                    {counting ? <span>Counting...</span> : <span>CycleCount</span>}
+                  {counting ? (
+                    <span>Counting...</span>
+                  ) : (
+                    <span>CycleCount</span>
+                  )}
                 </Button>
               </div>
             </form>
@@ -105,7 +126,7 @@ export default function OcmeCycleCount() {
                   <TableHead>Result</TableHead>
                 </TableRow>
               </TableHeader>
-                            {data.length === 0 ? (
+              {data?.length === 0 ? (
                 <TableBody>
                   {Array(10)
                     .fill(0)
@@ -140,7 +161,7 @@ export default function OcmeCycleCount() {
                 </TableBody>
               ) : (
                 <>
-                                    {data.map((i: any) => {
+                  {data?.map((i: any) => {
                     let classname = ``;
                     if (i.info === "Quality Check Required") {
                       classname = `bg-red-500`;
@@ -165,9 +186,15 @@ export default function OcmeCycleCount() {
                         <TableCell className={`font-medium ${classname}`}>
                           {i.runningNumber}
                         </TableCell>
-                                                <TableCell className={`font-medium ${classname}`}>{i.ocme}</TableCell>
+                        <TableCell className={`font-medium ${classname}`}>
-                                                <TableCell className={`font-medium ${classname}`}>{i.stock}</TableCell>
+                          {i.ocme}
-                                                <TableCell className={`font-medium ${classname}`}>{i.info}</TableCell>
+                        </TableCell>
+                        <TableCell className={`font-medium ${classname}`}>
+                          {i.stock}
+                        </TableCell>
+                        <TableCell className={`font-medium ${classname}`}>
+                          {i.info}
+                        </TableCell>
                       </TableRow>
                     );
                   })}

package.json

@@ -21,7 +21,7 @@
     "deploy": "standard-version --conventional-commits && npm run prodBuild",
     "zipServer": "dotenvx run -f .env -- tsx server/scripts/zipUpBuild.ts \"C:\\Users\\matthes01\\Documents\\lstv2\"",
     "v1Build": "cd C:\\Users\\matthes01\\Documents\\logisticsSupportTool && npm run oldBuilder",
-    "prodBuild": "npm run v1Build && powershell -ExecutionPolicy Bypass -File server/scripts/build.ps1 -dir \"C:\\Users\\matthes01\\Documents\\lstv2\" && npm run zipServer",
+    "prodBuild": "npm run v1Build && powershell -ExecutionPolicy Bypass -File server/scripts/build.ps1 -dir \"C:\\Users\\matthes01\\Documents\\lstv2-dev\" && npm run zipServer",
     "commit": "cz",
     "prodinstall": "npm i --omit=dev && npm run db:migrate",
     "checkupdates": "npx npm-check-updates"
@@ -32,7 +32,7 @@
     }
   },
   "admConfig": {
-    "build": 50,
+    "build": 54,
     "oldBuild": "backend-0.1.3.zip"
   },
   "devDependencies": {

server/index.ts

@@ -53,17 +53,17 @@ app.use(
 );
 
 // 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) {
-    return 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", {
   openapi: "3.0.0",

server/scripts/update.ps1

@@ -415,10 +415,10 @@ try {
     Start-Service -DisplayName  $serviceLstV2
     Start-Sleep -Seconds 1
     Write-Host "$($server) finished updating"
-    if($token -eq "usday1"){
+    # if($token -eq "usday1"){
-        Write-Host "Starting $($serviceOcme)"
+    #     Write-Host "Starting $($serviceOcme)"
-        Start-Service -DisplayName  $serviceOcme 
+    #     Start-Service -DisplayName  $serviceOcme 
-    }
+    # }
 
 }
 Invoke-Command -ComputerName $server -ScriptBlock $plantFunness -ArgumentList $server, $token, $location, $buildZip, $buildLoc, $obslst, $obsBuild -Credential $credentials

server/scripts/updateServers.ts

@@ -10,7 +10,10 @@ type UpdateServerResponse = {
   message: string;
 };
 
-export const updateServer = async (devApp: string, server: string | null): Promise<UpdateServerResponse> => {
+export const updateServer = async (
+  devApp: string,
+  server: string | null
+): Promise<UpdateServerResponse> => {
   const app = await getAppInfo(devApp);
   const serverInfo = await db
     .select()
@@ -26,7 +29,8 @@ export const updateServer = async (devApp: string, server: string | null): Promi
     );
     return {
       success: false,
-            message: "Looks like you are missing the plant token or have entered an incorrect one please try again.",
+      message:
+        "Looks like you are missing the plant token or have entered an incorrect one please try again.",
     };
   }
 
@@ -73,6 +77,8 @@ export const updateServer = async (devApp: string, server: string | null): Promi
     ,
   ];
 
+  console.log(args);
+
   return new Promise(async (resolve, reject) => {
     const process = spawn("powershell", args);
     // change the server to upgradeing
@@ -156,7 +162,12 @@ export const updateServer = async (devApp: string, server: string | null): Promi
 export async function processAllServers(devApp: string) {
   const servers = await db.select().from(serverData);
 
-    createLog("info", "lst", "serverUpdater", `Running the update on all servers`);
+  createLog(
+    "info",
+    "lst",
+    "serverUpdater",
+    `Running the update on all servers`
+  );
   let count = 1;
   for (const server of servers) {
     try {
@@ -166,7 +177,12 @@ export async function processAllServers(devApp: string) {
 
       //return {success: true, message: `${server.sName} was updated.`, data: updateToServer};
     } catch (error: any) {
-            createLog("info", "lst", "serverUpdater", `Error updating ${server.sName}: ${error.message}`);
+      createLog(
+        "info",
+        "lst",
+        "serverUpdater",
+        `Error updating ${server.sName}: ${error.message}`
+      );
       //return {success: false, message: `Error updating ${server.sName}: ${error.message}`};
     }
   }

server/scripts/zipUpBuild.ts

@@ -99,7 +99,7 @@ const updateBuildNumber = (appLock: string) => {
       // Auto-commit changes
       execSync("git add package.json");
       execSync(
-        `git commit -m "build: bump build number to ${pkgJson.admConfig.build}"`
+        `git commit -m "chore(release): bump build number to ${pkgJson.admConfig.build}"`
       );
     } else {
       createLog(

server/services/ocme/controller/cycleCount/ocmeInventory.ts

@@ -3,9 +3,14 @@ import axios from "axios";
 export const ocmeInv = async (data: any) => {
   try {
     const res = await axios.post(
-            "http://usday1vms010:3250/api/v1/getLaneData",
+      "http://usday1vms010:3250/api/v1/getlanedata",
       { lane: data.lane, laneType: data.laneType },
-            {headers: {"Content-Type": "application/json", Connection: "keep-alive"}}
+      {
+        headers: {
+          "Content-Type": "application/json",
+          Connection: "keep-alive",
+        },
+      }
     );
     // console.log(res.data.data);
 

server/services/ocme/controller/postRunningNr.ts

@@ -6,38 +6,62 @@ import {query} from "../../sqlServer/prodSqlServer.js";
 import { labelData } from "../../sqlServer/querys/materialHelpers/labelInfo.js";
 
 export const postLabelData = async (data: any) => {
-    // if we have sscc we will do everything here and ignore the rn even it its sent over
+  console.log(data);
-    if (data.sscc && !data.runningNr) {
+  let newData = data;
-        data.runningNr = data.sscc.slice(10, -1);
+  if (Array.isArray(data)) {
+    newData = {
+      sscc: data[1],
+      areaFrom: data[0],
+      completed: true,
+    };
   }
 
-    if (!data.sscc && !data.runningNr) {
+  if (newData.sscc && !newData.runningNr) {
-        // data.runningNr = data.sscc.slice(10, -1);
+    newData.runningNr = newData.sscc.slice(10, -1);
-        return {success: false, message: "Missing data please try again", data: []};
+  }
+  if (!newData.sscc && !newData.runningNr) {
+    return {
+      success: false,
+      message: "Missing data please try again",
+      data: [],
+    };
   }
-
   let label;
-    const filterQuery = labelData.replaceAll("[rn]", data.runningNr);
+  const filterQuery = labelData.replaceAll("[rn]", newData.runningNr);
-
   try {
     label = await query(filterQuery, "Label data");
   } catch (error) {
-        createLog("error", "ocme", "ocme", "There was an error getting the labelData");
+    createLog(
+      "error",
+      "ocme",
+      "ocme",
+      "There was an error getting the labelData"
+    );
   }
   const newPost = {
-        sscc: data.sscc ? data.sscc : await createSSCC(data.runningNr),
+    sscc: newData.sscc ? newData.sscc : await createSSCC(newData.runningNr),
-        runningNr: data.runningNr,
+    runningNr: newData.runningNr,
-        completed: data.completed,
+    completed: newData.completed,
     lineNum: label[0].machineLocation,
-        areaFrom: data.areaFrom,
+    areaFrom: newData.areaFrom,
     pickedUp: false,
   };
-
   try {
-        const enterNewData = await db.insert(ocmeData).values(newPost).returning({sscc: ocmeData.sscc});
+    const enterNewData = await db
-        return {success: true, message: "Data was posted to ocme info", data: enterNewData};
+      .insert(ocmeData)
+      .values(newPost)
+      .returning({ sscc: ocmeData.sscc });
+    return {
+      success: true,
+      message: "Data was posted to ocme info",
+      data: enterNewData,
+    };
   } catch (error) {
     console.log(error);
-        return {success: false, message: "Data was posted to ocme info", data: newPost};
+    return {
+      success: false,
+      message: "Data was posted to ocme info",
+      data: newPost,
+    };
   }
 };

server/services/ocme/route/cycleCount.ts

@@ -18,7 +18,7 @@ app.openapi(
     tags: ["ocme"],
     summary: "Cycle counts a lane based on the lane Alias",
     method: "post",
-        path: "/cyclecount",
+    path: "/cycleCount",
     middleware: authMiddleware,
     request: {
       body: {
@@ -48,10 +48,21 @@ app.openapi(
 
     try {
       const cycleData = await cycleCount(body, user);
-            return c.json({success: true, message: `${body.lane} was just cycle counted.`, data: cycleData}, 200);
+      return c.json(
+        {
+          success: true,
+          message: `${body.lane} was just cycle counted.`,
+          data: cycleData,
+        },
+        200
+      );
     } catch (error) {
       return c.json(
-                {success: false, message: `There was an error cycle counting ${body.lane}`, data: error},
+        {
+          success: false,
+          message: `There was an error cycle counting ${body.lane}`,
+          data: error,
+        },
         400
       );
     }

server/services/ocme/route/getInfo.ts

@@ -7,7 +7,9 @@ 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"}),
+  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" }),
 });
@@ -17,7 +19,7 @@ app.openapi(
     tags: ["ocme"],
     summary: "Get all current info",
     method: "get",
-        path: "/getinfo",
+    path: "/getInfo",
     request: {
       body: {
         content: {
@@ -43,7 +45,10 @@ app.openapi(
           "application/json": {
             schema: z.object({
               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: [] }),
             }),
           },
@@ -72,9 +77,19 @@ app.openapi(
     // make sure we have a vaid user being accessed thats really logged in
     apiHit(c, { endpoint: "api/auth/register" });
     try {
-            return c.json({success: true, message: "Ocme Info", data: await getInfo()}, 200);
+      return c.json(
+        { success: true, message: "Ocme Info", data: await getInfo() },
+        200
+      );
     } 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
+      );
     }
   }
 );

server/services/ocme/route/getShipmentPallets.ts

@@ -13,7 +13,7 @@ app.openapi(
     tags: ["ocme"],
     summary: "Post New running number to be picked up.",
     method: "post",
-        path: "/getshipmentpallets",
+    path: "/GetShipmentPallets",
     request: {
       body: {
         content: {
@@ -42,7 +42,10 @@ app.openapi(
           "application/json": {
             schema: z.object({
               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: [] }),
             }),
           },
@@ -73,9 +76,15 @@ app.openapi(
       const data = await c.req.json();
       apiHit(c, { endpoint: "api/ocme/getshipmentpallets", lastBody: data });
 
+      console.log;
+
       if (!data.shipmentID) {
         return c.json(
-                    {success: false, message: "You are missing the shipment id please try again.", data: []},
+          {
+            success: false,
+            message: "You are missing the shipment id please try again.",
+            data: [],
+          },
           400
         );
       }
@@ -83,11 +92,22 @@ app.openapi(
       const shiptmentData = await getShipmentPallets(data.shipmentID);
 
       return c.json(
-                {success: shiptmentData.success, message: shiptmentData.message, data: shiptmentData.data ?? []},
+        {
+          success: shiptmentData.success,
+          message: shiptmentData.message,
+          data: shiptmentData.data ?? [],
+        },
         200
       );
     } catch (error) {
-            return c.json({success: false, message: "There was an error getting the shipment data.", data: error}, 400);
+      return c.json(
+        {
+          success: false,
+          message: "There was an error getting the shipment data.",
+          data: error,
+        },
+        400
+      );
     }
   }
 );

server/services/ocme/route/pickedUp.ts

@@ -8,7 +8,10 @@ const app = new OpenAPIHono();
 const PostRunningNr = z.object({
   sscc: z.string().optional().openapi({ example: "00090103830005710997" }),
   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 }),
   all: z.boolean().optional().openapi({ example: false }),
 });
@@ -20,7 +23,7 @@ app.openapi(
     method: "patch",
     description:
       "removes the pallet(s) from showing as needed to be picked up, we clear everything related to the pallet number to reduce the risk of a mix, passing `all` will just clear everything that is pending.",
-        path: "/pickedup",
+    path: "/pickedUp",
     request: {
       body: {
         content: {
@@ -49,7 +52,10 @@ app.openapi(
           "application/json": {
             schema: z.object({
               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: [] }),
             }),
           },
@@ -67,7 +73,12 @@ app.openapi(
       500: {
         content: {
           "application/json": {
-                        schema: z.object({message: z.string().optional().openapi({example: "Internal Server error"})}),
+            schema: z.object({
+              message: z
+                .string()
+                .optional()
+                .openapi({ example: "Internal Server error" }),
+            }),
           },
         },
         description: "Internal Server Error",
@@ -80,9 +91,23 @@ app.openapi(
       const data = await c.req.json();
       apiHit(c, { endpoint: "api/ocme/pickedup", lastBody: data });
       const postPallet = await pickedup(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) {
-            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
+      );
     }
   }
 );

server/services/ocme/route/postRunningNumber.ts

@@ -8,7 +8,10 @@ const app = new OpenAPIHono();
 const PostRunningNr = z.object({
   sscc: z.string().optional().openapi({ example: "00090103830005710997" }),
   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 }),
 });
 
@@ -17,7 +20,7 @@ app.openapi(
     tags: ["ocme"],
     summary: "Post New running number to be picked up.",
     method: "post",
-        path: "/postrunningnumber",
+    path: "/postRunningNumber",
     request: {
       body: {
         content: {
@@ -46,7 +49,10 @@ app.openapi(
           "application/json": {
             schema: z.object({
               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: [] }),
             }),
           },
@@ -77,9 +83,23 @@ app.openapi(
       const data = await c.req.json();
       apiHit(c, { endpoint: "api/ocme/postRunningNumber", lastBody: 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) {
-            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
+      );
     }
   }
 );

server/services/tcpServer/tcpServer.ts

@@ -8,16 +8,21 @@ import restartTCP from "./route/restartServer.js";
 import { db } from "../../../database/dbclient.js";
 import { settings } from "../../../database/schema/settings.js";
 import { eq } from "drizzle-orm";
+import { postLabelData } from "../ocme/controller/postRunningNr.js";
 
 let tcpServer: net.Server;
 let tcpSockets: Set<net.Socket> = new Set();
 let isServerRunning = false;
 
-const tcpPort = await db.select().from(settings).where(eq(settings.name, "tcpPort"));
+const tcpPort = await db
+  .select()
+  .from(settings)
+  .where(eq(settings.name, "tcpPort"));
 const app = new OpenAPIHono();
 
 export const startTCPServer = () => {
-    if (isServerRunning) return {success: false, message: "Server is already running"};
+  if (isServerRunning)
+    return { success: false, message: "Server is already running" };
 
   tcpServer = net.createServer((socket) => {
     console.log("Client connected");
@@ -25,7 +30,11 @@ export const startTCPServer = () => {
     tcpSockets.add(socket);
     socket.on("data", (data: Buffer) => {
       console.log("Received:", data.toString());
-            socket.write("Message received");
+      const parseData = data.toString("utf-8").trimEnd().split(" ");
+      if (parseData[0] === "HB") {
+        return;
+      }
+      postLabelData(parseData);
     });
 
     socket.on("end", () => {
@@ -40,7 +49,12 @@ export const startTCPServer = () => {
   });
 
   tcpServer.listen(tcpPort[0]?.value ?? 2222, () => {
-        createLog("info", "lst", "tcp", `TCP Server listening on port ${tcpPort[0]?.value ?? 2222}`);
+    createLog(
+      "info",
+      "lst",
+      "tcp",
+      `TCP Server listening on port ${tcpPort[0]?.value ?? 2222}`
+    );
   });
 
   isServerRunning = true;
@@ -49,7 +63,8 @@ export const startTCPServer = () => {
 
 // Function to stop the TCP server
 export const stopTCPServer = () => {
-    if (!isServerRunning) return {success: false, message: "Server is not running"};
+  if (!isServerRunning)
+    return { success: false, message: "Server is not running" };
   for (const socket of tcpSockets) {
     socket.destroy();
   }