feature/IO-3499-React-19 checkpoint

client/src/components/parts-order-modal/parts-order-modal.container.jsx

@@ -82,6 +82,7 @@ export function PartsOrderModalContainer({
     setSaving(true);
     let insertResult;
 
+    try {
       insertResult = await insertPartOrder({
         variables: {
           po: [
@@ -105,6 +106,16 @@ export function PartsOrderModalContainer({
           title: t("parts_orders.errors.creating"),
           description: JSON.stringify(insertResult.errors)
         });
+        setSaving(false);
+        return;
+      }
+    } catch (error) {
+      notification.error({
+        title: t("parts_orders.errors.creating"),
+        description: error.message
+      });
+      console.error("Parts order insert error:", error);
+      setSaving(false);
       return;
     }
     notification.success({
@@ -118,9 +129,15 @@ export function PartsOrderModalContainer({
       type: isReturn ? "jobspartsreturn" : "jobspartsorder"
     });
 
+    // Use linesToOrder from context instead of form values to preserve job_line_id
+    const jobLineIds = linesToOrder
+      .filter((line) => (isReturn ? line.joblineid : line.id))
+      .map((line) => (isReturn ? line.joblineid : line.id));
+
+    try {
       const jobLinesResult = await updateJobLines({
         variables: {
-        ids: values.parts_order_lines.data.filter((item) => item.job_line_id).map((item) => item.job_line_id),
+          ids: jobLineIds,
           status: isReturn
             ? bodyshop.md_order_statuses.default_returned || "Returned*"
             : is_quote
@@ -129,7 +146,22 @@ export function PartsOrderModalContainer({
         }
       });
 
+      if (jobLinesResult.errors) {
+        notification.error({
+          title: t("parts_orders.errors.updating_status"),
+          description: JSON.stringify(jobLinesResult.errors)
+        });
+      }
+    } catch (error) {
+      notification.error({
+        title: t("parts_orders.errors.updating_status"),
+        description: error.message
+      });
+      console.error("Job lines update error:", error);
+    }
+
     if (!isReturn && removefrompartsqueue) {
+      try {
         await updateJob({
           variables: {
             jobId: jobId,
@@ -138,16 +170,13 @@ export function PartsOrderModalContainer({
             }
           }
         });
+      } catch (error) {
+        console.error("Update job queue error:", error);
       }
-
-    if (jobLinesResult.errors) {
-      notification.error({
-        title: t("parts_orders.errors.creating"),
-        description: JSON.stringify(jobLinesResult.errors)
-      });
     }
 
     if (values.vendorid === bodyshop.inhousevendorid) {
+      // Use linesToOrder for job_line_id, merge with form values for other fields
       setBillEnterContext({
         actions: { refetch: refetch },
         context: {
@@ -159,9 +188,10 @@ export function PartsOrderModalContainer({
             isinhouse: true,
             date: dayjs(),
             total: 0,
-            billlines: values.parts_order_lines.data.map((p) => {
+            billlines: values.parts_order_lines.data.map((p, index) => {
+              const originalLine = linesToOrder[index];
               return {
-                joblineid: p.job_line_id,
+                joblineid: isReturn ? originalLine?.joblineid : originalLine?.id,
                 actual_price: p.act_price,
                 actual_cost: 0, //p.act_price,
                 line_desc: p.line_desc,