@things-factory/sales-base 4.3.108 → 4.3.110

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

@@ -1,4 +1,3 @@
-import { ShippingOrder } from '../shipping-order/shipping-order'
 import { FileUpload, GraphQLUpload } from 'graphql-upload'
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 import { EntityManager, getRepository, In, Repository } from 'typeorm'
@@ -6,7 +5,9 @@ import { EntityManager, getRepository, In, Repository } from 'typeorm'
 import { Attachment, createAttachment, deleteAttachment } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint, getPermittedBizplaceIds } from '@things-factory/biz-base'
+// import { logger } from '@things-factory/env'
 import { generateId } from '@things-factory/id-rule-base'
+// import { Account, AccountingAPI } from '@things-factory/integration-accounting'
 import { Product } from '@things-factory/product-base'
 import { Setting } from '@things-factory/setting-base'
 import { Domain, ObjectRef } from '@things-factory/shell'
@@ -24,9 +25,10 @@ import { OrderNoGenerator } from '../../utils/order-no-generator'
 import { OrderInventory } from '../order-inventory/order-inventory'
 import { NewOrderInventory, OrderInventoryPatch } from '../order-inventory/order-inventory-types'
 import { ReleaseGood } from '../release-good/release-good'
+import { ExportInformationPatch, ShippingOrderInfoPatch } from '../release-good/release-good-types'
+import { ShippingOrder } from '../shipping-order/shipping-order'
 import { DeliveryOrder } from './delivery-order'
 import { DeliveryOrderPatch, NewDeliveryOrder } from './delivery-order-types'
-import { ExportInformationPatch, ShippingOrderInfoPatch } from '../release-good/release-good-types'
 
 @Resolver(DeliveryOrder)
 export class DeliveryOrderMutation {
@@ -210,11 +212,11 @@ export class DeliveryOrderMutation {
   /**
    * comment start
    * detailed review needed 06 Aug 2022 by @ChrisLim-git
-   * @param context 
-   * @param orderInfo 
-   * @param orderItems 
-   * @param shippingOrderInfo 
-   * @param exportInfo 
+   * @param context
+   * @param orderInfo
+   * @param orderItems
+   * @param shippingOrderInfo
+   * @param exportInfo
    * @returns DeliveryOrder
    */
   @Directive('@transaction')
@@ -231,7 +233,7 @@ export class DeliveryOrderMutation {
       const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
       const foundDeliveryOrder: DeliveryOrder = await tx.getRepository(DeliveryOrder).findOne({
         where: { domain, name: orderInfo.name },
-        relations: ['transportVehicle', 'bizplace']
+        relations: ['transportVehicle', 'bizplace', 'bizplace.domain']
       })
 
       const foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
@@ -260,16 +262,16 @@ export class DeliveryOrderMutation {
         const product: Product = inventory.product
         const foundItem = inventory.reusablePallet
           ? orderItems.filter(
-            (item: any) =>
-              item.productName === `${product.name} (${product.description})` &&
-              item.batchId === orderInventory.batchId &&
-              item.pallet === inventory.reusablePallet.name
-          )
+              (item: any) =>
+                item.productName === `${product.name} (${product.description})` &&
+                item.batchId === orderInventory.batchId &&
+                item.pallet === inventory.reusablePallet.name
+            )
           : orderItems.filter(
-            (item: any) =>
-              item.productName === `${product.name} (${product.description})` &&
-              item.batchId === orderInventory.batchId
-          )
+              (item: any) =>
+                item.productName === `${product.name} (${product.description})` &&
+                item.batchId === orderInventory.batchId
+            )
 
         if (foundItem[0].remark !== '') orderInventory.remark = foundItem[0].remark
         return orderInventory
@@ -349,7 +351,7 @@ export class DeliveryOrderMutation {
          * I think the expectation here is to update instead of save
          * Should use .update instead of .save as it will override data that was not meant to be updated
          * example:
-         * 
+         *
          * savedShippingOrder = await tx.getRepository(ShippingOrder).update({
          *  shipName: exportInfo.shipName,
          *  containerNo: exportInfo.containerNo,
@@ -358,7 +360,7 @@ export class DeliveryOrderMutation {
          *  status: ORDER_STATUS.PENDING,
          *  updater: user
          * })
-         * 
+         *
          * Unless the intention was not to update but to insert
          */
         savedShippingOrder = await tx.getRepository(ShippingOrder).save({
@@ -421,6 +423,34 @@ export class DeliveryOrderMutation {
         updater: user
       })
 
+      // const orderSource: string = foundReleaseGood.source
+      // switch (orderSource) {
+      //   case ApplicationType.XILNEX:
+      //     if (foundDeliveryOrder.status === ORDER_STATUS.READY_TO_DISPATCH) {
+      //       const xilnex: Account = await tx.getRepository(Account).findOne({
+      //         domain: foundDeliveryOrder.bizplace.domain,
+      //         status: 'active',
+      //         platform: 'xilnex'
+      //       })
+
+      //       if (xilnex) {
+      //         try {
+      //           await AccountingAPI.createTransferNote(xilnex, {
+      //             releaseGood: foundReleaseGood,
+      //             deliveryOrder: foundDeliveryOrder,
+      //             orderInventories
+      //           })
+      //         } catch (error) {
+      //           logger.error(`delivery-order-mutation[dispatchDeliveryOrder]: ${error}`)
+      //         }
+      //       }
+      //     }
+      //     break
+
+      //   default:
+      //     break
+      // }
+
       return foundDeliveryOrder
     } catch (e) {
       throw e

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

@@ -195,7 +195,6 @@ export class DraftReleaseGoodMutation {
       relations: [
         'orderProducts',
         'orderProducts.product',
-        'orderProducts.productDetail',
         'orderProducts.productBundle',
         'shippingOrder',
         'bizplace',
@@ -264,7 +263,10 @@ export class DraftReleaseGoodMutation {
           draftOrder.orderProducts = draftOrder.orderProducts.map(itm => {
             let foundProductInv = productInventory.items.find(
               i =>
-                (i.productDetailId == itm?.productDetail?.id || i.productId == itm?.productBundle?.id) &&
+                (i.productId == itm?.product?.id || i.productId == itm?.productBundle?.id) &&
+                i.packingType == itm.packingType &&
+                i.packingSize == itm.packingSize &&
+                i.uom == itm.uom &&
                 itm.releaseQty <= i.remainQty
             )
             return {
@@ -658,7 +660,6 @@ export async function upsertDraftReleaseGoodProducts(
       relations: [
         'orderProducts',
         'orderProducts.product',
-        'orderProducts.productDetail',
         'orderProducts.productBundle',
         'orderProducts.creator',
         'orderProducts.updater'

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

@@ -1,16 +1,20 @@
-import { Arg, Args, Ctx, Directive, Query, Resolver } from 'type-graphql'
-import { EntityManager, getRepository, In, SelectQueryBuilder } from 'typeorm'
+import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root, Directive } from 'type-graphql'
+import { getRepository, SelectQueryBuilder, EntityManager, In, getManager } from 'typeorm'
 
-import { Attachment } from '@things-factory/attachment-base'
-import { User } from '@things-factory/auth-base'
-import { Bizplace, getPermittedBizplaceIds, getPermittedBizplaces } from '@things-factory/biz-base'
-import { buildQuery, Domain, ListParam } from '@things-factory/shell'
+import { checkUserBelongsDomain, User } from '@things-factory/auth-base'
+import { Bizplace, getPermittedBizplaces, getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { buildQuery, Domain, ListParam, Filter, Pagination, Sorting } from '@things-factory/shell'
 
-import { ATTACHMENT_TYPE, DRAFT_RELEASE_ORDER_STATUS } from '../../constants'
-import { InventoryUtil } from '../../utils'
+import { DRAFT_RELEASE_ORDER_STATUS, ORDER_STATUS } from '../../constants'
 import { DraftReleaseGood } from './draft-release-good'
 import { DraftReleaseGoodList } from './draft-release-good-type'
 
+import { Attachment } from '@things-factory/attachment-base'
+import { ATTACHMENT_TYPE } from '../../constants'
+
+import { InventoryUtil } from '../../utils'
+import { OrderProduct } from '../order-product/order-product'
+
 @Resolver(DraftReleaseGood)
 export class DraftReleaseGoodQuery {
   @Query(returns => DraftReleaseGood, { description: 'To fetch a DraftReleaseGood' })
@@ -110,10 +114,10 @@ export class DraftReleaseGoodQuery {
           where drg1.status ='DRAFT' AND drg1.domain_id = $1
           AND NOT EXISTS (
             SELECT * FROM warehouse_bizplace_onhand_inventories wboi 
-            where (wboi."product_id" = op.product_id or wboi."product_bundle_id" = op.product_id) 
-            and wboi."domain_id" = op.domain_id
-            and wboi."bizplace_id" = op.bizplace_id
-            AND wboi."remain_qty" >= op.release_qty
+            where (wboi."productId" = op.product_id or wboi."productBundleId" = op.product_id) 
+            and wboi."domainId" = op.domain_id
+            and wboi."bizplaceId" = op.bizplace_id
+            AND wboi."remainQty" >= op.release_qty
           ) GROUP BY drg1.id
         )
       `,
@@ -251,7 +255,6 @@ export async function getDraftReleaseGoodFunction(_: any, name: any, context: an
         'releaseGood',
         'orderProducts',
         'orderProducts.product',
-        'orderProducts.productDetail',
         'orderProducts.productBundle',
         'shippingOrder',
         'bizplace',
@@ -313,7 +316,11 @@ export async function getDraftReleaseGoodFunction(_: any, name: any, context: an
 
     result.orderProducts = result.orderProducts.map(itm => {
       let foundProductInv = productInventory?.items.find(
-        i => i.productDetailId == itm?.productDetail?.id || i.productId == itm?.productBundle?.id
+        i =>
+          (i.productId == itm?.product?.id || i.productId == itm?.productBundle?.id) &&
+          i.packingType == itm.packingType &&
+          i.packingSize == itm.packingSize &&
+          i.uom == itm.uom
       )
       return {
         ...itm,
@@ -323,9 +330,6 @@ export async function getDraftReleaseGoodFunction(_: any, name: any, context: an
           brand: foundProductInv.productBrand,
           sku: foundProductInv.productSKU
         },
-        productDetail: itm.productDetail || {
-          id: foundProductInv.productDetailId
-        },
         groupType: foundProductInv ? foundProductInv.groupType : 'SINGLE',
         remainQty: foundProductInv ? foundProductInv.remainQty : 0,
         remainUomValue: foundProductInv ? foundProductInv.remainUomValue : 0,

package/server/service/goods-receival-note/goods-receival-note-mutation.ts

@@ -1,10 +1,14 @@
+import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
+import { EntityManager, getRepository, In, Repository } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
+// import { logger } from '@things-factory/env'
 import { generateId } from '@things-factory/id-rule-base'
+// import { Account, AccountingAPI } from '@things-factory/integration-accounting'
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
-import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, getRepository, In, Repository } from 'typeorm'
+
 import { ArrivalNotice, NewGoodsReceivalNote } from '../'
 import { GRN_STATUS, ORDER_NUMBER_RULE_TYPE, ORDER_NUMBER_SETTING_KEY } from '../../constants'
 import { OrderNoGenerator } from '../../utils/order-no-generator'
@@ -97,7 +101,10 @@ export async function generateGoodsReceivalNote(
   let orderNo: string = ''
 
   const bizplace: Bizplace = await bizplaceRepo.findOne({ where: { id: grn.customer } })
-  const arrivalNotice: ArrivalNotice = await ganRepo.findOne({ where: { domain, name: grn.refNo } })
+  const arrivalNotice: ArrivalNotice = await ganRepo.findOne({
+    where: { domain, name: grn.refNo },
+    relations: ['bizplace', 'bizplace.domain', 'orderProducts', 'orderProducts.productDetail']
+  })
   const grnNoSetting: Setting = await settingRepo.findOne({
     where: {
       domain,
@@ -111,7 +118,7 @@ export async function generateGoodsReceivalNote(
     orderNo = OrderNoGenerator.goodsReceiveNote()
   }
 
-  return await grnRepo.save({
+  const goodReceiveNote: GoodsReceivalNote = await grnRepo.save({
     ...grn,
     name: orderNo,
     domain,
@@ -121,4 +128,31 @@ export async function generateGoodsReceivalNote(
     creator: user,
     updater: user
   })
+
+  // const orderSource: string = arrivalNotice.source
+  // switch (orderSource) {
+  //   case ApplicationType.XILNEX:
+  //     const xilnex: Account = await tx.getRepository(Account).findOne({
+  //       domain: arrivalNotice.bizplace.domain,
+  //       status: 'active',
+  //       platform: 'xilnex'
+  //     })
+
+  //     if (xilnex) {
+  //       try {
+  //         await AccountingAPI.createGoodsReceivedNote(xilnex, {
+  //           arrivalNotice,
+  //           orderProducts: arrivalNotice.orderProducts
+  //         })
+  //       } catch (error) {
+  //         logger.error(`goods-receival-note-mutation[generateGoodsReceivalNote]: ${error}`)
+  //       }
+  //     }
+  //     break
+
+  //   default:
+  //     break
+  // }
+
+  return goodReceiveNote
 }

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

@@ -11,7 +11,7 @@ import {
 } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Product, ProductDetail } from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 
 import { Invoice } from '../invoice/invoice'
@@ -77,10 +77,6 @@ export class InvoiceProduct {
   @Field({ nullable: true })
   shippingFeePaidByCustomer: number
 
-  @ManyToOne(type => ProductDetail, { nullable: true })
-  @Field({ nullable: true })
-  productDetail: ProductDetail
-
   @CreateDateColumn()
   @Field()
   createdAt: Date

package/server/service/order-inventory/order-inventory-query.ts

@@ -286,7 +286,6 @@ export class OrderInventoryQuery {
       .leftJoinAndSelect('oi.bizplace', 'bizplace')
       .leftJoinAndSelect('oi.inventory', 'inventory')
       .leftJoinAndSelect('inventory.product', 'product')
-      .leftJoinAndSelect('inventory.productDetail', 'productDetail')
       .leftJoinAndSelect('oi.creator', 'creator')
       .leftJoinAndSelect('oi.updater', 'updater')
 
@@ -300,7 +299,6 @@ export class OrderInventoryQuery {
         releaseGoodName: item.releaseGood.name,
         palletId: item.inventory.palletId,
         productId: item.inventory.product.id,
-        productDetailId: item.inventory.productDetail.id,
         productName: item.inventory.product.name,
         productSKU: item.inventory.product.sku,
         productBrand: item.inventory.product.brand,

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

@@ -41,9 +41,6 @@ export class NewOrderInventory {
   @Field(type => NewProduct, { nullable: true })
   product: NewProduct
 
-  @Field(type => ObjectRef, { nullable: true })
-  productDetail: ObjectRef
-
   @Field({ nullable: true })
   productSKU: string
 
@@ -203,9 +200,6 @@ export class OrderInventoryPatch {
   @Field({ nullable: true })
   productId: string
 
-  @Field({ nullable: true })
-  productDetailId: string
-
   @Field({ nullable: true })
   orderProductId: string
 

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

@@ -13,7 +13,7 @@ import {
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Product, ProductDetail} from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, Location } from '@things-factory/warehouse-base'
 
@@ -341,13 +341,6 @@ export class OrderInventory {
   @Field({ nullable: true })
   loadedAt: Date
 
-  @ManyToOne(type => ProductDetail, { nullable: true })
-  @Field({ nullable: true })
-  productDetail: ProductDetail
-
-  @Field({ nullable: true })
-  productDetailId: String
-
   @Field({ nullable: true })
   dispatchedAt: Date
 

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

@@ -26,7 +26,6 @@ export class OrderProductQuery {
 
     let qb: SelectQueryBuilder<OrderProduct> = await getRepository(OrderProduct).createQueryBuilder('op')
     qb.leftJoinAndSelect('op.product', 'product')
-      .leftJoinAndSelect('op.productDetail', 'productDetail')
       .leftJoinAndSelect('op.domain', 'domain')
       .leftJoinAndSelect('op.bizplace', 'bizplace')
       .leftJoinAndSelect('bizplace.company', 'company')

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

@@ -90,9 +90,6 @@ export class OrderProductPatch {
   @Field(type => ObjectRef, { nullable: true })
   toInventory: ObjectRef
 
-  @Field(type => ObjectRef, { nullable: true })
-  productDetail: ObjectRef
-
   @Field(type => InboundProduct, { nullable: true })
   product: InboundProduct
 
@@ -234,9 +231,6 @@ export class NewOrderProduct {
   @Field(type => ObjectRef, { nullable: true })
   toInventory: ObjectRef
 
-  @Field(type => ObjectRef, { nullable: true })
-  productDetail: ObjectRef
-
   @Field(type => InboundProduct, { nullable: true })
   product: InboundProduct
 

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

@@ -327,6 +327,10 @@ export class OrderProduct {
   @Field()
   status: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  refItemId: string
+
   @CreateDateColumn()
   @Field()
   createdAt: Date

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

@@ -12,7 +12,7 @@ import {
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Product, ProductDetail } from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
@@ -200,10 +200,6 @@ export class OrderVas {
   @Field()
   updatedAt: Date
 
-  @ManyToOne(type => ProductDetail, { nullable: true })
-  @Field({ nullable: true })
-  productDetail: ProductDetail
-
   @ManyToOne(type => User)
   @Field(type => User, { nullable: true })
   creator: User
@@ -217,5 +213,4 @@ export class OrderVas {
 
   @RelationId((orderVas: OrderVas) => orderVas.updater)
   updaterId: string
-
 }