cowch/lstV2
1
0
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

test(added in commands): relocate and updated to remove

Browse Source
This commit is contained in:
Blake Matthes
2025-06-12 21:12:15 -05:00
parent 99ad79c662
commit e865c1dcaf
7 changed files with 149 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
frontend/src/components/logistics/helperCommands/commands/Relocate.tsx Normal file
View File

@@ -0,0 +1,133 @@
import { LstCard } from "@/components/extendedUI/LstCard";
import { Button } from "@/components/ui/button";
import { CardContent, CardHeader } from "@/components/ui/card";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { useForm } from "@tanstack/react-form";
import axios from "axios";
import { useState } from "react";
import { toast } from "sonner";
export default function Relocate() {
const [bookingIn, setBookingIn] = useState(false);
const form = useForm({
defaultValues: { runningNr: " ", lane: "" },
onSubmit: async ({ value }) => {
// Do something with form data
setBookingIn(true);
try {
const res = await axios.post("/api/ocp/bookin", {
runningNr: parseInt(value.runningNr),
});
if (res.data.success) {
toast.success(res.data.message);
form.reset();
setBookingIn(false);
} else {
console.log(res.data.data.errors);
toast.error(res.data.data.errors[0]?.message);
form.reset();
setBookingIn(false);
}
} catch (error) {
console.log(error);
toast.error(
"There was an error booking in pallet please validate you entered the correct info and try again."
);
setBookingIn(false);
}
},
});
return (
<LstCard>
<CardHeader>
<p>Relocate a pallet to another lane</p>
</CardHeader>
<form
onSubmit={(e) => {
e.preventDefault();
e.stopPropagation();
}}
>
<CardContent>
<form.Field
name="runningNr"
validators={{
// We can choose between form-wide and field-specific validators
onChange: ({ value }) =>
value.length > 2
? undefined
: "Please enter a valid running number",
}}
children={(field) => {
return (
<div className="">
<Label htmlFor="runningNr" className="mb-2">
Runnning Number
</Label>
<Input
name={field.name}
value={field.state.value}
onBlur={field.handleBlur}
type="number"
onChange={(e) =>
field.handleChange(e.target.value)
}
/>
{field.state.meta.errors.length ? (
<em>
{field.state.meta.errors.join(",")}
</em>
) : null}
</div>
);
}}
/>
<form.Field
name="lane"
validators={{
// We can choose between form-wide and field-specific validators
onChange: ({ value }) =>
value.length > 2
? undefined
: "Please enter a valid running number",
}}
children={(field) => {
return (
<div className="">
<Label htmlFor="runningNr" className="mb-2">
Enter lane
</Label>
<Input
name={field.name}
value={field.state.value}
onBlur={field.handleBlur}
//type="number"
onChange={(e) =>
field.handleChange(e.target.value)
}
/>
{field.state.meta.errors.length ? (
<em>
{field.state.meta.errors.join(",")}
</em>
) : null}
</div>
);
}}
/>
<div className="flex mt-2 justify-end">
<Button
onClick={form.handleSubmit}
disabled={bookingIn}
>
Relocate
</Button>
</div>
</CardContent>
</form>
</LstCard>
);
}

3
frontend/src/components/logistics/helperCommands/helperPage.tsx
View File

@@ -1,7 +1,9 @@
import Bookin from "./commands/Bookin";
import Relocate from "./commands/Relocate";
import RemoveAsNonReusable from "./commands/RemoveAsNonReusable";
export default function HelperPage() {
const url: string = window.location.host.split(":")[0];
return (
<div className="flex flex-wrap m-2 justify-center">
<div className="m-1">
@@ -11,6 +13,7 @@ export default function HelperPage() {
<div className="m-1">
<RemoveAsNonReusable />
</div>
<div className="m-1">{url === "localhost" && <Relocate />}</div>
</div>
);
}

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

@@ -1,7 +1,10 @@
import ConsumeMaterial from "@/components/logistics/materialHelper/consumption/ConsumeMaterial";
import {createFileRoute} from "@tanstack/react-router";
import PreformReturn from "@/components/logistics/materialHelper/consumption/PreformReturn";
import { createFileRoute } from "@tanstack/react-router";
export const Route = createFileRoute("/(logistics)/materialHelper/consumption/")({
export const Route = createFileRoute(
"/(logistics)/materialHelper/consumption/"
)({
component: RouteComponent,
head: () => ({
meta: [
@@ -17,9 +20,11 @@ export const Route = createFileRoute("/(logistics)/materialHelper/consumption/")
});
function RouteComponent() {
const url: string = window.location.host.split(":")[0];
return (
<div>
<ConsumeMaterial />
{url === "localhost" && <PreformReturn />}
</div>
);
}

2
frontend/src/routes/(logistics)/materialHelper/index.tsx
View File

@@ -1,5 +1,5 @@
import MaterialHelperPage from "@/components/logistics/materialHelper/materialHelperPage";
import {createFileRoute} from "@tanstack/react-router";
import { createFileRoute } from "@tanstack/react-router";
export const Route = createFileRoute("/(logistics)/materialHelper/")({
component: RouteComponent,

2
server/services/logistics/controller/commands/removeAsNonReusable.ts
View File

@@ -72,7 +72,7 @@ export const removeAsNonReusable = async (data: any) => {
if (stage === 0) {
stage = 1;
scanner.write(
`${STX}${scannerID[0].value}${label.data[0].Barcode}${ETX}`
`${STX}${scannerID[0].value}@${label.data[0].Barcode}${ETX}`
);
} else if (stage === 1) {
scanner.end();

2
server/services/ocp/controller/printers/updatePrinters.ts
View File

@@ -44,6 +44,7 @@ export const updatePrinters = async () => {
ipAddress: prodPrinterInfo[i].ipAddress,
port: prodPrinterInfo[i].port,
remark: prodPrinterInfo[i].remark,
processes: prodPrinterInfo[i].processes,
};
const { data, error } = await tryCatch(
db
@@ -57,6 +58,7 @@ export const updatePrinters = async () => {
ipAddress: prodPrinterInfo[i].ipAddress,
port: prodPrinterInfo[i].port,
remark: prodPrinterInfo[i].remark,
processes: prodPrinterInfo[i].processes,
upd_date: sql`NOW()`,
//printDelay: "90", // need to remove in a couple weeks
},

3
server/services/prodUser/prodUser.ts
View File

@@ -1,10 +1,11 @@
import { OpenAPIHono } from "@hono/zod-openapi";
import produser from "./routes/produser.js";
import createProdRole from "./routes/addProdRole.js";
import getRoles from "./routes/getProdRoles.js";
import { prodRoles } from "./utils/prodRoles.js";
const app = new OpenAPIHono();
const routes = [produser, createProdRole] as const;
const routes = [produser, createProdRole, getRoles] as const;
const appRoutes = routes.forEach((route) => {
app.route("/produser", route);