@things-factory/sales-base 4.3.86 → 4.3.94-alpha.1

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

@@ -3,7 +3,7 @@ import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 import { EntityManager, getConnection, getRepository, In, Not, Repository } from 'typeorm'
 
 import { Attachment, createAttachments } from '@things-factory/attachment-base'
-import { Partner, Role, User } from '@things-factory/auth-base'
+import { ApplicationType, Partner, Role, User } from '@things-factory/auth-base'
 import {
   Bizplace,
   getDomainUsers,
@@ -14,10 +14,9 @@ import {
 import { generateId } from '@things-factory/id-rule-base'
 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 { Product, ProductBundleSetting } from '@things-factory/product-base'
+import { Product, ProductBundleSetting, ProductDetail } 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'
@@ -136,7 +135,7 @@ export class ReleaseGoodMutation {
           context,
           tx
         )
-      } catch (error) {}
+      } catch (error) { }
 
     if (errorsCaught.length)
       throw new ValidationError({
@@ -485,20 +484,21 @@ export async function generateReleaseGoodFunction(
     await InventoryUtil.validateWarehousePartnersProductsQuantity(domain, bizplace, orderInventories, context, tx)
     /** End Validate Release Order Product Quantity Section */
 
-    if (releaseGood.type == 'b2c') {
-      const sellercraft: Sellercraft = await tx
-        .getRepository(Sellercraft)
-        .findOne({ domain: bizplace.domain, status: SellercraftStatus.ACTIVE })
+    const orderSource: string = releaseGood.source
+    switch (orderSource) {
+      case ApplicationType.SELLERCRAFT:
+        const sellercraft: Sellercraft = await tx
+          .getRepository(Sellercraft)
+          .findOne({ domain: bizplace.domain, status: SellercraftStatus.ACTIVE })
 
-      let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
-        where: { domain: bizplace.domain }
-      })
+        if (sellercraft) {
+          const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+          await sellercraftCtrl.checkExistingReleaseGood(sellercraft, releaseGood)
+        }
 
-      if (sellercraft) {
-        const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-        await sellercraftCtrl.checkExistingReleaseGood(sellercraft, releaseGood)
-      } else if (customerAvailableSftp) {
-      } else {
+        break
+
+      case ApplicationType.MMS:
         const refNo: string = releaseGood.refNo
         const foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
           where: {
@@ -532,7 +532,10 @@ export async function generateReleaseGoodFunction(
             throw new Error('Existing release order found')
           }
         }
-      }
+        break
+
+      default:
+        break
     }
 
     let newReleaseGood: ReleaseGood = new ReleaseGood()
@@ -624,8 +627,8 @@ export async function generateReleaseGoodFunction(
       orderMethod: releaseGood?.orderMethod
         ? releaseGood.orderMethod
         : releaseGood.orderInventories[0]?.inventory?.id
-        ? ORDER_METHOD.SELECT_BY_PALLET
-        : ORDER_METHOD.SELECT_BY_PRODUCT,
+          ? ORDER_METHOD.SELECT_BY_PALLET
+          : ORDER_METHOD.SELECT_BY_PRODUCT,
       status: ORDER_STATUS.PENDING,
       packageId: releaseGood?.packageId,
       storeName: releaseGood?.storeName,
@@ -672,7 +675,7 @@ export async function generateReleaseGoodFunction(
 
           const pbSettings: ProductBundleSetting[] = await tx.getRepository(ProductBundleSetting).find({
             where: { productBundle: oi.product.id },
-            relations: ['product', 'productBundle']
+            relations: ['product', 'productBundle', 'productDetail']
           })
 
           pbSettings.forEach(pbs => {
@@ -686,6 +689,9 @@ export async function generateReleaseGoodFunction(
                 id: pbs.product.id,
                 name: pbs.product.name,
                 groupType: PRODUCT_GROUP_TYPE.SINGLE
+              },
+              productDetail: {
+                id: pbs.productDetail.id
               }
             }
             splitBundleOIs.push(splitOI)
@@ -700,6 +706,10 @@ export async function generateReleaseGoodFunction(
     newReleaseGood = await tx.getRepository(ReleaseGood).save(newReleaseGood)
 
     for (let oi of orderInventories) {
+      let productDetail: any = await tx
+        .getRepository(ProductDetail)
+        .findOne(oi.productDetail.id, { relations: ['product'] })
+
       let newOrderInv: OrderInventory = Object.assign({}, oi)
       newOrderInv = {
         ...newOrderInv,
@@ -708,7 +718,8 @@ export async function generateReleaseGoodFunction(
         status: ORDER_INVENTORY_STATUS.PENDING,
         name: OrderNoGenerator.orderInventory(),
         releaseGood: newReleaseGood,
-        product: await tx.getRepository(Product).findOne(oi.product.id),
+        product: productDetail.product,
+        productDetail,
         creator: user,
         updater: user
       }
@@ -746,9 +757,9 @@ export async function generateReleaseGoodFunction(
         }
 
         let assignedOrderInventories: OrderInventory[] = await InventoryUtil.autoAssignInventoryForRelease(
-          newOrderInv.product,
           oi,
-          oi.packingType,
+          productDetail.product,
+          productDetail,
           locationSortingRules,
           bizplace,
           warehouseDomain,
@@ -887,16 +898,32 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
   let foundOVs: OrderVas[] = foundReleaseGood.orderVass
   let customerBizplace: Bizplace = foundReleaseGood.bizplace
   const companyDomain: Domain = customerBizplace?.company.domain
+
   const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
     where: { domain: foundReleaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE },
     relations: ['domain']
   })
 
-  if (foundReleaseGood.type == 'b2c') {
+  const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+
+  let updateSCStock = async sellercraft => {
     if (sellercraft) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...foundReleaseGood, orderProducts: foundOPs })
-    } else {
+      await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'CONFIRM_ORDER')
+    }
+  }
+
+  const orderSource: string = foundReleaseGood.source
+  switch (orderSource) {
+    case ApplicationType.SELLERCRAFT:
+      if (foundReleaseGood.type == 'b2c' && sellercraft) {
+        foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, {
+          ...foundReleaseGood,
+          orderProducts: foundOPs
+        })
+      }
+      break
+
+    case ApplicationType.MMS:
       // find for any existing marketplace store connections
       let marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
         where: { domain: companyDomain, status: 'ACTIVE' },
@@ -959,14 +986,13 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
         const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
         await ecommerceCtrl.updateProductVariationStock(marketplaceStores, productIds, companyDomain)
       }
-    }
-  }
 
-  if (foundReleaseGood.type == 'b2b') {
-    if (sellercraft) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'CONFIRM_ORDER')
-    }
+      updateSCStock(sellercraft)
+      break
+
+    default:
+      updateSCStock(sellercraft)
+      break
   }
 
   // 1. RO Status change (PENDING => PENDING_RECEIVE)
@@ -1183,13 +1209,21 @@ export async function rejectReleaseGood(
   }
 
   if (foundOPs && foundOPs.length) {
-    const sellercraft: Sellercraft = await tx
-      .getRepository(Sellercraft)
-      .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
+    const orderSource: string = releaseGood.source
+    switch (orderSource) {
+      case ApplicationType.SELLERCRAFT:
+        const sellercraft: Sellercraft = await tx
+          .getRepository(Sellercraft)
+          .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
+
+        if (sellercraft) {
+          const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+          await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'REJECT_ORDER')
+        }
+        break
 
-    if (sellercraft) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'REJECT_ORDER')
+      default:
+        break
     }
 
     await tx.getRepository(OrderProduct).save(
@@ -1288,6 +1322,7 @@ export async function bulkGenerateReleaseGood(
       phone1: releaseGood?.phone1 || null,
       phone2: releaseGood?.phone2 || null,
       email: releaseGood?.email || null,
+      source: releaseGood?.source || null,
       airwayBill: releaseGood?.airwayBill,
       refNo: releaseGood.refNo,
       refNo2: releaseGood.refNo2,
@@ -1296,8 +1331,8 @@ export async function bulkGenerateReleaseGood(
       ownTransport: releaseGood?.ownTransport || false,
       orderMethod: ORDER_METHOD.SELECT_BY_PRODUCT,
       status: ORDER_STATUS.PENDING,
-      creator: user,
-      updater: user
+      creator: releaseGood?.creator || user,
+      updater: releaseGood?.updater || user
     }
 
     newReleaseGood = await tx.getRepository(ReleaseGood).save(newReleaseGood)
@@ -1339,12 +1374,17 @@ export async function bulkGenerateReleaseGood(
         }
       }
 
-      const product: Product = await tx.getRepository(Product).findOne(oi.productId)
+      let productDetail = oi.orderProduct?.productDetail
+      let product = oi.orderProduct?.product
+      if (!productDetail) {
+        productDetail = await tx.getRepository(ProductDetail).findOne(oi.productDetailId, { relations: ['product'] })
+        product = productDetail.product
+      }
 
       let assignedResult = await InventoryUtil.autoAssignInventoryForRelease(
-        product,
         oi,
-        oi.packingType,
+        product,
+        productDetail,
         locationSortingRules,
         bizplace,
         warehouseDomain,
@@ -1370,8 +1410,8 @@ export async function bulkGenerateReleaseGood(
         status: ORDER_INVENTORY_STATUS.PENDING,
         name: OrderNoGenerator.orderInventory(),
         releaseGood: newReleaseGood,
-        creator: user,
-        updater: user
+        creator: newReleaseGood?.creator || user,
+        updater: newReleaseGood?.updater || user
       }
 
       let newOrderProduct: Partial<OrderProduct>
@@ -1393,8 +1433,8 @@ export async function bulkGenerateReleaseGood(
           actualPalletQty: 0,
           status: ORDER_PRODUCT_STATUS.ASSIGNED,
           releaseGood: newReleaseGood,
-          creator: user,
-          updater: user
+          creator: newReleaseGood?.creator || user,
+          updater: newReleaseGood?.updater || user
         }
 
         newOrderProduct = await tx.getRepository(OrderProduct).save(newOrderProduct)
@@ -1403,7 +1443,7 @@ export async function bulkGenerateReleaseGood(
           ...oi.orderProduct,
           totalUomValue: `${oi.orderProduct.releaseUomValue} ${oi.orderProduct.uom}`,
           status: ORDER_PRODUCT_STATUS.ASSIGNED,
-          updater: user
+          updater: newReleaseGood?.updater || user
         })
       }
 

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

@@ -196,6 +196,7 @@ export class ReleaseGoodQuery {
           .createQueryBuilder('oi')
           .leftJoinAndSelect('oi.inventory', 'inventory')
           .leftJoinAndSelect('oi.product', 'product')
+          .leftJoinAndSelect('oi.productDetail', 'productDetail')
           .leftJoinAndSelect('inventory.location', 'location')
           .where('oi.domain_id = :domainId', { domainId: domain.id })
           .andWhere('oi.release_good_id = :releaseGoodId', { releaseGoodId: releaseGood.id })
@@ -226,6 +227,7 @@ export class ReleaseGoodQuery {
                 batchIdRef: inventory.batchIdRef,
                 palletId: inventory.palletId,
                 product: orderInv.product,
+                productDetail: orderInv.productDetail,
                 productIdRef: orderInv.product.id,
                 productName: `${orderInv.product.name} (${orderInv.product.description})`,
                 packingType: orderInv.packingType,
@@ -375,10 +377,7 @@ export class ReleaseGoodQuery {
         params.filters.push({
           name: typeFilter == 'b2c' ? 'releaseDate' : 'createdAt',
           operator: 'gte',
-          value:
-            typeFilter == 'b2c'
-              ? releaseDateFrom
-              : fromDateVal.toISOString(),
+          value: typeFilter == 'b2c' ? releaseDateFrom : fromDateVal.toISOString(),
           relation: false
         })
       }
@@ -393,9 +392,7 @@ export class ReleaseGoodQuery {
           name: typeFilter == 'b2c' ? 'releaseDate' : 'createdAt',
           operator: typeFilter == 'b2c' ? 'lte' : 'lt',
           value:
-            typeFilter == 'b2c'
-              ? releaseDateTo
-              : new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+            typeFilter == 'b2c' ? releaseDateTo : new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
           relation: false
         })
       }

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

@@ -1,6 +1,6 @@
 import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
 
-import { Product } from '@things-factory/product-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import { ObjectRef } from '@things-factory/shell'
 import { Location } from '@things-factory/warehouse-base'
 
@@ -77,6 +77,9 @@ export class InventoryInfos {
   @Field(type => Product, { nullable: true })
   product?: Product
 
+  @Field(type => ProductDetail, { nullable: true })
+  productDetail?: ProductDetail
+
   @Field({ nullable: true })
   packingType?: string
 
@@ -185,8 +188,6 @@ export class NewReleaseGood {
   @Field({ nullable: true })
   orderMethod: string
 
-
-
   @Field({ nullable: true })
   collectionOrderNo: string
 

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

@@ -95,8 +95,8 @@ export class ReleaseGood {
       DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
-          ? 'varchar2'
-          : 'smallint',
+        ? 'varchar2'
+        : 'smallint',
     enum: ReleaseOrderType,
     default: ReleaseOrderType.B2B
   })
@@ -167,15 +167,13 @@ export class ReleaseGood {
       DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
-          ? 'varchar2'
-          : 'smallint',
+        ? 'varchar2'
+        : 'smallint',
     enum: DispatchmentStatus,
     default: DispatchmentStatus.READY_TO_DISPATCH
   })
   dispatchmentStatus: DispatchmentStatus
 
-
-
   @Column({ nullable: true })
   @Field({ nullable: true })
   refNo: String
@@ -443,6 +441,10 @@ export class ReleaseGood {
   @Field({ nullable: true })
   stopId: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  source: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   manifestedAt: Date

package/server/service/return-order/return-order-mutation.ts

@@ -6,7 +6,7 @@ import { Attachment, createAttachments } from '@things-factory/attachment-base'
 import { Role, User } from '@things-factory/auth-base'
 import { Bizplace, getDomainUsers } from '@things-factory/biz-base'
 import { sendNotification } from '@things-factory/notification'
-import { Product } from '@things-factory/product-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
@@ -59,6 +59,7 @@ export class ReturnOrderMutation {
         itm =>
           itm.product.id === curr.product.id &&
           itm.packingType === curr.packingType &&
+          itm.productDetailId === curr.product.productDetailId &&
           itm.batchId === curr.batchId &&
           itm.packingSize === curr.packingSize
       )
@@ -99,6 +100,7 @@ export class ReturnOrderMutation {
       newOrderInv.name = OrderNoGenerator.orderInventory()
       newOrderInv.returnOrder = createdReturnOrder
       newOrderInv.product = await tx.getRepository(Product).findOne(moi.product.id)
+      newOrderInv.productDetail = await tx.getRepository(ProductDetail).findOne(moi.productDetail.id)
       newOrderInv.creator = user
       newOrderInv.updater = user
 

package/server/service/return-order/return-order-types.ts

@@ -115,6 +115,7 @@ export class NewReturnOrder {
   @Field({ nullable: true })
   truckNo: string
 
+
   @Field({ nullable: true })
   deliveryOrderNo: string
 

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

@@ -12,7 +12,7 @@ import {
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Product } from '@things-factory/product-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
@@ -127,6 +127,10 @@ export class ReverseKittingOrderInventory {
   @Field({ nullable: true })
   updatedAt?: Date
 
+  @ManyToOne(type => ProductDetail, { nullable: true })
+  @Field({ nullable: true })
+  productDetail: ProductDetail
+
   @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true })
   creator?: User