@things-factory/worksheet-base 4.3.27 → 4.3.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.27",
+  "version": "4.3.28",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -29,16 +29,16 @@
     "@things-factory/document-template-base": "^4.3.27",
     "@things-factory/id-rule-base": "^4.3.27",
     "@things-factory/integration-lmd": "^4.3.27",
-    "@things-factory/integration-marketplace": "^4.3.27",
-    "@things-factory/integration-sellercraft": "^4.3.27",
+    "@things-factory/integration-marketplace": "^4.3.28",
+    "@things-factory/integration-sellercraft": "^4.3.28",
     "@things-factory/integration-sftp": "^4.3.27",
-    "@things-factory/marketplace-base": "^4.3.27",
+    "@things-factory/marketplace-base": "^4.3.28",
     "@things-factory/notification": "^4.3.27",
-    "@things-factory/sales-base": "^4.3.27",
+    "@things-factory/sales-base": "^4.3.28",
     "@things-factory/setting-base": "^4.3.27",
     "@things-factory/shell": "^4.3.27",
     "@things-factory/transport-base": "^4.3.27",
-    "@things-factory/warehouse-base": "^4.3.27"
+    "@things-factory/warehouse-base": "^4.3.28"
   },
-  "gitHead": "52398bed65c4cf97263cd983c2c518e882ddbcde"
+  "gitHead": "f1af695e2848b49871ca1d4f1661a5620ed428da"
 }

package/server/controllers/outbound/picking-worksheet-controller.ts

@@ -5,6 +5,7 @@ import { generateId } from '@things-factory/id-rule-base'
 import { Product, ProductDetail } from '@things-factory/product-base'
 import {
   ORDER_INVENTORY_STATUS,
+  ORDER_PRODUCT_STATUS,
   ORDER_STATUS,
   OrderInventory,
   OrderNoGenerator,
@@ -344,7 +345,8 @@ export class PickingWorksheetController extends VasWorksheetController {
       'worksheetDetails',
       'worksheetDetails.targetInventory',
       'worksheetDetails.targetInventory.inventory',
-      'worksheetDetails.targetInventory.product'
+      'worksheetDetails.targetInventory.product',
+      'worksheetDetails.targetInventory.orderProduct'
     ])
 
     const worksheetDetails: WorksheetDetail[] = await this.extractMatchedWorksheetDetails(
@@ -353,7 +355,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       productId,
       packingType,
       packingSize,
-      ['targetInventory', 'targetInventory.inventory']
+      ['targetInventory', 'targetInventory.inventory', 'targetInventory.orderProduct']
     )
 
     let worksheetDetailIds: string[] = []
@@ -370,6 +372,13 @@ export class PickingWorksheetController extends VasWorksheetController {
       inventory.lockedQty = inventory.lockedQty - targetInventory.releaseQty
       inventory.lockedUomValue = inventory.lockedUomValue - targetInventory.releaseUomValue
       await this.updateInventory(inventory)
+
+      await this.trxMgr
+        .getRepository(OrderProduct)
+        .update(
+          { id: targetInventory.orderProduct.id },
+          { status: ORDER_PRODUCT_STATUS.PENDING_ASSIGN, updater: this.user }
+        )
     }
 
     await this.trxMgr.getRepository(WorksheetDetail).delete(worksheetDetailIds)

package/server/graphql/resolvers/worksheet/putaway/complete-putaway.ts

@@ -1,13 +1,56 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
+import { MarketplaceStore } from '@things-factory/integration-marketplace'
+import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
+import { ArrivalNotice } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { PutawayWorksheetController } from '../../../../controllers'
+import { EcommerceController, SellercraftController } from '../../../../controllers/ecommerce'
 import { Worksheet } from '../../../../entities'
 
 export const completePutawayResolver = {
   async completePutaway(_: any, { arrivalNoticeNo }, context: any) {
     const { tx, user, domain }: { tx: EntityManager; user: User; domain: Domain } = context.state
     await completePutaway(tx, domain, user, arrivalNoticeNo)
+
+    const arrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
+      where: { domain, name: arrivalNoticeNo },
+      relations: [
+        'purchaseOrder',
+        'bizplace',
+        'bizplace.domain',
+        'bizplace.company',
+        'bizplace.company.domain',
+        'orderProducts',
+        'orderProducts.product',
+        'orderProducts.product.productDetails',
+        'orderProducts.product.productDetails.childProductDetail'
+      ]
+    })
+
+    // search for any active marketplace connection
+    const companyDomain: Domain = arrivalNotice.bizplace.company.domain
+    const customerDomain: Domain = arrivalNotice.bizplace.domain
+    const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
+      where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
+      relations: ['marketplaceDistributors']
+    })
+
+    const sellercraft: Sellercraft = await tx
+      .getRepository(Sellercraft)
+      .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
+
+    if (sellercraft) {
+      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+      await sellercraftCtrl.registerProductInbound(sellercraft, arrivalNotice)
+    }
+
+    if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
+      const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+      await ecommerceCtrl.updateProductVariationStock(marketplaceStores, arrivalNotice.orderProducts, companyDomain)
+    }
   }
 }
 
@@ -28,4 +71,4 @@ export async function completePutaway(
       relations: ['bizplace', 'arrivalNotice']
     })
   }
-} 
+}

package/server/graphql/resolvers/worksheet/unloading/complete-unloading.ts

@@ -2,15 +2,12 @@ import { EntityManager, In } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { MarketplaceStore } from '@things-factory/integration-marketplace'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { ArrivalNotice, generateGoodsReceivalNote } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS } from '../../../../constants'
 import { PutawayWorksheetController, UnloadingWorksheetController } from '../../../../controllers'
-import { EcommerceController, SellercraftController } from '../../../../controllers/ecommerce'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
 
 export const completeUnloadingResolver = {
@@ -40,28 +37,6 @@ export const completeUnloadingResolver = {
       where: { domain, refOrderId: arrivalNotice.id, status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED]) }
     })
 
-    // search for any active marketplace connection
-    const companyDomain: Domain = arrivalNotice.bizplace.company.domain
-    const customerDomain: Domain = arrivalNotice.bizplace.domain
-    const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
-      where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
-      relations: ['marketplaceDistributors']
-    })
-
-    const sellercraft: Sellercraft = await tx
-      .getRepository(Sellercraft)
-      .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
-
-    if (sellercraft) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.registerProductInbound(sellercraft, arrivalNotice)
-    }
-
-    if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
-      const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-      await ecommerceCtrl.updateProductVariationStock(marketplaceStores, arrivalNotice.orderProducts, companyDomain)
-    }
-
     putawayWorksheet = await putawayWSCtrl.generatePutawayWorksheet(arrivalNotice.name, inventories)
 
     if (putawayWorksheet.status === WORKSHEET_STATUS.DEACTIVATED) {

package/server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details-by-bulk.ts

@@ -3,6 +3,7 @@ import { EntityManager, getRepository } from 'typeorm'
 import { User } from '@things-factory/auth-base'
 import {
   ORDER_INVENTORY_STATUS,
+  ORDER_PRODUCT_STATUS,
   ORDER_TYPES,
   OrderInventory,
   OrderNoGenerator,
@@ -126,6 +127,14 @@ export const generateBatchPickingWorksheetDetailsByBulkResolver = {
                     .where('id = :id', { id: targetInventory.id })
                   await qbInv.execute()
 
+                  // update order product status to ASSIGNED
+                  await tx
+                    .getRepository(OrderProduct)
+                    .update(
+                      { id: orderInventory.orderProduct.id },
+                      { status: ORDER_PRODUCT_STATUS.ASSIGNED, updater: user }
+                    )
+
                   // Create new order inventory with status -> READY_TO_PICK, type -> RELEASE_OF_GOODS
                   let newTargetInventory: OrderInventory = new OrderInventory()
                   newTargetInventory = {

package/server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details.ts

@@ -1,12 +1,20 @@
+import { EntityManager } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
 import { Product } from '@things-factory/product-base'
-import { OrderInventory, OrderNoGenerator, ORDER_INVENTORY_STATUS } from '@things-factory/sales-base'
+import {
+  ORDER_INVENTORY_STATUS,
+  ORDER_PRODUCT_STATUS,
+  OrderInventory,
+  OrderNoGenerator,
+  OrderProduct
+} from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
-import { EntityManager } from 'typeorm'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 import { WorksheetNoGenerator } from '../../../utils'
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
 
 export const generateBatchPickingWorksheetDetailsResolver = {
   async generateBatchPickingWorksheetDetails(
@@ -124,6 +132,11 @@ export const generateBatchPickingWorksheetDetailsResolver = {
           }
         )
 
+        // update order product status to ASSIGNED
+        await tx
+          .getRepository(OrderProduct)
+          .update({ id: prevOrdInv.orderProduct.id }, { status: ORDER_PRODUCT_STATUS.ASSIGNED, updater: user })
+
         // Generate Worksheet Detail
         let newWorksheetDetail: WorksheetDetail = new WorksheetDetail()
         newWorksheetDetail = {

package/server/graphql/resolvers/worksheet-detail/generate-picking-worksheet-details.ts

@@ -3,12 +3,13 @@ import { EntityManager } from 'typeorm'
 import { User } from '@things-factory/auth-base'
 import {
   ORDER_INVENTORY_STATUS,
+  ORDER_PRODUCT_STATUS,
   ORDER_TYPES,
   OrderInventory,
   OrderInventoryPatch,
   OrderNoGenerator,
-  ReleaseGood,
-  OrderProduct
+  OrderProduct,
+  ReleaseGood
 } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
@@ -117,6 +118,11 @@ export const generatePickingWorksheetDetailsResolver = {
           .where('id = :id', { id: targetInventory.inventory.id })
           .execute()
 
+        // update order product status to ASSIGNED
+        await tx
+          .getRepository(OrderProduct)
+          .update({ id: targetInventory.orderProduct.id }, { status: ORDER_PRODUCT_STATUS.ASSIGNED, updater: user })
+
         // 7. collect new worksheet details records
         const worksheetDetail: WorksheetDetail = Object.assign(new WorksheetDetail(), {
           domain,

package/server/graphql/resolvers/worksheet-detail/generate-release-good-worksheet-details.ts

@@ -2,7 +2,13 @@ import { EntityManager } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Product } from '@things-factory/product-base'
-import { ORDER_INVENTORY_STATUS, OrderInventory, OrderNoGenerator, OrderProduct } from '@things-factory/sales-base'
+import {
+  ORDER_INVENTORY_STATUS,
+  ORDER_PRODUCT_STATUS,
+  OrderInventory,
+  OrderNoGenerator,
+  OrderProduct
+} from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
@@ -110,6 +116,11 @@ export async function generateReleaseGoodWorksheetDetails(
         updater: user
       })
 
+      // update order product status to ASSIGNED
+      await tx
+        .getRepository(OrderProduct)
+        .update({ id: targetProduct.id }, { status: ORDER_PRODUCT_STATUS.ASSIGNED, updater: user })
+
       // 3. Create worksheet details
       await tx.getRepository(WorksheetDetail).save({
         ...wsd,