diff --git a/src/app/api/m/orders/create-empty/route.ts b/src/app/api/m/orders/create-empty/route.ts
index 4065373..44e8125 100644
--- a/src/app/api/m/orders/create-empty/route.ts
+++ b/src/app/api/m/orders/create-empty/route.ts
@@ -48,8 +48,8 @@ export async function POST() {
 
 async function genOrderNo(): Promise<string> {
   const today = new Date();
-  const ymd = `${today.getFullYear()}${String(today.getMonth() + 1).padStart(2, "0")}${String(today.getDate()).padStart(2, "0")}`;
-  const prefix = `ORD-${ymd}-`;
+  const ymd = `${String(today.getFullYear()).slice(-2)}${String(today.getMonth() + 1).padStart(2, "0")}${String(today.getDate()).padStart(2, "0")}`;
+  const prefix = `O${ymd}`;
   const row = await queryOne<{ MAX_NO: string }>(
     `SELECT COALESCE(MAX(order_no), '') AS "MAX_NO" FROM momo_orders WHERE order_no LIKE $1 || '%'`,
     [prefix]
diff --git a/src/app/api/m/orders/save/route.ts b/src/app/api/m/orders/save/route.ts
index 0538e08..b44eb48 100644
--- a/src/app/api/m/orders/save/route.ts
+++ b/src/app/api/m/orders/save/route.ts
@@ -250,8 +250,8 @@ export async function POST(req: NextRequest) {
 
 async function genOrderNo(): Promise<string> {
   const today = new Date();
-  const ymd = `${today.getFullYear()}${String(today.getMonth() + 1).padStart(2, "0")}${String(today.getDate()).padStart(2, "0")}`;
-  const prefix = `ORD-${ymd}-`;
+  const ymd = `${String(today.getFullYear()).slice(-2)}${String(today.getMonth() + 1).padStart(2, "0")}${String(today.getDate()).padStart(2, "0")}`;
+  const prefix = `O${ymd}`;
   const row = await queryOne<{ MAX_NO: string }>(
     `SELECT COALESCE(MAX(order_no), '') AS "MAX_NO" FROM momo_orders WHERE order_no LIKE $1 || '%'`,
     [prefix]
diff --git a/src/app/api/m/procurements/create-empty/route.ts b/src/app/api/m/procurements/create-empty/route.ts
index eb070c2..5aed261 100644
--- a/src/app/api/m/procurements/create-empty/route.ts
+++ b/src/app/api/m/procurements/create-empty/route.ts
@@ -22,8 +22,8 @@ export async function POST(req: NextRequest) {
 
 async function genProcNo(): Promise<string> {
   const today = new Date();
-  const ymd = `${today.getFullYear()}${String(today.getMonth() + 1).padStart(2, "0")}${String(today.getDate()).padStart(2, "0")}`;
-  const prefix = `PRC-${ymd}-`;
+  const ymd = `${String(today.getFullYear()).slice(-2)}${String(today.getMonth() + 1).padStart(2, "0")}${String(today.getDate()).padStart(2, "0")}`;
+  const prefix = `P${ymd}`;
   const row = await queryOne<{ MAX_NO: string }>(
     `SELECT COALESCE(MAX(proc_no), '') AS "MAX_NO" FROM momo_procurements WHERE proc_no LIKE $1 || '%'`,
     [prefix]
diff --git a/src/app/api/m/procurements/save/route.ts b/src/app/api/m/procurements/save/route.ts
index 3481d39..e112832 100644
--- a/src/app/api/m/procurements/save/route.ts
+++ b/src/app/api/m/procurements/save/route.ts
@@ -53,8 +53,8 @@ export async function POST(req: NextRequest) {
 
 async function genProcNo(): Promise<string> {
   const today = new Date();
-  const ymd = `${today.getFullYear()}${String(today.getMonth() + 1).padStart(2, "0")}${String(today.getDate()).padStart(2, "0")}`;
-  const prefix = `PRC-${ymd}-`;
+  const ymd = `${String(today.getFullYear()).slice(-2)}${String(today.getMonth() + 1).padStart(2, "0")}${String(today.getDate()).padStart(2, "0")}`;
+  const prefix = `P${ymd}`;
   const row = await queryOne<{ MAX_NO: string }>(
     `SELECT COALESCE(MAX(proc_no), '') AS "MAX_NO" FROM momo_procurements WHERE proc_no LIKE $1 || '%'`,
     [prefix]