@things-factory/sales-base 3.7.12 → 3.8.0

package/server/graphql/resolvers/return-order/generate-return-order.ts

@@ -1,10 +1,12 @@
+import { EntityManager } from 'typeorm'
+
 import { Attachment, createAttachments } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
-import { Bizplace, getMyBizplace } from '@things-factory/biz-base'
+import { Bizplace } from '@things-factory/biz-base'
 import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
-import { EntityManager } from 'typeorm'
+
 import { ORDER_STATUS } from '../../../constants'
 import { ATTACHMENT_TYPE } from '../../../constants/attachment-type'
 import { ORDER_INVENTORY_STATUS } from '../../../constants/order'
@@ -17,7 +19,6 @@ export const generateReturnOrder = {
 
     const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne(returnOrder.customerBizplaceId)
     let orderInventories: OrderInventory[] = returnOrder.orderInventories
-    let foundInv = Inventory
 
     let newReturnOrder: ReturnOrder = {
       ...returnOrder,
@@ -29,7 +30,7 @@ export const generateReturnOrder = {
       updater: user
     }
 
-    if (newReturnOrder.orderInventories[0].returnQty < 0) { 
+    if (newReturnOrder.orderInventories[0].returnQty < 0) {
       throw new Error('invalid return quantity')
     }
 
@@ -47,8 +48,7 @@ export const generateReturnOrder = {
       newOrderInv.updater = user
 
       if (newOrderInv.inventory?.id) {
-        foundInv = await tx.getRepository(Inventory).findOne(newOrderInv.inventory.id)
-        newOrderInv.inventory = foundInv
+        newOrderInv.inventory = await tx.getRepository(Inventory).findOne(newOrderInv.inventory?.id)
       }
 
       await tx.getRepository(OrderInventory).save(newOrderInv)

package/server/graphql/types/order-inventory/order-inventory.ts

@@ -16,6 +16,7 @@ export const OrderInventory = gql`
     batchIdRef: String
     productName: String
     productSKU: String
+    productBrand: String
     packingType: String
     packingSize: Float
     originQty: Int

package/server/graphql/types/others/inventory-product-group.ts

@@ -6,6 +6,7 @@ export const InventoryProductGroup = gql`
     batchId: String
     batchIdRef: String
     productSKU: String
+    productBrand: String
     productName: String
     packingType: String
     packingSize: Float

package/server/graphql/types/release-good/index.ts

@@ -1,5 +1,7 @@
 import { InventoryInfos } from './inventory-infos'
+import { NewRawReleaseGood } from './new-raw-release-good'
 import { NewReleaseGood } from './new-release-good'
+import { RawReleaseGood } from './raw-release-good'
 import { ReleasableInventory } from './releasable-inventory'
 import { ReleasableInventoryList } from './releasable-inventory-list'
 import { ReleaseGood } from './release-good'
@@ -9,6 +11,11 @@ import { ReleaseGoodPatch } from './release-good-patch'
 import { ShippingOrderInfo } from './shipping-order-info'
 
 export const Mutation = /* GraphQL */ `
+  bulkAddReleaseGoods (
+    rawReleaseGoods: [NewRawReleaseGood]
+    bizplaceId: String
+  ): ReleaseGoodList @privilege(category: "order_customer", privilege: "mutation") @transaction
+
   deleteReleaseGood (
     name: String!
   ): Boolean @privilege(category: "order_customer", privilege: "mutation") @transaction
@@ -49,6 +56,11 @@ export const Mutation = /* GraphQL */ `
 `
 
 export const Query = /* GraphQL */ `
+  bulkReleaseGoodsAvailableItems (
+    rawReleaseGoods: [NewRawReleaseGood]
+    bizplaceId: String
+  ): [RawReleaseGood] @privilege(category: "order_customer", privilege: "query") @transaction
+
   releaseGoods (
     filters: [Filter],
     pagination: Pagination,
@@ -78,7 +90,9 @@ export const Query = /* GraphQL */ `
 `
 
 export const Types = [
+  RawReleaseGood,
   ReleaseGood,
+  NewRawReleaseGood,
   NewReleaseGood,
   ReleaseGoodPatch,
   ReleaseGoodList,

package/server/graphql/types/release-good/new-raw-release-good.ts

@@ -0,0 +1,56 @@
+import gql from 'graphql-tag'
+
+export const NewRawReleaseGood = gql`
+  input NewRawReleaseGood {
+    name: String
+    releaseDate: String
+    type: String
+    collectionOrderNo: String
+    ownTransport: Boolean
+    crossDocking: Boolean
+    courierOption: Boolean
+    packingOption: Boolean
+    packageId: String
+    truckNo: String
+    refNo: String
+    refNo2: String
+    refNo3: String
+    pickupAddress: String
+    pickupTime: String
+    handoverType: String
+    dropoffAddress: String
+    marketplaceOrderStatus: String
+    billingAddress: String
+    deliveryAddress1: String
+    deliveryAddress2: String
+    deliveryAddress3: String
+    deliveryAddress4: String
+    deliveryAddress5: String
+    attentionTo: String
+    attentionCompany: String
+    city: String
+    state: String
+    postalCode: String
+    country: String
+    phone1: String
+    phone2: String
+    email: String
+    transporter: String
+    trackingNo: String
+    airwayBill: String
+    invoice: String
+    status: String
+    description: String
+    warehouseId: String #outletID
+    deliverTo: String
+    customerBizplaceId: String
+    partnerBizplaceId: String
+    batchId: String
+    packingType: String
+    packingSize: Int
+    uom: String
+    productId: String
+    sku: String
+    releaseQty: Int
+  }
+`

package/server/graphql/types/release-good/raw-release-good.ts

@@ -0,0 +1,59 @@
+import gql from 'graphql-tag'
+
+export const RawReleaseGood = gql`
+  type RawReleaseGood {
+    name: String
+    releaseDate: String
+    type: String
+    collectionOrderNo: String
+    ownTransport: Boolean
+    crossDocking: Boolean
+    courierOption: Boolean
+    packingOption: Boolean
+    packageId: String
+    truckNo: String
+    refNo: String
+    refNo2: String
+    refNo3: String
+    pickupAddress: String
+    pickupTime: String
+    handoverType: String
+    dropoffAddress: String
+    marketplaceOrderStatus: String
+    billingAddress: String
+    deliveryAddress1: String
+    deliveryAddress2: String
+    deliveryAddress3: String
+    deliveryAddress4: String
+    deliveryAddress5: String
+    attentionTo: String
+    attentionCompany: String
+    city: String
+    state: String
+    postalCode: String
+    country: String
+    phone1: String
+    phone2: String
+    email: String
+    transporter: String
+    trackingNo: String
+    airwayBill: String
+    invoice: String
+    status: String
+    description: String
+    warehouseId: String #outletID
+    deliverTo: String
+    customerBizplaceId: String
+    partnerBizplaceId: String
+    batchId: String
+    packingType: String
+    packingSize: Int
+    uom: String
+    productId: String
+    sku: String
+    releaseQty: Int
+    releaseUomValue: Float
+    assignedQty: Int
+    assignedUomValue: Float
+  }
+`

package/server/graphql/types/release-good/release-good.ts

@@ -25,6 +25,7 @@ export const ReleaseGood = gql`
     refNo: String
     refNo2: String
     refNo3: String
+    noOfItems: Int
     attachments: [Attachment]
     deliveryOrders: [DeliveryOrder]
     exportOption: Boolean

package/server/utils/inventory-util.ts

@@ -11,6 +11,7 @@ import {
   InventoryNoGenerator,
   Location,
   LOCATION_STATUS,
+  LOCATION_TYPE,
   Pallet
 } from '@things-factory/warehouse-base'
 
@@ -99,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",
@@ -108,6 +110,7 @@ export const InventoryUtil = {
             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 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
@@ -115,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,
@@ -124,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", 
@@ -336,6 +340,10 @@ async function getConditions(
             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'],
@@ -417,22 +425,26 @@ 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
-                .map(
-                  (v: { batchId: string; productId: string; packingType: string }) =>
-                    `('${v.batchId}', '${v.productId}', '${v.packingType}')`
-                )
-                .join()})
+              .map(
+                (v: { batchId: string; productId: string; packingType: string }) =>
+                  `('${v.batchId}', '${v.productId}', '${v.packingType}')`
+              )
+              .join()})
             `
             break
 
           case 'batch_bundle':
             bundleWhereClause += `
               ${bundleWhereClause == '' ? 'WHERE' : 'AND'} pb.id ${operator === 'in' ? 'IN' : 'NOT IN'} (${value
-                .map((v: { productId: string }) => `('${v.productId}')`)
-                .join()})
+              .map((v: { productId: string }) => `('${v.productId}')`)
+              .join()})
             `
             break
         }