@things-factory/warehouse-base 4.3.105-alpha.0 → 4.3.106

package/server/service/pallet/pallet-mutation.ts

@@ -1,5 +1,5 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, In, getRepository } from 'typeorm'
+import { EntityManager, In } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
@@ -8,7 +8,6 @@ import { Domain } from '@things-factory/shell'
 import { PalletHistory } from '../pallet-history/pallet-history'
 import { Pallet } from './pallet'
 import { NewPallet, PalletPatch } from './pallet-types'
-import i18next from 'i18next'
 
 @Resolver(Pallet)
 export class PalletMutation {
@@ -26,8 +25,12 @@ export class PalletMutation {
   }
 
   @Directive('@transaction')
-  @Mutation(returns => Boolean)
-  async updatePallet(@Arg('name') name: string, @Arg('patch') patch: PalletPatch, @Ctx() context: any) {
+  @Mutation(returns => Pallet)
+  async updatePallet(
+    @Arg('name') name: string,
+    @Arg('patch') patch: PalletPatch,
+    @Ctx() context: any
+  ): Promise<Pallet> {
     const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
 
     const repository = tx.getRepository(Pallet)
@@ -43,66 +46,80 @@ export class PalletMutation {
   }
 
   @Directive('@transaction')
-  @Mutation(returns => Boolean)
-  async updateMultiplePallet(@Arg('patches', type => [PalletPatch]) patches: PalletPatch[], @Ctx() context: any) {
+  @Mutation(returns => [Pallet])
+  async updateMultiplePallet(
+    @Arg('patches', type => [PalletPatch]) patches: PalletPatch[],
+    @Ctx() context: any
+  ): Promise<Pallet[]> {
     const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
 
-    for (let patch of patches) {
-      let foundPallet: Pallet
+    let results = []
+    const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
+    const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
 
-      if (patch.name) {
-        foundPallet = await getRepository(Pallet).findOne({
-          where: {
-            domain,
-            name: patch.name
-          },
-          relations: ['owner', 'holder']
-        })
-      } else if (patch.id) {
-        foundPallet = await getRepository(Pallet).findOne({
-          where: {
-            domain,
-            id: patch.id
-          },
-          relations: ['owner', 'holder']
-        })
-      }
+    if (_createRecords.length > 0) {
+      for (let i = 0; i < _createRecords.length; i++) {
+        const newRecord = _createRecords[i]
 
-      if (!foundPallet) {
-        delete patch?.id
+        if (newRecord.owner && newRecord.owner.id) {
+          newRecord.owner = await tx.getRepository(Bizplace).findOne(newRecord.owner.id)
+        }
+
+        if (newRecord.holder && newRecord.holder.id) {
+          newRecord.holder = await tx.getRepository(Bizplace).findOne(newRecord.holder.id)
+        }
 
-        let newPallet = await tx.getRepository(Pallet).save({ ...patch, domain, creator: user, updater: user })
+        const result: Pallet = await tx.getRepository(Pallet).save({
+          domain: domain,
+          creator: user,
+          updater: user,
+          ...newRecord
+        })
 
         await tx.getRepository(PalletHistory).save({
-          ...patch,
-          pallet: newPallet,
+          ...newRecord,
+          pallet: result,
           domain: domain,
           creator: user,
           updater: user,
           transactionType: 'NEW'
         })
-      } else {
-        if (patch.cuFlag === '+') {
-          throw new Error(i18next.t('error.pallet (x) already exists', { x: patch.name }))
+
+        results.push({ ...result, cuFlag: '+' })
+      }
+    }
+
+    if (_updateRecords.length > 0) {
+      for (let i = 0; i < _updateRecords.length; i++) {
+        const newRecord = _updateRecords[i]
+        const pallet = await tx.getRepository(Pallet).findOne({
+          where: { id: newRecord.id },
+          relations: ['owner', 'holder']
+        })
+        const seq = pallet.seq + 1
+
+        if (newRecord.owner && newRecord.owner.id) {
+          newRecord.owner = await tx.getRepository(Bizplace).findOne(newRecord.owner.id)
+        }
+
+        if (newRecord.holder && newRecord.holder.id) {
+          newRecord.holder = await tx.getRepository(Bizplace).findOne(newRecord.holder.id)
         }
-        delete patch.cuFlag
-
-        let updatedPallet: any = await tx.getRepository(Pallet).update(
-          { id: foundPallet.id },
-          {
-            ...patch,
-            updater: user,
-            seq: foundPallet.seq++,
-            refOrderNo: null
-          }
-        )
+
+        const result = await tx.getRepository(Pallet).save({
+          ...pallet,
+          ...newRecord,
+          seq,
+          updater: user,
+          refOrderNo: null
+        })
 
         let newHistory = {
-          ...foundPallet,
-          ...patch,
-          pallet: updatedPallet,
-          seq: updatedPallet.seq,
-          domain,
+          ...pallet,
+          ...newRecord,
+          pallet: result,
+          seq,
+          domain: domain,
           creator: user,
           updater: user,
           transactionType: 'UPDATE'
@@ -113,10 +130,12 @@ export class PalletMutation {
         await tx.getRepository(PalletHistory).save({
           ...newHistory
         })
+
+        results.push({ ...result, cuFlag: 'M' })
       }
     }
 
-    return true
+    return results
   }
 
   @Directive('@transaction')

package/server/service/tote/tote-mutation.ts

@@ -97,7 +97,7 @@ export class ToteMutation {
 
         let foundTote = await tx
           .getRepository(Tote)
-          .findOne({ where: { domain, name: tote.name, bizplace: newRecord.bizplace } })
+          .findOne({ where: { domain, name: newRecord.name, bizplace: newRecord.bizplace } })
 
         if (foundTote) {
           throw new Error('Duplicated tote found')

package/server/service/tote/tote-query.ts

@@ -1,5 +1,5 @@
-import { Arg, Ctx, FieldResolver, Query, Resolver, Root, Directive } from 'type-graphql'
-import { getRepository, IsNull, EntityManager } from 'typeorm'
+import { Arg, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
+import { getRepository, IsNull } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
@@ -10,7 +10,6 @@ import { ToteList } from './tote-types'
 
 @Resolver(Tote)
 export class ToteQuery {
-  @Directive('@transaction')
   @Query(returns => ToteList)
   async totes(
     @Ctx() context: any,
@@ -18,12 +17,11 @@ export class ToteQuery {
     @Arg('pagination', type => Pagination, { nullable: true }) pagination?: Pagination,
     @Arg('sortings', type => [Sorting], { nullable: true }) sortings?: Sorting[]
   ): Promise<ToteList> {
-    const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+    const { domain }: { domain: Domain } = context.state
 
-    const deletedFilter: any = filters.find((filter: any) => filter.name === 'deleted_at')
-    delete filters[filters.indexOf(deletedFilter)]
+    const deletedFilter: any = filters.find((filter: any) => filter.name === 'deleted' && filter.value === true)
 
-    const queryBuilder = tx.getRepository(Tote).createQueryBuilder()
+    const queryBuilder = getRepository(Tote).createQueryBuilder()
     buildQuery(queryBuilder, { filters, pagination, sortings }, context)
 
     queryBuilder
@@ -31,9 +29,9 @@ export class ToteQuery {
       .leftJoinAndSelect('Tote.bizplace', 'Bizplace')
       .leftJoinAndSelect('Tote.creator', 'Creator')
       .leftJoinAndSelect('Tote.updater', 'Updater')
-      .andWhere('Domain.id = :domainId', { domainId: domain.id })
+      .where('Domain.id = :domainId', { domainId: domain.id })
 
-    if (deletedFilter.value) {
+    if (deletedFilter) {
       queryBuilder.andWhere('Tote.deletedAt IS NOT NULL')
     } else {
       queryBuilder.andWhere('Tote.deletedAt IS NULL')

package/server/service/warehouse/warehouse-mutation.ts

@@ -7,8 +7,6 @@ import { Domain } from '@things-factory/shell'
 import { Warehouse } from './warehouse'
 import { NewWarehouse, WarehousePatch } from './warehouse-types'
 
-import i18next from 'i18next'
-
 @Resolver(Warehouse)
 export class WarehouseMutation {
   @Directive('@privilege(category: "warehouse", privilege: "mutation")')
@@ -31,48 +29,11 @@ export class WarehouseMutation {
 
   @Directive('@privilege(category: "warehouse", privilege: "mutation")')
   @Directive('@transaction')
-  @Mutation(returns => Boolean)
+  @Mutation(returns => [Warehouse])
   async updateMultipleWarehouse(
     @Arg('patches', type => [WarehousePatch]) patches: WarehousePatch[],
     @Ctx() context: any
-  ) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-
-    for (let patch of patches) {
-      let foundWarehouse: Warehouse
-
-      if (patch?.name) {
-        foundWarehouse = await tx.getRepository(Warehouse).findOne({
-          domain,
-          name: patch.name
-        })
-      } else if (patch?.id) {
-        foundWarehouse = await tx.getRepository(Warehouse).findOne({
-          domain,
-          id: patch.id
-        })
-      }
-
-      if (!foundWarehouse) {
-        delete patch?.id
-        await tx.getRepository(Warehouse).save({ ...patch, domain, creator: user, updater: user })
-      } else {
-        if (patch.cuFlag === '+') {
-          throw new Error(i18next.t('error.warehouse (x) already exists', { x: patch.name }))
-        }
-        delete patch.cuFlag
-        await tx.getRepository(Warehouse).update(
-          { id: foundWarehouse.id },
-          {
-            ...patch,
-            updater: user
-          }
-        )
-      }
-    }
-
-    return true
-
+  ): Promise<Warehouse[]> {
     let results = []
     const _createRecords = patches.filter((patch: any) => patch.cuFlag === '+')
     const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')

package/server/utils/inventory-util.ts

@@ -147,134 +147,68 @@ export async function generateInventoryHistory(
     }
   })
 
-  let lastSeq: number
-  let res: any
-  let inventoryHistoryFields: any = {
+  let seq: number = 0
+  let openingQty: number = 0
+  let openingUomValue: number = 0
+
+  if (lastInvHistory) {
+    openingQty = lastInvHistory.openingQty + lastInvHistory.qty
+    openingUomValue = lastInvHistory.openingUomValue + lastInvHistory.uomValue
+    seq = lastInvHistory.seq + 1
+  }
+
+  let remainQty = (openingQty || 0) + (qty || 0)
+
+  let inventoryHistory: any = new InventoryHistory()
+
+  inventoryHistory = {
+    ...inventory,
+    name: InventoryNoGenerator.inventoryHistoryName(),
+    inventory,
+    seq: seq,
+    status: remainQty == 0 ? INVENTORY_STATUS.TERMINATED : inventory.status,
+    transactionType,
     refOrderId: refOrder?.id || null,
     orderNo: refOrder?.name || null,
     orderRefNo: refOrder?.refNo || null,
-    uom: inventory?.uom,
-
+    qty,
+    openingQty,
+    uomValue,
+    openingUomValue: openingUomValue,
     creator: user,
-    updater: user,
-    domain: inventory?.domain,
-    bizplace: inventory?.bizplace,
-    reusablePallet: inventory?.reusablePallet,
-    inventory: inventory,
-    product: inventory?.product,
-    warehouse: inventory?.warehouse,
-    location: inventory?.location,
-
-    palletId: inventory?.palletId,
-    batchId: inventory?.batchId,
-    zone: inventory?.zone,
-    packingType: inventory?.packingType,
-    description: inventory?.description,
-    expirationDate: inventory?.expirationDate,
-    unitCost: inventory?.unitCost,
-    batchIdRef: inventory?.batchIdRef,
-    cartonId: inventory?.cartonId,
-    manufactureYear: inventory?.manufactureYear,
-    packingSize: inventory?.packingSize,
-    manufactureDate: inventory?.manufactureDate
+    updater: user
   }
 
-  if (!lastInvHistory) {
-    res = await invHistoryRepo
-    .createQueryBuilder()
-    .insert()
-    .into(InventoryHistory)
-    .values([
-      {
-        ...inventoryHistoryFields,
-        name: InventoryNoGenerator.inventoryHistoryName(),
-        status: inventory.status,
-        transactionType,
-        qty,
-        openingQty: 0,
-        uomValue,
-        openingUomValue: 0,
-        seq: 0
-      }
-    ])
-    .returning('*')
-    .execute()
-  }
-  else {
-    if (transactionType == 'PICKING' || transactionType == 'UNLOADING') {
-      const findSameOrderHistory: InventoryHistory[] = await invHistoryRepo.find({
-        domain: inventory.domain,
-        palletId: inventory.palletId,
-        refOrderId: refOrder.id
-      })
-  
-      if (findSameOrderHistory.length > 0) {
-        let prevTotalQty = 0
-        let prevTotalUomValue = 0
-        for (let oh of findSameOrderHistory) {
-          prevTotalQty += oh.qty
-          prevTotalUomValue += oh.uomValue
-        }
-        qty -= prevTotalQty
-        uomValue -= prevTotalUomValue
-      }
+  delete inventoryHistory.updatedAt
+  delete inventoryHistory.createdAt
+  delete inventoryHistory.id
+
+  let newInventoryHistory = await invHistoryRepo.save(inventoryHistory)
+
+  if (remainQty == 0) {
+    seq = seq + 1
+    let terminatedHistory = {
+      ...newInventoryHistory,
+      name: InventoryNoGenerator.inventoryHistoryName(),
+      seq: seq,
+      status: INVENTORY_STATUS.TERMINATED,
+      transactionType: INVENTORY_TRANSACTION_TYPE.TERMINATED,
+      uom: inventory.uom,
+      qty: 0,
+      openingQty: 0,
+      uomValue: 0,
+      openingUomValue: 0
     }
-  
-    res = await invHistoryRepo
-      .createQueryBuilder()
-      .insert()
-      .into(InventoryHistory)
-      .values([
-        {
-          ...inventoryHistoryFields,
-          name: InventoryNoGenerator.inventoryHistoryName(),
-          status: () =>
-            `(select case when opening_qty + (select qty from inventory_histories where pallet_id = '${inventory.palletId}' order by seq desc limit 1) = 0 then 'TERMINATED' else 'STORED' end as status from inventory_histories where pallet_id = '${inventory.palletId}' order by seq desc limit 1)`,
-          transactionType,
-          qty,
-          openingQty: () =>
-            `(select opening_qty from inventory_histories where pallet_id = '${inventory.palletId}' order by seq desc limit 1) + (select qty from inventory_histories where pallet_id = '${inventory.palletId}' order by seq desc limit 1)`,
-          uomValue,
-          openingUomValue: () =>
-            `(select opening_uom_value from inventory_histories where pallet_id = '${inventory.palletId}' order by seq desc limit 1) + ${uomValue}`,
-          seq: () =>
-            `(select seq from inventory_histories where pallet_id = '${inventory.palletId}' order by seq desc limit 1) + 1`
-        }
-      ])
-      .returning('*')
-      .execute()
-  }
 
-  let newInventoryHistory: InventoryHistory = res.generatedMaps[0]
-  lastSeq = newInventoryHistory.seq
-
-  if (newInventoryHistory.openingQty + qty == 0 && transactionType != 'UNDO_UNLOADING') {
-    let terminatedRes = await invHistoryRepo
-      .createQueryBuilder()
-      .insert()
-      .into(InventoryHistory)
-      .values([
-        {
-          ...inventoryHistoryFields,
-          name: InventoryNoGenerator.inventoryHistoryName(),
-          status: INVENTORY_STATUS.TERMINATED,
-          transactionType: INVENTORY_TRANSACTION_TYPE.TERMINATED,
-          qty: 0,
-          openingQty: 0,
-          uomValue: 0,
-          openingUomValue: 0,
-          seq: () =>
-            `(select seq from inventory_histories where inventory_id = '${inventory.id}' order by seq desc limit 1) + 1`
-        }
-      ])
-      .returning('seq')
-      .execute()
-
-    lastSeq = terminatedRes.generatedMaps[0].seq
+    delete terminatedHistory.id
+
+    newInventoryHistory = await invHistoryRepo.save(terminatedHistory)
     inventory.status = INVENTORY_STATUS.TERMINATED
   }
 
-  await invRepo.update(inventory.id, { lastSeq, updater: user })
+  if (inventory.lastSeq !== seq) {
+    await invRepo.update(inventory.id, { lastSeq: newInventoryHistory.seq, updater: user })
+  }
 
   await switchLocationStatus(domain, location, user, trxMgr)
   return newInventoryHistory

package/translations/en.json

@@ -1,7 +1,4 @@
 {
-  "error.no_location_found": "no location found",
-  "error.pallet (x) already exists": "Pallet ({x}) already exists",
-  "error.warehouse (x) already exists": "Warehouse ({x}) already exists",
   "field.location": "location",
   "field.product_batch": "product batch",
   "field.lot": "lot",
@@ -19,5 +16,6 @@
   "field.qty": "qty",
   "field.state": "state",
   "field.date": "date",
-  "field.type": "type"
+  "field.type": "type",
+  "error.no_location_found": "no location found"
 }

package/translations/ko.json

@@ -1,7 +1,4 @@
 {
-  "error.no_location_found": "발견된 로케이션이 없습니다",
-  "error.pallet (x) already exists": "[ko] Pallet ({x}) already exists",
-  "error.warehouse (x) already exists": "[ko] Warehouse ({x}) already exists",
   "field.location": "로케이션",
   "field.product_batch": "제품 배치",
   "field.lot": "롯트",
@@ -19,5 +16,6 @@
   "field.qty": "수량",
   "field.state": "국가",
   "field.date": "날짜",
-  "field.type": "유형"
+  "field.type": "유형",
+  "error.no_location_found": "발견된 로케이션이 없습니다"
 }

package/translations/ms.json

@@ -1,7 +1,4 @@
 {
-  "error.no_location_found": "[ms]no location found",
-  "error.pallet (x) already exists": "[ms] Pallet ({x}) already exists",
-  "error.warehouse (x) already exists": "[ko] Warehouse ({x}) already exists",
   "field.location": "lokasi",
   "field.product_batch": "kumpulan produk",
   "field.lot": "lot",
@@ -19,5 +16,6 @@
   "field.qty": "kuantiti",
   "field.state": "keadaan",
   "field.date": "tarikh",
-  "field.type": "jenis"
+  "field.type": "jenis",
+  "error.no_location_found": "[ms]no location found"
 }

package/translations/zh.json

@@ -1,23 +1,21 @@
 {
-  "error.no_location_found": "[zh]no location found",
-  "error.pallet (x) already exists": "[zh] Pallet ({x}) already exists",
-  "error.warehouse (x) already exists": "[ko] Warehouse ({x}) already exists",
-  "field.bizplace": "分部",
-  "field.date": "日期",
-  "field.end_qty": "最终数量",
-  "field.in_qty": "进口数量",
   "field.location": "位置",
-  "field.lot": "地块",
-  "field.out_qty": "出口数量",
   "field.product_batch": "产品批次",
-  "field.product": "产品",
-  "field.qty": "数量",
+  "field.lot": "地块",
+  "field.warehouse": "仓库",
+  "field.zone": "区",
   "field.section": "段",
+  "field.unit": "单元",
   "field.shelf": "架子",
+  "field.bizplace": "分部",
   "field.start_qty": "开始数量",
+  "field.in_qty": "进口数量",
+  "field.out_qty": "出口数量",
+  "field.end_qty": "最终数量",
+  "field.product": "产品",
+  "field.qty": "数量",
   "field.state": "状态",
+  "field.date": "日期",
   "field.type": "类型",
-  "field.unit": "单元",
-  "field.warehouse": "仓库",
-  "field.zone": "区"
+  "error.no_location_found": "[zh]no location found"
 }