@things-factory/worksheet-base 4.3.393 → 4.3.395

package/server/graphql/resolvers/worksheet/picking/bulk-activate-picking.ts

@@ -17,6 +17,7 @@ import {
   PickingWorksheetController
 } from '../../../../controllers'
 import { Worksheet } from '../../../../entities'
+import { createLmdParcel } from '../../../../utils'
 
 export const activateBulkPickingResolver = {
   async activateBulkPicking(_: any, { worksheetNo }, context: any) {
@@ -33,6 +34,7 @@ export async function activateBulkPicking(
   worksheetNo: string[]
 ): Promise<Worksheet[]> {
   const worksheetController: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
+  const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
   const worksheets = await worksheetController.activateBulkPicking(worksheetNo)
 
   for (const worksheet of worksheets) {
@@ -40,6 +42,11 @@ export async function activateBulkPicking(
     let releaseGood: ReleaseGood = worksheet.releaseGood
     const orderSource: string = releaseGood.source
 
+    const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+      where: { orderNo: releaseGood.refNo, domain: companyDomain },
+      relations: ['marketplaceStore']
+    })
+
     switch (orderSource) {
       case ApplicationType.MMS:
         // find for any existing marketplace store connections
@@ -56,11 +63,6 @@ export async function activateBulkPicking(
             await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain)
           }
 
-          const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-            where: { orderNo: releaseGood.refNo, domain: companyDomain },
-            relations: ['marketplaceStore']
-          })
-
           if (marketplaceOrder) {
             const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
 
@@ -68,12 +70,35 @@ export async function activateBulkPicking(
               const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
               await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PICKING)
             }
+
+            await ecommerceCtrl.createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, releaseGood)
           }
         }
         break
       default:
         break
     }
+
+    if (
+      releaseGood?.orderPackages?.length &&
+      releaseGood.lmdOption &&
+      releaseGood.lastMileDelivery &&
+      releaseGood?.orderPackages?.some(op => op.parcelId == null)
+    ) {
+      await createLmdParcel([releaseGood], tx, domain, user, marketplaceOrder)
+
+      //where to trigger update parcel count
+      let countParcel = releaseGood?.countParcel ? releaseGood.countParcel : 0
+      const releaseGoodId = releaseGood?.id
+
+      await tx.getRepository(ReleaseGood).update(
+        { id: releaseGoodId },
+        {
+          countParcel: countParcel+1,
+          updater: user.id
+        }
+      )
+    }
   }
   return worksheets
 }

package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts

@@ -1,13 +1,22 @@
-import { EntityManager, getManager, In } from 'typeorm'
+import {
+  EntityManager,
+  getManager,
+  In
+} from 'typeorm'
 
-import { ApplicationType, User } from '@things-factory/auth-base'
-import { Bizplace, getMyBizplace } from '@things-factory/biz-base'
+import {
+  ApplicationType,
+  User
+} from '@things-factory/auth-base'
 import { logger } from '@things-factory/env'
 import { Account } from '@things-factory/integration-accounting'
 import { sqsSendMessage } from '@things-factory/integration-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Powrup } from '@things-factory/integration-powrup'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
+import {
+  Sellercraft,
+  SellercraftStatus
+} from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder } from '@things-factory/marketplace-base'
 import {
   ORDER_STATUS,
@@ -23,15 +32,17 @@ import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
 import {
+  createOrderPackageAndItems,
   PackingWorksheetController,
   PickingWorksheetController,
   SellercraftController,
   SortingWorksheetController
 } from '../../../../controllers/'
 import { EcommerceController } from '../../../../controllers/ecommerce'
-import { WorksheetController } from '../../../../controllers/worksheet-controller'
-import { Worksheet, WorksheetDetail } from '../../../../entities'
-import { createLmdParcel } from '../../../../utils'
+import {
+  Worksheet,
+  WorksheetDetail
+} from '../../../../entities'
 
 export const completeBatchPickingResolver = {
   async completeBatchPicking(_: any, { taskNo }, context: any) {
@@ -209,55 +220,22 @@ export async function completeBatchPicking(
             break
 
           default:
-            let orderPackage: OrderPackage = {
-              name: OrderNoGenerator.orderPackage(),
-              packageId: null,
-              trackingNo: null,
-              transporter: null,
-              airwayBill: null,
-              status: ORDER_STATUS.PROCESSING,
-              releaseGood: foundReleaseGood,
-              domain: foundReleaseGood.domain,
-              bizplace: foundReleaseGood.bizplace,
-              creator: foundReleaseGood.creator,
-              updater: foundReleaseGood.updater
-            }
-
-            let savedOrderPackage: OrderPackage = await tx.getRepository(OrderPackage).save(orderPackage)
-            const orderPackageItems: OrderPackageItem[] = foundReleaseGood.orderProducts.map(op => {
-              if (op.product){
-                return {
-                  name: OrderNoGenerator.orderPackageItem(),
-                  orderProduct: op,
-                  status: ORDER_STATUS.PROCESSING,
-                  releaseQty: op.releaseQty,
-                  orderPackage: savedOrderPackage,
-                  domain: foundReleaseGood.domain,
-                  bizplace: foundReleaseGood.bizplace,
-                  creator: foundReleaseGood.creator,
-                  updater: foundReleaseGood.updater,
-                  productDetail: op.productDetail
-                }
-              } else {
-                let productBundle = op.productBundle
-                return productBundle.productBundleSettings.map(pbs => ({
-                  name: OrderNoGenerator.orderPackageItem(),
-                  orderProduct: op,
-                  status: ORDER_STATUS.PROCESSING,
-                  releaseQty: op.releaseQty * pbs.bundleQty,
-                  orderPackage: savedOrderPackage,
-                  domain: foundReleaseGood.domain,
-                  bizplace: foundReleaseGood.bizplace,
-                  creator: foundReleaseGood.creator,
-                  updater: foundReleaseGood.updater,
-                  productDetail: pbs.productDetail
-                }))
+            if(!foundReleaseGood?.orderPackages?.length){
+              let orderPackage: OrderPackage = {
+                name: OrderNoGenerator.orderPackage(),
+                packageId: null,
+                trackingNo: null,
+                transporter: null,
+                airwayBill: null,
+                status: ORDER_STATUS.PROCESSING,
+                releaseGood: foundReleaseGood,
+                domain: foundReleaseGood.domain,
+                bizplace: foundReleaseGood.bizplace,
+                creator: foundReleaseGood.creator,
+                updater: foundReleaseGood.updater
               }
-            }).flat()
-
-            await tx.getRepository(OrderPackageItem).save(orderPackageItems)
-            orderPackage.orderPackageItems = orderPackageItems
-            foundReleaseGood.orderPackages = [orderPackage]
+            
+            await createOrderPackageAndItems(tx, foundReleaseGood, orderPackage)
             break
         }
 
@@ -308,7 +286,6 @@ export async function completeBatchPicking(
           foundReleaseGood.lastMileDelivery &&
           foundReleaseGood?.orderPackages?.some(op => op.parcelId == null)
         ) {
-          await createLmdParcel([foundReleaseGood], tx, domain, user, marketplaceOrder)
           // trigger RTS
           try {
             const orderSource: string = foundReleaseGood.source
@@ -360,6 +337,7 @@ export async function completeBatchPicking(
       }
 
       return false
+    }
     } else {
       let foundObsoleteInventories: any = worksheet
       await tx.getRepository(Inventory).update({ id: In(foundObsoleteInventories) }, { obsolete: true })

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

@@ -57,6 +57,7 @@ import {
   WORKSHEET_TYPE
 } from '../../../../constants'
 import {
+  createOrderPackageAndItems,
   LoadingWorksheetController,
   PackingWorksheetController,
   PickingWorksheetController,
@@ -70,7 +71,6 @@ import {
   WorksheetDetail,
   ActiveWorksheetPickingView
 } from '../../../../entities'
-import { createLmdParcel } from '../../../../utils'
 import { activateVas } from '../vas/activate-vas'
 
 export const completePickingResolver = {
@@ -359,6 +359,7 @@ export async function completePicking(
             break
 
           default:
+            if (!releaseGood?.orderPackages?.length) {
             let orderPackage: OrderPackage = {
               name: OrderNoGenerator.orderPackage(),
               packageId: null,
@@ -374,40 +375,8 @@ export async function completePicking(
               updater: releaseGood.updater
             }
 
-            let savedOrderPackage: OrderPackage = await tx.getRepository(OrderPackage).save(orderPackage)
-            const orderPackageItems: OrderPackageItem[] = releaseGood.orderProducts.map(op => {
-              if (op.product){
-                return {
-                  name: OrderNoGenerator.orderPackageItem(),
-                  orderProduct: op,
-                  status: ORDER_STATUS.PROCESSING,
-                  releaseQty: op.releaseQty,
-                  orderPackage: savedOrderPackage,
-                  domain: releaseGood.domain,
-                  bizplace: releaseGood.bizplace,
-                  creator: releaseGood.creator,
-                  updater: releaseGood.updater,
-                  productDetail: op.productDetail
-                }
-              } else {
-                let productBundle = op.productBundle
-                return productBundle.productBundleSettings.map(pbs => ({
-                  name: OrderNoGenerator.orderPackageItem(),
-                  orderProduct: op,
-                  status: ORDER_STATUS.PROCESSING,
-                  releaseQty: op.releaseQty * pbs.bundleQty,
-                  orderPackage: savedOrderPackage,
-                  domain: releaseGood.domain,
-                  bizplace: releaseGood.bizplace,
-                  creator: releaseGood.creator,
-                  updater: releaseGood.updater,
-                  productDetail: pbs.productDetail
-                }))
-              }
-            }).flat()
-            await tx.getRepository(OrderPackageItem).save(orderPackageItems)
-            orderPackage.orderPackageItems = orderPackageItems
-            releaseGood.orderPackages = [orderPackage]
+            await createOrderPackageAndItems(tx, releaseGood, orderPackage)
+            }
             break
         }
 
@@ -515,7 +484,6 @@ export async function completePicking(
           releaseGood.lastMileDelivery &&
           releaseGood?.orderPackages?.some(op => op.parcelId == null)
         ) {
-          await createLmdParcel([releaseGood], tx, domain, user, marketplaceOrder)
           // trigger RTS
           try {
             const orderSource: string = releaseGood.source

package/server/index.ts

@@ -16,3 +16,5 @@ export * from './controllers/render-orientage-grn'
 export * from './controllers/render-orientage-do'
 export * from './controllers/render-ro-do'
 export * from './controllers/ecommerce/ecommerce-controller'
+
+export {createOrderPackageAndItems} from './controllers/outbound/picking-worksheet-controller'