diff --git a/src/controllers/07-task-controller.ts b/src/controllers/07-task-controller.ts
index a8dc523..3119a8d 100644
--- a/src/controllers/07-task-controller.ts
+++ b/src/controllers/07-task-controller.ts
@@ -517,14 +517,6 @@ export class TaskActionController extends Controller {
         where: { id: taskOrderId },
         data: { taskOrderStatus: TaskOrderStatus.Complete },
       }),
-      prisma.requestWorkStepStatus.updateMany({
-        where: {
-          task: {
-            some: { taskOrderId, taskStatus: TaskStatus.InProgress },
-          },
-        },
-        data: { workStatus: RequestWorkStatus.Completed },
-      }),
       prisma.requestWorkStepStatus.updateMany({
         where: {
           task: {
@@ -543,6 +535,15 @@ export class TaskActionController extends Controller {
       }),
     ]);
 
+    await prisma.requestWorkStepStatus.updateMany({
+      where: {
+        task: {
+          some: { taskOrderId, taskStatus: TaskStatus.Complete },
+        },
+      },
+      data: { workStatus: RequestWorkStatus.Completed },
+    });
+
     await prisma.$transaction(async (tx) => {
       const requestList = await tx.requestData.findMany({
         include: {
@@ -577,6 +578,7 @@ export class TaskActionController extends Controller {
       const completed: string[] = [];
 
       requestList.forEach((item) => {
+        console.log(item);
         const completeCheck = item.requestWork.every((work) => {
           const stepCount =
             work.productService.work?.productOnWork.find(