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

Compare commits

base: cowch:030f9f9aacdfcca1298a26be4442f5629626ba79
Branches Tags
cowch:main cowch:migration cowch:dev
...
compare: cowch:3b5e82fdc122824b4f59f00f2ed59b90813694ba
Branches Tags
cowch:main cowch:migration cowch:dev

12 Commits
030f9f9aac ... 3b5e82fdc1

Author SHA1 Message Date
Blake Matthes
3b5e82fdc1 feat(ocp): added wrappercard into the mix 2025-03-25 18:57:00 -05:00
Blake Matthes
f9cd3fb881 feat(ocp): prodlink check added 2025-03-25 18:56:36 -05:00
Blake Matthes
51267f5202 fix(ocme): fixed the camera routes 2025-03-25 18:55:57 -05:00
Blake Matthes
ceaa25f31e feat(ocp): added labeling logs in 2025-03-25 18:55:23 -05:00
Blake Matthes
416254353c chore(release): bump build number to 84 2025-03-25 18:21:47 -05:00
Blake Matthes
7f946c095b chore(release): bump build number to 83 2025-03-25 18:03:32 -05:00
Blake Matthes
c2aa69ab0a chore(release): bump build number to 82 2025-03-25 18:02:14 -05:00
Blake Matthes
250988800e chore(release): bump build number to 81 2025-03-25 17:57:13 -05:00
Blake Matthes
cacfd6d2e0 chore(release): bump build number to 80 2025-03-25 17:49:07 -05:00
Blake Matthes
8d2721b0c2 chore(release): bump build number to 79 2025-03-25 17:44:41 -05:00
Blake Matthes
36cdc7b4bf chore(release): bump build number to 78 2025-03-25 17:39:26 -05:00
Blake Matthes
4d4d6fc7a4 chore(release): bump build number to 77 2025-03-25 15:48:28 -05:00
20 changed files with 2966 additions and 126 deletions
Expand all files Collapse all files

4
database/migrations/0030_conscious_cable.sql Normal file
View File

@@ -0,0 +1,4 @@
CREATE TABLE "prodlabels" (
"label_id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
"runningNr" integer NOT NULL
);

7
database/migrations/0031_loud_alex_power.sql Normal file
View File

@@ -0,0 +1,7 @@
ALTER TABLE "prodlabels" ADD COLUMN "printerID" integer;--> statement-breakpoint
ALTER TABLE "prodlabels" ADD COLUMN "printerName" text;--> statement-breakpoint
ALTER TABLE "prodlabels" ADD COLUMN "line" integer;--> statement-breakpoint
ALTER TABLE "prodlabels" ADD COLUMN "status" text;--> statement-breakpoint
ALTER TABLE "prodlabels" ADD COLUMN "add_date" timestamp;--> statement-breakpoint
ALTER TABLE "prodlabels" ADD COLUMN "upd_date" timestamp;--> statement-breakpoint
CREATE UNIQUE INDEX "runningNr" ON "prodlabels" USING btree ("runningNr");

1194
database/migrations/meta/0030_snapshot.json Normal file
View File

File diff suppressed because it is too large Load Diff

1246
database/migrations/meta/0031_snapshot.json Normal file
View File

File diff suppressed because it is too large Load Diff

14
database/migrations/meta/_journal.json
View File

@@ -211,6 +211,20 @@
"when": 1742917978318, "when": 1742917978318,
"tag": "0029_giant_blue_blade", "tag": "0029_giant_blue_blade",
"breakpoints": true "breakpoints": true
},
{
"idx": 30,
"version": "7",
"when": 1742938986653,
"tag": "0030_conscious_cable",
"breakpoints": true
},
{
"idx": 31,
"version": "7",
"when": 1742939306614,
"tag": "0031_loud_alex_power",
"breakpoints": true
} }
] ]
} }

29
database/schema/prodLabels.ts Normal file
View File

@@ -0,0 +1,29 @@
import {
integer,
pgTable,
uuid,
uniqueIndex,
text,
timestamp,
} from "drizzle-orm/pg-core";
import { createSelectSchema } from "drizzle-zod";
export const prodlabels = pgTable(
"prodlabels",
{
label_id: uuid("label_id").defaultRandom().primaryKey(),
printerID: integer("printerID"),
printerName: text("printerName"),
line: integer("line"),
runningNr: integer("runningNr").notNull(),
status: text("status"),
add_date: timestamp("add_date"),
upd_date: timestamp("upd_date"),
},
(table) => [
//uniqueIndex("emailUniqueIndex").on(sql`lower(${table.email})`),
uniqueIndex("runningNr").on(table.runningNr),
]
);
export const prodlabelsSchema = createSelectSchema(prodlabels);

131
frontend/src/components/ocme/WrapperCard.tsx Normal file
View File

@@ -0,0 +1,131 @@
import axios from "axios";
import { LstCard } from "../extendedUI/LstCard";
import { Button } from "../ui/button";
import { ScrollArea } from "../ui/scroll-area";
import { Skeleton } from "../ui/skeleton";
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from "../ui/table";
import { toast } from "sonner";
const currentPallets = [
{ key: "line", label: "Line" },
{ key: "runningNr", label: "Running #" },
{ key: "upd_date", label: "Date Scanned" },
{ key: "waitingfor", label: "Waiting For" },
{ key: "clear", label: "Clear" },
];
const currentTags = [
{ key: "line", label: "Line" },
{ key: "printerName", label: "Printer" },
{ key: "runningNr", label: "Running #" },
{ key: "upd_date", label: "Label date" },
{ key: "status", label: "Label Status" },
];
export default function WrapperManualTrigger() {
const cameraTrigger = async () => {
try {
const res = await axios.get("/ocme/api/v1/manualCameraTrigger");
if (res.data.success) {
toast.success(res.data.message);
return;
}
if (!res.data.success) {
toast.error(res.data.message);
}
} catch (error) {
console.log(error);
//stoast.success(error.data.message);
}
};
return (
<LstCard className="m-2 p-2">
<ScrollArea className="max-h-[200px]">
<span>Wrapper Pallet Info</span>
<Table>
<TableHeader>
<TableRow>
{currentPallets.map((l) => (
<TableHead key={l.key}>{l.label}</TableHead>
))}
</TableRow>
</TableHeader>
<TableBody>
{Array(3)
.fill(0)
.map((_, i) => (
<TableRow key={i}>
<TableCell className="font-medium">
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</ScrollArea>
<ScrollArea className="max-h-[200px]">
<Table>
<TableHeader>
<TableRow>
{currentTags.map((l) => (
<TableHead key={l.key}>{l.label}</TableHead>
))}
</TableRow>
</TableHeader>
<TableBody>
{Array(3)
.fill(0)
.map((_, i) => (
<TableRow key={i}>
<TableCell className="font-medium">
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</ScrollArea>
<div>
<hr />
<p className="text-center mb-3">Manual Triggers</p>
<div className="flex flex-row justify-between">
<Button onClick={cameraTrigger}>Camera</Button>
<Button>Rfid</Button>
</div>
</div>
</LstCard>
);
}

127
frontend/src/components/production/ocp/LabelLog.tsx
View File

@@ -1,23 +1,30 @@
import {LstCard} from "@/components/extendedUI/LstCard"; import { LstCard } from "@/components/extendedUI/LstCard";
import {Skeleton} from "@/components/ui/skeleton"; import { Skeleton } from "@/components/ui/skeleton";
import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table"; import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from "@/components/ui/table";
// import {useSessionStore} from "@/lib/store/sessionStore"; // import {useSessionStore} from "@/lib/store/sessionStore";
// import {useSettingStore} from "@/lib/store/useSettings"; // import {useSettingStore} from "@/lib/store/useSettings";
import {useQuery} from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query";
import {getlabels} from "@/utils/querys/production/labels"; import { getlabels } from "@/utils/querys/production/labels";
import {format} from "date-fns"; import { format } from "date-fns";
const labelLogs = [ const labelLogs = [
{key: "line", label: "Line"}, { key: "line", label: "Line" },
{key: "printerName", label: "Printer"}, { key: "printerName", label: "Printer" },
{key: "runningNr", label: "Running #"}, { key: "runningNr", label: "Running #" },
{key: "upd_date", label: "Label date"}, { key: "upd_date", label: "Label date" },
{key: "status", label: "Label Status"}, { key: "status", label: "Label Status" },
//{key: "reprint", label: "Reprint"}, // removing the reprint button for now until repritning is working as intended //{key: "reprint", label: "Reprint"}, // removing the reprint button for now until repritning is working as intended
]; ];
export default function LabelLog() { export default function LabelLog() {
const {data, isError, isLoading} = useQuery(getlabels("4")); const { data, isError, isLoading } = useQuery(getlabels("4"));
//const {user} = useSessionStore(); //const {user} = useSessionStore();
//const {settings} = useSettingStore(); //const {settings} = useSettingStore();
//const server = settings.filter((n) => n.name === "server")[0]?.value || ""; //const server = settings.filter((n) => n.name === "server")[0]?.value || "";
@@ -40,26 +47,26 @@ export default function LabelLog() {
<TableBody> <TableBody>
{Array(7) {Array(7)
.fill(0) .fill(0)
.map((_, i) => ( .map((_, i) => (
<TableRow key={i}> <TableRow key={i}>
<TableCell className="font-medium"> <TableCell className="font-medium">
<Skeleton className="h-4" /> <Skeleton className="h-4" />
</TableCell> </TableCell>
<TableCell> <TableCell>
<Skeleton className="h-4" /> <Skeleton className="h-4" />
</TableCell> </TableCell>
<TableCell> <TableCell>
<Skeleton className="h-4" /> <Skeleton className="h-4" />
</TableCell> </TableCell>
<TableCell> <TableCell>
<Skeleton className="h-4" /> <Skeleton className="h-4" />
</TableCell> </TableCell>
<TableCell> <TableCell>
<Skeleton className="h-4" /> <Skeleton className="h-4" />
</TableCell> </TableCell>
</TableRow> </TableRow>
))} ))}
</TableBody> </TableBody>
</Table> </Table>
</LstCard> </LstCard>
@@ -82,39 +89,47 @@ export default function LabelLog() {
<> <>
<TableBody> <TableBody>
{Array(7) {Array(7)
.fill(0) .fill(0)
.map((_, i) => ( .map((_, i) => (
<TableRow key={i}> <TableRow key={i}>
<TableCell className="font-medium"> <TableCell className="font-medium">
<Skeleton className="h-4" /> <Skeleton className="h-4" />
</TableCell> </TableCell>
<TableCell> <TableCell>
<Skeleton className="h-4" /> <Skeleton className="h-4" />
</TableCell> </TableCell>
<TableCell> <TableCell>
<Skeleton className="h-4" /> <Skeleton className="h-4" />
</TableCell> </TableCell>
<TableCell> <TableCell>
<Skeleton className="h-4" /> <Skeleton className="h-4" />
</TableCell> </TableCell>
<TableCell> <TableCell>
<Skeleton className="h-4" /> <Skeleton className="h-4" />
</TableCell> </TableCell>
</TableRow> </TableRow>
))} ))}
</TableBody> </TableBody>
</> </>
) : ( ) : (
<TableBody> <TableBody>
{data?.map((label: any) => ( {data?.map((label: any) => (
<TableRow key={label.runningNr}> <TableRow key={label.runningNr}>
<TableCell className="font-medium">{label.line}</TableCell> <TableCell className="font-medium">
<TableCell className="font-medium">{label.printerName}</TableCell> {label.line}
<TableCell className="font-medium">{label.runningNr}</TableCell> </TableCell>
<TableCell className="font-medium">
{label.printerName}
</TableCell>
<TableCell className="font-medium">
{label.runningNr}
</TableCell>
<TableCell className="font-medium"> <TableCell className="font-medium">
{format(label.upd_date, "M/d/yyyy hh:mm")} {format(label.upd_date, "M/d/yyyy hh:mm")}
</TableCell> </TableCell>
<TableCell className="font-medium">{label.status}</TableCell> <TableCell className="font-medium">
{label.status}
</TableCell>
</TableRow> </TableRow>
))} ))}
</TableBody> </TableBody>

16
frontend/src/components/production/ocp/OcpPage.tsx
View File

@@ -1,9 +1,14 @@
import WrapperManualTrigger from "@/components/ocme/WrapperCard";
import LabelLog from "./LabelLog"; import LabelLog from "./LabelLog";
import Lots from "./Lots"; import Lots from "./Lots";
import OcpLogs from "./OcpLogs"; import OcpLogs from "./OcpLogs";
import PrinterStatus from "./PrinterStatus"; import PrinterStatus from "./PrinterStatus";
import { useSettingStore } from "@/lib/store/useSettings";
export default function OCPPage() { export default function OCPPage() {
const { settings } = useSettingStore();
const server = settings.filter((n) => n.plantToken === "usday1");
return ( return (
<div className="h-dvh w-full overflow-hidden"> <div className="h-dvh w-full overflow-hidden">
<div className="flex flex-wrap gap-2"> <div className="flex flex-wrap gap-2">
@@ -21,8 +26,15 @@ export default function OCPPage() {
</div> </div>
</div> </div>
</div> </div>
<div className="w-1/6"> <div className="w-1/6 flex flex-col">
<PrinterStatus /> {server && (
<div>
<WrapperManualTrigger />
</div>
)}
<div>
<PrinterStatus />
</div>
</div> </div>
</div> </div>
</div> </div>

69
frontend/src/components/production/ocp/PrinterStatus.tsx
View File

@@ -1,6 +1,14 @@
import {LstCard} from "@/components/extendedUI/LstCard"; import { LstCard } from "@/components/extendedUI/LstCard";
import {Skeleton} from "@/components/ui/skeleton"; import { ScrollArea } from "@/components/ui/scroll-area";
import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table"; import { Skeleton } from "@/components/ui/skeleton";
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from "@/components/ui/table";
let printerCols = [ let printerCols = [
{ {
@@ -19,34 +27,37 @@ let printerCols = [
export default function PrinterStatus() { export default function PrinterStatus() {
return ( return (
<LstCard className="m-2 p-2"> <LstCard className="m-2 p-2">
<p className="text-center">Printer Status</p> <ScrollArea className="max-h-[300px]">
<Table> <p className="text-center">Printer Status</p>
<TableHeader>
<TableRow>
{printerCols.map((l) => (
<TableHead key={l.key}>{l.label}</TableHead>
))}
</TableRow>
</TableHeader>
<TableBody> <Table>
{Array(10) <TableHeader>
.fill(0) <TableRow>
.map((_, i) => ( {printerCols.map((l) => (
<TableRow key={i}> <TableHead key={l.key}>{l.label}</TableHead>
<TableCell className="font-medium"> ))}
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
</TableRow> </TableRow>
))} </TableHeader>
</TableBody>
</Table> <TableBody>
{Array(5)
.fill(0)
.map((_, i) => (
<TableRow key={i}>
<TableCell className="font-medium">
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</ScrollArea>
</LstCard> </LstCard>
); );
} }

4
frontend/src/utils/querys/production/labels.tsx
View File

@@ -1,4 +1,4 @@
import {queryOptions} from "@tanstack/react-query"; import { queryOptions } from "@tanstack/react-query";
import axios from "axios"; import axios from "axios";
export function getlabels(hours: string) { export function getlabels(hours: string) {
@@ -13,7 +13,7 @@ export function getlabels(hours: string) {
} }
const fetchSettings = async (hours: string) => { const fetchSettings = async (hours: string) => {
const {data} = await axios.get(`/api/v1/ocp/labels?hours=${hours}`); const { data } = await axios.get(`/api/ocp/getlabels?hours=${hours}`);
// if we are not localhost ignore the devDir setting. // if we are not localhost ignore the devDir setting.
//const url: string = window.location.host.split(":")[0]; //const url: string = window.location.host.split(":")[0];
return data.data ?? []; return data.data ?? [];

4
package.json
View File

@@ -32,7 +32,7 @@
} }
}, },
"admConfig": { "admConfig": {
"build": 76, "build": 84,
"oldBuild": "backend-0.1.3.zip" "oldBuild": "backend-0.1.3.zip"
}, },
"devDependencies": { "devDependencies": {
@@ -78,4 +78,4 @@
"ws": "^8.18.1", "ws": "^8.18.1",
"zod": "^3.24.2" "zod": "^3.24.2"
} }
} }

11
server/services/ocme/controller/triggerCamera.ts
View File

@@ -18,8 +18,15 @@ export const triggerScanner = async () => {
} }
const scannerData = JSON.parse(setting[0]?.value); const scannerData = JSON.parse(setting[0]?.value);
let data = scannerData.filter((n: any) => n.name === "wrapper1"); let data = scannerData.filter((n: any) => n.name === "wrapper1");
let port = data[0].port;
console.log(data); if (data.length === 0) {
return {
success: false,
message: "Looks like the scanner is missing.",
};
}
let port = data[0]?.port;
createLog( createLog(
"info", "info",
"wrapperScanner", "wrapperScanner",

31
server/services/ocme/route/triggerCamera.ts
View File

@@ -7,19 +7,22 @@ import { triggerScanner } from "../controller/triggerCamera.js";
const app = new OpenAPIHono({ strict: false }); const app = new OpenAPIHono({ strict: false });
app.openapi( app.openapi(
createRoute({ createRoute({
tags: ["ocme"], tags: ["ocme"],
summary: "Triggers the camera at the end of the dyco.", summary: "Triggers the camera at the end of the dyco.",
method: "get", method: "get",
path: "/manualCameraTrigger", path: "/manualCameraTrigger",
responses: responses(), responses: responses(),
}), }),
async (c) => { async (c) => {
// make sure we have a vaid user being accessed thats really logged in // make sure we have a vaid user being accessed thats really logged in
apiHit(c, { endpoint: "api/auth/register" }); apiHit(c, { endpoint: "api/auth/register" });
const manualTrigger = await triggerScanner(); const manualTrigger: any = await triggerScanner();
console.log(manualTrigger); console.log(manualTrigger);
return c.json({ success: true, message: "Manual triggered" }); return c.json({
} success: manualTrigger.success,
message: manualTrigger.message,
});
}
); );
export default app; export default app;

32
server/services/ocp/controller/labeling/getLabels.ts Normal file
View File

@@ -0,0 +1,32 @@
import { desc, lte, sql } from "drizzle-orm";
import { db } from "../../../../../database/dbclient.js";
import { prodlabels } from "../../../../../database/schema/prodLabels.js";
import { tryCatch } from "../../../../globalUtils/tryCatch.js";
export const getLabels = async (hours: string) => {
const { data: labelInfo, error: labelError } = await tryCatch(
db
.select()
.from(prodlabels)
.where(
lte(
prodlabels.upd_date,
sql.raw(`NOW() - INTERVAL '${hours} hours'`)
)
)
.orderBy(desc(prodlabels.upd_date))
);
if (labelError) {
return {
success: false,
message: "There was an error getting the labels",
data: labelError,
};
}
return {
success: true,
message: "Current labels order by upd_Date.",
data: labelInfo,
};
};

68
server/services/ocp/controller/lots/prolinkCheck.ts Normal file
View File

@@ -0,0 +1,68 @@
import { db } from "../../../../../database/dbclient.js";
import { settings } from "../../../../../database/schema/settings.js";
import { tryCatch } from "../../../../globalUtils/tryCatch.js";
import { createLog } from "../../../logger/logger.js";
import { query } from "../../../sqlServer/prodSqlServer.js";
import { prolinkQuery } from "../../../sqlServer/querys/ocp/prolinkCheck.js";
// check the if the lot matches
export const prolinkCheck = async (lot: any) => {
const { data, error: settingError } = await tryCatch(
db.select().from(settings)
);
if (settingError) {
createLog(
"error",
"ocp",
"ocp",
`There was an error getting the settings.`
);
return;
}
const settingData: any = data;
const plantToken = settingData.filter(
(s: any) => s.name === "plantToken"
)[0].value;
const prolinkCheck = settingData.filter(
(s: any) => s.name === "prolinkCheck"
)[0].value;
// if we want to ignore prolink check it will be disabled and then just return a pass as true
if (prolinkCheck === "0") {
createLog(
"info",
"ocp",
"ocp",
`Prolink Check is disabled skipping check.`
);
return true;
}
// run the query
try {
const prolink = await query(prolinkQuery, "Prolink Checks");
//console.log(lot);
// filter out the lot
const filterdLot = prolink.filter(
(p: any) => p.AlplaLabelOnline === lot
);
//console.log(filterdLot);
if (filterdLot[0].LotCheck === "Good") {
return true;
} else {
return false;
}
} catch (err) {
createLog(
"error",
"ocp",
"ocp",
`Error from running the Prolink Check query: ${err}`
);
return false;
}
};

7
server/services/ocp/ocpService.ts
View File

@@ -8,6 +8,7 @@ import { settings } from "../../../database/schema/settings.js";
import updateprinters from "./routes/printers/updatePrinters.js"; import updateprinters from "./routes/printers/updatePrinters.js";
import { updatePrinters } from "./controller/printers/updatePrinters.js"; import { updatePrinters } from "./controller/printers/updatePrinters.js";
import getLots from "./routes/lots/getLots.js"; import getLots from "./routes/lots/getLots.js";
import getLabels from "./routes/labeling/getLabels.js";
const app = new OpenAPIHono(); const app = new OpenAPIHono();
@@ -18,6 +19,8 @@ const routes = [
updateprinters, updateprinters,
// lots // lots
getLots, getLots,
// labeling
getLabels,
] as const; ] as const;
const setting = await db.select().from(settings); const setting = await db.select().from(settings);
@@ -33,6 +36,8 @@ app.all("/ocp/*", (c) => {
}); });
// run the printer update on restart just to keep everything good // run the printer update on restart just to keep everything good
updatePrinters(); setTimeout(() => {
updatePrinters();
}, 3 * 1000);
export default app; export default app;

37
server/services/ocp/routes/labeling/getLabels.ts Normal file
View File

@@ -0,0 +1,37 @@
// an external way to creating logs
import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
import { responses } from "../../../../globalUtils/routeDefs/responses.js";
import { tryCatch } from "../../../../globalUtils/tryCatch.js";
import { getLabels } from "../../controller/labeling/getLabels.js";
const app = new OpenAPIHono({ strict: false });
app.openapi(
createRoute({
tags: ["ocp"],
summary: "Returns current active lots that are tech released",
method: "get",
path: "/getlabels",
responses: responses(),
}),
async (c) => {
const hours = c.req.query("hours");
const { data: labelData, error: labelError } = await tryCatch(
getLabels(hours ?? "2")
);
if (labelError) {
return c.json({
success: false,
message: "There was an error getting the printers",
});
}
return c.json({
success: labelData.success,
message: labelData.message,
data: labelData.data,
});
}
);
export default app;

25
server/services/sqlServer/querys/ocp/prolinkCheck.ts Normal file
View File

@@ -0,0 +1,25 @@
export const prolinkQuery = `
select * from (
select *
From(select
V_Maschinen_ProdPlanungen.MaschinenStandort as Machine,
V_Maschinen_ProdPlanungen.IdProdPlanung as AlplaLabelOnline,
prolink.lot Prolink,
case when AlplaPROD_test1.dbo.V_Maschinen_ProdPlanungen.IdProdPlanung <> prolink.lot
Then 'IncorrectLot'
Else 'Good' end as LotCheck
from AlplaPROD_test1.dbo.V_Maschinen_ProdPlanungen (nolock)
left join
(
SELECT *
FROM (SELECT IdMaschine,
Produktionslos as lot,
Startzeit as StartTime,
Upd_Date,
ROW_NUMBER() OVER (PARTITION BY IdMaschine ORDER BY Upd_Date DESC) RN_Prolink
FROM AlplaPROD_test1.dbo.T_HistoryProduktionsdaten (nolock)
WHERE Upd_Date BETWEEN DATEADD(DD, - 10, getdate()) AND DATEADD(DD, 1, getdate())) a
WHERE RN_Prolink = 1
) as prolink on AlplaPROD_test1.dbo.V_Maschinen_ProdPlanungen.IdMaschine=prolink.IdMaschine) a
) a
`;

36
tsconfig.json
View File

@@ -1,20 +1,20 @@
{ {
"compilerOptions": { "compilerOptions": {
"target": "ESNext", "target": "ESNext",
"module": "NodeNext", "module": "NodeNext",
"moduleResolution": "nodenext", "moduleResolution": "nodenext",
"strict": true, "strict": true,
"verbatimModuleSyntax": true, "verbatimModuleSyntax": true,
"skipLibCheck": true, "skipLibCheck": true,
"types": ["node"], "types": ["node"],
"jsx": "react-jsx", "jsx": "react-jsx",
"jsxImportSource": "hono/jsx", "jsxImportSource": "hono/jsx",
"outDir": "./dist", "outDir": "./dist",
"removeComments": true, "removeComments": true,
"allowJs": true, "allowJs": true,
"esModuleInterop": true, "esModuleInterop": true,
"resolveJsonModule": true "resolveJsonModule": true
}, },
"include": ["server", "scripts/**/*.ts"], "include": ["server", "scripts/**/*.ts"],
"exclude": ["node_modules", "frontend", "dist", "testFiles"] "exclude": ["node_modules", "frontend", "dist", "testFiles"]
} }