@things-factory/warehouse-base 7.1.29 → 7.1.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/warehouse-base",
-  "version": "7.1.29",
+  "version": "7.1.30",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,10 +26,10 @@
   "dependencies": {
     "@things-factory/biz-base": "^7.1.24",
     "@things-factory/id-rule-base": "^7.1.24",
-    "@things-factory/integration-sellercraft": "^7.1.29",
-    "@things-factory/marketplace-base": "^7.1.29",
-    "@things-factory/product-base": "^7.1.25",
+    "@things-factory/integration-sellercraft": "^7.1.30",
+    "@things-factory/marketplace-base": "^7.1.30",
+    "@things-factory/product-base": "^7.1.30",
     "@things-factory/setting-base": "^7.1.24"
   },
-  "gitHead": "f207892ca9a9d0811b62232810c875fdb278f14e"
+  "gitHead": "1e985cc6d9db84862cbaf08363442e91e6ab10ba"
 }

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

@@ -1,10 +1,12 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { In, MoreThan, SelectQueryBuilder } from 'typeorm'
+import { In, MoreThan, SelectQueryBuilder, Equal } from 'typeorm'
 
 import { Bizplace } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { Product } from '@things-factory/product-base'
+// @ts-ignore
+import { ArrivalNotice } from '@things-factory/sales-base'
 
 import { INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, LOCATION_STATUS, RULE_TYPE } from '../../constants'
 import { SellercraftController } from '../../controllers'
@@ -19,7 +21,10 @@ export class InventoryMutation {
   @Directive('@privilege(category: "inventory", privilege: "mutation")')
   @Directive('@transaction')
   @Mutation(returns => Inventory)
-  async createInventory(@Arg('inventory') inventory: NewInventory, @Ctx() context: ResolverContext): Promise<Inventory> {
+  async createInventory(
+    @Arg('inventory') inventory: NewInventory,
+    @Ctx() context: ResolverContext
+  ): Promise<Inventory> {
     const { tx } = context.state
 
     return await tx.getRepository(Inventory).save({
@@ -61,7 +66,11 @@ export class InventoryMutation {
   @Directive('@privilege(category: "inventory", privilege: "mutation")')
   @Directive('@transaction')
   @Mutation(returns => Inventory)
-  async updateInventoryRemark(@Arg('id') id: string, @Arg('remark') remark: string, @Ctx() context: ResolverContext): Promise<Inventory> {
+  async updateInventoryRemark(
+    @Arg('id') id: string,
+    @Arg('remark') remark: string,
+    @Ctx() context: ResolverContext
+  ): Promise<Inventory> {
     const { domain, user, tx } = context.state
 
     const repository = tx.getRepository(Inventory)
@@ -87,14 +96,20 @@ export class InventoryMutation {
   @Directive('@privilege(category: "inventory", privilege: "mutation")')
   @Directive('@transaction')
   @Mutation(returns => [Inventory])
-  async updateMultipleInventory(@Arg('patches', type => [InventoryPatch]) patches: InventoryPatch[], @Ctx() context: ResolverContext): Promise<Inventory[]> {
+  async updateMultipleInventory(
+    @Arg('patches', type => [InventoryPatch]) patches: InventoryPatch[],
+    @Ctx() context: ResolverContext
+  ): Promise<Inventory[]> {
     return await updateMultipleInventory(patches, context)
   }
 
   @Directive('@privilege(category: "inventory", privilege: "mutation")')
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async deleteInventories(@Arg('ids', type => [String]) ids: string[], @Ctx() context: ResolverContext): Promise<Boolean> {
+  async deleteInventories(
+    @Arg('ids', type => [String]) ids: string[],
+    @Ctx() context: ResolverContext
+  ): Promise<Boolean> {
     const { tx } = context.state
 
     await tx.getRepository(Inventory).delete({
@@ -150,8 +165,15 @@ export class InventoryMutation {
 
     let inventory: Inventory = await invQb.getOne()
     if (!inventory) throw new Error('Inventory not found')
+    const arrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
+      where: {
+        domain: { id: domain.id },
+        id: Equal(inventory.refOrderId)
+      }
+    })
 
-    if (qty > inventory.qty - (inventory?.lockedQty > 0 ? inventory.lockedQty : 0)) throw new Error('Transfer quantity exceeded inventory quantity')
+    if (qty > inventory.qty - (inventory?.lockedQty > 0 ? inventory.lockedQty : 0))
+      throw new Error('Transfer quantity exceeded inventory quantity')
 
     if (toLocation.name == inventory.location.name) throw new Error('Inventory is in current location')
 
@@ -196,14 +218,21 @@ export class InventoryMutation {
 
         await transactionInventory.transactionInventory(
           { ...inventory, qty: inventory.qty - transferQty, uomValue: inventory.uomValue - transferUomValue },
-          null,
+          arrivalNotice,
           -transferQty,
           -transferUomValue,
           INVENTORY_TRANSACTION_TYPE.RELOCATE,
           reason || null
         )
 
-        await transactionInventory.transactionInventory(newInventory, null, transferQty, transferUomValue, INVENTORY_TRANSACTION_TYPE.RELOCATE, reason || null)
+        await transactionInventory.transactionInventory(
+          newInventory,
+          arrivalNotice,
+          transferQty,
+          transferUomValue,
+          INVENTORY_TRANSACTION_TYPE.RELOCATE,
+          reason || null
+        )
 
         if (sellercraft) {
           const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
@@ -228,7 +257,14 @@ export class InventoryMutation {
           })
         }
 
-        await transactionInventory.transactionInventory(inventory, null, 0, 0, INVENTORY_TRANSACTION_TYPE.RELOCATE, reason || null)
+        await transactionInventory.transactionInventory(
+          inventory,
+          arrivalNotice,
+          0,
+          0,
+          INVENTORY_TRANSACTION_TYPE.RELOCATE,
+          reason || null
+        )
 
         if (sellercraft) {
           const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
@@ -264,7 +300,10 @@ export class InventoryMutation {
   }
 }
 
-export async function updateMultipleInventory(patches: InventoryPatch[], context: ResolverContext): Promise<Inventory[]> {
+export async function updateMultipleInventory(
+  patches: InventoryPatch[],
+  context: ResolverContext
+): Promise<Inventory[]> {
   const { domain, user, tx } = context.state
 
   let results = []
@@ -411,7 +450,12 @@ export async function updateMultipleInventory(patches: InventoryPatch[], context
         newRecord.product = (await tx.getRepository(Product).findOneBy({ id: newRecord.product.id })) as any
       }
 
-      if ((newRecord.product && newRecord.product.id) || (newRecord.bizplace && newRecord.bizplace.id) || newRecord.batchId || newRecord.packingType) {
+      if (
+        (newRecord.product && newRecord.product.id) ||
+        (newRecord.bizplace && newRecord.bizplace.id) ||
+        newRecord.batchId ||
+        newRecord.packingType
+      ) {
         if (
           inventory.bizplace.id !== (newRecord.bizplace ? newRecord.bizplace.id : '') ||
           inventory.product.id !== (newRecord.product ? newRecord.product.id : '') ||