Merge pull request 'migration' (#51) from migration into main

Reviewed-on: #51

.gitignore

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

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
     }
   ]
 }

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/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/__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>

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\"",
@@ -36,7 +36,7 @@
     }
   },
   "admConfig": {
-    "build": 609,
+    "build": 661,
     "oldBuild": "backend-0.1.3.zip"
   },
   "devDependencies": {

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/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

@@ -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

@@ -289,11 +289,13 @@ export const labelingProcess = async ({
                 "error",
                 "labeling",
                 "ocp",
-                `There was an error booking in  the label: ${book.data?.errors[0]?.message}`
+                `There was an error booking in  the label: ${JSON.stringify(
+                    book.data
+                )}`
             );
             return {
                 success: false,
-                message: `Error Booking in label: ${book.data?.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 === "noMM") {
-            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,56 +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 &&
-                    n.noPKGShortage !== "pkgGood" &&
-                    n.noPKGShortage !== "noPkg"
-            );
-            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) =>
+            // 3. Manual color
+            const manualColor = checkCondition({
+                results: res,
+                lot,
+                filterFn: (n) =>
                     !n.IsMainMaterial &&
                     n.isManual &&
-                    n.noPKGShortage !== "pkgGood" &&
-                    n.noPKGShortage !== "noPkg"
-            );
-            if (
-                manualConsumeColor.some(
-                    (n: any) => n.noManualShortage === "noOK"
-                )
-            ) {
-                isStaged = {
-                    message: `lot: ${lot.lot}, is missing: ${manualConsumeColor
-                        .map(
-                            (o: any) =>
-                                `${o.MaterialHumanReadableId} - ${o.MaterialDescription}`
-                        )
-                        .join(",\n ")} for manual Material`,
-                    success: false,
-                };
-            }
+                    !("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",
@@ -137,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) =>
@@ -149,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/sqlServer/querys/ocp/mainMaterial.ts

@@ -23,7 +23,7 @@
 
 export const mmQuery = `
 use [test1_AlplaPROD2.0_Read]
-declare @lot as NVARCHAR(max) = [lotNumber]
+declare @lot as NVARCHAR(max) = [lotNumber] 
 /*
 checks all needed material including pkg
 
@@ -52,7 +52,7 @@ MaterialHumanReadableId
 	,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.TotalProducedQuantity+1) * cp.Pieces  else
+	,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 
@@ -63,9 +63,12 @@ MaterialHumanReadableId
 		then 'mmGood' 
 		else 'noMM' end else null end as noMMShortage
 
-	-- pkg check
+	-- pkg check auto
 	,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 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 
@@ -131,5 +134,7 @@ group by IdArtikelVarianten,ArtikelVariantenBez
 ) as l on 
 l.IdArtikelVarianten = MaterialHumanReadableId
 
-where lot.ProductionLotHumanReadableId = @lot
+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