Skip to content

Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.

fix: MES operation cards open again for companies with a copied twin (#1743)

Anshul sharma0608ffdc42d0
diff --git a/apps/erp/app/modules/inventory/inventory.service.ts b/apps/erp/app/modules/inventory/inventory.service.ts
index 3ca06deb65..28cba44ff5 100644
--- a/apps/erp/app/modules/inventory/inventory.service.ts
+++ b/apps/erp/app/modules/inventory/inventory.service.ts
@@ -1401,12 +1401,14 @@ export async function getTrackedEntities(
export async function getTrackedEntitiesByMakeMethodId(
client: SupabaseClient<Database>,
- jobMakeMethodId: string
+ jobMakeMethodId: string,
+ companyId: string
) {
return client
.from("trackedEntity")
.select("*")
.eq("attributes->>Job Make Method", jobMakeMethodId)
+ .eq("companyId", companyId)
.order("createdAt", { ascending: true });
}
@@ -1496,12 +1498,14 @@ export async function updateTrackedEntityExpiry(
export async function getTrackedEntitiesByOperationId(
client: SupabaseClient<Database>,
- operationId: string
+ operationId: string,
+ companyId: string
) {
const jobOperation = await client
.from("jobOperation")
.select("jobMakeMethodId")
.eq("id", operationId)
+ .eq("companyId", companyId)
.single();
if (jobOperation.error || !jobOperation.data.jobMakeMethodId)
@@ -1512,7 +1516,8 @@ export async function getTrackedEntitiesByOperationId(
return getTrackedEntitiesByMakeMethodId(
client,
- jobOperation.data.jobMakeMethodId
+ jobOperation.data.jobMakeMethodId,
+ companyId
);
}
diff --git a/apps/erp/app/modules/inventory/lineage.server.ts b/apps/erp/app/modules/inventory/lineage.server.ts
index aab0304442..724f5cae94 100644
--- a/apps/erp/app/modules/inventory/lineage.server.ts
+++ b/apps/erp/app/modules/inventory/lineage.server.ts
@@ -403,13 +403,22 @@ export async function fetchContainmentsForEntities(
export async function fetchJobScopedLineage(
client: SupabaseClient<Database>,
jobId: string,
+ companyId: string,
depth: number
): Promise<LineagePayload> {
const safeDepth = clampDepth(depth);
const [seedEntitiesRes, seedActivitiesRes] = await Promise.all([
- client.from("trackedEntity").select("*").eq("attributes->>Job", jobId),
- client.from("trackedActivity").select("*").eq("attributes->>Job", jobId)
+ client
+ .from("trackedEntity")
+ .select("*")
+ .eq("attributes->>Job", jobId)
+ .eq("companyId", companyId),
+ client
+ .from("trackedActivity")
+ .select("*")
+ .eq("attributes->>Job", jobId)
+ .eq("companyId", companyId)
]);
const state = newLineageState();
diff --git a/apps/erp/app/modules/production/ui/Jobs/JobHeader.tsx b/apps/erp/app/modules/production/ui/Jobs/JobHeader.tsx
index 9c369c8fc1..a370887c83 100644
--- a/apps/erp/app/modules/production/ui/Jobs/JobHeader.tsx
+++ b/apps/erp/app/modules/production/ui/Jobs/JobHeader.tsx
@@ -1289,6 +1289,7 @@ function JobCompleteModal({
onClose: () => void;
}) {
const { carbon } = useCarbon();
+ const { company } = useUser();
const [loading, setLoading] = useState(true);
const { t } = useLingui();
const [defaultStorageUnitId, setDefaultStorageUnitId] = useState<
@@ -1345,6 +1346,7 @@ function JobCompleteModal({
.from("jobMakeMethod")
.select("*")
.eq("jobId", job?.id!)
+ .eq("companyId", company.id)
.is("parentMaterialId", null)
.single(),
getJobReceipts(job?.id!)
@@ -1368,6 +1370,7 @@ function JobCompleteModal({
.from("trackedEntity")
.select("*")
.eq("attributes->>Job Make Method", makeMethod.data?.id!)
+ .eq("companyId", company.id)
.order("createdAt", { ascending: true });
if (trackedEntities.data?.length) {
diff --git a/apps/erp/app/routes/file+/operation+/$id.labels[.]pdf.tsx b/apps/erp/app/routes/file+/operation+/$id.labels[.]pdf.tsx
index 576723a9f8..04d7b5e464 100644
--- a/apps/erp/app/routes/file+/operation+/$id.labels[.]pdf.tsx
+++ b/apps/erp/app/routes/file+/operation+/$id.labels[.]pdf.tsx
@@ -23,7 +23,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
const [company, companySettings, trackedEntities] = await Promise.all([
getCompany(client, companyId),
getCompanySettings(client, companyId),
- getTrackedEntitiesByMakeMethodId(client, id)
+ getTrackedEntitiesByMakeMethodId(client, id, companyId)
]);
if (company.error) {
diff --git a/apps/erp/app/routes/file+/operation+/$id.labels[.]zpl.tsx b/apps/erp/app/routes/file+/operation+/$id.labels[.]zpl.tsx
index 8820d42b03..c611863ca6 100644
--- a/apps/erp/app/routes/file+/operation+/$id.labels[.]zpl.tsx
+++ b/apps/erp/app/routes/file+/operation+/$id.labels[.]zpl.tsx
@@ -23,7 +23,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
const [companySettings, trackedEntities] = await Promise.all([
getCompanySettings(client, companyId),
- getTrackedEntitiesByMakeMethodId(client, id)
+ getTrackedEntitiesByMakeMethodId(client, id, companyId)
]);
const url = new URL(request.url);
diff --git a/apps/erp/app/routes/x+/traceability+/graph.tsx b/apps/erp/app/routes/x+/traceability+/graph.tsx
index b5131b61cf..9e4aaa10f7 100644
--- a/apps/erp/app/routes/x+/traceability+/graph.tsx
+++ b/apps/erp/app/routes/x+/traceability+/graph.tsx
@@ -93,6 +93,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
const jobPayload = await fetchJobScopedLineage(
client,
associatedJobId,
+ companyId,
depth
);
const jobReadableId = await getJobReadableId(client, associatedJobId);
@@ -118,7 +119,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
if (jobId) {
const jobReadableId = await getJobReadableId(client, jobId);
const payload = withJobNode(
- await fetchJobScopedLineage(client, jobId, depth),
+ await fetchJobScopedLineage(client, jobId, companyId, depth),
jobId,
jobReadableId
);
diff --git a/apps/mes/app/routes/file+/operation+/$id.labels[.]pdf.tsx b/apps/mes/app/routes/file+/operation+/$id.labels[.]pdf.tsx
index 65458f00bb..72c4af81ec 100644
--- a/apps/mes/app/routes/file+/operation+/$id.labels[.]pdf.tsx
+++ b/apps/mes/app/routes/file+/operation+/$id.labels[.]pdf.tsx
@@ -24,7 +24,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
const [companySettings, trackedEntities] = await Promise.all([
getCompanySettings(client, companyId),
- getTrackedEntitiesByOperationId(client, id)
+ getTrackedEntitiesByOperationId(client, id, companyId)
]);
// Get the label size from query params or default to avery5163
diff --git a/apps/mes/app/routes/file+/operation+/$id.labels[.]zpl.tsx b/apps/mes/app/routes/file+/operation+/$id.labels[.]zpl.tsx
index d3d362397f..5535177058 100644
--- a/apps/mes/app/routes/file+/operation+/$id.labels[.]zpl.tsx
+++ b/apps/mes/app/routes/file+/operation+/$id.labels[.]zpl.tsx
@@ -11,7 +11,7 @@ import {
getCompanyLogoForLabel,
resolveLabelLogo
} from "~/services/labelLogo.server";
-import { getTrackedEntitiesByMakeMethodId } from "~/services/operations.service";
+import { getTrackedEntitiesByOperationId } from "~/services/operations.service";
import { path } from "~/utils/path";
export async function loader({ request, params }: LoaderFunctionArgs) {
@@ -22,7 +22,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
const [companySettings, trackedEntities] = await Promise.all([
getCompanySettings(client, companyId),
- getTrackedEntitiesByMakeMethodId(client, id)
+ getTrackedEntitiesByOperationId(client, id, companyId)
]);
const url = new URL(request.url);
diff --git a/apps/mes/app/routes/x+/assembly.$operationId.tsx b/apps/mes/app/routes/x+/assembly.$operationId.tsx
index 1e3e65de3a..9d3d6c860d 100644
--- a/apps/mes/app/routes/x+/assembly.$operationId.tsx
+++ b/apps/mes/app/routes/x+/assembly.$operationId.tsx
@@ -113,7 +113,11 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
assemblyPlayback
] = await Promise.all([
getThumbnailPathByItemId(serviceRole, op.itemId),
- getTrackedEntitiesByMakeMethodId(serviceRole, op.jobMakeMethodId),
+ getTrackedEntitiesByMakeMethodId(
+ serviceRole,
+ op.jobMakeMethodId,
+ companyId
+ ),
getJobMakeMethod(serviceRole, op.jobMakeMethodId),
getJobOperationProcedure(serviceRole, operationId),
getToolsByOperationId(serviceRole, operationId),
diff --git a/apps/mes/app/routes/x+/end.$operationId.tsx b/apps/mes/app/routes/x+/end.$operationId.tsx
index 6a2f62049f..6751a9e50f 100644
--- a/apps/mes/app/routes/x+/end.$operationId.tsx
+++ b/apps/mes/app/routes/x+/end.$operationId.tsx
@@ -166,7 +166,8 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
if (!trackedEntityId) {
const trackedEntities = await getTrackedEntitiesByMakeMethodId(
serviceRole,
- jobOperation.data.jobMakeMethodId
+ jobOperation.data.jobMakeMethodId,
+ companyId
);
// Complete the next incomplete serial unit for this operation (createdAt
@@ -236,7 +237,8 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
// "operation complete" redirect below.
const remainingTrackedEntities = await getTrackedEntitiesByMakeMethodId(
serviceRole,
- jobOperation.data.jobMakeMethodId
+ jobOperation.data.jobMakeMethodId,
+ companyId
);
const nextTrackedEntity = (remainingTrackedEntities.data ?? []).find(
(entity) => isSerialEntityIncompleteForOperation(entity, operationId)
diff --git a/apps/mes/app/routes/x+/inspection.$operationId.tsx b/apps/mes/app/routes/x+/inspection.$operationId.tsx
index d6ea4d4ac4..1697603b76 100644
--- a/apps/mes/app/routes/x+/inspection.$operationId.tsx
+++ b/apps/mes/app/routes/x+/inspection.$operationId.tsx
@@ -142,7 +142,11 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
getInspectionSamplingPlans(serviceRole, lot.data.id, companyId),
getInspectionMeasurements(serviceRole, lot.data.id, companyId),
getIssueTypesList(serviceRole, companyId),
- getTrackedEntitiesByMakeMethodId(serviceRole, op.jobMakeMethodId),
+ getTrackedEntitiesByMakeMethodId(
+ serviceRole,
+ op.jobMakeMethodId,
+ companyId
+ ),
getJobMakeMethod(serviceRole, op.jobMakeMethodId),
getProductionEventsForJobOperation(serviceRole, { operationId, userId }),
getProductionQuantitiesForJobOperation(serviceRole, operationId),
diff --git a/apps/mes/app/routes/x+/operation.$operationId.tsx b/apps/mes/app/routes/x+/operation.$operationId.tsx
index f719e9576a..aaf442a011 100644
--- a/apps/mes/app/routes/x+/operation.$operationId.tsx
+++ b/apps/mes/app/routes/x+/operation.$operationId.tsx
@@ -189,7 +189,8 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
getThumbnailPathByItemId(serviceRole, operation.data?.[0].itemId),
getTrackedEntitiesByMakeMethodId(
serviceRole,
- operation.data?.[0].jobMakeMethodId
+ operation.data?.[0].jobMakeMethodId,
+ companyId
),
getJobMakeMethod(serviceRole, operation.data?.[0].jobMakeMethodId),
getKanbanByJobId(serviceRole, job.data.id),
diff --git a/apps/mes/app/routes/x+/start.$operationId.tsx b/apps/mes/app/routes/x+/start.$operationId.tsx
index c287d63f1f..0374da1f99 100644
--- a/apps/mes/app/routes/x+/start.$operationId.tsx
+++ b/apps/mes/app/routes/x+/start.$operationId.tsx
@@ -166,7 +166,8 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
if (!trackedEntityId && jobOperation.data.jobMakeMethodId) {
const trackedEntities = await getTrackedEntitiesByMakeMethodId(
serviceRole,
- jobOperation.data.jobMakeMethodId
+ jobOperation.data.jobMakeMethodId,
+ companyId
);
// Start the next incomplete serial unit for this operation (createdAt asc),
diff --git a/apps/mes/app/services/operations.service.ts b/apps/mes/app/services/operations.service.ts
index 86fc118462..3531aa3851 100644
--- a/apps/mes/app/services/operations.service.ts
+++ b/apps/mes/app/services/operations.service.ts
@@ -1905,12 +1905,14 @@ export async function getScrapReasonsList(
export async function getTrackedEntitiesByMakeMethodId(
client: SupabaseClient<Database>,
- jobMakeMethodId: string
+ jobMakeMethodId: string,
+ companyId: string
) {
return client
.from("trackedEntity")
.select("*")
.eq("attributes->>Job Make Method", jobMakeMethodId)
+ .eq("companyId", companyId)
.order("createdAt", { ascending: true });
}
@@ -1978,12 +1980,14 @@ export async function getTrackedEntity(
export async function getTrackedEntitiesByOperationId(
client: SupabaseClient<Database>,
- operationId: string
+ operationId: string,
+ companyId: string
) {
const jobOperation = await client
.from("jobOperation")
.select("jobMakeMethodId")
.eq("id", operationId)
+ .eq("companyId", companyId)
.single();
if (jobOperation.error || !jobOperation.data.jobMakeMethodId)
@@ -1994,7 +1998,8 @@ export async function getTrackedEntitiesByOperationId(
return getTrackedEntitiesByMakeMethodId(
client,
- jobOperation.data.jobMakeMethodId
+ jobOperation.data.jobMakeMethodId,
+ companyId
);
}
diff --git a/apps/mes/app/services/quality.server.ts b/apps/mes/app/services/quality.server.ts
index 18f6e76b69..138bc8479d 100644
--- a/apps/mes/app/services/quality.server.ts
+++ b/apps/mes/app/services/quality.server.ts
@@ -363,7 +363,8 @@ export async function getInspectionOutcomeState(
requiresSerialTracking && operation.jobMakeMethodId
? await getTrackedEntitiesByMakeMethodId(
serviceRole,
- operation.jobMakeMethodId
+ operation.jobMakeMethodId,
+ args.companyId
)
: null;
diff --git a/packages/database/supabase/functions/issue/index.ts b/packages/database/supabase/functions/issue/index.ts
index a21b3f190a..408de288d6 100644
--- a/packages/database/supabase/functions/issue/index.ts
+++ b/packages/database/supabase/functions/issue/index.ts
@@ -2040,6 +2040,7 @@ serve(async (req: Request) => {
.from("trackedEntity")
.select("*")
.eq("attributes->>Job Make Method", jobOperation.data.jobMakeMethodId)
+ .eq("companyId", companyId)
.order("createdAt", { ascending: true });
if (!trackedEntities.data || trackedEntities.data.length === 0) {
diff --git a/packages/jobs/src/inngest/functions/tasks/print-job/resolvers.ts b/packages/jobs/src/inngest/functions/tasks/print-job/resolvers.ts
index 36919ec6d9..0d8b444dc0 100644
--- a/packages/jobs/src/inngest/functions/tasks/print-job/resolvers.ts
+++ b/packages/jobs/src/inngest/functions/tasks/print-job/resolvers.ts
@@ -151,6 +151,7 @@ async function queryTrackedEntities(
"jobMakeMethodId, ...jobMakeMethod(...item(readableIdWithRevision))"
)
.eq("id", sourceDocumentId)
+ .eq("companyId", companyId)
.single();
if (!jobOperation?.jobMakeMethodId)
@@ -160,6 +161,7 @@ async function queryTrackedEntities(
.from("trackedEntity")
.select("*")
.eq("attributes->>Job Make Method", jobOperation?.jobMakeMethodId)
+ .eq("companyId", companyId)
.order("createdAt", { ascending: true });
return {