@things-factory/sales-base 7.0.0-alpha.16 → 7.0.0-alpha.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-base",
-  "version": "7.0.0-alpha.16",
+  "version": "7.0.0-alpha.19",
   "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": "^7.0.0-alpha.9",
-    "@things-factory/auth-base": "^7.0.0-alpha.9",
-    "@things-factory/biz-base": "^7.0.0-alpha.9",
-    "@things-factory/code-base": "^7.0.0-alpha.9",
-    "@things-factory/integration-sftp": "^7.0.0-alpha.16",
-    "@things-factory/notification": "^7.0.0-alpha.9",
-    "@things-factory/product-base": "^7.0.0-alpha.9",
-    "@things-factory/setting-base": "^7.0.0-alpha.9",
-    "@things-factory/shell": "^7.0.0-alpha.9",
-    "@things-factory/transport-base": "^7.0.0-alpha.9",
-    "@things-factory/warehouse-base": "^7.0.0-alpha.16"
+    "@things-factory/attachment-base": "^7.0.0-alpha.18",
+    "@things-factory/auth-base": "^7.0.0-alpha.18",
+    "@things-factory/biz-base": "^7.0.0-alpha.19",
+    "@things-factory/code-base": "^7.0.0-alpha.18",
+    "@things-factory/integration-sftp": "^7.0.0-alpha.19",
+    "@things-factory/notification": "^7.0.0-alpha.18",
+    "@things-factory/product-base": "^7.0.0-alpha.19",
+    "@things-factory/setting-base": "^7.0.0-alpha.18",
+    "@things-factory/shell": "^7.0.0-alpha.18",
+    "@things-factory/transport-base": "^7.0.0-alpha.19",
+    "@things-factory/warehouse-base": "^7.0.0-alpha.19"
   },
-  "gitHead": "f8d2a44c3443fc11462533da838503f25e74672b"
+  "gitHead": "3a85ee4b15d4f0e79073840537febc3c044ef8cf"
 }

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

@@ -80,7 +80,7 @@ export class NewOrderInventory {
   @Field({ nullable: true })
   uom: string
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   palletQty: number
 
   @Field({ nullable: true })

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

@@ -1,29 +1,11 @@
-import {
-  Field,
-  Float,
-  ID,
-  ObjectType
-} from 'type-graphql'
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  ManyToOne,
-  OneToMany,
-  PrimaryGeneratedColumn,
-  RelationId,
-  UpdateDateColumn
-} from 'typeorm'
+import { Field, Float, ID, ObjectType } from 'type-graphql'
+import { Column, CreateDateColumn, Entity, Index, ManyToOne, OneToMany, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
-import {
-  Inventory,
-  Location
-} from '@things-factory/warehouse-base'
+import { Inventory, Location } from '@things-factory/warehouse-base'
 
 import { ArrivalNotice } from '../arrival-notice/arrival-notice'
 import { DeliveryOrder } from '../delivery-order/delivery-order'
@@ -290,7 +272,7 @@ export class OrderInventory {
   @Field({ nullable: true })
   actualPackQty: number
 
-  @Column({ nullable: true })
+  @Column('float', { nullable: true })
   @Field({ nullable: true })
   palletQty: number
 

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

@@ -1,15 +1,6 @@
-import {
-  Field,
-  Float,
-  InputType,
-  Int,
-  ObjectType
-} from 'type-graphql'
-
-import {
-  ObjectRef,
-  ScalarDate
-} from '@things-factory/shell'
+import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
+
+import { ObjectRef, ScalarDate } from '@things-factory/shell'
 
 import { OrderProduct } from './order-product'
 
@@ -144,13 +135,13 @@ export class OrderProductPatch {
   @Field(type => Float, { nullable: true })
   unpackQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   palletQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   actualPalletQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   adjustedPalletQty: number
 
   @Field({ nullable: true })
@@ -288,13 +279,13 @@ export class NewOrderProduct {
   @Field(type => Float, { nullable: true })
   unpackQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   palletQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   actualPalletQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   adjustedPalletQty: number
 
   @Field({ nullable: true })

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

@@ -1,30 +1,20 @@
-import { Field, ID, ObjectType, Float } from 'type-graphql'
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-  RelationId,
-  UpdateDateColumn,
-  OneToMany
-} from 'typeorm'
+import { Field, Float, ID, ObjectType } from 'type-graphql'
+import { Column, CreateDateColumn, Entity, Index, ManyToOne, OneToMany, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Product, ProductDetail, ProductBundle } from '@things-factory/product-base'
+import { Product, ProductBundle, ProductDetail } from '@things-factory/product-base'
 import { Domain, ScalarDate } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
 import { ArrivalNotice } from '../arrival-notice/arrival-notice'
 import { CollectionOrder } from '../collection-order/collection-order'
 import { DeliveryOrder } from '../delivery-order/delivery-order'
+import { DraftReleaseGood } from '../draft-release-good/draft-release-good'
+import { OrderInventory } from '../order-inventory/order-inventory'
 import { PurchaseOrder } from '../purchase-order/purchase-order'
 import { ReleaseGood } from '../release-good/release-good'
-import { DraftReleaseGood } from '../draft-release-good/draft-release-good'
 import { RetailReplenishmentOrder } from '../retail-replenishment-order/retail-replenishment-order'
-import { OrderInventory } from '../order-inventory/order-inventory'
 
 @Entity()
 @Index('ix_order-product_0', (orderProduct: OrderProduct) => [orderProduct.domain, orderProduct.name], {
@@ -285,15 +275,15 @@ export class OrderProduct {
   @Field({ nullable: true })
   miscAmt: number
 
-  @Column({ nullable: true })
+  @Column('float', { nullable: true })
   @Field({ nullable: true })
   palletQty: number
 
-  @Column({ nullable: true })
+  @Column('float', { nullable: true })
   @Field({ nullable: true })
   adjustedPalletQty: number
 
-  @Column({ nullable: true })
+  @Column('float', { nullable: true })
   @Field({ nullable: true })
   actualPalletQty: number
 

package/server/service/others/other-query.ts

@@ -8,14 +8,7 @@ import { Product, ProductDetail } from '@things-factory/product-base'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain, ListParam } from '@things-factory/shell'
 
-import {
-  InventoryProductGroup,
-  InventoryProductGroupList,
-  NewOrderInventory,
-  NewOrderProduct,
-  OrderInventory,
-  OrderProduct
-} from '../'
+import { InventoryProductGroup, InventoryProductGroupList, NewOrderInventory, NewOrderProduct, OrderInventory, OrderProduct } from '../'
 import { InventoryUtil } from '../../utils'
 
 @Resolver()
@@ -23,12 +16,8 @@ export class OtherQuery {
   @Directive('@privilege(category: "inventory", privilege: "query", domainOwnerGranted: true)')
   @Directive('@transaction')
   @Query(returns => InventoryProductGroupList)
-  async allBizplaceProductInventory(
-    @Ctx() context: ResolverContext,
-    @Args() params: ListParam
-  ): Promise<InventoryProductGroupList> {
-    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace?: Bizplace } =
-      context.state
+  async allBizplaceProductInventory(@Ctx() context: ResolverContext, @Args() params: ListParam): Promise<InventoryProductGroupList> {
+    const { domain, user, tx, bizplace } = context.state
 
     let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
 
@@ -62,12 +51,8 @@ export class OtherQuery {
   @Directive('@privilege(category: "inventory", privilege: "query", domainOwnerGranted: true)')
   @Directive('@transaction')
   @Query(returns => InventoryProductGroupList)
-  async inventoryProductGroup(
-    @Ctx() context: ResolverContext,
-    @Args() params: ListParam
-  ): Promise<InventoryProductGroupList> {
-    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace?: Bizplace } =
-      context.state
+  async inventoryProductGroup(@Ctx() context: ResolverContext, @Args() params: ListParam): Promise<InventoryProductGroupList> {
+    const { domain, user, tx, bizplace } = context.state
 
     let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
 
@@ -100,12 +85,8 @@ export class OtherQuery {
 
   @Directive('@transaction')
   @Query(returns => InventoryProductGroupList)
-  async inventoryProductGroupOpenAPI(
-    @Ctx() context: ResolverContext,
-    @Args() params: ListParam
-  ): Promise<InventoryProductGroupList> {
-    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace?: Bizplace } =
-      context.state
+  async inventoryProductGroupOpenAPI(@Ctx() context: ResolverContext, @Args() params: ListParam): Promise<InventoryProductGroupList> {
+    const { domain, user, tx, bizplace } = context.state
 
     let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
 
@@ -144,8 +125,7 @@ export class OtherQuery {
     @Arg('partnerBizplaceId') partnerBizplaceId: string,
     @Arg('orderInventories', type => [NewOrderInventory], { nullable: true }) orderInventories?: NewOrderInventory[]
   ): Promise<OrderInventory[]> {
-    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace?: Bizplace } =
-      context.state
+    const { domain, user, tx, bizplace } = context.state
 
     let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
     let foundPermittedBizplace: Bizplace
@@ -239,11 +219,7 @@ export class OtherQuery {
         batchIdRef: availableItem ? availableItem.batchIdRef : null,
         packingType: availableItem ? availableItem.packingType : orderInventory.packingType,
         packingSize: availableItem ? availableItem.packingSize : 1,
-        releaseQty: orderInventory.releaseQty
-          ? Number.isInteger(orderInventory.releaseQty)
-            ? orderInventory.releaseQty
-            : null
-          : null,
+        releaseQty: orderInventory.releaseQty ? (Number.isInteger(orderInventory.releaseQty) ? orderInventory.releaseQty : null) : null,
         releaseUomValue: availableItem
           ? Number.isInteger(orderInventory.releaseQty)
             ? parseFloat((orderInventory.releaseQty * packageUomValue).toFixed(2))
@@ -259,31 +235,18 @@ export class OtherQuery {
     }
 
     try {
-      await InventoryUtil.validateWarehousePartnersProductsQuantity(
-        domain,
-        partnerBizplace,
-        newOrderInventories,
-        context,
-        tx
-      )
+      await InventoryUtil.validateWarehousePartnersProductsQuantity(domain, partnerBizplace, newOrderInventories, context, tx)
     } catch (e) {
       const errorData = JSON.parse(e.detail.data)
 
       errorData.forEach(dt => {
-        let idx = newOrderInventories.findIndex(
-          x =>
-            x.product?.id && x.product.id == dt.productId && x.batchId == dt.batchId && x.packingType == dt.packingType
-        )
+        let idx = newOrderInventories.findIndex(x => x.product?.id && x.product.id == dt.productId && x.batchId == dt.batchId && x.packingType == dt.packingType)
 
         if (idx >= 0) {
           newOrderInventories[idx].remainQty = dt.availableQty
           newOrderInventories[idx].remainUomValue = dt.availableUomValue
-          newOrderInventories[idx].isError =
-            dt.availableQty == null
-              ? newOrderInventories[idx].releaseQty > 0
-              : newOrderInventories[idx].releaseQty > dt.availableQty
-          newOrderInventories[idx].remainUomValueWithUom =
-            dt.availableUomValue == null ? '' : `${dt.availableUomValue} ${dt.uom}`
+          newOrderInventories[idx].isError = dt.availableQty == null ? newOrderInventories[idx].releaseQty > 0 : newOrderInventories[idx].releaseQty > dt.availableQty
+          newOrderInventories[idx].remainUomValueWithUom = dt.availableUomValue == null ? '' : `${dt.availableUomValue} ${dt.uom}`
           if (newOrderInventories[idx].inventory != null) {
             newOrderInventories[idx].inventory.remainQty = dt.availableQty
             newOrderInventories[idx].inventory.remainUomValue = dt.availableUomValue
@@ -304,8 +267,7 @@ export class OtherQuery {
     @Arg('partnerBizplaceId') partnerBizplaceId: string,
     @Arg('orderProducts', type => [NewOrderProduct], { nullable: true }) orderProducts: NewOrderProduct[]
   ): Promise<OrderProduct[]> {
-    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace?: Bizplace } =
-      context.state
+    const { domain, user, tx, bizplace } = context.state
 
     const productDetailRepo = tx.getRepository(ProductDetail)
 
@@ -366,14 +328,12 @@ export class OtherQuery {
       if (foundProduct) {
         let productDetail: ProductDetail
         const hasConditions: boolean = Boolean(
-          (orderProduct?.packingType && orderProduct?.packingType.trim() != '') ||
-            (orderProduct?.uom && orderProduct?.uom.trim() != '')
+          (orderProduct?.packingType && orderProduct?.packingType.trim() != '') || (orderProduct?.uom && orderProduct?.uom.trim() != '')
         )
         let productDetailCondition: any = { product: foundProduct }
 
         if (hasConditions) {
-          if (orderProduct?.packingType && orderProduct.packingType.trim() != '')
-            productDetailCondition.packingType = orderProduct.packingType.trim()
+          if (orderProduct?.packingType && orderProduct.packingType.trim() != '') productDetailCondition.packingType = orderProduct.packingType.trim()
 
           if (orderProduct?.uom && orderProduct.uom.trim() != '') productDetailCondition.uom = orderProduct.uom.trim()
         } else {
@@ -385,13 +345,7 @@ export class OtherQuery {
         })
 
         const uomValue: number =
-          strictProduct == true
-            ? productDetail?.uomValue
-              ? productDetail.uomValue
-              : null
-            : orderProduct?.uomValue
-            ? orderProduct.uomValue
-            : productDetail.uomValue
+          strictProduct == true ? (productDetail?.uomValue ? productDetail.uomValue : null) : orderProduct?.uomValue ? orderProduct.uomValue : productDetail.uomValue
 
         newOrderProduct = {
           ...orderProduct,
@@ -411,12 +365,7 @@ export class OtherQuery {
             primaryUnit: productDetail?.uom ? productDetail.uom : null,
             primaryValue: productDetail?.uomValue ? productDetail.uomValue : null
           },
-          totalUomValue:
-            orderProduct.packQty > 0
-              ? uomValue
-                ? `${(orderProduct.packQty * uomValue).toFixed(2)} ${productDetail.uom}`
-                : null
-              : null
+          totalUomValue: orderProduct.packQty > 0 ? (uomValue ? `${(orderProduct.packQty * uomValue).toFixed(2)} ${productDetail.uom}` : null) : null
         }
       } else {
         newOrderProduct = {
@@ -439,8 +388,7 @@ export class OtherQuery {
     @Arg('partnerBizplaceId') partnerBizplaceId: string,
     @Arg('orderProducts', type => [NewOrderProduct], { nullable: true }) orderProducts: NewOrderProduct[]
   ): Promise<OrderProduct[]> {
-    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace?: Bizplace } =
-      context.state
+    const { domain, user, tx, bizplace } = context.state
 
     const productDetailRepo = tx.getRepository(ProductDetail)
 
@@ -501,14 +449,12 @@ export class OtherQuery {
       if (foundProduct) {
         let productDetail: ProductDetail
         const hasConditions: boolean = Boolean(
-          (orderProduct?.packingType && orderProduct?.packingType.trim() != '') ||
-            (orderProduct?.uom && orderProduct?.uom.trim() != '')
+          (orderProduct?.packingType && orderProduct?.packingType.trim() != '') || (orderProduct?.uom && orderProduct?.uom.trim() != '')
         )
         let productDetailCondition: any = { product: foundProduct }
 
         if (hasConditions) {
-          if (orderProduct?.packingType && orderProduct.packingType.trim() != '')
-            productDetailCondition.packingType = orderProduct.packingType.trim()
+          if (orderProduct?.packingType && orderProduct.packingType.trim() != '') productDetailCondition.packingType = orderProduct.packingType.trim()
 
           if (orderProduct?.uom && orderProduct.uom.trim() != '') productDetailCondition.uom = orderProduct.uom.trim()
         } else {
@@ -520,13 +466,7 @@ export class OtherQuery {
         })
 
         const uomValue: number =
-          strictProduct == true
-            ? productDetail?.uomValue
-              ? productDetail.uomValue
-              : null
-            : orderProduct?.uomValue
-            ? orderProduct.uomValue
-            : productDetail.uomValue
+          strictProduct == true ? (productDetail?.uomValue ? productDetail.uomValue : null) : orderProduct?.uomValue ? orderProduct.uomValue : productDetail.uomValue
 
         newOrderProduct = {
           ...orderProduct,
@@ -546,12 +486,7 @@ export class OtherQuery {
             primaryUnit: productDetail?.uom ? productDetail.uom : null,
             primaryValue: productDetail?.uomValue ? productDetail.uomValue : null
           },
-          totalUomValue:
-            orderProduct.packQty > 0
-              ? uomValue
-                ? `${(orderProduct.packQty * uomValue).toFixed(2)} ${productDetail.uom}`
-                : null
-              : null
+          totalUomValue: orderProduct.packQty > 0 ? (uomValue ? `${(orderProduct.packQty * uomValue).toFixed(2)} ${productDetail.uom}` : null) : null
         }
       } else {
         newOrderProduct = {