Merge branch 'develop'
All checks were successful
Spell Check / Spell Check with Typos (push) Successful in 6s

This commit is contained in:
Methapon2001 2025-08-04 09:02:06 +07:00
commit a0bb23e1e8
3 changed files with 76 additions and 35 deletions

View file

@ -631,6 +631,7 @@ export class StatsController extends Controller {
createdAt: { gte: v, lte: date.endOf("month").toDate() }, createdAt: { gte: v, lte: date.endOf("month").toDate() },
invoice: { invoice: {
quotation: { quotation: {
quotationStatus: { notIn: [QuotationStatus.Canceled] },
registeredBranch: { OR: permissionCondCompany(req.user) }, registeredBranch: { OR: permissionCondCompany(req.user) },
}, },
}, },

View file

@ -456,13 +456,19 @@ export class RequestDataActionController extends Controller {
data: { quotationStatus: QuotationStatus.Canceled, urgent: false }, data: { quotationStatus: QuotationStatus.Canceled, urgent: false },
}) })
.then(async (res) => { .then(async (res) => {
await tx.notification.createMany({ await Promise.all(
data: res.map((v) => ({ res.map((v) =>
title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated", tx.notification.create({
detail: "รหัส / code : " + v.code + " Canceled", data: {
receiverId: v.createdByUserId, title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
})), detail: "รหัส / code : " + v.code + " Canceled",
}); receiverId: v.createdByUserId,
registeredBranchId: v.registeredBranchId,
groupReceiver: { create: { name: "document_checker" } },
},
}),
),
);
}), }),
tx.taskOrder tx.taskOrder
.updateManyAndReturn({ .updateManyAndReturn({
@ -481,6 +487,7 @@ export class RequestDataActionController extends Controller {
title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated", title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
detail: "รหัส / code : " + v.code + " Canceled", detail: "รหัส / code : " + v.code + " Canceled",
receiverId: v.createdByUserId, receiverId: v.createdByUserId,
registeredBranchId: v.registeredBranchId,
groupReceiver: { create: { name: "document_checker" } }, groupReceiver: { create: { name: "document_checker" } },
}, },
}), }),
@ -662,13 +669,19 @@ export class RequestDataActionController extends Controller {
data: { quotationStatus: QuotationStatus.Canceled, urgent: false }, data: { quotationStatus: QuotationStatus.Canceled, urgent: false },
}) })
.then(async (res) => { .then(async (res) => {
await tx.notification.createMany({ await Promise.all(
data: res.map((v) => ({ res.map((v) =>
title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated", tx.notification.create({
detail: "รหัส / code : " + v.code + " Canceled", data: {
receiverId: v.createdByUserId, title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
})), detail: "รหัส / code : " + v.code + " Canceled",
}); receiverId: v.createdByUserId,
registeredBranchId: v.registeredBranchId,
groupReceiver: { create: { name: "document_checker" } },
},
}),
),
);
}), }),
tx.taskOrder.updateMany({ tx.taskOrder.updateMany({
where: { where: {
@ -766,13 +779,19 @@ export class RequestDataActionController extends Controller {
}, },
}) })
.then(async (res) => { .then(async (res) => {
await tx.notification.createMany({ await Promise.all(
data: res.map((v) => ({ res.map((v) =>
title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated", tx.notification.create({
detail: "รหัส / code : " + v.code + " Completed", data: {
receiverId: v.createdByUserId, title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
})), detail: "รหัส / code : " + v.code + " Completed",
}); receiverId: v.createdByUserId,
registeredBranchId: v.registeredBranchId,
groupReceiver: { create: { name: "document_checker" } },
},
}),
),
);
const token = await this.#getLineToken(); const token = await this.#getLineToken();
if (!token) return; if (!token) return;
@ -1178,13 +1197,19 @@ export class RequestListController extends Controller {
data: { quotationStatus: QuotationStatus.Canceled, urgent: false }, data: { quotationStatus: QuotationStatus.Canceled, urgent: false },
}) })
.then(async (res) => { .then(async (res) => {
await tx.notification.createMany({ await Promise.all(
data: res.map((v) => ({ res.map((v) =>
title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated", tx.notification.create({
detail: "รหัส / code : " + v.code + " Canceled", data: {
receiverId: v.createdByUserId, title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
})), detail: "รหัส / code : " + v.code + " Canceled",
}); receiverId: v.createdByUserId,
registeredBranchId: v.registeredBranchId,
groupReceiver: { create: { name: "document_checker" } },
},
}),
),
);
}), }),
tx.taskOrder.updateMany({ tx.taskOrder.updateMany({
where: { where: {
@ -1292,13 +1317,19 @@ export class RequestListController extends Controller {
}, },
}) })
.then(async (res) => { .then(async (res) => {
await tx.notification.createMany({ await Promise.all(
data: res.map((v) => ({ res.map((v) =>
title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated", tx.notification.create({
detail: "รหัส / code : " + v.code + " Completed", data: {
receiverId: v.createdByUserId, title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
})), detail: "รหัส / code : " + v.code + " Completed",
}); receiverId: v.createdByUserId,
registeredBranchId: v.registeredBranchId,
groupReceiver: { create: { name: "document_checker" } },
},
}),
),
);
const token = await this.#getLineToken(); const token = await this.#getLineToken();
if (!token) return; if (!token) return;

View file

@ -407,6 +407,7 @@ export class TaskController extends Controller {
data: { data: {
title: "ใบสั่งงานใหม่ / New Task Order", title: "ใบสั่งงานใหม่ / New Task Order",
detail: "รหัส / code : " + v.code, detail: "รหัส / code : " + v.code,
registeredBranchId: v.registeredBranchId,
groupReceiver: { create: { name: "document_checker" } }, groupReceiver: { create: { name: "document_checker" } },
}, },
}); });
@ -554,6 +555,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,
registeredBranchId: record.registeredBranchId,
groupReceiver: { create: { name: "document_checker" } }, groupReceiver: { create: { name: "document_checker" } },
}, },
}); });
@ -749,6 +751,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,
registeredBranchId: record.registeredBranchId,
groupReceiver: { create: { name: "document_checker" } }, groupReceiver: { create: { name: "document_checker" } },
}, },
}), }),
@ -805,6 +808,7 @@ export class TaskActionController extends Controller {
title: "ใบงานเสร็จสิ้น / Task Complete", title: "ใบงานเสร็จสิ้น / Task Complete",
detail: "รหัสใบสั่งงาน / Order : " + record.code, detail: "รหัสใบสั่งงาน / Order : " + record.code,
receiverId: record.createdByUserId, receiverId: record.createdByUserId,
registeredBranchId: record.registeredBranchId,
groupReceiver: { create: { name: "document_checker" } }, groupReceiver: { create: { name: "document_checker" } },
}, },
}); });
@ -918,6 +922,7 @@ export class TaskActionController extends Controller {
include: { include: {
quotation: { quotation: {
select: { select: {
registeredBranchId: true,
createdByUserId: true, createdByUserId: true,
}, },
}, },
@ -932,6 +937,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.quotation.createdByUserId, receiverId: v.quotation.createdByUserId,
registeredBranchId: v.quotation.registeredBranchId,
groupReceiver: { create: { name: "document_checker" } }, groupReceiver: { create: { name: "document_checker" } },
}, },
}), }),
@ -984,6 +990,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,
registeredBranchId: v.registeredBranchId,
groupReceiver: { create: { name: "document_checker" } }, groupReceiver: { create: { name: "document_checker" } },
}, },
}), }),
@ -1232,6 +1239,7 @@ export class UserTaskController extends Controller {
title: "สถานะใบส่งงานมีการเปลี่ยนแปลง / Order Status Changed", title: "สถานะใบส่งงานมีการเปลี่ยนแปลง / Order Status Changed",
detail: "รหัสใบสั่งงาน / Order : " + v.code + " InProgress", detail: "รหัสใบสั่งงาน / Order : " + v.code + " InProgress",
receiverId: v.createdByUserId, receiverId: v.createdByUserId,
registeredBranchId: v.registeredBranchId,
groupReceiver: { create: { name: "document_checker" } }, groupReceiver: { create: { name: "document_checker" } },
}, },
}); });
@ -1240,6 +1248,7 @@ export class UserTaskController extends Controller {
title: "มีการรับงาน / Task Accepted", title: "มีการรับงาน / Task Accepted",
detail: "รหัสใบสั่งงาน / Order : " + v.code, detail: "รหัสใบสั่งงาน / Order : " + v.code,
receiverId: v.createdByUserId, receiverId: v.createdByUserId,
registeredBranchId: v.registeredBranchId,
groupReceiver: { create: { name: "document_checker" } }, groupReceiver: { create: { name: "document_checker" } },
}, },
}); });