@things-factory/warehouse-base 4.3.159 → 4.3.162

package/server/service/inventory-change/inventory-change-mutation.ts

@@ -1,14 +1,34 @@
-import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, In, MoreThan, Not } from 'typeorm'
+import {
+  Arg,
+  Ctx,
+  Directive,
+  Mutation,
+  Resolver
+} from 'type-graphql'
+import {
+  EntityManager,
+  In,
+  MoreThan,
+  Not
+} from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
 import { Account } from '@things-factory/integration-accounting'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import { Product, ProductDetail } from '@things-factory/product-base'
-import { PartnerSetting, Setting } from '@things-factory/setting-base'
+import {
+  Sellercraft,
+  SellercraftStatus
+} from '@things-factory/integration-sellercraft'
+import {
+  Product,
+  ProductDetail
+} from '@things-factory/product-base'
+import {
+  PartnerSetting,
+  Setting
+} from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
 import {
@@ -18,7 +38,11 @@ import {
   LOCATION_STATUS,
   LOCATION_TYPE
 } from '../../constants'
-import { EcommerceController, PosController, SellercraftController } from '../../controllers'
+import {
+  EcommerceController,
+  PosController,
+  SellercraftController
+} from '../../controllers'
 import { InventoryNoGenerator } from '../../utils'
 import { InventoryHistory } from '../inventory-history/inventory-history'
 import { InventoryItemChange } from '../inventory-item-change/inventory-item-change'
@@ -28,7 +52,11 @@ import { Inventory } from '../inventory/inventory'
 import { InventoryPatch } from '../inventory/inventory-types'
 import { Location } from '../location/location'
 import { InventoryChange } from './inventory-change'
-import { InventoryChangeList, InventoryChangePatch, NewInventoryChange } from './inventory-change-types'
+import {
+  InventoryChangeList,
+  InventoryChangePatch,
+  NewInventoryChange
+} from './inventory-change-types'
 
 @Resolver(InventoryChange)
 export class InventoryChangeMutation {
@@ -216,22 +244,26 @@ export class InventoryChangeMutation {
 
           var product: Product = await tx.getRepository(Product).findOne(newRecord.product.id)
           var productDetail: ProductDetail = await tx.getRepository(ProductDetail).findOne({
-            where: [{
-              product: { id: newRecord.product.id },
-              packingType: newRecord.packingType,
-              packingSize: newRecord.packingSize,
-              uom: newRecord.uom
-            },
-            {
-              product: { id: newRecord.product.id },
-              isDefault: true
-            }],
+            where: [
+              {
+                product: { id: newRecord.product.id },
+                packingType: newRecord.packingType,
+                packingSize: newRecord.packingSize,
+                uom: newRecord.uom
+              },
+              {
+                product: { id: newRecord.product.id },
+                isDefault: true
+              }
+            ],
             order: { isDefault: 'DESC' }
           })
 
           newRecord.product = product
           newRecord.productDetail = productDetail
-
+          if (!newRecord.unitCost) {
+            newRecord.unitCost = product.unitCost
+          }
           newRecord.status = 'PENDING'
           newRecord.transactionType = 'NEW'
 
@@ -327,7 +359,7 @@ export class InventoryChangeMutation {
 
           let existingRecord = await tx.getRepository(Inventory).findOne({
             where: { domain, palletId: updateRecord?.palletId },
-            relations: ['location', 'warehouse', 'product', 'bizplace', 'bizplace.domain']
+            relations: ['location', 'warehouse', 'product', 'productDetail', 'bizplace', 'bizplace.domain']
           })
 
           if (!existingRecord) {
@@ -342,6 +374,12 @@ export class InventoryChangeMutation {
             qtyDiff = existingQty == adjustQty ? existingQty - adjustQty : adjustQty - existingQty
           }
 
+          if (!updateRecord.unitCost) {
+            if (existingRecord.unitCost != null) {
+              updateRecord.unitCost = existingRecord.unitCost || existingRecord.product?.costPrice
+            }
+          }
+
           if (!!updateRecord?.location?.id) {
             var location = await tx.getRepository(Location).findOne({
               where: { id: updateRecord.location.id },
@@ -361,12 +399,30 @@ export class InventoryChangeMutation {
           }
 
           let product: Product
+          let productDetail: ProductDetail
 
           if (!!updateRecord?.product?.id) {
             product = await tx.getRepository(Product).findOne(updateRecord.product.id)
+            productDetail = await tx.getRepository(ProductDetail).findOne({
+              where: [
+                {
+                  product: { id: updateRecord.product.id },
+                  packingType: updateRecord?.packingType ? updateRecord.packingType : existingRecord.packingType,
+                  packingSize: updateRecord?.packingSize ? updateRecord.packingSize : existingRecord.packingSize,
+                  uom: updateRecord?.uom ? updateRecord.uom : existingRecord.uom
+                },
+                {
+                  product: { id: updateRecord.product.id },
+                  isDefault: true
+                }
+              ],
+              order: { isDefault: 'DESC' }
+            })
             updateRecord.product = product
+            updateRecord.productDetail = productDetail
           } else {
             product = existingRecord.product
+            productDetail = existingRecord.productDetail
           }
 
           updateRecord.transactionType == 'MISSING'
@@ -382,6 +438,7 @@ export class InventoryChangeMutation {
 
           const updatedInventoryChange: InventoryChange = await inventoryChangeRepo.save({
             palletId: existingRecord.palletId,
+            cartonId: existingRecord.cartonId,
             ...updateRecord,
             id: undefined,
             name: InventoryNoGenerator.inventoryName(),
@@ -389,6 +446,7 @@ export class InventoryChangeMutation {
             domain: domain,
             creator: user,
             updater: user
+            //here?
           })
 
           const prevBizAccount: Account = await tx
@@ -870,6 +928,22 @@ export async function approveInventoryChanges(patches: any, context: any) {
           statusFilter = (newRecord.qty != null ? newRecord.qty : inventory.qty) > 0 ? 'STORED' : 'TERMINATED'
         }
 
+        let expirationDate = newRecord?.expirationDate ? newRecord.expirationDate : inventory.expirationDate
+        const { shelfLife } = inventory.product
+
+        if (shelfLife && expirationDate) {
+          let date: Date = new Date()
+          expirationDate = new Date(expirationDate)
+
+          const releaseBefore: Date = new Date(expirationDate.setDate(expirationDate.getDate() - shelfLife))
+
+          if (date > releaseBefore) {
+            inventory.obsolete = true
+          } else {
+            inventory.obsolete = false
+          }
+        }
+
         delete newRecord.createdAt
         await tx.getRepository(Inventory).save({
           ...inventory,
@@ -1028,6 +1102,19 @@ export async function approveInventoryChanges(patches: any, context: any) {
             ? null
             : newRecord.expirationDate
 
+        const { shelfLife } = newRecord.product
+
+        if (shelfLife && expirationDate) {
+          let date: Date = new Date()
+          expirationDate = new Date(expirationDate)
+
+          const releaseBefore: Date = new Date(expirationDate.setDate(expirationDate.getDate() - shelfLife))
+
+          if (date > releaseBefore) {
+            newRecord.obsolete = true
+          }
+        }
+
         let savedInventory = await tx.getRepository(Inventory).save({
           ...newRecord,
           expirationDate,

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

@@ -32,6 +32,36 @@ export class InventoryChangeQuery {
       params.filters = [...params.filters.filter(filter => filter.name != 'bizplace')]
     }
 
+    const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
+    if (fromDateParamIdx >= 0) {
+      let fromDateVal = new Date(params.filters[fromDateParamIdx].value)
+      params.filters.splice(fromDateParamIdx, 1)
+
+      params.filters.push({
+        name: 'createdAt',
+        operator: 'gte',
+        value: fromDateVal.toISOString(),
+        relation: false
+      })
+    } else {
+      throw new Error(`Error: Date range not provided correctly.`)
+    }
+
+    const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate')
+    if (toDateParamIdx >= 0) {
+      let toDateVal = new Date(params.filters[toDateParamIdx].value)
+      params.filters.splice(toDateParamIdx, 1)
+
+      params.filters.push({
+        name: 'createdAt',
+        operator: 'lt',
+        value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+        relation: false
+      })
+    } else {
+      throw new Error(`Error: Date range not provided correctly.`)
+    }
+
     const qb: SelectQueryBuilder<InventoryChange> = getRepository(InventoryChange).createQueryBuilder('ic')
     buildQuery(qb, params, context)
 

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

@@ -24,6 +24,12 @@ export class InventoryChangePatch {
 
   @Field({ nullable: true })
   cuFlag?: string
+
+  @Field({ nullable: true })
+  fromDate: string
+
+  @Field({ nullable: true })
+  toDate: string
 }
 
 @InputType()

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

@@ -104,6 +104,10 @@ export class InventoryChange {
   @Field({ nullable: true })
   uom: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  sku: string
+
   @Column('float', { nullable: true })
   @Field({ nullable: true })
   weight: number
@@ -120,6 +124,14 @@ export class InventoryChange {
   @Field({ nullable: true })
   unitCost: number
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  adjustmentCode: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  adjustmentNote: string
+
   @Column()
   @Field()
   status: string

package/server/service/inventory-history/inventory-history-mutation.ts

@@ -102,7 +102,7 @@ export class InventoryHistoryMutation {
     return true
   }
 
-  @Directive('transaction')
+  @Directive('@transaction')
   @Mutation(returns => Boolean)
   async deleteInventoryHistories(
     @Arg('names', type => [String]) names: string[],

package/server/utils/inventory-util.ts

@@ -523,6 +523,7 @@ export async function getInventoriesByStrategy(
       ) AS rn
     FROM inventories i
     INNER JOIN locations l ON i.location_id = l.id
+    INNER JOIN products p ON p.id = i.product_id
       AND l.TYPE NOT IN ($1, $2)
     INNER JOIN temp_op2 op ON i.product_id = op."productId"::uuid
       AND i.batch_id = op."batchId"
@@ -532,6 +533,8 @@ export async function getInventoriesByStrategy(
     WHERE i.domain_id = $3
     AND i.bizplace_id = $4
     AND i.status = $5
+    AND i.obsolete = false
+    AND case when i.expiration_date is not null and p.p.shelf_life is not null then CURRENT_DATE < i.expiration_date - p.p.shelf_life else true end
     ORDER BY op."productId", rn
   `,
     [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE, domainId, bizplaceId, INVENTORY_STATUS.STORED]