@things-factory/sales-base 4.3.71 → 4.3.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-base",
-  "version": "4.3.71",
+  "version": "4.3.75",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,17 +24,17 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/attachment-base": "^4.3.69",
-    "@things-factory/auth-base": "^4.3.69",
-    "@things-factory/biz-base": "^4.3.69",
-    "@things-factory/code-base": "^4.3.69",
-    "@things-factory/integration-sftp": "^4.3.69",
-    "@things-factory/notification": "^4.3.69",
-    "@things-factory/product-base": "^4.3.69",
-    "@things-factory/setting-base": "^4.3.69",
-    "@things-factory/shell": "^4.3.69",
-    "@things-factory/transport-base": "^4.3.69",
-    "@things-factory/warehouse-base": "^4.3.69"
+    "@things-factory/attachment-base": "^4.3.74",
+    "@things-factory/auth-base": "^4.3.74",
+    "@things-factory/biz-base": "^4.3.74",
+    "@things-factory/code-base": "^4.3.74",
+    "@things-factory/integration-sftp": "^4.3.74",
+    "@things-factory/notification": "^4.3.74",
+    "@things-factory/product-base": "^4.3.75",
+    "@things-factory/setting-base": "^4.3.74",
+    "@things-factory/shell": "^4.3.74",
+    "@things-factory/transport-base": "^4.3.74",
+    "@things-factory/warehouse-base": "^4.3.75"
   },
-  "gitHead": "b625baf20f3ff9b95925a19f6dfd6fd0f797b6fd"
+  "gitHead": "3076ac1b79bc1f56d033b4d13c1dd9baac545e27"
 }

package/server/service/arrival-notice/arrival-notice-query.ts

@@ -478,7 +478,6 @@ export async function validateBulkArrivalNoticesFunction(
 	        AND raw.import_cargo = an.import_cargo 
 	        LEFT JOIN products pr ON LOWER(pr.sku) = LOWER(raw.sku)
 	        LEFT JOIN product_details pd ON pr.id = pd.product_id
-	        AND pr.bizplace_id = $1
 	        AND CASE WHEN raw.packing_type NOTNULL AND raw.packing_size NOTNULL AND raw.uom NOTNULL
 	          THEN pd.packing_type = raw.packing_type AND pd.packing_size = raw.packing_size AND pd.uom = raw.uom 
 	          WHEN raw.packing_type NOTNULL AND raw.packing_size NOTNULL AND raw.uom ISNULL
@@ -486,6 +485,7 @@ export async function validateBulkArrivalNoticesFunction(
 	            WHEN raw.packing_type ISNULL AND raw.packing_size ISNULL AND raw.uom NOTNULL
 	              THEN pd.uom = raw.uom AND pd.is_default IS TRUE ELSE pd.is_default IS TRUE
 	        END
+        WHERE pr.bizplace_id = $1
 	      GROUP BY raw.ref_no, raw.ref_no_2, raw.ref_no_3, raw.eta_date, raw.truck_no, raw.own_transport, raw.container, raw.container_no, raw.container_size, raw.import_cargo, raw.loose_item,
 	        pr.id, pd.id, raw.sku, pr.name, pr.description, raw.batch_id, raw.batch_id_ref, raw.packing_type, raw.packing_size, raw.uom, raw.unit_price, raw.manufacture_date, an.ref_no, an.name
       ) SELECT foo.*, 

package/server/service/draft-release-good/draft-release-good-query.ts

@@ -109,18 +109,16 @@ export class DraftReleaseGoodQuery {
       tx.query(
         `
         create temp table temp_op_calculation on commit drop as (
-          select drg1.id, sum(case when wboi."remainQty" >= op.release_qty then 0 else 1 end) as insufficient_count, count(*) as total_row 
-          from draft_release_goods drg1
+          SELECT drg1.id from draft_release_goods drg1
           left join order_products op on drg1.id = op.draft_release_good_id
-          left join warehouse_bizplace_onhand_inventories wboi 
-            on (wboi."productId" = op.product_id or wboi."productBundleId" = op.product_id) 
-            and wboi."packingType" = op.packing_type 
-            and wboi."packingSize" = op.packing_size 
-            and wboi.uom = op.uom
+          where drg1.status ='DRAFT' AND drg1.domain_id = $1
+          AND NOT EXISTS (
+            SELECT * FROM warehouse_bizplace_onhand_inventories wboi 
+            where (wboi."productId" = op.product_id or wboi."productBundleId" = op.product_id) 
             and wboi."domainId" = op.domain_id
             and wboi."bizplaceId" = op.bizplace_id
-          where op.domain_id = $1 and drg1.status ='DRAFT'
-          group by drg1.id
+            AND wboi."remainQty" >= op.release_qty
+          ) GROUP BY drg1.id
         )
       `,
         [domain.id]
@@ -130,7 +128,7 @@ export class DraftReleaseGoodQuery {
       buildQuery(qb, params, context)
       qb.addSelect('COALESCE("cc".rank, 99999)', 'rank')
       qb.addSelect(
-        `CASE WHEN "drg".status = 'DRAFT' and (tmp_calc.insufficient_count > 0 or tmp_calc.total_row = 0) then 'INSUFFICIENT' else "drg".status END`,
+        `CASE WHEN "drg".status = 'DRAFT' and tmp_calc.id IS NOT null then 'INSUFFICIENT' else "drg".status END`,
         'computed_status'
       )
       qb.leftJoin(`temp_op_calculation`, 'tmp_calc', 'tmp_calc.id = drg.id')

package/server/service/order-product/order-product.ts

@@ -59,6 +59,13 @@ import { OrderInventory } from '../order-inventory/order-inventory'
   ],
   { unique: true }
 )
+@Index(
+  'ix_order-product_4',
+  (orderProduct: OrderProduct) => [
+    orderProduct.draftReleaseGood
+  ],
+  { unique: false }
+)
 @ObjectType()
 export class OrderProduct {
   @PrimaryGeneratedColumn('uuid')

package/server/service/release-good/release-good-mutation.ts

@@ -16,12 +16,13 @@ import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { Sftp } from '@things-factory/integration-sftp'
 import { MarketplaceOrder, MarketplaceProductVariation } from '@things-factory/marketplace-base'
-import { sendNotification } from '@things-factory/notification'
+// import { sendNotification } from '@things-factory/notification'
 import { Product, ProductBundleSetting } from '@things-factory/product-base'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
+// import { NewOrderProduct } from '../order-product/order-product-types'
 import {
   ATTACHMENT_TYPE,
   ORDER_INVENTORY_STATUS,
@@ -48,7 +49,6 @@ import { ShippingOrderPatch } from '../shipping-order/shipping-order-types'
 import { Vas } from '../vas/vas'
 import { ReleaseGood } from './release-good'
 import { bulkReleaseGoodsAvailableItemsFunction } from './release-good-query'
-import { NewOrderProduct } from '../order-product/order-product-types'
 
 @Resolver(ReleaseGood)
 export class ReleaseGoodMutation {
@@ -1294,6 +1294,7 @@ export async function bulkGenerateReleaseGood(
       refNo3: releaseGood.refNo3,
       releaseDate: releaseGood.releaseDate,
       ownTransport: releaseGood?.ownTransport || false,
+      orderMethod: ORDER_METHOD.SELECT_BY_PRODUCT,
       status: ORDER_STATUS.PENDING,
       creator: user,
       updater: user

package/server/service/release-good/release-good-query.ts

@@ -1,11 +1,10 @@
-import orderBy from 'lodash/orderBy'
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
 import { EntityManager, getRepository, In, Repository, SelectQueryBuilder } from 'typeorm'
 
 import { Attachment } from '@things-factory/attachment-base'
 import { checkUserBelongsDomain, User } from '@things-factory/auth-base'
 import { Bizplace, getCompanyBizplace, getMyBizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { Product } from '@things-factory/product-base'
+import { logger } from '@things-factory/env'
 import { buildQuery, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
 import { Inventory, LOCATION_TYPE } from '@things-factory/warehouse-base'
 
@@ -13,7 +12,7 @@ import { ATTACHMENT_TYPE, ORDER_INVENTORY_STATUS, ORDER_STATUS } from '../../con
 import { OrderInventory } from '../order-inventory/order-inventory'
 import { ShippingOrder } from '../shipping-order/shipping-order'
 import { ReleaseGood } from './release-good'
-import { InventoryInfos, NewReleaseGood, ReleasableInventoryList, ReleaseGoodList } from './release-good-types'
+import { NewReleaseGood, ReleasableInventoryList, ReleaseGoodList } from './release-good-types'
 
 @Resolver(ReleaseGood)
 export class ReleaseGoodQuery {
@@ -166,56 +165,58 @@ export class ReleaseGoodQuery {
     @Arg('refNo', { nullable: true }) refNo?: string,
     @Arg('name', { nullable: true }) name?: string
   ): Promise<ReleaseGood> {
-    const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
-    let param: any
-
-    if (name) param = { domain, name }
-    else param = { domain, refNo }
-
-    const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
-      where: { ...param },
-      relations: [
-        'domain',
-        'bizplace',
-        'shippingOrder',
-        'arrivalNotice',
-        'orderProducts',
-        'orderProducts.product',
-        'orderInventories',
-        'orderInventories.inventory',
-        'orderInventories.product',
-        'orderInventories.inventory.product',
-        'orderInventories.inventory.location',
-        'orderVass',
-        'orderVass.vas',
-        'orderVass.targetProduct',
-        'orderVass.inventory',
-        'creator',
-        'updater',
-        'deliverTo'
-      ]
-    })
+    try {
+      const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+      let param: any
 
-    if (releaseGood) {
-      const roBizId: string = releaseGood.bizplace.id
-      const shippingOrder: ShippingOrder = releaseGood.shippingOrder
-      const foundAttachments: Attachment[] = await tx.getRepository(Attachment).find({
-        where: {
-          domain,
-          refBy: releaseGood.id,
-          category: ATTACHMENT_TYPE.DELIVERY_ORDER
-        }
+      if (name) param = { domain, name }
+      else param = { domain, refNo }
+
+      const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
+        where: { ...param },
+        relations: [
+          'domain',
+          'bizplace',
+          'shippingOrder',
+          'arrivalNotice',
+          'orderProducts',
+          'orderProducts.product',
+          'orderVass',
+          'orderVass.vas',
+          'orderVass.targetProduct',
+          'orderVass.inventory',
+          'creator',
+          'updater'
+        ]
       })
 
-      await prepOITempTable(domain, tx)
+      if (releaseGood) {
+        let oiQb: SelectQueryBuilder<OrderInventory> = tx
+          .getRepository(OrderInventory)
+          .createQueryBuilder('oi')
+          .leftJoinAndSelect('oi.inventory', 'inventory')
+          .leftJoinAndSelect('oi.product', 'product')
+          .leftJoinAndSelect('inventory.location', 'location')
+          .where('oi.domain_id = :domainId', { domainId: domain.id })
+          .andWhere('oi.release_good_id = :releaseGoodId', { releaseGoodId: releaseGood.id })
+          .andWhere('oi.status NOT IN (:...orderInventoryStatus)', {
+            orderInventoryStatus: [ORDER_INVENTORY_STATUS.COMPLETE_SPLIT, ORDER_INVENTORY_STATUS.REPLACED]
+          })
+          .orderBy('product.sku', 'ASC')
+
+        let orderInventories: OrderInventory[] = await oiQb.getMany()
+
+        const shippingOrder: ShippingOrder = releaseGood.shippingOrder
+        const foundAttachments: Attachment[] = await tx.getRepository(Attachment).find({
+          where: {
+            domain,
+            refBy: releaseGood.id,
+            category: ATTACHMENT_TYPE.DELIVERY_ORDER
+          }
+        })
 
-      let invInfos = await Promise.all(
-        releaseGood.orderInventories
-          .filter(
-            itm =>
-              itm.status !== ORDER_INVENTORY_STATUS.COMPLETE_SPLIT && itm.status !== ORDER_INVENTORY_STATUS.REPLACED
-          )
-          .map(async (orderInv: OrderInventory) => {
+        let invInfos = await Promise.all(
+          orderInventories.map(async (orderInv: OrderInventory) => {
             if (orderInv?.inventory?.id) {
               const inventory: Inventory = orderInv.inventory
               return {
@@ -224,11 +225,11 @@ export class ReleaseGoodQuery {
                 batchId: inventory.batchId,
                 batchIdRef: inventory.batchIdRef,
                 palletId: inventory.palletId,
-                product: inventory.product,
-                productIdRef: inventory.product.id,
-                productName: `${inventory.product.name} (${inventory.product.description})`,
-                packingType: inventory.packingType,
-                packingSize: inventory.packingSize,
+                product: orderInv.product,
+                productIdRef: orderInv.product.id,
+                productName: `${orderInv.product.name} (${orderInv.product.description})`,
+                packingType: orderInv.packingType,
+                packingSize: orderInv.packingSize,
                 location: inventory.location,
                 qty: inventory.qty,
                 lockedQty: inventory.lockedQty,
@@ -241,58 +242,31 @@ export class ReleaseGoodQuery {
                 status: orderInv.status,
                 refWorksheetId: orderInv.refWorksheetId
               }
-            } else {
-              const {
-                batchId,
-                batchIdRef,
-                product,
-                packingType,
-                packingSize,
-                releaseQty,
-                releaseUomValue,
-                refWorksheetId
-              } = orderInv
-              const { id: productIdRef, name: productName }: Product = product
-              const { qty, uomValue, uom } = await getAvailableAmount(roBizId, productIdRef, batchId, packingType, tx)
-
-              return {
-                batchId,
-                batchIdRef,
-                productIdRef,
-                product,
-                productName,
-                packingType,
-                packingSize,
-                qty,
-                uom,
-                uomValue,
-                releaseQty,
-                releaseUomValue,
-                refWorksheetId
-              }
             }
           })
-      )
-
-      const result = {
-        ...releaseGood,
-        attachment: foundAttachments,
-        shippingOrderInfo: {
-          containerNo: shippingOrder?.containerNo || '',
-          containerSize: shippingOrder?.containerSize || '',
-          containerLeavingDate: shippingOrder?.containerLeavingDate || '',
-          containerArrivalDate: shippingOrder?.containerArrivalDate || '',
-          containerClosureDate: shippingOrder?.containerClosureDate || '',
-          shipName: shippingOrder?.shipName || '',
-          remark: shippingOrder?.remark || '',
-          remindContainerDeparture: shippingOrder?.remindContainerDeparture || null
-        },
-        inventoryInfos: orderBy<InventoryInfos>(invInfos, ['product.sku'], ['asc'])
-      }
+        )
 
-      dropOITempTable(domain, tx)
+        const result = {
+          ...releaseGood,
+          attachment: foundAttachments,
+          shippingOrderInfo: {
+            containerNo: shippingOrder?.containerNo || '',
+            containerSize: shippingOrder?.containerSize || '',
+            containerLeavingDate: shippingOrder?.containerLeavingDate || '',
+            containerArrivalDate: shippingOrder?.containerArrivalDate || '',
+            containerClosureDate: shippingOrder?.containerClosureDate || '',
+            shipName: shippingOrder?.shipName || '',
+            remark: shippingOrder?.remark || '',
+            remindContainerDeparture: shippingOrder?.remindContainerDeparture || null
+          },
+          inventoryInfos: invInfos
+        }
 
-      return result
+        return result
+      }
+    } catch (error) {
+      logger.error(`release-good-query[releaseGoodDetail]: ${error}`)
+      throw new Error(error)
     }
   }
 
@@ -300,6 +274,7 @@ export class ReleaseGoodQuery {
   @Query(returns => ReleaseGoodList)
   async releaseGoodRequests(@Ctx() context: any, @Args() params: ListParam): Promise<ReleaseGoodList> {
     try {
+      console.time('t1')
       const { domain, user }: { domain: Domain; user: User } = context.state
 
       const statusFilter = params.filters.some(e => e.name === 'status')
@@ -310,6 +285,7 @@ export class ReleaseGoodQuery {
       const orderRemarkFilter = params.filters.find(param => param.name === 'orderRemark')
       const manifestedFilter = params.filters.find(param => param.name === 'manifested')
       const orderInfoFilter = params.filters.find(param => param.name === 'name')
+      const typeFilter = params.filters.find(param => param.name === 'type')?.value
 
       if (await checkUserBelongsDomain(domain, user)) {
         if (!statusFilter && !params.filters.some(e => e.name === 'name')) {
@@ -393,12 +369,16 @@ export class ReleaseGoodQuery {
       const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
       if (fromDateParamIdx >= 0) {
         let fromDateVal = new Date(params.filters[fromDateParamIdx].value)
+        let releaseDateFrom = params.filters.find(param => param.name === 'fromDate')?.value
         params.filters.splice(fromDateParamIdx, 1)
 
         params.filters.push({
-          name: 'createdAt',
+          name: typeFilter == 'b2c' ? 'releaseDate' : 'createdAt',
           operator: 'gte',
-          value: fromDateVal.toISOString(),
+          value:
+            typeFilter == 'b2c'
+              ? releaseDateFrom
+              : fromDateVal.toISOString(),
           relation: false
         })
       }
@@ -406,12 +386,16 @@ export class ReleaseGoodQuery {
       const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate')
       if (toDateParamIdx >= 0) {
         let toDateVal = new Date(params.filters[toDateParamIdx].value)
+        let releaseDateTo = params.filters.find(param => param.name === 'toDate')?.value
         params.filters.splice(toDateParamIdx, 1)
 
         params.filters.push({
-          name: 'createdAt',
-          operator: 'lt',
-          value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+          name: typeFilter == 'b2c' ? 'releaseDate' : 'createdAt',
+          operator: typeFilter == 'b2c' ? 'lte' : 'lt',
+          value:
+            typeFilter == 'b2c'
+              ? releaseDateTo
+              : new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
           relation: false
         })
       }
@@ -520,9 +504,10 @@ export class ReleaseGoodQuery {
             orderRemark: item?.remark ? true : false
           }
         })
-
+      console.timeEnd('t1')
       return { items, total }
     } catch (error) {
+      logger.error(`release-good-query[releaseGoodRequests]: ${error}`)
       throw error
     }
   }
@@ -679,7 +664,7 @@ export class ReleaseGoodQuery {
 async function prepOITempTable(domain: Domain, tx: EntityManager) {
   await tx.query(
     `
-    CREATE TEMP TABLE oi AS (
+    CREATE TEMP TABLE oi ON COMMIT DROP AS (
       SELECT
         SUM(oi.release_qty) as release_qty,
         SUM(oi.release_uom_value) as release_uom_value,