@things-factory/sales-base 4.0.10 → 4.0.14

package/server/service/reverse-kitting-order/reverse-kitting-order-query.ts

@@ -3,13 +3,15 @@ import { getRepository, In } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { generateId } from '@things-factory/id-rule-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import { convertListParams, Domain, ListParam } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS } from '@things-factory/warehouse-base'
 
 import { ORDER_VAS_STATUS } from '../../constants'
 import { ReverseKittingOrderInventory } from '../reverse-kitting-order-inventory/reverse-kitting-order-inventory'
 import { ReverseKittingOrder } from './reverse-kitting-order'
-import { ReverseKittingOrderList } from './reverse-kitting-order-type'
+import { LotInfo, ReverseKittingOrderList, ReverseKittingInventoryDetail } from './reverse-kitting-order-type'
 
 @Resolver(ReverseKittingOrder)
 export class ReverseKittingOrderQuery {
@@ -26,13 +28,13 @@ export class ReverseKittingOrderQuery {
       relations: [
         'domain',
         'bizplace',
-        'orderReverseKittings',
-        'orderReverseKittings.vas',
-        'orderReverseKittings.inventory',
-        'orderReverseKittings.inventory.product',
-        'orderReverseKittings.inventory.location',
-        'orderReverseKittings.inventory.warehouse',
-        'orderReverseKittings.targetProduct',
+        'reverseKittingOrderInventories',
+        'reverseKittingOrderInventories.vas',
+        'reverseKittingOrderInventories.inventory',
+        'reverseKittingOrderInventories.inventory.product',
+        'reverseKittingOrderInventories.inventory.location',
+        'reverseKittingOrderInventories.inventory.warehouse',
+        'reverseKittingOrderInventories.targetProduct',
         'creator',
         'updater'
       ]
@@ -41,37 +43,119 @@ export class ReverseKittingOrderQuery {
 
   @Query(returns => ReverseKittingOrder, { description: 'To fetch a ReverseKittingOrder' })
   async reverseKittingInventories(
-    @Arg('orderReverseKittingName') orderReverseKittingName: string,
+    @Arg('reverseKittingOIName') reverseKittingOIName: string,
+    @Arg('productDetailId') productDetailId: string,
     @Ctx() context: any
   ): Promise<Inventory[]> {
     const { domain } = context.state
-    const foundOrderReverseKitting: ReverseKittingOrderInventory = await getRepository(
+
+    const productDetail: ProductDetail = await getRepository(ProductDetail).findOne({
+      where: { id: productDetailId },
+      relations: ['product']
+    })
+
+    const product: Product = productDetail.product
+
+    const foundReverseKittingOI: ReverseKittingOrderInventory = await getRepository(
       ReverseKittingOrderInventory
     ).findOne({
       where: {
         domain,
-        name: orderReverseKittingName,
+        name: reverseKittingOIName,
         status: ORDER_VAS_STATUS.PROCESSING
       },
       relations: ['bizplace', 'reverseKittingOrder', 'inventory']
     })
 
-    if (!foundOrderReverseKitting) return
+    if (!foundReverseKittingOI) return
 
-    const reverseKittingOrder: ReverseKittingOrder = foundOrderReverseKitting.reverseKittingOrder
-    const customerBizplace: Bizplace = foundOrderReverseKitting.bizplace
+    const reverseKittingOrder: ReverseKittingOrder = foundReverseKittingOI.reverseKittingOrder
+    const customerBizplace: Bizplace = foundReverseKittingOI.bizplace
     return await getRepository(Inventory).find({
       where: {
         domain,
         bizplace: customerBizplace,
         refOrderId: reverseKittingOrder.id,
-        orderVasId: foundOrderReverseKitting.id,
+        orderVasId: foundReverseKittingOI.id,
+        product: product,
         status: INVENTORY_STATUS.STORED
       },
-      relations: ['product', 'bizplace']
+      relations: ['product', 'bizplace', 'location']
     })
   }
 
+  @Query(returns => [ReverseKittingInventoryDetail], {
+    description: 'To generate lot id and label for reverse kitting'
+  })
+  async generateReverseKittingLotId(
+    @Arg('targets', type => [LotInfo]) targets: LotInfo[],
+    @Arg('type') type: string,
+    @Ctx() context: any
+  ): Promise<ReverseKittingInventoryDetail[]> {
+    const { tx, domain } = context.state
+    // 1. get and set the date
+    const today = new Date()
+    const year = today.getFullYear()
+    const month = today.getMonth()
+    const day = today.getDate()
+
+    const yy = String(year).substr(String(year).length - 2)
+    const mm = String(month + 1).padStart(2, '0')
+    const dd = String(day).padStart(2, '0')
+
+    const date = yy + mm + dd
+    let results = []
+
+    // 2. get worksheet detail
+    let ids = targets.map(target => target.id)
+
+    // - getRepository using In(array) to pass the value to defined variable
+    const foundOrderReverseKittings: ReverseKittingOrderInventory[] = await tx
+      .getRepository(ReverseKittingOrderInventory)
+      .find({
+        where: {
+          domain,
+          id: In(ids)
+        },
+        relations: ['domain', 'bizplace']
+      })
+
+    // 3. from worksheet detail get product name, product type, batchid, packing type, bizplace
+
+    if (foundOrderReverseKittings.length <= 0) throw new Error('Unable to find order reverse kittings')
+    else {
+      for (let i = 0; i < foundOrderReverseKittings.length; i++) {
+        let foundORK = foundOrderReverseKittings[i]
+        for (let idx = 0; idx < targets.length; idx++) {
+          if (foundORK.id === targets[idx].id) {
+            // 4. generate pallet id based on print qty > call generateId resolver
+            for (let i = 0; i < targets[idx].printQty; i++) {
+              const generatedPalletId = await generateId({
+                domain,
+                type,
+                seed: {
+                  batchId: foundORK.inventory.batchId,
+                  date: date
+                }
+              })
+
+              // 5. map all data to be returned
+              if (foundORK != null) {
+                results.push({
+                  ...foundORK,
+                  palletId: generatedPalletId,
+                  bizplace: foundORK.bizplace
+                })
+              }
+            }
+          }
+        }
+      }
+    }
+
+    return results
+  }
+
   @Query(returns => ReverseKittingOrderList, { description: 'To fetch multiple ReverseKittingOrders' })
   async reverseKittingOrders(@Args() params: ListParam, @Ctx() context: any): Promise<ReverseKittingOrderList> {
     const { domain, user }: { domain: Domain; user: User } = context.state
@@ -84,9 +168,9 @@ export class ReverseKittingOrderQuery {
       relations: [
         'domain',
         'bizplace',
-        'orderReverseKittings',
-        'orderReverseKittings.inventory',
-        'orderReverseKittings.inventory.product',
+        'reverseKittingOrderInventories',
+        'reverseKittingOrderInventories.inventory',
+        'reverseKittingOrderInventories.inventory.product',
         'creator',
         'updater'
       ]

package/server/service/reverse-kitting-order/reverse-kitting-order-type.ts

@@ -1,6 +1,12 @@
-import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
+import { Field, ID, InputType, Int, ObjectType, Float } from 'type-graphql'
 
 import { ObjectRef } from '@things-factory/shell'
+import { Product } from '@things-factory/product-base'
+import { Location } from '@things-factory/warehouse-base'
+import { Domain } from '@things-factory/shell'
+import { Bizplace } from '@things-factory/biz-base'
+import { Inventory, Warehouse } from '@things-factory/warehouse-base'
+import { User } from '@things-factory/auth-base'
 
 import { NewReverseKittingOrderInventory } from '../reverse-kitting-order-inventory/reverse-kitting-order-inventory-type'
 import { ReverseKittingOrder } from './reverse-kitting-order'
@@ -23,6 +29,15 @@ export class NewReverseKittingOrder {
   remark?: string
 }
 
+@InputType()
+export class LotInfo {
+  @Field()
+  id: string
+
+  @Field()
+  printQty: number
+}
+
 @InputType()
 export class ReverseKittingOrderPatch {
   @Field(type => ID, { nullable: true })
@@ -52,3 +67,93 @@ export class ReverseKittingOrderList {
   @Field(type => Int)
   total: number
 }
+
+@ObjectType()
+export class ReverseKittingInventoryDetail {
+  @Field(type => ID)
+  readonly id: string
+
+  @Field(type => Domain, { nullable: true })
+  domain: Domain
+
+  @Field(type => Bizplace, { nullable: true })
+  bizplace: Bizplace
+
+  @Field(type => Inventory, { nullable: true })
+  refInventory: Inventory
+
+  @Field({ nullable: true })
+  name: string
+
+  @Field({ nullable: true })
+  palletId: string
+
+  @Field({ nullable: true })
+  cartonId: string
+
+  @Field({ nullable: true })
+  batchId: string
+
+  @Field(type => Product, { nullable: true })
+  product: Product
+
+  @Field(type => Location, { nullable: true })
+  location: Location
+
+  @Field(type => Warehouse, { nullable: true })
+  warehouse: Warehouse
+
+  @Field({ nullable: true })
+  zone: string
+
+  @Field({ nullable: true })
+  packingType: string
+
+  @Field(type => Float, { nullable: true })
+  packingSize: number
+
+  @Field(type => Int, { nullable: true })
+  qty: number
+
+  @Field(type => Int, { nullable: true })
+  remainQty: number
+
+  @Field({ nullable: true })
+  otherRef: string
+
+  @Field(type => Int, { nullable: true })
+  lastSeq: number
+
+  @Field(type => Float, { nullable: true })
+  uomValue: number
+
+  @Field(type => Float, { nullable: true })
+  remainUomValue: number
+
+  @Field({ nullable: true })
+  uom: string
+
+  @Field({ nullable: true })
+  status: string
+
+  @Field({ nullable: true })
+  description: string
+
+  @Field({ nullable: true })
+  remark: string
+
+  @Field({ nullable: true })
+  batchIdRef: string
+
+  @Field(type => User, { nullable: true })
+  creator: User
+
+  @Field(type => User, { nullable: true })
+  updater: User
+
+  @Field({ nullable: true })
+  createdAt: string
+
+  @Field({ nullable: true })
+  updatedAt: string
+}

package/server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory-mutation.ts

@@ -1,13 +1,22 @@
-import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
-import { getRepository, In } from 'typeorm'
+import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
+import { In } from 'typeorm'
+
+import { getPermittedBizplaceIds } from '@things-factory/biz-base'
+
 import { ReverseKittingOrderInventory } from './reverse-kitting-order-inventory'
-import { NewReverseKittingOrderInventory, ReverseKittingOrderInventoryPatch } from './reverse-kitting-order-inventory-type'
+import {
+  NewReverseKittingOrderInventory,
+  ReverseKittingOrderInventoryPatch
+} from './reverse-kitting-order-inventory-type'
 
 @Resolver(ReverseKittingOrderInventory)
 export class ReverseKittingOrderInventoryMutation {
   @Directive('@transaction')
   @Mutation(returns => ReverseKittingOrderInventory, { description: 'To create new ReverseKittingOrderInventory' })
-  async createReverseKittingOrderInventory(@Arg('reverseKittingOrderInventory') reverseKittingOrderInventory: NewReverseKittingOrderInventory, @Ctx() context: any): Promise<ReverseKittingOrderInventory> {
+  async createReverseKittingOrderInventory(
+    @Arg('reverseKittingOrderInventory') reverseKittingOrderInventory: NewReverseKittingOrderInventory,
+    @Ctx() context: any
+  ): Promise<ReverseKittingOrderInventory> {
     const { domain, user, tx } = context.state
 
     return await tx.getRepository(ReverseKittingOrderInventory).save({
@@ -19,28 +28,36 @@ export class ReverseKittingOrderInventoryMutation {
   }
 
   @Directive('@transaction')
-  @Mutation(returns => ReverseKittingOrderInventory, { description: 'To modify ReverseKittingOrderInventory information' })
+  @Mutation(returns => ReverseKittingOrderInventory, {
+    description: 'To modify ReverseKittingOrderInventory information'
+  })
   async updateReverseKittingOrderInventory(
     @Arg('id') id: string,
     @Arg('patch') patch: ReverseKittingOrderInventoryPatch,
     @Ctx() context: any
   ): Promise<ReverseKittingOrderInventory> {
-    const { domain, user, tx } = context.state
-
-    const repository = tx.getRepository(ReverseKittingOrderInventory)
-    const reverseKittingOrderInventory = await repository.findOne({
-      where: { domain, id }
-    })
+    const { tx, user, domain } = context.state
+    const reverseKittingOI: ReverseKittingOrderInventory = await tx
+      .getRepository(ReverseKittingOrderInventory)
+      .findOne({
+        where: {
+          domain,
+          bizplace: In(await getPermittedBizplaceIds(domain, user)),
+          id
+        }
+      })
 
-    return await repository.save({
-      ...reverseKittingOrderInventory,
+    return await tx.getRepository(ReverseKittingOrderInventory).save({
+      ...reverseKittingOI,
       ...patch,
       updater: user
     })
   }
 
   @Directive('@transaction')
-  @Mutation(returns => [ReverseKittingOrderInventory], { description: "To modify multiple ReverseKittingOrderInventories' information" })
+  @Mutation(returns => [ReverseKittingOrderInventory], {
+    description: "To modify multiple ReverseKittingOrderInventories' information"
+  })
   async updateMultipleReverseKittingOrderInventory(
     @Arg('patches', type => [ReverseKittingOrderInventoryPatch]) patches: ReverseKittingOrderInventoryPatch[],
     @Ctx() context: any

package/server/utils/inventory-util.ts

@@ -11,6 +11,7 @@ import {
   InventoryNoGenerator,
   Location,
   LOCATION_STATUS,
+  LOCATION_TYPE,
   Pallet
 } from '@things-factory/warehouse-base'
 
@@ -67,7 +68,8 @@ export const InventoryUtil = {
               oi.product_id,
               p.name AS product_name,
               oi.packing_type,
-              oi.packing_size
+              oi.packing_size,
+              oi.uom
             FROM
               order_inventories oi
             LEFT JOIN
@@ -80,12 +82,14 @@ export const InventoryUtil = {
               AND oi.product_id NOTNULL
               AND oi.packing_type NOTNULL
               AND oi.packing_size NOTNULL
+              AND oi.inventory_id IS NULL
             GROUP BY
               oi.batch_id,
               oi.batch_id_ref,
               oi.product_id,
               oi.packing_type,
               oi.packing_size,
+              oi.uom,
               p.name
           )
           SELECT
@@ -96,6 +100,7 @@ export const InventoryUtil = {
             i.uom AS "uom",
             concat(p.name, ' (', p.description, ')') AS "productName",
             coalesce(p.sku, '') AS "productSKU",
+            coalesce(p.brand, '') AS "productBrand",
             p.id AS "productId",
             SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0)) - MAX(COALESCE(bp.bundle_product_release_qty, 0)) AS "remainQty",
             SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) AS "remainUomValue",
@@ -104,7 +109,8 @@ export const InventoryUtil = {
           FROM
             inventories i
             LEFT JOIN products p ON i.product_id = p.id
-            LEFT JOIN oi ON i.batch_id = oi.batch_id AND p.name = oi.product_name AND i.packing_type = oi.packing_type AND i.packing_size = oi.packing_size
+            LEFT JOIN oi ON i.batch_id = oi.batch_id AND p.name = oi.product_name AND i.packing_type = oi.packing_type AND i.packing_size = oi.packing_size AND i.uom = oi.uom
+            LEFT JOIN locations l2 ON i.location_id = l2.id AND i.domain_id = l2.domain_id
             LEFT JOIN (
               SELECT pbs.product_id, SUM(pbs.bundle_qty * src.release_qty) AS bundle_product_release_qty, SUM(pbs.bundle_qty * src.release_uom_value) AS bundle_product_release_uom_value 
               FROM product_bundle_settings pbs
@@ -112,6 +118,7 @@ export const InventoryUtil = {
               GROUP BY pbs.product_id
             ) bp on i.product_id = bp.product_id
           WHERE i.domain_id = $1
+          AND l2.type NOT IN ('${LOCATION_TYPE.QUARANTINE}', '${LOCATION_TYPE.RESERVE}')
           ${productWhereClause}
           GROUP BY
           i.batch_id,
@@ -121,7 +128,7 @@ export const InventoryUtil = {
           i.packing_size,
           i.uom
           UNION 
-          SELECT 'BUNDLE' AS "batchId", null as "batchIdRef", packing_type, packing_size,'UNIT' AS "uom", name AS "productName", sku AS "productSKU", id AS "productId",
+          SELECT 'BUNDLE' AS "batchId", null as "batchIdRef", packing_type, packing_size,'UNIT' AS "uom", name AS "productName", sku AS "productSKU", 'brand' AS "productBrand", id AS "productId",
           MIN(FLOOR(pbs."availableQty")) AS "remainQty", 
           MIN(FLOOR(pbs."availableUomValue")) AS "remainUomValue", 
           CONCAT(MIN(FLOOR(pbs."availableUomValue")),' UNIT') AS "remainUomValueWithUom", 
@@ -189,14 +196,15 @@ export const InventoryUtil = {
           product_id: x.product.id,
           batch_id: x.batchId,
           packing_type: x.packingType,
-          release_qty: x.releaseQty
+          release_qty: x.releaseQty,
+          uom: x.uom
         }
       })
     )
 
     let resultQb = await trxMgr.query(
       `
-      select joi.product_id as "productId", joi.batch_id as "batchId", joi.packing_type as "packingType", joi.release_qty as "releaseQty",
+      select joi.product_id as "productId", joi.batch_id as "batchId", joi.packing_type as "packingType", joi.uom as "uom", joi.release_qty as "releaseQty",
       sum(i.qty - coalesce(i.locked_qty,0)) - coalesce(
       (
         select sum(oi.release_qty) from order_inventories oi 
@@ -205,6 +213,7 @@ export const InventoryUtil = {
         and oi.product_id = joi.product_id
         and oi.batch_id = joi.batch_id
         and oi.packing_type = joi.packing_type
+        and oi.uom = joi.uom
         and oi.domain_id = $1
         and oi.bizplace_id = $2
       ),0) as "availableQty",
@@ -216,16 +225,18 @@ export const InventoryUtil = {
         and oi.product_id = joi.product_id
         and oi.batch_id = joi.batch_id
         and oi.packing_type = joi.packing_type
+        and oi.uom = joi.uom
         and oi.domain_id = $1
         and oi.bizplace_id = $2
-      ),0) as "availableUomValue", i.uom
+      ),0) as "availableUomValue"
       from json_populate_recordset(NULL::order_inventories,'${json_oi}') joi
       left join inventories i on joi.product_id = i.product_id 
       and joi.batch_id = i.batch_id
       and joi.packing_type = i.packing_type and i.status ='STORED'
+      and joi.uom = i.uom
       and i.domain_id = $1
       and i.bizplace_id = $2
-      group by joi.product_id, joi.batch_id, joi.packing_type, joi.release_qty, i.uom
+      group by joi.product_id, joi.batch_id, joi.packing_type, joi.release_qty, joi.uom
     `,
       [warehouseDomain.id, partnerBizplace.id]
     )
@@ -325,6 +336,14 @@ async function getConditions(
             whereClause += `AND LOWER("batchId") LIKE '${value.toLowerCase()}'`
             break
 
+          case 'batchIdRef':
+            whereClause += `AND LOWER("batchIdRef") LIKE '${value.toLowerCase()}'`
+            break
+
+          case 'productBrand':
+            whereClause += `AND LOWER("productBrand") LIKE '${value.toLowerCase()}'`
+            break
+
           case 'productName':
             const products: Product[] = await trxMgr.getRepository(Product).find({
               select: ['id'],
@@ -406,6 +425,10 @@ async function getConditions(
             whereClause += `AND LOWER("groupType") LIKE 'bundle'`
             break
 
+          case 'hideBundle':
+            whereClause += `AND LOWER("groupType") LIKE 'single'`
+            break
+
           case 'batch_product':
             productWhereClause += `
               AND (i.batch_id, p.id, i.packing_type) ${operator === 'in' ? 'IN' : 'NOT IN'} (${value

package/server/utils/order-no-generator.ts

@@ -8,51 +8,63 @@ export class OrderNoGenerator {
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static purchaseOrder() {
+  static collectionOrder() {
     const currentDate = new Date()
-    return `PO-${currentDate.getFullYear()}${
+    return `CO-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static jobSheet(domainName) {
+  static cycleCount() {
     const currentDate = new Date()
-    return `${domainName}-${currentDate.getFullYear()}${
+    return `CC-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static goodsReceiveNote() {
+  static deliveryOrder() {
     const currentDate = new Date()
-    return `GRN-${currentDate.getFullYear()}${
+    return `DO-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static cycleCount() {
+  static goodsReceiveNote() {
     const currentDate = new Date()
-    return `CC-${currentDate.getFullYear()}${
+    return `GRN-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static stockTake() {
+  static jobSheet(domainName) {
     const currentDate = new Date()
-    return `ST-${currentDate.getFullYear()}${
+    return `${domainName}-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static shippingOrder() {
+  static manifest() {
     const currentDate = new Date()
-    return `SO-${currentDate.getFullYear()}${
+    return `LM-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static returnOrder() {
+  static orderInventory() {
+    return uuid()
+  }
+
+  static orderProduct() {
+    return `OP-${uuid()}`
+  }
+
+  static orderVas() {
+    return `OV-${uuid()}`
+  }
+
+  static purchaseOrder() {
     const currentDate = new Date()
-    return `RTO-${currentDate.getFullYear()}${
+    return `PO-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
@@ -64,46 +76,34 @@ export class OrderNoGenerator {
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static orderProduct() {
-    return `OP-${uuid()}`
+  static releaseVas() {
+    return uuid()
   }
 
-  static collectionOrder() {
+  static retailReplenishmentOrder() {
     const currentDate = new Date()
-    return `CO-${currentDate.getFullYear()}${
+    return `RR-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static deliveryOrder() {
+  static returnOrder() {
     const currentDate = new Date()
-    return `DO-${currentDate.getFullYear()}${
+    return `RTO-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static orderInventory() {
-    return uuid()
-  }
-
-  static releaseVas() {
-    return uuid()
-  }
-
-  static vasOrder() {
+  static shippingOrder() {
     const currentDate = new Date()
-    return `VO-${currentDate.getFullYear()}${
+    return `SO-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static orderVas() {
-    return `OV-${uuid()}`
-  }
-
-  static retailReplenishmentOrder() {
+  static stockTake() {
     const currentDate = new Date()
-    return `RR-${currentDate.getFullYear()}${
+    return `ST-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
@@ -114,4 +114,11 @@ export class OrderNoGenerator {
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
+
+  static vasOrder() {
+    const currentDate = new Date()
+    return `VO-${currentDate.getFullYear()}${
+      currentDate.getMonth() + 1
+    }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
+  }
 }

package/dist-server/middlewares/index.js

@@ -1 +0,0 @@
-//# sourceMappingURL=index.js.map

package/dist-server/middlewares/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/middlewares/index.ts"],"names":[],"mappings":""}