Merge branch 'develop'
All checks were successful
Spell Check / Spell Check with Typos (push) Successful in 4s
All checks were successful
Spell Check / Spell Check with Typos (push) Successful in 4s
This commit is contained in:
commit
92762c512d
1 changed files with 126 additions and 81 deletions
|
|
@ -337,7 +337,8 @@ export class TaskController extends Controller {
|
||||||
where: { OR: taskList },
|
where: { OR: taskList },
|
||||||
});
|
});
|
||||||
|
|
||||||
return await tx.taskOrder.create({
|
return await tx.taskOrder
|
||||||
|
.create({
|
||||||
include: {
|
include: {
|
||||||
taskList: {
|
taskList: {
|
||||||
include: {
|
include: {
|
||||||
|
|
@ -400,6 +401,16 @@ export class TaskController extends Controller {
|
||||||
taskList: { create: taskList },
|
taskList: { create: taskList },
|
||||||
taskProduct: { create: taskProduct },
|
taskProduct: { create: taskProduct },
|
||||||
},
|
},
|
||||||
|
})
|
||||||
|
.then(async (v) => {
|
||||||
|
await prisma.notification.create({
|
||||||
|
data: {
|
||||||
|
title: "ใบสั่งงานใหม่ / New Task Order",
|
||||||
|
detail: "รหัส / code : " + v.code,
|
||||||
|
groupReceiver: { create: { name: "document_checker" } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return v;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -543,6 +554,7 @@ export class TaskController extends Controller {
|
||||||
title: "มีการส่งงาน / Task Submitted",
|
title: "มีการส่งงาน / Task Submitted",
|
||||||
detail: "รหัสใบสั่งงาน / Order : " + record.code,
|
detail: "รหัสใบสั่งงาน / Order : " + record.code,
|
||||||
receiverId: record.createdByUserId,
|
receiverId: record.createdByUserId,
|
||||||
|
groupReceiver: { create: { name: "document_checker" } },
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -737,6 +749,7 @@ export class TaskActionController extends Controller {
|
||||||
title: "มีการส่งงาน / Task Submitted",
|
title: "มีการส่งงาน / Task Submitted",
|
||||||
detail: "รหัสใบสั่งงาน / Order : " + record.code,
|
detail: "รหัสใบสั่งงาน / Order : " + record.code,
|
||||||
receiverId: record.createdByUserId,
|
receiverId: record.createdByUserId,
|
||||||
|
groupReceiver: { create: { name: "document_checker" } },
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
]);
|
]);
|
||||||
|
|
@ -769,7 +782,8 @@ export class TaskActionController extends Controller {
|
||||||
const code = `RI${year}${month}${last.value.toString().padStart(6, "0")}`;
|
const code = `RI${year}${month}${last.value.toString().padStart(6, "0")}`;
|
||||||
|
|
||||||
await Promise.all([
|
await Promise.all([
|
||||||
tx.taskOrder.update({
|
tx.taskOrder
|
||||||
|
.update({
|
||||||
where: { id: taskOrderId },
|
where: { id: taskOrderId },
|
||||||
data: {
|
data: {
|
||||||
urgent: false,
|
urgent: false,
|
||||||
|
|
@ -784,6 +798,16 @@ export class TaskActionController extends Controller {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
})
|
||||||
|
.then(async (record) => {
|
||||||
|
await tx.notification.create({
|
||||||
|
data: {
|
||||||
|
title: "ใบงานเสร็จสิ้น / Task Complete",
|
||||||
|
detail: "รหัสใบสั่งงาน / Order : " + record.code,
|
||||||
|
receiverId: record.createdByUserId,
|
||||||
|
groupReceiver: { create: { name: "document_checker" } },
|
||||||
|
},
|
||||||
|
});
|
||||||
}),
|
}),
|
||||||
tx.requestWorkStepStatus.updateMany({
|
tx.requestWorkStepStatus.updateMany({
|
||||||
where: {
|
where: {
|
||||||
|
|
@ -888,9 +912,27 @@ export class TaskActionController extends Controller {
|
||||||
if (completeCheck) completed.push(item.id);
|
if (completeCheck) completed.push(item.id);
|
||||||
});
|
});
|
||||||
|
|
||||||
await tx.requestData.updateMany({
|
await tx.requestData
|
||||||
|
.updateManyAndReturn({
|
||||||
where: { id: { in: completed } },
|
where: { id: { in: completed } },
|
||||||
|
include: {
|
||||||
|
quotation: {
|
||||||
|
select: {
|
||||||
|
createdByUserId: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
data: { requestDataStatus: RequestDataStatus.Completed },
|
data: { requestDataStatus: RequestDataStatus.Completed },
|
||||||
|
})
|
||||||
|
.then(async (res) => {
|
||||||
|
await tx.notification.createMany({
|
||||||
|
data: res.map((v) => ({
|
||||||
|
title: "รายการคำขอเสร็จสิ้น / Request Complete",
|
||||||
|
detail: "รหัส / code : " + v.code + " Completed",
|
||||||
|
receiverId: v.quotation.createdByUserId,
|
||||||
|
groupReceiver: { create: { name: "document_checker" } },
|
||||||
|
})),
|
||||||
|
});
|
||||||
});
|
});
|
||||||
await tx.quotation
|
await tx.quotation
|
||||||
.updateManyAndReturn({
|
.updateManyAndReturn({
|
||||||
|
|
@ -936,6 +978,7 @@ export class TaskActionController extends Controller {
|
||||||
title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
|
title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
|
||||||
detail: "รหัส / code : " + v.code + " Completed",
|
detail: "รหัส / code : " + v.code + " Completed",
|
||||||
receiverId: v.createdByUserId,
|
receiverId: v.createdByUserId,
|
||||||
|
groupReceiver: { create: { name: "document_checker" } },
|
||||||
})),
|
})),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -1176,19 +1219,21 @@ export class UserTaskController extends Controller {
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
.then(async (v) => {
|
.then(async (v) => {
|
||||||
await tx.notification.createMany({
|
await tx.notification.create({
|
||||||
data: [
|
data: {
|
||||||
{
|
|
||||||
title: "สถานะใบส่งงานมีการเปลี่ยนแปลง / Order Status Changed",
|
title: "สถานะใบส่งงานมีการเปลี่ยนแปลง / Order Status Changed",
|
||||||
detail: "รหัสใบสั่งงาน / Order : " + v.code + " InProgress",
|
detail: "รหัสใบสั่งงาน / Order : " + v.code + " InProgress",
|
||||||
receiverId: v.createdByUserId,
|
receiverId: v.createdByUserId,
|
||||||
|
groupReceiver: { create: { name: "document_checker" } },
|
||||||
},
|
},
|
||||||
{
|
});
|
||||||
|
await tx.notification.create({
|
||||||
|
data: {
|
||||||
title: "มีการรับงาน / Task Accepted",
|
title: "มีการรับงาน / Task Accepted",
|
||||||
detail: "รหัสใบสั่งงาน / Order : " + v.code,
|
detail: "รหัสใบสั่งงาน / Order : " + v.code,
|
||||||
receiverId: v.createdByUserId,
|
receiverId: v.createdByUserId,
|
||||||
|
groupReceiver: { create: { name: "document_checker" } },
|
||||||
},
|
},
|
||||||
],
|
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
tx.task.updateMany({
|
tx.task.updateMany({
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue