feat(finaly): the final push before moving all to the new lst

this could still print a label if the system detects the material properly but some other issue with
alplaprod happened

.gitignore

@@ -157,3 +157,4 @@ backend-0.1.3.zip
 BulkForecastTemplate
 BulkOrdersTemplate
 check.json
+server/services/ocp/controller/materials/materialcheck.bak

.includes

@@ -0,0 +1,8 @@
+database
+dist
+frontend/dist
+CHANGELOG.md
+drizzle.config.ts
+package.json
+package-lock.json
+README.md

CHANGELOG.md

@@ -1,5 +1,36 @@
 # All CHanges to LST can be found below.
 
+## [2.27.0](https://git.tuffraid.net/cowch/lstV2/compare/v2.26.0...v2.27.0) (2025-09-10)
+
+
+### 🌟 Enhancements
+
+* **eom:** lastSales, lastPurch added to be pulled with new template ([7cc3778](https://git.tuffraid.net/cowch/lstV2/commits/7cc3778506fc92392ca8431aee0edb203861e10d))
+
+
+### 🛠️ Code Refactor
+
+* **cosume:** changes to allow non logged in users to use this function ([271cdbd](https://git.tuffraid.net/cowch/lstV2/commits/271cdbdbfa2478ecf56e9b01a4474508acacda2e))
+* **mm query:** changes to the query to see pkg and materials properly and not duplicates ([57966ac](https://git.tuffraid.net/cowch/lstV2/commits/57966ac9de72543014451b7ccd75539296ccaa51))
+* **rfid:** changes to show all tags vs only 3 if there are more ([b677bc1](https://git.tuffraid.net/cowch/lstV2/commits/b677bc14981faff30c91f6ffe4602319dd3c6016))
+* **silo card:** changes to allow viewers to see and able to attach and detach ([796a8dc](https://git.tuffraid.net/cowch/lstV2/commits/796a8dccd2807890abdff7c8dacf8b2246eb265e))
+* **sql:** articles added in UOM ([cfed981](https://git.tuffraid.net/cowch/lstV2/commits/cfed981928a56389e09ef428c43ceabc1caec28e))
+
+
+### 🐛 Bug fixes
+
+* **article check:** corrected the query to not have a specfic plant in it ([79f1f8f](https://git.tuffraid.net/cowch/lstV2/commits/79f1f8f91ba33533de7f4a7cc91503cfd8dd4ce5))
+* **bookin:** corrected the bookin in error response ([1f8b8a7](https://git.tuffraid.net/cowch/lstV2/commits/1f8b8a7248c11c7e264c8c5ae7c042c5a0878c46))
+* **bookin:** corrections to only show the message on error vs the json ([b3ce767](https://git.tuffraid.net/cowch/lstV2/commits/b3ce767b323c990c0ccf35ad6c2c67136a27272e))
+* **db:** changes to the user so it deletes correctly ([932a72b](https://git.tuffraid.net/cowch/lstV2/commits/932a72ba884673471f0056e721cc3f2c8e34b4f3))
+* **eomservice:** changes to stop a crash incase the sql returned nothing due to start up ([6caa598](https://git.tuffraid.net/cowch/lstV2/commits/6caa5984e7a3e7b48b119c176835663ffec71151))
+* **frontend:** typos ([c6f6ef6](https://git.tuffraid.net/cowch/lstV2/commits/c6f6ef626295f452cdf26f6776b74cfb3b1a10f5))
+* **label query:** fixes to only pull in active layouts ([99ecf52](https://git.tuffraid.net/cowch/lstV2/commits/99ecf52218556e048ba9262e74f9b3d020dea31d))
+* **main material check:** corrections to properly ignore pkg during color checks ([6910550](https://git.tuffraid.net/cowch/lstV2/commits/6910550de769dce04b1045f96ab19cf7b8d1ef8c))
+* **material check:** split manual material out of the mm to properly catch it ([a53915a](https://git.tuffraid.net/cowch/lstV2/commits/a53915ad8cbec5bd8d6ba4643c460ad0162249e2))
+* **materials:** more fixes to try and please all plants to use this version and not call me ([00899a5](https://git.tuffraid.net/cowch/lstV2/commits/00899a5b778eab792b350a0b47589de1524d91c8))
+* **register:** changes to not give everyone system admin ([415d2e4](https://git.tuffraid.net/cowch/lstV2/commits/415d2e4a1d851cc46ac64ffc814a280a02293bbc))
+
 ## [2.26.0](https://git.tuffraid.net/cowch/lstV2/compare/v2.25.0...v2.26.0) (2025-08-28)
 
 

README.md

@@ -1,3 +1,7 @@
+# THIS VERSION IS NO LONGER BEING UPDATED PLEASE GO TO THE NEW REPO LINK BELOW
+
+[NEW LST REPO](https://git.tuffraid.net/cowch/lst)
+
 # lstV2
 
 Logistics Support Tool V2

database/migrations/0072_round_black_knight.sql

@@ -0,0 +1,3 @@
+ALTER TABLE "userRoles" DROP CONSTRAINT "userRoles_user_id_users_user_id_fk";
+--> statement-breakpoint
+ALTER TABLE "userRoles" ADD CONSTRAINT "userRoles_user_id_users_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("user_id") ON DELETE cascade ON UPDATE no action;

database/migrations/meta/_journal.json

@@ -505,6 +505,13 @@
       "when": 1754768521841,
       "tag": "0071_fantastic_old_lace",
       "breakpoints": true
+    },
+    {
+      "idx": 72,
+      "version": "7",
+      "when": 1757167736042,
+      "tag": "0072_round_black_knight",
+      "breakpoints": true
     }
   ]
 }

database/schema/userRoles.ts

@@ -27,7 +27,7 @@ export const userRoles = pgTable(
     {
         user_id: uuid("user_id")
             .notNull()
-            .references(() => users.user_id),
+            .references(() => users.user_id, { onDelete: "cascade" }),
         role_id: uuid("role_id")
             .notNull()
             .references(() => roles.role_id),

frontend/src/components/logistics/materialHelper/consumption/ConsumeMaterial.tsx

@@ -1,26 +1,30 @@
-import {LstCard} from "@/components/extendedUI/LstCard";
-import {Button} from "@/components/ui/button";
-import {CardHeader} from "@/components/ui/card";
-import {Input} from "@/components/ui/input";
-import {Label} from "@/components/ui/label";
-import {useSessionStore} from "@/lib/store/sessionStore";
-import axios from "axios";
-import {useState} from "react";
+import { LstCard } from "@/components/extendedUI/LstCard";
+import { Button } from "@/components/ui/button";
+import { CardHeader } from "@/components/ui/card";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
 
-import {useForm} from "react-hook-form";
-import {toast} from "sonner";
+import axios from "axios";
+import { useState } from "react";
+
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
 
 export default function ConsumeMaterial() {
-    const {register: register1, handleSubmit: handleSubmit1, reset} = useForm();
+    const {
+        register: register1,
+        handleSubmit: handleSubmit1,
+        reset,
+    } = useForm();
     const [submitting, setSubmitting] = useState(false);
-    const {token} = useSessionStore();
 
     const handleConsume = async (data: any) => {
         setSubmitting(true);
         try {
-            const result = await axios.post(`/api/logistics/consume`, data, {
-                headers: {Authorization: `Bearer ${token}`},
-            });
+            // const result = await axios.post(`/api/logistics/consume`, data, {
+            //     headers: {Authorization: `Bearer ${token}`},
+            // });
+            const result = await axios.post(`/api/logistics/consume`, data);
             if (result.data.success) {
                 toast.success(result.data.message);
                 setSubmitting(false);
@@ -33,12 +37,14 @@ export default function ConsumeMaterial() {
                 toast.error(result.data.message);
             }
         } catch (error: any) {
-            //console.log(error);
+            console.log(error);
             setSubmitting(false);
             if (error.status === 401) {
                 toast.error("Unauthorized to do this task.");
             } else {
-                toast.error("Unexpected error if this continues please constact an admin.");
+                toast.error(
+                    "Unexpected error if this continues please constact an admin."
+                );
             }
         }
     };
@@ -53,7 +59,9 @@ export default function ConsumeMaterial() {
                         <LstCard>
                             <form onSubmit={handleSubmit1(handleConsume)}>
                                 <div className="m-2">
-                                    <Label htmlFor="runningNr">Enter unit running number</Label>
+                                    <Label htmlFor="runningNr">
+                                        Enter unit running number
+                                    </Label>
                                     <Input
                                         className="mt-2"
                                         //defaultValue="634"
@@ -62,7 +70,9 @@ export default function ConsumeMaterial() {
                                     />
                                 </div>
                                 <div className="m-2">
-                                    <Label htmlFor="lotNum">Enter lot number</Label>
+                                    <Label htmlFor="lotNum">
+                                        Enter lot number
+                                    </Label>
                                     <Input
                                         className="mt-2"
                                         //defaultValue="634"
@@ -71,7 +81,12 @@ export default function ConsumeMaterial() {
                                     />
                                 </div>
 
-                                <Button className="m-2" color="primary" type="submit" disabled={submitting}>
+                                <Button
+                                    className="m-2"
+                                    color="primary"
+                                    type="submit"
+                                    disabled={submitting}
+                                >
                                     Consume materal
                                 </Button>
                             </form>
@@ -81,12 +96,19 @@ export default function ConsumeMaterial() {
                         <LstCard>
                             <div className="w-96 p-1">
                                 <ol>
-                                    <li>1. Enter the running number of the material you would like to consume</li>
-                                    <li>2. Enter the lot number you will be consuming to</li>
+                                    <li>
+                                        1. Enter the running number of the
+                                        material you would like to consume
+                                    </li>
+                                    <li>
+                                        2. Enter the lot number you will be
+                                        consuming to
+                                    </li>
                                     <li>3. Press consume material</li>
                                 </ol>
                                 <p className="text-pretty w-96">
-                                    *This process is only for barcoded material, if it is set to auto consume you will
+                                    *This process is only for barcoded material,
+                                    if it is set to auto consume you will
                                     encounter and error.
                                 </p>
                             </div>

frontend/src/components/logistics/materialHelper/consumption/TransferToNextLot.tsx

@@ -14,13 +14,16 @@ import {
     TooltipContent,
     TooltipTrigger,
 } from "@/components/ui/tooltip";
+import { useSettingStore } from "@/lib/store/useSettings";
 
 export default function TransferToNextLot() {
     const [gaylordFilled, setGaylordFilled] = useState([0]);
     const [actualAmount, setActualAmount] = useState(0);
     const [tab, setTab] = useState("esitmate");
     const [typeSwitch, setTypeSwitch] = useState(false);
+    const { settings } = useSettingStore();
 
+    const server = settings.filter((n: any) => n.name === "dbServer");
     const form = useAppForm({
         defaultValues: {
             runningNumber: "",
@@ -111,7 +114,7 @@ export default function TransferToNextLot() {
                                                     }
                                                 >
                                                     <p className="text-center">
-                                                        Almost full
+                                                        Almost full - 95%
                                                     </p>
                                                 </button>
                                                 <button
@@ -129,7 +132,7 @@ export default function TransferToNextLot() {
                                                     }
                                                 >
                                                     <p className="text-center">
-                                                        About 75% full
+                                                        About full - 75%
                                                     </p>
                                                 </button>
                                                 <button
@@ -145,7 +148,7 @@ export default function TransferToNextLot() {
                                                     }
                                                 >
                                                     <p className="text-center">
-                                                        Half full
+                                                        Half full - 50%
                                                     </p>
                                                 </button>
                                                 <button
@@ -163,7 +166,7 @@ export default function TransferToNextLot() {
                                                     }
                                                 >
                                                     <p className="text-center">
-                                                        Almost empty
+                                                        Almost empty - 25%
                                                     </p>
                                                 </button>
                                             </div>
@@ -218,7 +221,7 @@ export default function TransferToNextLot() {
                                                     name="runningNumber"
                                                     children={(field) => (
                                                         <field.InputField
-                                                            label="Runnung Number"
+                                                            label="Running Number"
                                                             inputType="number"
                                                             required={true}
                                                         />
@@ -398,6 +401,19 @@ export default function TransferToNextLot() {
                                             process, this process will just get
                                             the gaylord to the next lot.
                                         </p>
+                                        <br />
+                                        {settings.length > 0 && (
+                                            <p>
+                                                For more in depth instructions
+                                                please{" "}
+                                                <a
+                                                    href={`https://${server[0].value}.alpla.net/lst/d/docs/ocp/ocp#tranfer-partial-estimated-quantity-to-the-next-lot`}
+                                                    target="_blank"
+                                                >
+                                                    <em>CLICK HERE</em>
+                                                </a>
+                                            </p>
+                                        )}
                                     </div>
                                 ) : (
                                     <div>
@@ -437,6 +453,19 @@ export default function TransferToNextLot() {
                                             process, this process will just get
                                             the gaylord to the next lot.
                                         </p>
+                                        <br />
+                                        {settings.length > 0 && (
+                                            <p>
+                                                For more in depth instructions
+                                                please{" "}
+                                                <a
+                                                    href={`https://${server[0].value}.alpla.net/lst/d/docs/ocp/ocp#tranfer-partial-estimated-quantity-to-the-next-lot`}
+                                                    target="_blank"
+                                                >
+                                                    <em>CLICK HERE</em>
+                                                </a>
+                                            </p>
+                                        )}
                                     </div>
                                 )}
                             </LstCard>

frontend/src/components/logistics/siloAdjustments/DetachSilo.tsx

@@ -48,6 +48,7 @@ export function DetachSilo(props: any) {
                 );
 
                 if (res.status === 200) {
+                    console.log(res.data.data);
                     toast.success(res.data.message);
 
                     refetch();

frontend/src/components/logistics/siloAdjustments/SiloCard.tsx

@@ -21,13 +21,28 @@ import { toast } from "sonner";
 import ChartData from "./ChartData";
 import { AttachSilo } from "./AttachSilo";
 import { DetachSilo } from "./DetachSilo";
+import { useSessionStore } from "@/lib/store/sessionStore";
+import { useModuleStore } from "@/lib/store/useModuleStore";
+import { useGetUserRoles } from "@/lib/store/useGetRoles";
 
 export default function SiloCard(data: any) {
     const token = localStorage.getItem("auth_token");
     const [submitting, setSubmitting] = useState(false);
     const { refetch } = useQuery(getStockSilo());
+    const { user } = useSessionStore();
+    const { userRoles } = useGetUserRoles();
+    const { modules } = useModuleStore();
     const silo = data.silo;
 
+    // roles that can do the silo adjustments
+    const roles = ["systemAdmin", "technician", "admin", "manager"];
+
+    const module = modules.filter((n) => n.name === "logistics");
+
+    const accessRoles = userRoles.filter(
+        (n) => n.module_id === module[0]?.module_id
+    ) as any;
+
     const form = useForm({
         defaultValues: {
             newLevel: "",
@@ -46,7 +61,7 @@ export default function SiloCard(data: any) {
                     dataToSubmit,
                     { headers: { Authorization: `Bearer ${token}` } }
                 );
-                console.log(res.data);
+                //console.log(res.data);
 
                 if (res.data.success) {
                     toast.success(res.data.message);
@@ -70,6 +85,8 @@ export default function SiloCard(data: any) {
             }
         },
     });
+
+    console.log(accessRoles);
     return (
         <LstCard>
             <div className="flex flex-row">
@@ -109,82 +126,98 @@ export default function SiloCard(data: any) {
                                 </ul>
                             </div>
                         ) : (
-                            <form
-                                onSubmit={(e) => {
-                                    e.preventDefault();
-                                    e.stopPropagation();
-                                }}
-                            >
-                                <form.Field
-                                    name="newLevel"
-                                    validators={{
-                                        // We can choose between form-wide and field-specific validators
-                                        onChange: ({ value }) =>
-                                            value.length > 1
-                                                ? undefined
-                                                : "You must enter a value greate than 1",
-                                    }}
-                                    children={(field) => {
-                                        return (
-                                            <div className="m-2 min-w-48 max-w-96 p-2">
-                                                <div className="flex flex-row">
-                                                    <Label htmlFor="newLevel">
-                                                        New level
-                                                    </Label>
-                                                    <div>
-                                                        <Disclaimer />
-                                                    </div>
-                                                </div>
-                                                <div className="flex flex-row">
-                                                    <Input
-                                                        name={field.name}
-                                                        value={
-                                                            field.state.value
-                                                        }
-                                                        onBlur={
-                                                            field.handleBlur
-                                                        }
-                                                        type="decimal"
-                                                        onChange={(e) =>
-                                                            field.handleChange(
-                                                                e.target.value
-                                                            )
-                                                        }
-                                                    />
-                                                    <Button
-                                                        className="ml-1"
-                                                        variant="outline"
-                                                        type="submit"
-                                                        onClick={
-                                                            form.handleSubmit
-                                                        }
-                                                        disabled={submitting}
-                                                    >
-                                                        {submitting ? (
-                                                            <span className="w-24">
-                                                                Submitting...
-                                                            </span>
-                                                        ) : (
-                                                            <span className="w-24">
-                                                                Submit
-                                                            </span>
-                                                        )}
-                                                    </Button>
-                                                </div>
+                            <>
+                                {user &&
+                                    roles.includes(accessRoles[0]?.role) && (
+                                        <form
+                                            onSubmit={(e) => {
+                                                e.preventDefault();
+                                                e.stopPropagation();
+                                            }}
+                                        >
+                                            <form.Field
+                                                name="newLevel"
+                                                validators={{
+                                                    // We can choose between form-wide and field-specific validators
+                                                    onChange: ({ value }) =>
+                                                        value.length > 1
+                                                            ? undefined
+                                                            : "You must enter a value greate than 1",
+                                                }}
+                                                children={(field) => {
+                                                    return (
+                                                        <div className="m-2 min-w-48 max-w-96 p-2">
+                                                            <div className="flex flex-row">
+                                                                <Label htmlFor="newLevel">
+                                                                    New level
+                                                                </Label>
+                                                                <div>
+                                                                    <Disclaimer />
+                                                                </div>
+                                                            </div>
+                                                            <div className="flex flex-row">
+                                                                <Input
+                                                                    name={
+                                                                        field.name
+                                                                    }
+                                                                    value={
+                                                                        field
+                                                                            .state
+                                                                            .value
+                                                                    }
+                                                                    onBlur={
+                                                                        field.handleBlur
+                                                                    }
+                                                                    type="decimal"
+                                                                    onChange={(
+                                                                        e
+                                                                    ) =>
+                                                                        field.handleChange(
+                                                                            e
+                                                                                .target
+                                                                                .value
+                                                                        )
+                                                                    }
+                                                                />
+                                                                <Button
+                                                                    className="ml-1"
+                                                                    variant="outline"
+                                                                    type="submit"
+                                                                    onClick={
+                                                                        form.handleSubmit
+                                                                    }
+                                                                    disabled={
+                                                                        submitting
+                                                                    }
+                                                                >
+                                                                    {submitting ? (
+                                                                        <span className="w-24">
+                                                                            Submitting...
+                                                                        </span>
+                                                                    ) : (
+                                                                        <span className="w-24">
+                                                                            Submit
+                                                                        </span>
+                                                                    )}
+                                                                </Button>
+                                                            </div>
 
-                                                {field.state.meta.errors
-                                                    .length ? (
-                                                    <em>
-                                                        {field.state.meta.errors.join(
-                                                            ","
-                                                        )}
-                                                    </em>
-                                                ) : null}
-                                            </div>
-                                        );
-                                    }}
-                                />
-                            </form>
+                                                            {field.state.meta
+                                                                .errors
+                                                                .length ? (
+                                                                <em>
+                                                                    {field.state.meta.errors.join(
+                                                                        ","
+                                                                    )}
+                                                                </em>
+                                                            ) : null}
+                                                        </div>
+                                                    );
+                                                }}
+                                            />
+                                        </form>
+                                    )}
+                            </>
                         )}
                     </div>
                 </LstCard>

frontend/src/components/production/ocp/ManualPrinting/ManualPrintForm.tsx

@@ -243,7 +243,8 @@ export default function ManualPrintForm() {
                         <Textarea
                             //label="Comments"
                             placeholder="add more info as needed."
-                            {...register("additionalComments")}
+                            {...(register("additionalComments"),
+                            { required: true, minLength: 10 })}
                         />
                     </div>
 

frontend/src/routes/(logistics)/materialHelper/consumption/index.tsx

@@ -32,7 +32,10 @@ function RouteComponent() {
                     <TransferToNextLot />
                 </>
             ) : (
-                <TransferToNextLot />
+                <>
+                    <ConsumeMaterial />
+                    <TransferToNextLot />
+                </>
             )}
         </div>
     );

frontend/src/routes/__root.tsx

@@ -28,6 +28,7 @@ import { useLogout } from "@/hooks/useLogout";
 import ExportInventoryData from "@/components/logistics/warehouse/ExportInventoryData";
 import { AddCards } from "@/components/dashboard/AddCards";
 import DMButtons from "@/components/logistics/dm/DMButtons";
+import { useSettingStore } from "@/lib/store/useSettings";
 //import { AddCards } from "@/components/dashboard/AddCards";
 
 // same as the layout
@@ -38,6 +39,9 @@ export const Route = createRootRoute({
         const { user } = useSessionStore();
         const logout = useLogout();
         const location = useLocation();
+        const { settings } = useSettingStore();
+
+        const server = settings.filter((n: any) => n.name === "dbServer");
 
         return (
             <div className="overflow-hidden">
@@ -61,6 +65,17 @@ export const Route = createRootRoute({
                                 <div className="m-1">
                                     <ModeToggle />
                                 </div>
+                                <div className="mr-1 ml-1">
+                                    {settings.length > 0 && (
+                                        <a
+                                            href={`https://${server[0].value}.alpla.net/lst/d`}
+                                            target="_blank"
+                                        >
+                                            LST - Docs
+                                        </a>
+                                    )}
+                                </div>
+
                                 {session ? (
                                     <div className="m-1">
                                         <DropdownMenu>

frontend/src/routes/register.tsx

@@ -33,13 +33,12 @@ function RouteComponent() {
                                     <span className="font-bold">
                                         Authentication Notice:
                                     </span>
-                                    To interact with the Alpla prod through this
-                                    application, you must use your{" "}
-                                    <span className="font-semibold">
-                                        Windows login credentials
+                                    <span>
+                                        The username, email, and password are
+                                        only for LST you <em>DO NOT</em>Need to
+                                        use Windows username if you do not wish
+                                        to.
                                     </span>
-                                    . These credentials are used solely for
-                                    authentication purposes.
                                 </li>
                                 {/* <li>
                                     <span className="font-bold">

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "lstv2",
-  "version": "2.26.0",
+  "version": "2.27.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "lstv2",
-      "version": "2.26.0",
+      "version": "2.27.0",
       "dependencies": {
         "@dotenvx/dotenvx": "^1.45.1",
         "@hono/node-server": "^1.14.4",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lstv2",
-  "version": "2.26.0",
+  "version": "2.27.0",
   "type": "module",
   "scripts": {
     "dev": "concurrently -n \"server,frontend\" -c \"#007755,#2f6da3\" \"npm run dev:server\" \"cd frontend && npm run dev\"",
@@ -21,8 +21,8 @@
     "db:dev": "npm run build && npm run db:generate && npm run db:migrate",
     "deploy": "standard-version --conventional-commits && npm run build",
     "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",
-    "scriptBuild": "powershell -ExecutionPolicy Bypass -File server/scripts/build.ps1 -dir \"C:\\Users\\matthes01\\Documents\\lstv2\"",
+    "newBuild": "npm run build:server && npm run build:frontend && npm run zipServer && npm run copyToNew",
+    "copyToNew": "powershell -ExecutionPolicy Bypass -File server/scripts/copyToLst.ps1 -dir \"C:\\Users\\matthes01\\Documents\\lstv2\"",
     "removeOld": "rimraf dist && rimraf frontend/dist",
     "prodBuild": "npm run v1Build && npm run build && npm run zipServer && npm run dev",
     "commit": "cz",
@@ -36,7 +36,7 @@
     }
   },
   "admConfig": {
-    "build": 579,
+    "build": 661,
     "oldBuild": "backend-0.1.3.zip"
   },
   "devDependencies": {

server/scripts/copyToLst.ps1

@@ -0,0 +1,61 @@
+param(
+    [string]$IncludesFile = ".includes",
+    [string]$Destination  = "C:\Users\matthes01\Documents\lst\lstV2",
+    [string]$BaseDir      = "C:\Users\matthes01\Documents\lst"
+)
+
+# .\copy-includes.ps1 will run with defaults
+# .\copy-includes.ps1 -IncludesFile ".\mylist.txt" -Destination "D:\build\lstV2" will override defaults
+
+if (-Not (Test-Path $IncludesFile)) {
+    Write-Error "Includes file not found: $IncludesFile"
+    exit 1
+}
+
+# Ensure destination exists
+if (!(Test-Path -Path $Destination)) {
+    New-Item -ItemType Directory -Path $Destination | Out-Null
+    Write-Host "Folder created: $Destination"
+}
+
+# Empty the destination folder
+Get-ChildItem -Path $Destination -Recurse -Force | Remove-Item -Recurse -Force
+
+# If BaseDir wasn’t explicitly passed in, use IncludesFile directory
+if (-not $PSBoundParameters.ContainsKey('BaseDir')) {
+    $BaseDir = Split-Path -Parent (Resolve-Path $IncludesFile)
+}
+
+# Read includes list (ignore blank lines & comments)
+$items = Get-Content $IncludesFile |
+    ForEach-Object { $_.Trim() } |
+    Where-Object { $_ -and -not $_.StartsWith("#") }
+
+foreach ($item in $items) {
+    if ([System.IO.Path]::IsPathRooted($item)) {
+        # Absolute path (rare case)
+        $sourcePath = $item
+        $relative   = Split-Path $item -Leaf   # just take folder/file name
+    } else {
+        # Relative to BaseDir
+        $sourcePath = Join-Path $BaseDir $item
+        $relative   = $item                    # keep full relative path e.g. "frontend\dist"
+    }
+
+    if (-Not (Test-Path $sourcePath)) {
+        Write-Warning "Skipping missing path: $sourcePath"
+        continue
+    }
+
+    # Destination path should preserve the relative structure
+    $targetPath = Join-Path $Destination $relative
+
+    # Ensure the parent folder exists
+    $targetDir = Split-Path $targetPath -Parent
+    if (-not (Test-Path $targetDir)) {
+        New-Item -ItemType Directory -Path $targetDir -Force | Out-Null
+    }
+
+    Write-Host "Copying $sourcePath -> $targetPath" -ForegroundColor Cyan
+    Copy-Item -Path $sourcePath -Destination $targetPath -Recurse -Force
+}

server/services/auth/controllers/register.ts

@@ -37,7 +37,7 @@ export const registerUser = async (
             .values({ username, email, password })
             .returning({ user: users.username, email: users.email });
 
-        if (usercount.length <= 1) {
+        if (usercount.length === 0) {
             createLog(
                 "info",
                 "auth",

server/services/dataMart/controller/psiGetInventory.ts

@@ -0,0 +1,63 @@
+import { and, between, inArray, sql } from "drizzle-orm";
+import { db } from "../../../../database/dbclient.js";
+import { invHistoricalData } from "../../../../database/schema/historicalINV.js";
+import { tryCatch } from "../../../globalUtils/tryCatch.js";
+import { createLog } from "../../logger/logger.js";
+
+// type ArticleData = {
+//     id: string
+// }
+export const psiGetInventory = async (
+    avs: string,
+    startDate: string,
+    endDate: string
+) => {
+    let articles: any = [];
+
+    if (!avs) {
+        return {
+            success: false,
+            message: `Missing av's please send at least one over`,
+            data: [],
+        };
+    }
+
+    const ids = avs.split(",").map((id) => id.trim());
+
+    const { data, error } = (await tryCatch(
+        db
+            .select()
+            .from(invHistoricalData)
+            .where(
+                and(
+                    inArray(invHistoricalData.article, ids),
+                    between(invHistoricalData.histDate, startDate, endDate)
+                )
+            )
+        //.limit(100)
+    )) as any;
+
+    if (error) {
+        createLog(
+            "error",
+            "datamart",
+            "datamart",
+            `There was an error getting the planning info: ${JSON.stringify(
+                error
+            )}`
+        );
+        return {
+            success: false,
+            messsage: `There was an error getting the planning info`,
+            data: error,
+        };
+    }
+
+    articles = data;
+    console.log(articles.length);
+    return {
+        success: true,
+        message: "PSI planning Data",
+        data: articles,
+    };
+};

server/services/dataMart/controller/psiGetPlanningData.ts

@@ -0,0 +1,63 @@
+import { tryCatch } from "../../../globalUtils/tryCatch.js";
+import { createLog } from "../../logger/logger.js";
+import { query } from "../../sqlServer/prodSqlServer.js";
+import { planningNumbersByAVDate } from "../../sqlServer/querys/psiReport/planningNumbersByAv.js";
+
+// type ArticleData = {
+//     id: string
+// }
+export const psiGetPlanningData = async (
+    avs: string,
+    startDate: string,
+    endDate: string
+) => {
+    let articles: any = [];
+
+    if (!avs) {
+        return {
+            success: false,
+            message: `Missing av's please send at least one over`,
+            data: [],
+        };
+    }
+
+    const { data, error } = (await tryCatch(
+        query(
+            planningNumbersByAVDate
+                .replace("[articles]", avs)
+                .replace("[startDate]", startDate)
+                .replace("[endDate]", endDate),
+            "PSI planning info"
+        )
+    )) as any;
+
+    if (error) {
+        createLog(
+            "error",
+            "datamart",
+            "datamart",
+            `There was an error getting the planning info: ${JSON.stringify(
+                error
+            )}`
+        );
+        return {
+            success: false,
+            messsage: `There was an error getting the planning info`,
+            data: error,
+        };
+    }
+
+    articles = data.data;
+
+    return {
+        success: true,
+        message: "PSI planning Data",
+        data: articles.map((n: any) => {
+            if (n.PalDay) {
+                return { ...n, PalDay: n.PalDay.toFixed(2) };
+            }
+
+            return n;
+        }),
+    };
+};

server/services/dataMart/controller/psiGetProductionData.ts

@@ -0,0 +1,63 @@
+import { tryCatch } from "../../../globalUtils/tryCatch.js";
+import { createLog } from "../../logger/logger.js";
+import { query } from "../../sqlServer/prodSqlServer.js";
+import { productionNumbers } from "../../sqlServer/querys/psiReport/prodcuctionNumbers.js";
+
+// type ArticleData = {
+//     id: string
+// }
+export const psiGetProductionData = async (
+    avs: string,
+    startDate: string,
+    endDate: string
+) => {
+    let articles: any = [];
+
+    if (!avs) {
+        return {
+            success: false,
+            message: `Missing av's please send at least one over`,
+            data: [],
+        };
+    }
+
+    const { data, error } = (await tryCatch(
+        query(
+            productionNumbers
+                .replace("[articles]", avs)
+                .replace("[startDate]", startDate)
+                .replace("[endDate]", endDate),
+            "PSI production info"
+        )
+    )) as any;
+
+    if (error) {
+        createLog(
+            "error",
+            "datamart",
+            "datamart",
+            `There was an error getting the planning info: ${JSON.stringify(
+                error
+            )}`
+        );
+        return {
+            success: false,
+            messsage: `There was an error getting the planning info`,
+            data: error,
+        };
+    }
+
+    articles = data.data;
+
+    return {
+        success: true,
+        message: "PSI planning Data",
+        data: articles.map((n: any) => {
+            if (n.PalDay) {
+                return { ...n, PalDay: n.PalDay.toFixed(2) };
+            }
+
+            return n;
+        }),
+    };
+};

server/services/dataMart/dataMartService.ts

@@ -10,6 +10,9 @@ import addressCorrections from "./route/getCityStateData.js";
 import fifoIndex from "./route/getFifoIndex.js";
 import financeAudit from "./route/getFinanceAudit.js";
 import psiArticleData from "./route/getPsiArticleData.js";
+import psiPlanningData from "./route/getPsiPlanningData.js";
+import psiProductionData from "./route/getPsiProductionData.js";
+import psiInventory from "./route/getPsiinventory.js";
 
 const app = new OpenAPIHono();
 
@@ -25,6 +28,9 @@ const routes = [
     fifoIndex,
     financeAudit,
     psiArticleData,
+    psiPlanningData,
+    psiProductionData,
+    psiInventory,
 ] as const;
 
 const appRoutes = routes.forEach((route) => {

server/services/dataMart/route/getPsiPlanningData.ts

@@ -0,0 +1,64 @@
+import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
+import { responses } from "../../../globalUtils/routeDefs/responses.js";
+import { tryCatch } from "../../../globalUtils/tryCatch.js";
+import { apiHit } from "../../../globalUtils/apiHits.js";
+import { psiGetPlanningData } from "../controller/psiGetPlanningData.js";
+
+const app = new OpenAPIHono({ strict: false });
+const Body = z.object({
+    includeRunnningNumbers: z.string().openapi({ example: "x" }),
+});
+app.openapi(
+    createRoute({
+        tags: ["dataMart"],
+        summary: "Returns the psiarticleData.",
+        method: "get",
+        path: "/psiplanningdata",
+        request: {
+            body: {
+                content: {
+                    "application/json": { schema: Body },
+                },
+            },
+        },
+        responses: responses(),
+    }),
+    async (c) => {
+        const q: any = c.req.queries();
+
+        // make sure we have a vaid user being accessed thats really logged in
+        apiHit(c, { endpoint: "/psiplanningdata" });
+        //console.log(articles["avs"][0]);
+        const { data, error } = await tryCatch(
+            psiGetPlanningData(
+                q["avs"] ? q["avs"][0] : null,
+                q["startDate"] ? q["startDate"][0] : null,
+                q["endDate"] ? q["endDate"][0] : null
+            )
+        );
+
+        if (error) {
+            console.log(error);
+            return c.json(
+                {
+                    success: false,
+                    message: "There was an error getting the planning.",
+                    data: error,
+                },
+                400
+            );
+        }
+
+        //console.log(data);
+
+        return c.json(
+            {
+                success: data.success,
+                message: data.message,
+                data: data.data,
+            },
+            data.success ? 200 : 400
+        );
+    }
+);
+export default app;

server/services/dataMart/route/getPsiProductionData.ts

@@ -0,0 +1,64 @@
+import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
+import { responses } from "../../../globalUtils/routeDefs/responses.js";
+import { tryCatch } from "../../../globalUtils/tryCatch.js";
+import { apiHit } from "../../../globalUtils/apiHits.js";
+import { psiGetProductionData } from "../controller/psiGetProductionData.js";
+
+const app = new OpenAPIHono({ strict: false });
+const Body = z.object({
+    includeRunnningNumbers: z.string().openapi({ example: "x" }),
+});
+app.openapi(
+    createRoute({
+        tags: ["dataMart"],
+        summary: "Returns the psiproductiondata.",
+        method: "get",
+        path: "/psiproductiondata",
+        request: {
+            body: {
+                content: {
+                    "application/json": { schema: Body },
+                },
+            },
+        },
+        responses: responses(),
+    }),
+    async (c) => {
+        const q: any = c.req.queries();
+
+        // make sure we have a vaid user being accessed thats really logged in
+        apiHit(c, { endpoint: "/psiproductiondata" });
+        //console.log(articles["avs"][0]);
+        const { data, error } = await tryCatch(
+            psiGetProductionData(
+                q["avs"] ? q["avs"][0] : null,
+                q["startDate"] ? q["startDate"][0] : null,
+                q["endDate"] ? q["endDate"][0] : null
+            )
+        );
+
+        if (error) {
+            console.log(error);
+            return c.json(
+                {
+                    success: false,
+                    message: "There was an error getting the production.",
+                    data: error,
+                },
+                400
+            );
+        }
+
+        //console.log(data);
+
+        return c.json(
+            {
+                success: data.success,
+                message: data.message,
+                data: data.data,
+            },
+            data.success ? 200 : 400
+        );
+    }
+);
+export default app;

server/services/dataMart/route/getPsiinventory.ts

@@ -0,0 +1,64 @@
+import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
+import { responses } from "../../../globalUtils/routeDefs/responses.js";
+import { tryCatch } from "../../../globalUtils/tryCatch.js";
+import { apiHit } from "../../../globalUtils/apiHits.js";
+import { psiGetInventory } from "../controller/psiGetInventory.js";
+
+const app = new OpenAPIHono({ strict: false });
+const Body = z.object({
+    includeRunnningNumbers: z.string().openapi({ example: "x" }),
+});
+app.openapi(
+    createRoute({
+        tags: ["dataMart"],
+        summary: "Returns the getPsiinventory.",
+        method: "get",
+        path: "/getpsiinventory",
+        request: {
+            body: {
+                content: {
+                    "application/json": { schema: Body },
+                },
+            },
+        },
+        responses: responses(),
+    }),
+    async (c) => {
+        const q: any = c.req.queries();
+
+        // make sure we have a vaid user being accessed thats really logged in
+        apiHit(c, { endpoint: "/getpsiinventory" });
+        //console.log(articles["avs"][0]);
+        const { data, error } = await tryCatch(
+            psiGetInventory(
+                q["avs"] ? q["avs"][0] : null,
+                q["startDate"] ? q["startDate"][0] : null,
+                q["endDate"] ? q["endDate"][0] : null
+            )
+        );
+
+        if (error) {
+            console.log(error);
+            return c.json(
+                {
+                    success: false,
+                    message: "There was an error getting the production.",
+                    data: error,
+                },
+                400
+            );
+        }
+
+        //console.log(data);
+
+        return c.json(
+            {
+                success: data.success,
+                message: data.message,
+                data: data.data,
+            },
+            data.success ? 200 : 400
+        );
+    }
+);
+export default app;

server/services/eom/eomService.ts

@@ -37,9 +37,9 @@ setTimeout(async () => {
     const shiftTimeSplit = shift?.data[0]?.shiftChange.split(":");
 
     const cronSetup = `${
-        shiftTimeSplit.length > 0 ? `${parseInt(shiftTimeSplit[1])}` : "0"
+        shiftTimeSplit?.length > 0 ? `${parseInt(shiftTimeSplit[1])}` : "0"
     } ${
-        shiftTimeSplit.length > 0 ? `${parseInt(shiftTimeSplit[0])}` : "7"
+        shiftTimeSplit?.length > 0 ? `${parseInt(shiftTimeSplit[0])}` : "7"
     } * * *`;
 
     //console.log(cronSetup);

server/services/eom/utils/removeHistorical.ts

@@ -27,7 +27,7 @@ export const deleteHistory = async () => {
             .where(
                 lte(
                     invHistoricalData.histDate,
-                    sql`(NOW() - INTERVAL '45 day')::date`
+                    sql`(NOW() - INTERVAL '365 day')::date`
                 )
             )
     );

server/services/logistics/controller/dm/forecast/mappings/loralForecast.ts

@@ -7,6 +7,8 @@ import { postForecast } from "../postForecast.js";
 import { query } from "../../../../../sqlServer/prodSqlServer.js";
 import { activeArticle } from "../../../../../sqlServer/querys/dataMart/article.js";
 import { addDays } from "date-fns";
+import { sendEmail } from "../../../../../notifications/controller/sendMail.js";
+import { createLog } from "../../../../../logger/logger.js";
 
 let customerID = 4;
 export const lorealForecast = async (data: any, user: any) => {
@@ -111,6 +113,9 @@ export const lorealForecast = async (data: any, user: any) => {
             );
 
             if (activeAV.length === 0) {
+                if (typeof forcast.customerArticleNo === "number") {
+                    missingSku.push(forcast);
+                }
                 continue;
             }
 
@@ -181,6 +186,9 @@ export const lorealForecast = async (data: any, user: any) => {
             );
 
             if (activeAV.length === 0) {
+                if (typeof forcast.customerArticleNo === "number") {
+                    missingSku.push(forcast);
+                }
                 continue;
             }
 
@@ -190,6 +198,56 @@ export const lorealForecast = async (data: any, user: any) => {
 
     //console.log(comForecast);
 
+    // email the  for the missing ones
+    const missedGrouped = Object.values(
+        missingSku.reduce((acc: any, item: any) => {
+            const key = item.customerArticleNo;
+
+            if (!acc[key]) {
+                // first time we see this customer
+                acc[key] = item;
+            } else {
+                // compare dates and keep the earliest
+                if (
+                    new Date(item.requirementDate) <
+                    new Date(acc[key].requirementDate)
+                ) {
+                    acc[key] = item;
+                }
+            }
+
+            return acc;
+        }, {})
+    );
+
+    const emailSetup = {
+        email: "Blake.matthes@alpla.com; Stuart.Gladney@alpla.com; Harold.Mccalister@alpla.com; Jenn.Osbourn@alpla.com",
+        subject:
+            missedGrouped.length > 0
+                ? `Alert! There are ${missedGrouped.length}, missing skus.`
+                : `Alert! There is a missing SKU.`,
+        template: "missingLorealSkus",
+        context: {
+            items: missedGrouped,
+        },
+    };
+
+    const { data: sentEmail, error: sendEmailError } = await tryCatch(
+        sendEmail(emailSetup)
+    );
+    if (sendEmailError) {
+        createLog(
+            "error",
+            "blocking",
+            "notify",
+            "Failed to send email, will try again on next interval"
+        );
+        return {
+            success: false,
+            message: "Failed to send email, will try again on next interval",
+        };
+    }
+
     // if the customerarticle number is not matching just ignore it
     const predefinedObject = {
         receivingPlantId: plantToken[0].value,

server/services/logistics/controller/materials/consumeMaterial.ts

@@ -13,7 +13,7 @@ type Data = {
     runningNr: string;
     lotNum: number;
 };
-export const consumeMaterial = async (data: Data, prod: any) => {
+export const consumeMaterial = async (data: Data) => {
     const { runningNr, lotNum } = data;
     // replace the rn
 
@@ -28,12 +28,7 @@ export const consumeMaterial = async (data: Data, prod: any) => {
         barcode = r?.data;
     } catch (error) {
         console.log(error);
-        createLog(
-            "error",
-            prod.user.username,
-            "logistics",
-            `Error getting barcode: ${error}`
-        );
+        createLog("error", "", "logistics", `Error getting barcode: ${error}`);
     }
 
     if (barcode.length === 0) {

server/services/logistics/route/consumeMaterial.ts

@@ -19,7 +19,7 @@ app.openapi(
         summary: "Consumes material based on its running number",
         method: "post",
         path: "/consume",
-        middleware: authMiddleware,
+        //middleware: authMiddleware,
         description:
             "Provided a running number and lot number you can consume material.",
         responses: {
@@ -51,33 +51,29 @@ app.openapi(
             );
         }
         apiHit(c, { endpoint: "/consume", lastBody: data });
-        const authHeader = c.req.header("Authorization");
-        const token = authHeader?.split("Bearer ")[1] || "";
+        //const authHeader = c.req.header("Authorization");
+        //const token = authHeader?.split("Bearer ")[1] || "";
 
+        //const payload = await verify(token, process.env.JWT_SECRET!);
         try {
-            const payload = await verify(token, process.env.JWT_SECRET!);
-            try {
-                //return apiReturn(c, true, access?.message, access?.data, 200);
+            //return apiReturn(c, true, access?.message, access?.data, 200);
 
-                const consume = await consumeMaterial(data, payload);
-                return c.json(
-                    { success: consume?.success, message: consume?.message },
-                    200
-                );
-            } catch (error) {
-                //console.log(error);
-                //return apiReturn(c, false, "Error in setting the user access", error, 400);
-                return c.json(
-                    {
-                        success: false,
-                        message: "Missing data please try again",
-                        error,
-                    },
-                    400
-                );
-            }
+            const consume = await consumeMaterial(data);
+            return c.json(
+                { success: consume?.success, message: consume?.message },
+                200
+            );
         } catch (error) {
-            return c.json({ success: false, message: "Unauthorized" }, 401);
+            //console.log(error);
+            //return apiReturn(c, false, "Error in setting the user access", error, 400);
+            return c.json(
+                {
+                    success: false,
+                    message: "Missing data please try again",
+                    error,
+                },
+                400
+            );
         }
     }
 );

server/services/logistics/route/detachSilo.ts

@@ -57,6 +57,7 @@ app.openapi(
             });
         }
 
+        console.log(silo);
         return c.json({
             success: silo.success,
             message: silo.message,

server/services/notifications/utils/views/missingLorealSkus.hbs

@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    {{!-- <link rel="stylesheet" href="styles/styles.css" /> --}}
+    {{> styles}}
+</head>
+<body>
+        <p>All,</p> 
+        <p>The below SKU's do not currently have an av and will be ignored in the forcast import.</p>   
+        <p>The date and qty are the first time needed showing from teh vmi report</p>     
+        <table > 
+        <thead> 
+            <tr> 
+            <th>Customer Article Number</th> 
+            <th>First Date Needed</th> 
+            <th>Quantity</th> 
+            </tr> 
+        </thead> 
+
+        <tbody>
+            {{#each items}}
+                    <tr>
+                        <td>{{customerArticleNo}}</td>
+                        <td>{{requirementDate}}</td>
+                        <td>{{quantity}}</td>
+                    </tr>
+                {{/each}}
+        </tbody>
+        </table>
+
+
+        <div>
+
+           <p>Thank you,</p>
+        <p>LST Team</p> 
+        </div>
+
+</body>
+</html>

server/services/ocp/controller/labeling/labelProcess.ts

@@ -285,9 +285,17 @@ export const labelingProcess = async ({
             //     "ocp",
             //     `Error Booking in label: ${book.errors[0].message}`
             // );
+            createLog(
+                "error",
+                "labeling",
+                "ocp",
+                `There was an error booking in  the label: ${JSON.stringify(
+                    book.data
+                )}`
+            );
             return {
                 success: false,
-                message: `Error Booking in label: ${book.errors[0]?.message}`,
+                message: `Error Booking in label`,
                 data: book,
             };
         }

server/services/ocp/controller/materials/mainMaterial.ts

@@ -60,13 +60,47 @@ export const isMainMatStaged = async (lot: any) => {
         //     isStaged = true;
         // }
 
+        type CheckConditionArgs = {
+            results: any[];
+            filterFn: (n: any) => boolean;
+            failCondition: (n: any) => boolean;
+            failMessage: string;
+            successMessage: string;
+            lot: { lot: string | number };
+        };
+
+        const checkCondition = ({
+            results,
+            filterFn,
+            failCondition,
+            failMessage,
+            successMessage,
+            lot,
+        }: CheckConditionArgs): { message: string; success: boolean } => {
+            const subset = results.filter(filterFn);
+
+            if (subset.some(failCondition)) {
+                const failing = subset.filter(failCondition);
+                return {
+                    message: `lot: ${lot.lot}, is missing: ${failing
+                        .map(
+                            (o: any) =>
+                                `${o.MaterialHumanReadableId} - ${o.MaterialDescription}`
+                        )
+                        .join(",\n ")} ${failMessage}`,
+                    success: false,
+                };
+            } else {
+                return { message: successMessage, success: true };
+            }
+        };
+
         createLog("info", "mainMaterial", "ocp", `Maint material query ran.`);
 
-        const mainMateiral = res.filter((n: any) => n.IsMainMaterial);
-
-        if (mainMateiral[0]?.noMaterialShortage === "no") {
-            isStaged = {
-                message: `Main material: ${mainMateiral[0].MaterialHumanReadableId} - ${mainMateiral[0].MaterialDescription}: is not staged for ${lot.lot} `,
+        const mainMaterial = res.find((n: any) => n.IsMainMaterial);
+        if (mainMaterial?.noMMShortage === "noMM") {
+            return {
+                message: `Main material: ${mainMaterial.MaterialHumanReadableId} - ${mainMaterial.MaterialDescription}: is not staged for ${lot.lot}`,
                 success: false,
             };
         }
@@ -75,48 +109,39 @@ export const isMainMatStaged = async (lot: any) => {
         // for manual consume color if active to check colors
         const checkColorSetting = set.filter((n) => n.name === "checkColor");
 
+        // 2. Auto color
         if (checkColorSetting[0].value === "1") {
-            const autoConsumeColor = res.filter(
-                (n: any) => !n.IsMainMaterial && !n.isManual
-            );
-            if (
-                autoConsumeColor.some(
-                    (n: any) => n.autoConsumeCheck === "autoConsumeNOK"
-                )
-            ) {
-                const onlyNOK = autoConsumeColor.filter(
-                    (n: any) => n.autoConsumeCheck === "autoConsumeNOK"
-                );
-                isStaged = {
-                    message: `lot: ${lot.lot}, is missing: ${onlyNOK
-                        .map(
-                            (o: any) =>
-                                `${o.MaterialHumanReadableId} - ${o.MaterialDescription}`
-                        )
-                        .join(",\n ")} for autoconsume`,
-                    success: false,
-                };
-            }
+            // auto check
+            // 2. Auto color
+            const autoColor = checkCondition({
+                results: res,
+                lot,
+                filterFn: (n) =>
+                    n.isManual &&
+                    !("noPKGAutoShortage" in n) &&
+                    !("noPKGManualShortage" in n), // pool = non-main, auto
+                failCondition: (n) => n.autoConsumeCheck === "autoConsumeNOK", // column = autoConsumeCheck
+                failMessage: "for autoconsume",
+                successMessage: "auto color is good",
+            });
+            if (!autoColor.success) return autoColor;
+            console.log(autoColor);
 
-            // // for manual consume color
-            const manualConsumeColor = res.filter(
-                (n: any) => !n.IsMainMaterial && n.isManual
-            );
-            if (
-                manualConsumeColor.some(
-                    (n: any) => n.noMaterialShortage === "yes"
-                )
-            ) {
-                isStaged = {
-                    message: `lot: ${lot.lot}, is missing: ${manualConsumeColor
-                        .map(
-                            (o: any) =>
-                                `${o.MaterialHumanReadableId} - ${o.MaterialDescription}`
-                        )
-                        .join(",\n ")} for manual Material`,
-                    success: false,
-                };
-            }
+            // 3. Manual color
+            const manualColor = checkCondition({
+                results: res,
+                lot,
+                filterFn: (n) =>
+                    !n.IsMainMaterial &&
+                    n.isManual &&
+                    !("noPKGAutoShortage" in n) &&
+                    !("noPKGManualShortage" in n), // pool = non-main, manual
+                failCondition: (n) => n.noManualShortage === "noOK", // column = noManualShortage
+                failMessage: "for manual material",
+                successMessage: "manual color is good",
+            });
+            if (!manualColor.success) return manualColor;
+            console.log(manualColor);
         } else {
             createLog(
                 "info",
@@ -129,11 +154,58 @@ export const isMainMatStaged = async (lot: any) => {
         // // if we want to check the packaging
         const checkPKGSetting = set.filter((n) => n.name === "checkPKG");
         if (checkPKGSetting[0].value === "1") {
-            const packagingCheck = res.filter(
-                (n: any) => !n.IsMainMaterial && n.isManual
+            const pkgAuto = checkCondition({
+                results: res,
+                lot,
+                filterFn: (n) =>
+                    !n.IsMainMaterial &&
+                    !n.isManual &&
+                    "noPKGAutoShortage" in n,
+                failCondition: (n) => n.noPKGAutoShortage === "noAutoPkg",
+                failMessage: "for pkg",
+                successMessage: "auto PKG is good",
+            });
+            if (!pkgAuto.success) return pkgAuto;
+            console.log(pkgAuto);
+
+            // 5. Packaging manual
+            const pkgManual = checkCondition({
+                results: res,
+                lot,
+                filterFn: (n) =>
+                    !n.IsMainMaterial &&
+                    n.isManual &&
+                    "noPKGManualShortage" in n,
+                failCondition: (n) => n.noPKGManualShortage === "noManPkg",
+                failMessage: "for pkg",
+                successMessage: "manual PKG is good",
+            });
+
+            if (!pkgManual.success) return pkgManual;
+            console.log(pkgManual);
+        } else {
+            createLog(
+                "info",
+                "mainMaterial",
+                "ocp",
+                "PKG check is not active."
             );
-            if (packagingCheck.some((n: any) => n.noPKGShortage === "noPkg")) {
-                isStaged = {
+        }
+
+        // manual pkg
+        if (checkPKGSetting[0].value === "1") {
+            const packagingCheck = res.filter(
+                (n: any) =>
+                    !n.IsMainMaterial &&
+                    n.isManual &&
+                    "noPKGManualShortage" in n
+            );
+            if (
+                packagingCheck.some(
+                    (n: any) => n.noPKGManualShortage === "noManPkg"
+                )
+            ) {
+                return (isStaged = {
                     message: `lot: ${lot.lot}, is missing: ${packagingCheck
                         .map(
                             (o: any) =>
@@ -141,7 +213,7 @@ export const isMainMatStaged = async (lot: any) => {
                         )
                         .join(",\n ")} for pkg`,
                     success: false,
-                };
+                });
             }
         } else {
             createLog(

server/services/ocp/controller/specialProcesses/inhouse/inhouseDelivery.ts

@@ -33,13 +33,13 @@ export const delieryInhouse = async (data: any) => {
                 "error",
                 "labeling",
                 "ocp",
-                `${data.printer.name}, Error:${res.data.Message}`
+                `${data.printer?.name}, Error:${res.data.Message}`
             );
             //printerUpdate(data.printer, 7, "Error while deliverying inhouse.");
 
             return {
                 success: true,
-                message: `${data.printer.name} had an error while trying to deliver.`,
+                message: `${data.printer?.name} had an error while trying to deliver.`,
                 data: res.data,
             };
         } // label was just delivered

server/services/rfid/controller/stations/wrappers.ts

@@ -43,9 +43,9 @@ export const wrapperStuff = async (tagData: any) => {
             "rfid",
             `There are ${tagData.length} tags and this ${
                 tagData[0].reader
-            } only allows 1 tag to create a label: tag ${tagData[0].tag}, ${
-                tagData[1].tag
-            }, ${tagData.length === 3 && tagData[2].tag}`
+            } only allows 1 tag to create a label: tag ${tagData
+                .map((o: any) => `${o.tag}`)
+                .join(",\n ")}`
         );
         const tag = { ...tagData[0], runningNr: 0 };
         //tagStuff([tag]);

server/services/sqlServer/querys/dataMart/article.ts

@@ -1,4 +1,6 @@
 export const activeArticle = `
+use AlplaPROD_test1
+
 SELECT V_Artikel.IdArtikelvarianten,
 V_Artikel.Bezeichnung,
 V_Artikel.ArtikelvariantenTypBez,
@@ -45,7 +47,10 @@ V_Artikel.ArtikelvariantenTypBez = 'Sleeve' or
 V_Artikel.ArtikelvariantenTypBez = 'Plastic Bag' or
 V_Artikel.ArtikelvariantenTypBez = 'Purch Spout' or
 V_Artikel.ArtikelvariantenTypBez = 'Seal' or
-V_Artikel.ArtikelvariantenTypBez = 'Tape'
+V_Artikel.ArtikelvariantenTypBez = 'Tape' or
+V_Artikel.ArtikelvariantenTypBez = 'Box' or
+V_Artikel.ArtikelvariantenTypBez = 'Label IML' or
+V_Artikel.ArtikelvariantenTypBez = 'Pallet Runner' 
 THEN 'PKG' 
 WHEN V_Artikel.ArtikelvariantenTypBez='HD-PE' or
 V_Artikel.ArtikelvariantenTypBez='HD-PE PCR' or
@@ -111,16 +116,17 @@ sales.[KdArtBez] as CustomerArticleDescription,
 round(V_Artikel.Zyklus, 2) as CycleTime,
 Sypronummer as salesAgreement,
 V_Artikel.ProdArtikelBez as ProductFamily
+,REPLACE(pur.UOM,'UOM:','') as UOM
 --,*
-FROM AlplaPROD_test1.dbo.V_Artikel (nolock)
+FROM dbo.V_Artikel (nolock)
 
 join
-AlplaPROD_test1.dbo.V_Artikelvarianten on AlplaPROD_test1.dbo.V_Artikel.IdArtikelvarianten = 
-AlplaPROD_test1.dbo.V_Artikelvarianten.IdArtikelvarianten
+dbo.V_Artikelvarianten (nolock) on dbo.V_Artikel.IdArtikelvarianten = 
+dbo.V_Artikelvarianten.IdArtikelvarianten
 
 join
-AlplaPROD_test1.dbo.V_FibuKonten_BASIS on AlplaPROD_test1.dbo.V_Artikelvarianten.IdFibuKonto = 
-AlplaPROD_test1.dbo.V_FibuKonten_BASIS.IdFibuKonto
+dbo.V_FibuKonten_BASIS (nolock) on dbo.V_Artikelvarianten.IdFibuKonto = 
+dbo.V_FibuKonten_BASIS.IdFibuKonto
 
 
 -- adding in the sales price
@@ -134,7 +140,7 @@ left join
 	,[KdArtNr]
 	,[KdArtBez]
 	--,* 
-	from AlplaPROD_test1.dbo.T_HistoryVK (nolock)
+	from dbo.T_HistoryVK (nolock)
 	where 
 	--GueltigabDatum > getDate() - 120 
     --and 
@@ -142,7 +148,26 @@ left join
 	and StandardKunde = 1 -- default address
 	) a
 	where RN = 1) as sales
-on AlplaPROD_test1.dbo.V_Artikel.IdArtikelvarianten = sales.av
+on dbo.V_Artikel.IdArtikelvarianten = sales.av
+
+/* adding the purchase price info */
+left join
+(select * from 
+(select 
+	ROW_NUMBER() OVER (PARTITION BY IdArtikelvarianten ORDER BY GueltigabDatum DESC) AS RN, 
+	IdArtikelvarianten as av
+	,GueltigabDatum as validDate
+	,EKPreis as price
+	,LiefArtNr as supplierNr
+	,case when Bemerkung is not null and  Bemerkung like '%UOM:%' then LEFT(Bemerkung, CHARINDEX(' ', Bemerkung)) else 'UOM:1' end as UOM
+	,Bemerkung
+ 	--,* 
+	from dbo.T_HistoryEK (nolock)
+	where 
+	 StandardLieferant = 1 -- default address
+	) a
+	where RN = 1) as pur
+on dbo.V_Artikel.IdArtikelvarianten = pur.av
 
 where V_Artikel.aktiv = 1 
 

server/services/sqlServer/querys/ocp/mainMaterial.ts

@@ -23,69 +23,78 @@
 
 export const mmQuery = `
 use [test1_AlplaPROD2.0_Read]
+declare @lot as NVARCHAR(max) = [lotNumber] 
 /*
 checks all needed material including pkg
 
 we only want to monitor the manual materials and the mm materail to make sure they are good.
 
 for auto consume materails this will be compared with another query.
-
 */
-SELECT lot.ProductionLotHumanReadableId
-,MaterialHumanReadableId
-,MaterialDescription
-	--IsMainMaterial,
-	,case when SourcingState in (1, 2) then 1 
+/*
+Material demands for this lot
+*/
+select 
+MaterialHumanReadableId
+,MaterialDescription 
+-- check box is staged so we could book in even if we used preprint.
+,case when SourcingState in (1, 2) then 1 
 	when x.ProvidedAmount > 0 then 1
 	when x.EffectiveConsumption > 0 then 1
 	else 0 end as Staged
-	,x.ProvidedAmount as Provided
-	,x.EffectiveConsumption as consumption 
-	,x.TotalDemand as totalDemand	, 
-	case when cp.Pieces = 1 then (lot.TotalProducedLoadingUnits+1) * p.LoadingUnitPieces else
-	(a.Weight *((case when cp.Percentage is null then 80.25 else cp.Percentage end) / 100) * ((lot.TotalProducedLoadingUnits+1) * p.LoadingUnitPieces)) / 1000 end totalNeeded
-	,l.qty as invForAutoConsume
-	/* remaining needed to complete the lot */
-	--,x.TotalDemand - x.EffectiveConsumption as remainingNeeded
-	/* do we have enough staged or scanned to the lot? */
-	,case when (case when x.ProvidedAmount <> 0 
-		then x.ProvidedAmount  else x.EffectiveConsumption end) > 		 
-		(case when cp.Pieces = 1 then (lot.TotalProducedLoadingUnits+1) * p.LoadingUnitPieces else
-		(a.Weight *((case when cp.Percentage is null then 80.25 else cp.Percentage end) / 100) * ((lot.TotalProducedLoadingUnits+1) * p.LoadingUnitPieces)) / 1000 end)
-		then 'good' 
-		else 'no' end as noMaterialShortage
-	-- pkg check
-	,case when pkg.QuantityPosition is null then null else	
-	(case when l.qty > (lot.TotalProducedLoadingUnits+1) * pkg.QuantityPosition  then 'pkgGood' else 'noPkg' end) end as  noPKGShortage
-
-	,case when cp.Percentage is null then 
-	case when l.qty > ((lot.TotalProducedLoadingUnits +1) * pkg.QuantityPosition) then 'autoConsumeOk' else 'autoConsumeNOK' end else
-	(case when l.qty > (a.Weight *((case when cp.Percentage is null then 80.25 else cp.Percentage end) / 100) * ((lot.TotalProducedLoadingUnits+1) * p.LoadingUnitPieces)) / 1000 and IsManualProcess = 0  
-	then 'autoConsumeOk' else 'autoConsumeNOK' end) end as autoConsumeCheck
 	,x.IsManualProcess as isManual
 	,IsMainMaterial
+	-- lot stuff
 	,lot.TotalPlannedLoadingUnits
 	,lot.TotalProducedLoadingUnits
 	,lot.TotalPlannedLoadingUnits - lot.TotalProducedLoadingUnits as remainingPallets
-	,case when cp.Percentage is null then 80.25 else cp.Percentage end as Percentage -- this is to over come the alternate mm put in planning
-	,case when cp.Pieces is not null then cp.Pieces else pkg.QuantityPosition end as peices
-FROM [issueMaterial].[MaterialDemand] x (nolock)
+	,x.ProvidedAmount as Provided -- this is what has been provided most of the time this is due to a silo attachment
+	,x.EffectiveConsumption as consumption  -- this is how much was consummed via cmd 112
+	,x.TotalDemand as totalDemand -- the total demand needed to finish the lot out
 
+	,case when cp.Pieces >= 0.001 then (lot.TotalProducedLoadingUnits+1) * cp.Pieces  else
+		(a.Weight *((case when cp.Percentage is null then 80 else cp.Percentage end) / 100) * ((lot.TotalProducedLoadingUnits+1) * p.LoadingUnitPieces)) / 1000 end totalNeeded
+
+	,case when IsMainMaterial = 1 then 
+	case when (case when x.ProvidedAmount <> 0 
+		then x.ProvidedAmount  else x.EffectiveConsumption end) > 		 
+		(case when cp.Pieces >= 0.001 then (lot.TotalProducedQuantity+1) * cp.Pieces else
+		(a.Weight *((case when cp.Percentage is null then 80 else cp.Percentage end) / 100) * ((lot.TotalProducedLoadingUnits+1) * p.LoadingUnitPieces)) / 1000 end)
+		then 'mmGood' 
+		else 'noMM' end else null end as noMMShortage
+
+	-- pkg check auto
+	,case when pkg.QuantityPosition is null then null else	
+	(case when l.qty > ((lot.TotalProducedLoadingUnits+1) * pkg.QuantityPosition) and IsManualProcess = 0 then 'pkgAutoGood' else 'noAutoPkg' end) end as  noPKGAutoShortage
+	-- plg check manual
+	,case when pkg.QuantityPosition is null then null else	
+	(case when x.EffectiveConsumption > ((lot.TotalProducedLoadingUnits+1) * pkg.QuantityPosition) and IsManualProcess = 1 then 'pkgManGood' else 'noManPkg' end) end as  noPKGManualShortage
+	-- manualMateiral
+	,case when IsMainMaterial = 0 and IsManualProcess = 1 then 
+	case when (case when x.ProvidedAmount <> 0 
+		then x.ProvidedAmount  else x.EffectiveConsumption end) > 		 
+		(case when cp.Pieces >= 0.001 then (lot.TotalProducedQuantity+1) * cp.Pieces else
+		(a.Weight *((case when cp.Percentage is null then 80 else cp.Percentage end) / 100) * ((lot.TotalProducedLoadingUnits+1) * p.LoadingUnitPieces)) / 1000 end)
+		then 'manualGood' 
+		else 'noOK' end else null end as noManualShortage
+-- autoconsume
+	,case when cp.Percentage is null then 
+	case when l.qty > ((lot.TotalProducedLoadingUnits +1) * pkg.QuantityPosition) then 'autoConsumeOk' else 'autoConsumeNOK' end else
+	(case when l.qty > (a.Weight *(cp.Percentage / 100) * ((lot.TotalProducedLoadingUnits+1) * p.LoadingUnitPieces)) / 1000 and IsManualProcess = 0  
+	then 'autoConsumeOk' else 'autoConsumeNOK' end) end as autoConsumeCheck
+	-- stock amounts
+	,l.qty as invForAutoConsume
+
+	,case when cp.Percentage is null then 0 else cp.Percentage end as Percentage
+	,pkg.QuantityPosition
+	,(lot.TotalProducedQuantity+1) * cp.Pieces
+from [issueMaterial].[MaterialDemand] x (nolock) 
+
+/* production lot info */
 left join
 	[productionControlling].[ProducedLot]  as lot on
 	lot.Id = x.ProductionLotId
 
-/* av data */ 
-left join
-	[masterData].[Article] as a on
-	a.id = lot.ArticleId
-
-/* compound*/
-left join
-[masterData].[CompoundPosition] as cp on
-cp.CompoundId = a.CompoundId 
-and cp.ArticleId =  x.MaterialId
-
 /* packagaing */ 
 left join
 [masterData].[PackagingInstructionPosition] as pkg on
@@ -97,6 +106,17 @@ left join
 [masterData].[PackagingInstruction] as p on
 p.id = lot.PackagingId
 
+/* av data */ 
+left join
+	[masterData].[Article] as a on
+	a.id = lot.ArticleId
+
+/* compound*/
+left join
+[masterData].[CompoundPosition] as cp on
+cp.CompoundId = a.CompoundId 
+and cp.ArticleId =  x.MaterialId
+
 /* current stock info for auto consumption*/
 left join
 (select 
@@ -113,5 +133,8 @@ where autoverbrauch = 1 and aktiv = 1
 group by IdArtikelVarianten,ArtikelVariantenBez
 ) as l on 
 l.IdArtikelVarianten = MaterialHumanReadableId
-where lot.ProductionLotHumanReadableId = [lotNumber]
+
+where lot.ProductionLotHumanReadableId = @lot and MaterialDescription not like '%nopal%'
+  and MaterialDescription NOT LIKE '%bb%'
+  and MaterialDescription NOT LIKE '%mcg%'
 `;

server/services/sqlServer/querys/psiReport/planningNumbersByAv.ts

@@ -1,33 +1,34 @@
 export const planningNumbersByAVDate = `
 use AlplaPROD_test1
-declare @start_date nvarchar(30) = [startDate] --'2025-01-01'
-declare @end_date nvarchar(30) = [endDate] --'2025-08-09'
+declare @start_date nvarchar(30) = '[startDate]' --'2025-01-01'
+declare @end_date nvarchar(30) = '[endDate]' --'2025-08-09'
 /*
 articles will need to be passed over as well as the date structure we want to see
 */
 
--- planned lots in planning
-
-select V_ProdLosProduktionJeProdTag_PLANNING.IdArtikelvarianten As Article,
+select x.IdArtikelvarianten As Article,
 ProduktionAlias as Description,
 standort as MachineId,
 MaschinenBezeichnung as MachineName,
 --MaschZyklus as PlanningCycleTime,
-V_ProdLosProduktionJeProdTag_PLANNING.IdProdPlanung as LotNumber,
+x.IdProdPlanung as LotNumber,
 FORMAT(ProdTag, 'MM/dd/yyyy') as ProductionDay,
-V_ProdLosProduktionJeProdTag_PLANNING.planMenge as TotalPlanned,
+x.planMenge as TotalPlanned,
 ProduktionMenge as QTYPerDay,
 round(ProduktionMengeVPK, 2) PalDay,
 Status as finished
 --MaschStdAuslastung as nee
 
-from dbo.V_ProdLosProduktionJeProdTag_PLANNING (nolock)
+from dbo.V_ProdLosProduktionJeProdTag_PLANNING (nolock) as x
 
 left join 
-dbo.V_ProdPlanung (nolock) on
-V_ProdLosProduktionJeProdTag_PLANNING .IdProdPlanung = V_ProdPlanung.IdProdPlanung
+dbo.V_ProdPlanung (nolock) as p on
+x.IdProdPlanung = p.IdProdPlanung
 
-where V_ProdLosProduktionJeProdTag_PLANNING.IdArtikelvarianten in ([articles]) and ProdTag between @start_date and @end_date --and IdProdPlanung = 18442
+where ProdTag between @start_date and @end_date 
+and p.IdArtikelvarianten in ([articles])
+--and V_ProdLosProduktionJeProdTag_PLANNING.IdKunde = 10 
+--and IdProdPlanung = 18442
 
-order by ProdTag
+order by ProdTag desc
 `;

server/services/sqlServer/querys/psiReport/prodcuctionNumbers.ts

@@ -1,8 +1,8 @@
 export const productionNumbers = `
 use [test1_AlplaPROD2.0_Reporting]
 
-declare @startDate nvarchar(30) = [startDate] --'2024-12-30'
-declare @endDate nvarchar(30) = [endDate] --'2025-08-09'
+declare @startDate nvarchar(30) = '[startDate]' --'2024-12-30'
+declare @endDate nvarchar(30) = '[endDate]' --'2025-08-09'
 
 select MachineLocation,
 ArticleHumanReadableId as article,

server/services/sqlServer/querys/psiReport/psiinventory.ts

@@ -0,0 +1,34 @@
+export const planningNumbersByAVDate = `
+use AlplaPROD_test1
+declare @start_date nvarchar(30) = '[startDate]' --'2025-01-01'
+declare @end_date nvarchar(30) = '[endDate]' --'2025-08-09'
+/*
+articles will need to be passed over as well as the date structure we want to see
+*/
+
+select x.IdArtikelvarianten As Article,
+ProduktionAlias as Description,
+standort as MachineId,
+MaschinenBezeichnung as MachineName,
+--MaschZyklus as PlanningCycleTime,
+x.IdProdPlanung as LotNumber,
+FORMAT(ProdTag, 'MM/dd/yyyy') as ProductionDay,
+x.planMenge as TotalPlanned,
+ProduktionMenge as QTYPerDay,
+round(ProduktionMengeVPK, 2) PalDay,
+Status as finished
+--MaschStdAuslastung as nee
+
+from dbo.V_ProdLosProduktionJeProdTag_PLANNING (nolock) as x
+
+left join 
+dbo.V_ProdPlanung (nolock) as p on
+x.IdProdPlanung = p.IdProdPlanung
+
+where ProdTag between @start_date and @end_date 
+and p.IdArtikelvarianten in ([articles])
+--and V_ProdLosProduktionJeProdTag_PLANNING.IdKunde = 10 
+--and IdProdPlanung = 18442
+
+order by ProdTag desc
+`;

server/services/sqlServer/querys/warehouse/labelInfo.ts

@@ -21,7 +21,7 @@ select ext.Barcode
 ,RunningNumber as runnungNumber
 ,SsccEanRunningNumber as externalRunningNumber
 ,ArticleHumanReadableId
-,case when LabelManagementHumanReadableId is null then (select HumanReadableId from [test1_AlplaPROD2.0_Read].[masterData].[LabelManagement] (nolock) where LabelMarkerId = 7) else LabelManagementHumanReadableId end as labelLayout
+,case when LabelManagementHumanReadableId is null then (select HumanReadableId from [test1_AlplaPROD2.0_Read].[masterData].[LabelManagement] (nolock) where LabelMarkerId = 7 and Active = 1) else LabelManagementHumanReadableId end as labelLayout
 ,case when EinlagerungsMengeSum IS NULL then 'notOnStock' else 'onStock' end as stockStatus
 from [test1_AlplaPROD2.0_Read].[labelling].[ExternalLabel] (nolock) as ext