From a7a9aa2874ddd1391b56983db51cfabd8e789213 Mon Sep 17 00:00:00 2001 From: Blake Matthes Date: Fri, 31 Oct 2025 09:41:08 -0500 Subject: [PATCH] fix(dm): correction to passing the username over for the importing of the file --- .../demandManagement/forecastEDIData.ts | 4 ++- .../logistics/routes/demandMgt/dmRoutes.ts | 9 +++++++ .../routes/demandMgt/forecastEDIData.ts | 27 +++++++++++++++++++ .../logistics/dm/ForecastImport.tsx | 7 +++-- .../-components/logistics/dm/OrderImport.tsx | 5 ++-- .../logistics/route/dm/bulkOrdersIn.ts | 6 ++--- .../services/logistics/route/dm/forecastIn.ts | 4 +-- 7 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 app/src/internal/logistics/routes/demandMgt/dmRoutes.ts create mode 100644 app/src/internal/logistics/routes/demandMgt/forecastEDIData.ts diff --git a/app/src/internal/logistics/controller/demandManagement/forecastEDIData.ts b/app/src/internal/logistics/controller/demandManagement/forecastEDIData.ts index 5aecb91..7411d6e 100644 --- a/app/src/internal/logistics/controller/demandManagement/forecastEDIData.ts +++ b/app/src/internal/logistics/controller/demandManagement/forecastEDIData.ts @@ -12,4 +12,6 @@ type IncomingForecastData = { CustomerArticleNumber: number; }; -export const forecastData = async (data: IncomingForecastData) => {}; +export const forecastData = async (data: IncomingForecastData) => { + console.log(data); +}; diff --git a/app/src/internal/logistics/routes/demandMgt/dmRoutes.ts b/app/src/internal/logistics/routes/demandMgt/dmRoutes.ts new file mode 100644 index 0000000..66387c2 --- /dev/null +++ b/app/src/internal/logistics/routes/demandMgt/dmRoutes.ts @@ -0,0 +1,9 @@ +import { Router } from "express"; +import { requireAuth } from "../../../../pkg/middleware/authMiddleware.js"; +import forecastData from "./forecastEDIData.js"; + +const router = Router(); + +router.use("/", requireAuth(), forecastData); + +export default router; diff --git a/app/src/internal/logistics/routes/demandMgt/forecastEDIData.ts b/app/src/internal/logistics/routes/demandMgt/forecastEDIData.ts new file mode 100644 index 0000000..2272223 --- /dev/null +++ b/app/src/internal/logistics/routes/demandMgt/forecastEDIData.ts @@ -0,0 +1,27 @@ +import type { Request, Response } from "express"; +import { Router } from "express"; +import z from "zod"; +import { preprintLabels } from "../../controller/labeling/preprint.js"; + +export const Preprint = z.object({ + scannerId: z.number(), + lotNr: z.number(), + machineId: z.number(), // 457=22, 458=23 + printerId: z.number(), // 457=22, 458=23 + layoutId: z.number(), + numberOfCopies: z.number(), + qtyToPrint: z.number().default(1), +}); + +const router = Router(); + +router.post("/preprint", async (req: Request, res: Response) => { + const parsed = Preprint.safeParse(req.body); + const print = await preprintLabels(req.body, req.user?.username || ""); + + res + .status(200) + .json({ success: print.success, message: print.message, data: print.data }); +}); + +export default router; diff --git a/frontend/src/routes/_old/old/-components/logistics/dm/ForecastImport.tsx b/frontend/src/routes/_old/old/-components/logistics/dm/ForecastImport.tsx index 27b910e..4814d30 100644 --- a/frontend/src/routes/_old/old/-components/logistics/dm/ForecastImport.tsx +++ b/frontend/src/routes/_old/old/-components/logistics/dm/ForecastImport.tsx @@ -2,11 +2,13 @@ import axios from "axios"; import { useRef, useState } from "react"; import { toast } from "sonner"; import { Button } from "@/components/ui/button"; +import { useAuth } from "@/lib/authClient"; export default function ForecastImport(props: any) { const fileInputRef: any = useRef(null); const [posting, setPosting] = useState(false); - const token = localStorage.getItem("auth_token"); + //const token = localStorage.getItem("auth_token"); + const { session } = useAuth(); //const [fileType, setFileType] = useState(""); const importOrders = async (e: any) => { const file = e.target.files[0]; @@ -20,6 +22,8 @@ export default function ForecastImport(props: any) { const formData = new FormData(); formData.append("postForecast", e.target.files[0]); formData.append("fileType", props.fileType); // extra field + formData.append("username", `${session?.user.username}`); + // console.log(formData); toast.success("Import started."); try { @@ -29,7 +33,6 @@ export default function ForecastImport(props: any) { { headers: { "Content-Type": "multipart/form-data", - Authorization: `Bearer ${token}`, }, }, ); diff --git a/frontend/src/routes/_old/old/-components/logistics/dm/OrderImport.tsx b/frontend/src/routes/_old/old/-components/logistics/dm/OrderImport.tsx index af3853f..cd7d3d6 100644 --- a/frontend/src/routes/_old/old/-components/logistics/dm/OrderImport.tsx +++ b/frontend/src/routes/_old/old/-components/logistics/dm/OrderImport.tsx @@ -2,11 +2,12 @@ import axios from "axios"; import { useRef, useState } from "react"; import { toast } from "sonner"; import { Button } from "@/components/ui/button"; +import { useAuth } from "@/lib/authClient"; export default function OrderImport(props: any) { const fileInputRef: any = useRef(null); const [posting, setPosting] = useState(false); - const token = localStorage.getItem("auth_token"); + const { session } = useAuth(); //const [fileType, setFileType] = useState(""); const importOrders = async (e: any) => { const file = e.target.files[0]; @@ -20,6 +21,7 @@ export default function OrderImport(props: any) { const formData = new FormData(); formData.append("postOrders", e.target.files[0]); formData.append("fileType", props.fileType); // extra field + formData.append("username", `${session?.user.username}`); try { const response = await axios.post( @@ -28,7 +30,6 @@ export default function OrderImport(props: any) { { headers: { "Content-Type": "multipart/form-data", - Authorization: `Bearer ${token}`, }, }, ); diff --git a/lstV2/server/services/logistics/route/dm/bulkOrdersIn.ts b/lstV2/server/services/logistics/route/dm/bulkOrdersIn.ts index 960b29e..b3a2b3a 100644 --- a/lstV2/server/services/logistics/route/dm/bulkOrdersIn.ts +++ b/lstV2/server/services/logistics/route/dm/bulkOrdersIn.ts @@ -36,15 +36,13 @@ app.openapi( async (c) => { apiHit(c, { endpoint: "/postbulkorders" }); const body = await c.req.parseBody(); - //console.log(body); // File | string + //console.log(body.username); // File | string // if (body["fileType"] === "standard") { // console.log(`doing standard orders in.`); // } - const { data: orders, error } = await tryCatch( - ordersIn(body, c.get("user")), - ); + const { data: orders, error } = await tryCatch(ordersIn(body, body)); if (error) { console.log(error); diff --git a/lstV2/server/services/logistics/route/dm/forecastIn.ts b/lstV2/server/services/logistics/route/dm/forecastIn.ts index 15b7712..b1bc5bf 100644 --- a/lstV2/server/services/logistics/route/dm/forecastIn.ts +++ b/lstV2/server/services/logistics/route/dm/forecastIn.ts @@ -44,9 +44,7 @@ app.openapi( // console.log(`doing standard orders in.`); // } - const { data: orders, error } = await tryCatch( - forecastIn(body, c.get("user")), - ); + const { data: orders, error } = await tryCatch(forecastIn(body, body)); if (error) { console.log(error);