diff --git a/src/controllers/customer-branch-controller.ts b/src/controllers/customer-branch-controller.ts
index 7d1ab5a..3801f19 100644
--- a/src/controllers/customer-branch-controller.ts
+++ b/src/controllers/customer-branch-controller.ts
@@ -121,11 +121,7 @@ export class CustomerBranchController extends Controller {
         { nameEN: { contains: query }, zipCode },
         { name: { contains: query }, zipCode },
         { email: { contains: query }, zipCode },
-        {
-          customer: {
-            code: { contains: query },
-          },
-        },
+        { code: { contains: query }, zipCode },
       ],
       AND: { customerId },
     } satisfies Prisma.CustomerBranchWhereInput;
@@ -219,38 +215,36 @@ export class CustomerBranchController extends Controller {
 
   @Post()
   async create(@Request() req: RequestWithUser, @Body() body: CustomerBranchCreate) {
-    if (body.provinceId || body.districtId || body.subDistrictId || body.customerId) {
-      const [province, district, subDistrict, customer] = await prisma.$transaction([
-        prisma.province.findFirst({ where: { id: body.provinceId || undefined } }),
-        prisma.district.findFirst({ where: { id: body.districtId || undefined } }),
-        prisma.subDistrict.findFirst({ where: { id: body.subDistrictId || undefined } }),
-        prisma.customer.findFirst({ where: { id: body.customerId || undefined } }),
-      ]);
-      if (body.provinceId && !province)
-        throw new HttpError(
-          HttpStatus.BAD_REQUEST,
-          "Province cannot be found.",
-          "missing_or_invalid_parameter",
-        );
-      if (body.districtId && !district)
-        throw new HttpError(
-          HttpStatus.BAD_REQUEST,
-          "District cannot be found.",
-          "missing_or_invalid_parameter",
-        );
-      if (body.subDistrictId && !subDistrict)
-        throw new HttpError(
-          HttpStatus.BAD_REQUEST,
-          "Sub-district cannot be found.",
-          "missing_or_invalid_parameter",
-        );
-      if (body.customerId && !customer)
-        throw new HttpError(
-          HttpStatus.BAD_REQUEST,
-          "Customer cannot be found.",
-          "missing_or_invalid_parameter",
-        );
-    }
+    const [province, district, subDistrict, customer] = await prisma.$transaction([
+      prisma.province.findFirst({ where: { id: body.provinceId || undefined } }),
+      prisma.district.findFirst({ where: { id: body.districtId || undefined } }),
+      prisma.subDistrict.findFirst({ where: { id: body.subDistrictId || undefined } }),
+      prisma.customer.findFirst({ where: { id: body.customerId || undefined } }),
+    ]);
+    if (body.provinceId && !province)
+      throw new HttpError(
+        HttpStatus.BAD_REQUEST,
+        "Province cannot be found.",
+        "missing_or_invalid_parameter",
+      );
+    if (body.districtId && !district)
+      throw new HttpError(
+        HttpStatus.BAD_REQUEST,
+        "District cannot be found.",
+        "missing_or_invalid_parameter",
+      );
+    if (body.subDistrictId && !subDistrict)
+      throw new HttpError(
+        HttpStatus.BAD_REQUEST,
+        "Sub-district cannot be found.",
+        "missing_or_invalid_parameter",
+      );
+    if (!customer)
+      throw new HttpError(
+        HttpStatus.BAD_REQUEST,
+        "Customer cannot be found.",
+        "missing_or_invalid_parameter",
+      );
 
     const { provinceId, districtId, subDistrictId, customerId, ...rest } = body;
 
@@ -269,6 +263,7 @@ export class CustomerBranchController extends Controller {
           data: {
             ...rest,
             branchNo: count + 1,
+            code: `${customer.code}-${(count + 1).toString().padStart(2, "0")}`,
             customer: { connect: { id: customerId } },
             province: { connect: provinceId ? { id: provinceId } : undefined },
             district: { connect: districtId ? { id: districtId } : undefined },
diff --git a/src/controllers/customer-controller.ts b/src/controllers/customer-controller.ts
index 4da54e8..a037e22 100644
--- a/src/controllers/customer-controller.ts
+++ b/src/controllers/customer-controller.ts
@@ -290,6 +290,7 @@ export class CustomerController extends Controller {
                   customerBranch?.map((v, i) => ({
                     ...v,
                     branchNo: i + 1,
+                    code: `${last.key.slice(9)}${last.value.toString().padStart(6, "0")}-${(i + 1).toString().padStart(2, "0")}`,
                     createdBy: req.user.name,
                     updateBy: req.user.name,
                   })) || [],
@@ -325,7 +326,9 @@ export class CustomerController extends Controller {
     @Request() req: RequestWithUser,
     @Body() body: CustomerUpdate,
   ) {
-    if (!(await prisma.customer.findUnique({ where: { id: customerId } }))) {
+    const customer = await prisma.customer.findUnique({ where: { id: customerId } });
+
+    if (!customer) {
       throw new HttpError(HttpStatus.NOT_FOUND, "Customer cannot be found.", "data_not_found");
     }
 
@@ -417,6 +420,7 @@ export class CustomerController extends Controller {
                 create: {
                   ...v,
                   branchNo: i + 1,
+                  code: `${customer.code}-${(i + 1).toString().padStart(2, "0")}`,
                   createdBy: req.user.name,
                   updateBy: req.user.name,
                   id: undefined,
@@ -424,6 +428,7 @@ export class CustomerController extends Controller {
                 update: {
                   ...v,
                   branchNo: i + 1,
+                  code: `${customer.code}-${(i + 1).toString().padStart(2, "0")}`,
                   updateBy: req.user.name,
                 },
               })),