@things-factory/warehouse-base 4.3.156 → 4.3.157

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

@@ -1,34 +1,14 @@
-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 {
@@ -38,11 +18,7 @@ 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'
@@ -52,11 +28,7 @@ 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 {
@@ -244,26 +216,22 @@ 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'
 
@@ -356,8 +324,6 @@ export class InventoryChangeMutation {
 
           const adjustQty: number = updateRecord?.qty | 0
           let qtyDiff: number = 0
-  
-//if updateRecord.unitcost then ...
 
           let existingRecord = await tx.getRepository(Inventory).findOne({
             where: { domain, palletId: updateRecord?.palletId },
@@ -376,15 +342,6 @@ export class InventoryChangeMutation {
             qtyDiff = existingQty == adjustQty ? existingQty - adjustQty : adjustQty - existingQty
           }
 
-          if (!updateRecord.unitCost){
-            if(existingRecord.unitCost != null){
-            updateRecord.unitCost = existingRecord.unitCost
-            }
-            if (!existingRecord.unitCost){
-            updateRecord.unitCost = existingRecord.product.costPrice
-            }
-            }
-
           if (!!updateRecord?.location?.id) {
             var location = await tx.getRepository(Location).findOne({
               where: { id: updateRecord.location.id },
@@ -432,7 +389,6 @@ export class InventoryChangeMutation {
             domain: domain,
             creator: user,
             updater: user
-            //here?
           })
 
           const prevBizAccount: Account = await tx
@@ -914,20 +870,6 @@ export async function approveInventoryChanges(patches: any, context: any) {
           statusFilter = (newRecord.qty != null ? newRecord.qty : inventory.qty) > 0 ? 'STORED' : 'TERMINATED'
         }
 
-        let { expirationDate } = inventory
-        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
-          }
-        }
-
         delete newRecord.createdAt
         await tx.getRepository(Inventory).save({
           ...inventory,
@@ -1086,19 +1028,6 @@ 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,36 +32,6 @@ 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,12 +24,6 @@ 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,10 +104,6 @@ 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
@@ -124,14 +120,6 @@ 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/utils/inventory-util.ts

@@ -131,7 +131,7 @@ export async function generateInventoryHistory(
 
   inventory = await invRepo.findOne({
     where: { id: inventory.id },
-    relations: ['domain', 'bizplace', 'product', 'warehouse', 'location', 'productDetail']
+    relations: ['domain', 'bizplace', 'product', 'warehouse', 'location', 'productDetail', 'reusablePallet']
   })
 
   const domain: Domain = inventory.domain
@@ -523,7 +523,6 @@ 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"
@@ -533,8 +532,6 @@ 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.shell_life is not null then CURRENT_DATE < i.expiration_date - p.shell_life else true end
     ORDER BY op."productId", rn
   `,
     [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE, domainId, bizplaceId, INVENTORY_STATUS.STORED]

package/dist-server/constants/adjustment-code.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ADJUSTMENT_CODE = void 0;
-exports.ADJUSTMENT_CODE = {
-    AC01: 'AC-01: LOST INVENTORY',
-    AC02: 'AC-02: DAMAGE',
-    AC03: 'AC-03: SHELF LIFE',
-    AC04: 'AC-04: STOCK NUMBER CHANGE',
-    AC05: 'AC-05: OWNERSHIP CHANGE',
-    AC06: 'AC-06: TRANSFER',
-    AC07: 'AC-07: OTHERS'
-};
-//# sourceMappingURL=adjustment-code.js.map

package/dist-server/constants/adjustment-code.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"adjustment-code.js","sourceRoot":"","sources":["../../server/constants/adjustment-code.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG;IAC7B,IAAI,EAAE,uBAAuB;IAC7B,IAAI,EAAE,eAAe;IACrB,IAAI,EAAE,mBAAmB;IACzB,IAAI,EAAE,4BAA4B;IAClC,IAAI,EAAE,yBAAyB;IAC/B,IAAI,EAAE,iBAAiB;IACvB,IAAI,EAAE,eAAe;CACtB,CAAA"}

package/server/constants/adjustment-code.ts

@@ -1,9 +0,0 @@
-export const ADJUSTMENT_CODE = {
-  AC01: 'AC-01: LOST INVENTORY',
-  AC02: 'AC-02: DAMAGE',
-  AC03: 'AC-03: SHELF LIFE',
-  AC04: 'AC-04: STOCK NUMBER CHANGE',
-  AC05: 'AC-05: OWNERSHIP CHANGE',
-  AC06: 'AC-06: TRANSFER',
-  AC07: 'AC-07: OTHERS'
-}