@things-factory/operato-hub 4.0.9 → 4.0.13

package/server/routers/api/restful-apis/v2/add-release-order.ts

@@ -1,404 +1,498 @@
 import gql from 'graphql-tag'
-import { getRepository, SelectQueryBuilder } from 'typeorm'
+import { EntityManager, getConnection, SelectQueryBuilder } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
 import { Product, ProductBundle, ProductDetail } from '@things-factory/product-base'
 import { ORDER_TYPES, OrderInventory } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
-import { Inventory, INVENTORY_STATUS } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
 import { WorksheetDetail } from '@things-factory/worksheet-base'
 
 import { businessMiddleware } from '../../../../middlewares/business-middleware'
 import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'
 
-const debug = require('debug')('things-factory:operato-hub:restful-api:v2:add-release-order')
+const debug = require('debug')('things-factory:operato-hub:restful-api:unstable:add-release-order')
 
 router.post(
   '/v2/warehouse/:warehouseId/add-release-order',
   businessMiddleware,
   warehouseMiddleware,
   async (context, next) => {
-    const { client, domain } = context.state
-    const { warehouseId: customerBizplaceId } = context.params
-    const { t } = context
+    return await getConnection().transaction(async (tx: EntityManager) => {
+      const { client, domain } = context.state
+      const { warehouseId: customerBizplaceId } = context.params
+      const { t } = context
 
-    if (!customerBizplaceId) context.throw(404, t('error.warehouse id not found'))
+      if (!customerBizplaceId) context.throw(404, t('error.warehouse id not found'))
 
-    let bodyReq = context.request.body
-    if (typeof bodyReq === undefined || !Object.keys(bodyReq)?.length) {
-      context.throw(400, t('error.invalid body request format'))
-    }
-    debug('post:/add-release-order request.body', bodyReq)
-    await checkMandatoryKey(context, bodyReq)
+      let bodyReq = context.request.body
+      if (typeof bodyReq === undefined || !Object.keys(bodyReq)?.length) {
+        context.throw(400, t('error.invalid body request format'))
+      }
+      debug('post:/add-release-order request.body', bodyReq)
+      await checkMandatoryKey(context, bodyReq)
 
-    // get customer company's bizplace
-    const custCompanyBizplace: Bizplace = await getCompanyBizplace(null, null, customerBizplaceId)
-    const customerBizplace: Bizplace = await getRepository(Bizplace).findOne({
-      where: { id: customerBizplaceId }
-    })
+      const isAutoAssign: Boolean = bodyReq.hasOwnProperty('isAutoAssign') ? bodyReq.isAutoAssign : true
 
-    const pickingProductSetting: Setting = await getRepository(Setting).findOne({
-      where: { domain, name: 'rule-for-picking-product' }
-    })
+      // get customer company's bizplace
+      const custCompanyBizplace: Bizplace = await getCompanyBizplace(null, null, customerBizplaceId, tx)
+      const customerBizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+        where: { id: customerBizplaceId }
+      })
+
+      const pickingProductSetting: Setting = await tx.getRepository(Setting).findOne({
+        where: { domain, name: 'rule-for-picking-product' }
+      })
 
-    let locationSortingRules = []
-    if (pickingProductSetting) {
-      let locationSetting = JSON.parse(pickingProductSetting.value)
-      for (const key in locationSetting) {
-        locationSortingRules.push({ name: key, desc: locationSetting[key] == 'ASC' ? false : true })
+      let locationSortingRules = []
+      if (pickingProductSetting) {
+        let locationSetting = JSON.parse(pickingProductSetting.value)
+        for (const key in locationSetting) {
+          locationSortingRules.push({ name: key, desc: locationSetting[key] == 'ASC' ? false : true })
+        }
       }
-    }
 
-    const orderInventories: OrderInventory[] = bodyReq.orderInventories
-    let newOrderInventories: OrderInventory[] = []
+      const orderInventories: OrderInventory[] = bodyReq.orderInventories
+      let newOrderInventories: OrderInventory[] = []
 
-    await Promise.all(
-      orderInventories.map(async orderInventory => {
-        const sku: string = orderInventory.product?.sku
-        const refCode: string = orderInventory.product?.refCode
-        const packingType: string = orderInventory.packingType
+      await Promise.all(
+        orderInventories.map(async orderInventory => {
+          const sku: string = orderInventory.product?.sku
+          const refCode: string = orderInventory.product?.refCode
+          const packingType: string = orderInventory.packingType
 
-        const qb: SelectQueryBuilder<ProductDetail> = getRepository(ProductDetail)
-          .createQueryBuilder('PD')
-          .innerJoinAndSelect('PD.product', 'PROD')
-          .where('PROD.bizplace_id = :bizplaceId', { bizplaceId: custCompanyBizplace.id })
+          const qb: SelectQueryBuilder<ProductDetail> = tx
+            .getRepository(ProductDetail)
+            .createQueryBuilder('PD')
+            .innerJoinAndSelect('PD.product', 'PROD')
+            .where('PROD.bizplace_id = :bizplaceId', { bizplaceId: custCompanyBizplace.id })
 
-        if (sku) {
-          qb.andWhere('PROD.sku = :sku', { sku })
+          if (!sku && !refCode) {
+            context.throw(404, t('error.sku or refCode not found'))
+          }
 
-          if (packingType) {
-            qb.andWhere('PD.packing_type = :packingType', { packingType })
+          if (refCode) {
+            qb.andWhere('PD.ref_code = :refCode', { refCode })
           }
-        }
 
-        if (refCode) {
-          qb.andWhere('PD.ref_code = :refCode', { refCode })
+          if (sku) {
+            qb.andWhere('PROD.sku = :sku', { sku })
+          }
 
           if (packingType) {
             qb.andWhere('PD.packing_type = :packingType', { packingType })
           }
-        }
-
-        const productDetail: ProductDetail = await qb.getOne()
 
-        if (productDetail) {
-          let newOrderInventory: OrderInventory = Object.assign({}, orderInventory)
+          const productDetail: ProductDetail = await qb.getOne()
 
-          newOrderInventory.product.sku = productDetail.product.sku
-          newOrderInventory.product = productDetail.product
-          newOrderInventory.packingType = productDetail.packingType
-          newOrderInventory.uomValue = productDetail.uomValue
-          newOrderInventories.push(newOrderInventory)
-        }
+          if (productDetail) {
+            let newOrderInventory: OrderInventory = Object.assign({}, orderInventory)
 
-        if (!productDetail) {
-          const qb: SelectQueryBuilder<ProductDetail> = getRepository(ProductBundle)
-            .createQueryBuilder('PB')
-            .innerJoinAndSelect('PB.productBundleSetting', 'PBS')
-            .innerJoinAndSelect('PBS.productDetail', 'PBD')
-            .innerJoinAndSelect('PBD.product', 'PROD')
-            .where('PB.bizplace_id = :bizplaceId', { bizplaceId: custCompanyBizplace.id })
+            newOrderInventory.product.sku = productDetail.product.sku
+            newOrderInventory.product = productDetail.product
+            newOrderInventory.packingType = productDetail.packingType
+            newOrderInventory.uomValue = productDetail.uomValue
+            newOrderInventories.push(newOrderInventory)
+          }
 
-          if (sku) {
-            qb.andWhere('PB.sku = :sku', { sku })
+          if (!productDetail) {
+            const qb: SelectQueryBuilder<ProductDetail> = tx
+              .getRepository(ProductBundle)
+              .createQueryBuilder('PB')
+              .innerJoinAndSelect('PB.productBundleSettings', 'PBS')
+              .innerJoinAndSelect('PBS.productDetail', 'PBD')
+              .innerJoinAndSelect('PBD.product', 'PROD')
+              .where('PB.bizplace_id = :bizplaceId', { bizplaceId: custCompanyBizplace.id })
+
+            if (!sku && !refCode) {
+              context.throw(404, t('error.sku or refCode not found'))
+            }
 
-            if (packingType) {
-              qb.andWhere('PB.packing_type = :packingType', { packingType })
+            if (refCode) {
+              qb.andWhere('PB.ref_code = :refCode', { refCode })
             }
-          }
 
-          if (refCode) {
-            qb.andWhere('PB.ref_code = :refCode', { refCode })
+            if (sku) {
+              qb.andWhere('PB.sku = :sku', { sku })
+            }
 
             if (packingType) {
               qb.andWhere('PB.packing_type = :packingType', { packingType })
             }
-          }
 
-          const foundProductBundle: ProductBundle = await qb.getOne()
-
-          if (foundProductBundle) {
-            const bundleProductSettings: any[] = foundProductBundle.productBundleSettings
-            bundleProductSettings.map(bundleProductSetting => {
-              const productDetailBundle: ProductDetail = bundleProductSetting.productDetail
-
-              let newOrderInventory: OrderInventory = Object.assign({}, orderInventory)
-              newOrderInventory.product.sku = productDetailBundle.product.sku
-              newOrderInventory.packingType = productDetailBundle.packingType
-              newOrderInventory.uomValue = productDetailBundle.uomValue
-              newOrderInventory.releaseQty = orderInventory.releaseQty * bundleProductSetting.bundleQty
-              newOrderInventory.product = productDetailBundle.product
-              newOrderInventories.push(newOrderInventory)
-            })
-          } else {
-            context.throw(404, t(`error.${orderInventory.product?.sku} not exist in product / bundle master`))
-          }
-        }
-      })
-    )
-
-    let finalOrderInventories: OrderInventory[] = []
-
-    // Case 1. Every order inventories has specified batch id
-    if (newOrderInventories.every((orderInventory: OrderInventory) => orderInventory.batchId)) {
-      finalOrderInventories = await Promise.all(
-        newOrderInventories.map(async (orderInventory: OrderInventory) => {
-          let filters: any = [
-            {
-              name: 'batchId',
-              operator: 'eq',
-              value: orderInventory.batchId
-            },
-            {
-              name: 'productName',
-              operator: 'eq',
-              value: orderInventory.product.sku
-            },
-            {
-              name: 'bizplace',
-              operator: 'in',
-              value: [customerBizplaceId]
+            const foundProductBundle: ProductBundle = await qb.getOne()
+
+            if (foundProductBundle) {
+              const bundleProductSettings: any[] = foundProductBundle.productBundleSettings
+              bundleProductSettings.map(bundleProductSetting => {
+                const productDetailBundle: ProductDetail = bundleProductSetting.productDetail
+
+                let newOrderInventory: OrderInventory = Object.assign({}, orderInventory)
+                newOrderInventory.product.sku = productDetailBundle.product.sku
+                newOrderInventory.packingType = productDetailBundle.packingType
+                newOrderInventory.uomValue = productDetailBundle.uomValue
+                newOrderInventory.releaseQty = orderInventory.releaseQty * bundleProductSetting.bundleQty
+                newOrderInventory.product = productDetailBundle.product
+                newOrderInventories.push(newOrderInventory)
+              })
+            } else {
+              if (sku) {
+                context.throw(404, t(`error.sku ${sku} not exist in product / bundle master`))
+              } else if (refCode) {
+                context.throw(404, t(`error.refCode ${refCode} not exist in product / bundle master`))
+              }
             }
-          ]
-
-          // 2. get all inventory data according to SKU and batchId
-          const response = await client.query({
-            query: gql`
-              query inventoriesByPallet($filters: [Filter]) {
-                inventoriesByPallet(filters: $filters) {
-                  items {
-                    product {
-                      id
-                      name
-                      description
+          }
+        })
+      )
+
+      let finalOrderInventories: OrderInventory[] = []
+
+      // Case 1. Every order inventories has specified batch id
+      if (newOrderInventories.every((orderInventory: OrderInventory) => orderInventory.batchId)) {
+        finalOrderInventories = await Promise.all(
+          newOrderInventories.map(async (orderInventory: OrderInventory) => {
+            let filters: any = [
+              {
+                name: 'batchId',
+                operator: 'eq',
+                value: orderInventory.batchId
+              },
+              {
+                name: 'productName',
+                operator: 'eq',
+                value: orderInventory.product.sku
+              },
+              {
+                name: 'bizplace',
+                operator: 'in',
+                value: [customerBizplaceId]
+              }
+            ]
+
+            // 2. get all inventory data according to SKU and batchId
+            const response = await client.query({
+              query: gql`
+                query inventoriesByPallet($filters: [Filter]) {
+                  inventoriesByPallet(filters: $filters) {
+                    items {
+                      product {
+                        id
+                        name
+                        description
+                      }
+                      batchId
+                      packingType
+                      remainQty
+                      remainWeight
+                      remainUomValue
                     }
-                    batchId
-                    packingType
-                    remainQty
-                    remainWeight
-                    remainUomValue
+                    total
                   }
-                  total
+                }
+              `,
+              variables: { filters, locationSortingRules },
+              context: {
+                ...context,
+                state: {
+                  ...context.state,
+                  bizplace: customerBizplace,
+                  domain
                 }
               }
-            `,
-            variables: { filters, locationSortingRules },
-            context: {
-              ...context,
-              state: {
-                ...context.state,
-                bizplace: customerBizplace,
-                domain
-              }
+            } as any)
+
+            if (!response.errors) {
+              const items = response.data.inventoriesByPallet.items || []
+              if (!items?.length)
+                context.throw(
+                  404,
+                  t(
+                    `error.no inventories found for ${orderInventory.product?.sku} with batch ID ${orderInventory?.batchId}`
+                  )
+                )
+
+              items.forEach(item => {
+                if (orderInventory.releaseQty > item.remainQty || orderInventory.releaseQty <= 0) {
+                  context.throw(404, t(`error.invalid release qty for ${orderInventory.product?.sku}`))
+                }
+
+                // 3. add more information to orderInventory
+                orderInventory.product.id = item.product.id
+                orderInventory.packingType = item.packingType
+                orderInventory.batchId = item.batchId
+                orderInventory.type = ORDER_TYPES.RELEASE_OF_GOODS
+                orderInventory.releaseUomValue = orderInventory.releaseQty * orderInventory.uomValue
+                orderInventory.uom = item.uom
+              })
+
+              return orderInventory
+            } else context.throw(404, t('error.failed to fetch inventory'))
+          })
+        )
+      } else {
+        // Case 2. Some of order inventories doesn't have specified batch id
+        // MMS order doesn't have batch ID field.
+        // To cover this case first result of found inventory will be a target of RO
+
+        for (let i: number = 0; i < newOrderInventories.length; i++) {
+          const orderInventory: OrderInventory = newOrderInventories[i]
+          const product: Product = orderInventory.product
+          const packingType: string = orderInventory.packingType
+
+          if (isAutoAssign) {
+            let qb: SelectQueryBuilder<Inventory> = tx.getRepository(Inventory).createQueryBuilder('iv')
+            qb.leftJoinAndSelect('iv.location', 'loc')
+              .andWhere('"iv"."domain_id" = :domainId')
+              .andWhere('"iv"."bizplace_id" = :bizplaceId')
+              .andWhere('"iv"."packing_type" = :packingType')
+              .andWhere('"iv"."product_id" = :productId')
+              .andWhere('"iv"."status" = :status')
+              .andWhere('"loc"."type" NOT IN (:...locationTypes)')
+              .setParameters({
+                domainId: domain.id,
+                bizplaceId: customerBizplace.id,
+                packingType: packingType,
+                productId: product.id,
+                status: INVENTORY_STATUS.STORED,
+                locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
+              })
+
+            if (locationSortingRules?.length > 0) {
+              locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
+                idx === 0
+                  ? qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+                  : qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+              })
+            } else {
+              qb.addOrderBy('"iv"."created_at"', 'ASC')
             }
-          } as any)
 
-          if (!response.errors) {
-            const items = response.data.inventoriesByPallet.items || []
-            if (!items?.length)
-              context.throw(
-                404,
-                t(
-                  `error.no inventories found for ${orderInventory.product?.sku} with batch ID ${orderInventory?.batchId}`
-                )
-              )
+            let inventories: Inventory[] = await qb.getMany()
+            if (!inventories?.length) context.throw(404, t(`error.no inventories found for ${product.sku}`))
 
-            items.forEach(item => {
-              if (orderInventory.releaseQty > item.remainQty || orderInventory.releaseQty <= 0) {
-                context.throw(404, t(`error.invalid release qty for ${orderInventory.product?.sku}`))
+            inventories = inventories.map(inventory => {
+              return {
+                ...inventory,
+                remainQty: inventory.qty - inventory.lockedQty,
+                remainUomValue: inventory.uomValue - inventory.lockedUomValue
               }
+            })
 
-              // 3. add more information to orderInventory
-              orderInventory.product.id = item.product.id
-              orderInventory.packingType = item.packingType
-              orderInventory.batchId = item.batchId
-              orderInventory.type = ORDER_TYPES.RELEASE_OF_GOODS
-              orderInventory.releaseUomValue = orderInventory.releaseQty * orderInventory.uomValue
+            const targetInventories: WorksheetDetail[] = _composeTargetInventories(
+              context,
+              product,
+              orderInventory,
+              inventories
+            )
+            targetInventories.map(item => {
+              finalOrderInventories.push(item.targetInventory)
             })
+          } else {
+            let filters: any = [
+              {
+                name: 'productName',
+                operator: 'eq',
+                value: orderInventory.product.sku
+              },
+              {
+                name: 'bizplace_id',
+                operator: 'eq',
+                value: customerBizplaceId
+              }
+            ]
+
+            // 2. get all inventory data according to SKU and batchId
+            const response = await client.query({
+              query: gql`
+                query inventoryProductGroup($filters: [Filter]) {
+                  inventoryProductGroup(filters: $filters) {
+                    items {
+                      productId
+                      productSKU
+                      productName
+                      batchId
+                      packingType
+                      remainQty
+                      remainWeight
+                      remainUomValue
+                    }
+                    total
+                  }
+                }
+              `,
+              variables: { filters },
+              context: {
+                ...context,
+                state: {
+                  ...context.state,
+                  bizplace: customerBizplace,
+                  domain
+                }
+              }
+            } as any)
+
+            if (!response.errors) {
+              const items = response.data.inventoryProductGroup.items || []
+              if (!items?.length)
+                context.throw(
+                  404,
+                  t(
+                    `error.no inventories found for ${orderInventory.product?.sku} with batch ID ${orderInventory?.batchId}`
+                  )
+                )
 
-            return orderInventory
-          } else context.throw(404, t('error.failed to fetch inventory'))
-        })
-      )
-    } else {
-      // Case 2. Some of order inventories doesn't have specified batch id
-      // MMS order doesn't have batch ID field.
-      // To cover this case first result of found inventory will be a target of RO
-
-      for (let i: number = 0; i < newOrderInventories.length; i++) {
-        const orderInventory: OrderInventory = newOrderInventories[i]
-        const product: Product = orderInventory.product
-        const packingType: string = orderInventory.packingType
-
-        let qb: SelectQueryBuilder<Inventory> = getRepository(Inventory).createQueryBuilder('iv')
-        qb.leftJoinAndSelect('iv.location', 'loc')
-          .andWhere('"iv"."domain_id" = :domainId')
-          .andWhere('"iv"."bizplace_id" = :bizplaceId')
-          .andWhere('"iv"."packing_type" = :packingType')
-          .andWhere('"iv"."product_id" = :productId')
-          .andWhere('"iv"."status" = :status')
-          .setParameters({
-            domainId: domain.id,
-            bizplaceId: customerBizplace.id,
-            packingType: packingType,
-            productId: product.id,
-            status: INVENTORY_STATUS.STORED
-          })
+              items.forEach(item => {
+                if (orderInventory.releaseQty > item.remainQty || orderInventory.releaseQty <= 0) {
+                  context.throw(404, t(`error.invalid release qty for ${orderInventory.product?.sku}`))
+                }
 
-        if (locationSortingRules?.length > 0) {
-          locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
-            idx === 0
-              ? qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
-              : qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
-          })
-        } else {
-          qb.addOrderBy('"iv"."created_at"', 'ASC')
+                // 3. add more information to orderInventory
+                orderInventory.product = { id: item.productId }
+                orderInventory.packingType = item.packingType
+                orderInventory.batchId = item.batchId
+                orderInventory.type = ORDER_TYPES.RELEASE_OF_GOODS
+                orderInventory.releaseUomValue = orderInventory.releaseQty * orderInventory.uomValue
+                orderInventory.uom = item.uom
+              })
+
+              delete orderInventory.uomValue
+              finalOrderInventories.push(orderInventory)
+            } else context.throw(404, t('error.failed to fetch inventory'))
+          }
         }
-
-        const inventories: Inventory[] = await qb.getMany()
-        if (!inventories?.length) context.throw(404, t(`error.no inventories found for ${product.sku}`))
-
-        const targetInventories: WorksheetDetail[] = _composeTargetInventories(
-          context,
-          product,
-          orderInventory,
-          inventories
-        )
-        targetInventories.map(item => {
-          finalOrderInventories.push(item.targetInventory)
-        })
       }
-    }
 
-    context.body = {
-      result: (
-        await client.mutate({
-          mutation: gql`
-            mutation addReleaseGood($releaseGood: NewReleaseGood, $shippingOrder: ShippingOrderPatch, $file: Upload) {
-              addReleaseGood(releaseGood: $releaseGood, shippingOrder: $shippingOrder, file: $file) {
-                id
-                name
-                refNo
-                status
-                truckNo
-                ownTransport
-                crossDocking
-                marketplaceOrderStatus
-                billingAddress
-                deliveryAddress1
-                deliveryAddress2
-                deliveryAddress3
-                deliveryAddress4
-                deliveryAddress5
-                attentionTo
-                attentionCompany
-                city
-                state
-                postalCode
-                country
-                phone1
-                phone2
-                email
-                transporter
-                trackingNo
-                airwayBill
-                invoice
-                type
-                arrivalNotice {
+      context.body = {
+        result: (
+          await client.mutate({
+            mutation: gql`
+              mutation addReleaseGood($releaseGood: NewReleaseGood, $shippingOrder: ShippingOrderPatch, $file: Upload) {
+                addReleaseGood(releaseGood: $releaseGood, shippingOrder: $shippingOrder, file: $file) {
+                  id
                   name
-                }
-                exportOption
-                releaseDate
-                collectionOrderNo
-                bizplace {
-                  name
-                }
-                orderInventories {
-                  product {
-                    sku
+                  refNo
+                  status
+                  truckNo
+                  ownTransport
+                  crossDocking
+                  marketplaceOrderStatus
+                  billingAddress
+                  deliveryAddress1
+                  deliveryAddress2
+                  deliveryAddress3
+                  deliveryAddress4
+                  deliveryAddress5
+                  attentionTo
+                  attentionCompany
+                  city
+                  state
+                  postalCode
+                  country
+                  phone1
+                  phone2
+                  email
+                  transporter
+                  trackingNo
+                  airwayBill
+                  invoice
+                  type
+                  arrivalNotice {
                     name
-                    description
                   }
-                  batchId
-                  packingType
-                  packingSize
-                  releaseQty
-                  releaseUomValue
-                }
-                orderVass {
-                  vas {
+                  exportOption
+                  releaseDate
+                  collectionOrderNo
+                  bizplace {
                     name
-                    operationGuide
-                    operationGuideType
                   }
-                  set
-                  targetType
-                  targetBatchId
-                  targetProduct {
-                    name
+                  orderInventories {
+                    product {
+                      sku
+                      name
+                      description
+                    }
+                    batchId
+                    packingType
+                    packingSize
+                    releaseQty
+                    releaseUomValue
+                  }
+                  orderVass {
+                    vas {
+                      name
+                      operationGuide
+                      operationGuideType
+                    }
+                    set
+                    targetType
+                    targetBatchId
+                    targetProduct {
+                      name
+                      description
+                    }
+                    packingType
+                    qty
+                    uomValue
+                    otherTarget
                     description
+                    remark
+                    status
+                    operationGuide
                   }
-                  packingType
-                  qty
-                  uomValue
-                  otherTarget
-                  description
-                  remark
-                  status
-                  operationGuide
                 }
               }
+            `,
+            variables: {
+              releaseGood: {
+                customerBizplaceId: customerBizplace.id,
+                courierOption: bodyReq.courierOption,
+                collectionOrderNo: bodyReq.collectionOrderNo,
+                exportOption: bodyReq.exportOption,
+                orderInventories: finalOrderInventories,
+                ownTransport: bodyReq.ownTransport,
+                packingOption: bodyReq.packingOption,
+                refNo: bodyReq.refNo,
+                refNo2: bodyReq?.refNo2,
+                releaseDate: bodyReq.releaseDate,
+                type: bodyReq.type,
+                marketplaceOrderStatus: bodyReq?.marketplaceOrderStatus,
+                billingAddress: bodyReq?.billTo?.billingAddress || null,
+                deliveryAddress1: bodyReq?.deliverTo?.deliveryAddress1 || null,
+                deliveryAddress2: bodyReq?.deliverTo?.deliveryAddress2 || null,
+                deliveryAddress3: bodyReq?.deliverTo?.deliveryAddress3 || null,
+                deliveryAddress4: bodyReq?.deliverTo?.deliveryAddress4 || null,
+                deliveryAddress5: bodyReq?.deliverTo?.deliveryAddress5 || null,
+                attentionTo: bodyReq?.deliverTo?.attentionTo || null,
+                attentionCompany: bodyReq?.deliverTo?.attentionCompany || null,
+                city: bodyReq?.deliverTo?.city || null,
+                state: bodyReq?.deliverTo?.state || null,
+                postalCode: bodyReq?.deliverTo?.postalCode || null,
+                country: bodyReq?.deliverTo?.country || null,
+                phone1: bodyReq?.deliverTo?.phone1 || null,
+                phone2: bodyReq?.deliverTo?.phone2 || null,
+                email: bodyReq?.deliverTo?.email || null,
+                transporter: bodyReq?.transporter,
+                trackingNo: bodyReq?.trackingNo,
+                airwayBill: bodyReq?.airwayBill,
+                invoice: bodyReq?.invoice
+              }
+            },
+            context: {
+              ...context,
+              hasUpload: true,
+              state: {
+                ...context.state,
+                customerBizplace,
+                domain,
+                type: 'api'
+              }
             }
-          `,
-          variables: {
-            releaseGood: {
-              customerBizplaceId: customerBizplace.id,
-              courierOption: bodyReq.courierOption,
-              collectionOrderNo: bodyReq.collectionOrderNo,
-              exportOption: bodyReq.exportOption,
-              orderInventories: finalOrderInventories,
-              ownTransport: bodyReq.ownTransport,
-              packingOption: bodyReq.packingOption,
-              refNo: bodyReq.refNo,
-              refNo2: bodyReq?.refNo2,
-              releaseDate: bodyReq.releaseDate,
-              type: bodyReq.type,
-              marketplaceOrderStatus: bodyReq?.marketplaceOrderStatus,
-              billingAddress: bodyReq?.billTo?.billingAddress || null,
-              deliveryAddress1: bodyReq?.deliverTo?.deliveryAddress1 || null,
-              deliveryAddress2: bodyReq?.deliverTo?.deliveryAddress2 || null,
-              deliveryAddress3: bodyReq?.deliverTo?.deliveryAddress3 || null,
-              deliveryAddress4: bodyReq?.deliverTo?.deliveryAddress4 || null,
-              deliveryAddress5: bodyReq?.deliverTo?.deliveryAddress5 || null,
-              attentionTo: bodyReq?.deliverTo?.attentionTo || null,
-              attentionCompany: bodyReq?.deliverTo?.attentionCompany || null,
-              city: bodyReq?.deliverTo?.city || null,
-              state: bodyReq?.deliverTo?.state || null,
-              postalCode: bodyReq?.deliverTo?.postalCode || null,
-              country: bodyReq?.deliverTo?.country || null,
-              phone1: bodyReq?.deliverTo?.phone1 || null,
-              phone2: bodyReq?.deliverTo?.phone2 || null,
-              email: bodyReq?.deliverTo?.email || null,
-              transporter: bodyReq?.transporter,
-              trackingNo: bodyReq?.trackingNo,
-              airwayBill: bodyReq?.airwayBill,
-              invoice: bodyReq?.invoice
-            }
-          },
-          context: {
-            ...context,
-            hasUpload: true,
-            state: {
-              ...context.state,
-              customerBizplace,
-              domain,
-              type: 'api'
-            }
-          }
-        } as any)
-      ).data
-    }
+          } as any)
+        ).data
+      }
+    })
   }
 )
 
@@ -429,9 +523,18 @@ export async function checkMandatoryKey(context, params) {
   }
 
   if ('orderInventories' in params) {
-    if (params.orderInventories.filter(record => !record.releaseQty || !record.product).length) {
-      noparams.push('orderInventories')
-    }
+    params.orderInventories.forEach((param, key) => {
+      let noSubParams = []
+
+      if (!param?.releaseQty) noSubParams.push('releaseQty')
+
+      if (!param?.product) noSubParams.push('product')
+
+      if (noSubParams?.length)
+        context.throw(400, context.t('error.required param x not found', { x: `${noSubParams.join(', ')}` }))
+    })
+  } else {
+    noparams.push('orderInventories')
   }
 
   if (noparams?.length) {
@@ -450,7 +553,7 @@ export function _composeTargetInventories(context, product, record, inventories)
   let totalInventoryQty: number = 0
 
   inventories.map(inventory => {
-    totalInventoryQty += inventory.qty
+    totalInventoryQty += inventory.remainQty
   })
 
   if (totalInventoryQty < record.releaseQty) {
@@ -462,7 +565,7 @@ export function _composeTargetInventories(context, product, record, inventories)
   while (compReleaseQty < record.releaseQty) {
     const inv = inventories[idx]
 
-    if (inv.qty > leftReleaseQty) {
+    if (inv.remainQty > leftReleaseQty) {
       compReleaseQty += leftReleaseQty
       compReleaseUomValue += leftReleaseUomValue
 
@@ -473,23 +576,25 @@ export function _composeTargetInventories(context, product, record, inventories)
           batchId: inv.batchId,
           releaseQty: leftReleaseQty,
           releaseUomValue: leftReleaseQty * record.uomValue,
+          uom: inv.uom,
           product: { id: product.id },
           type: ORDER_TYPES.RELEASE_OF_GOODS
         }
       })
     } else {
-      compReleaseQty += inv.qty
-      compReleaseUomValue += inv.uomValue
-      leftReleaseQty -= inv.qty
-      leftReleaseUomValue -= inv.uomValue
+      compReleaseQty += inv.remainQty
+      compReleaseUomValue += inv.remainUomValue
+      leftReleaseQty -= inv.remainQty
+      leftReleaseUomValue -= inv.remainUomValue
 
       targetInventories.push({
         targetInventory: {
           inventory: { id: inv.id },
           packingType: inv.packingType,
           batchId: inv.batchId,
-          releaseQty: inv.qty,
-          releaseUomValue: inv.uomValue,
+          releaseQty: inv.remainQty,
+          releaseUomValue: inv.remainUomValue,
+          uom: inv.uom,
           product: { id: product.id },
           type: ORDER_TYPES.RELEASE_OF_GOODS
         }