@things-factory/worksheet-base 4.3.185 → 4.3.187

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

@@ -26,6 +26,7 @@ import {
 import { EcommerceController } from '../../../../controllers/ecommerce'
 import { WorksheetController } from '../../../../controllers/worksheet-controller'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
+import { createLmdParcel } from '../../../../utils'
 
 export const completeBatchPickingResolver = {
   async completeBatchPicking(_: any, { taskNo }, context: any) {
@@ -81,9 +82,14 @@ export async function completeBatchPicking(
           'domain',
           'creator',
           'updater',
+          'lastMileDelivery',
           'orderPackages',
+          'orderPackages.orderPackageItems',
+          'orderPackages.orderPackageItems.orderProduct',
+          'orderPackages.orderPackageItems.orderProduct.product',
           'orderProducts',
           'orderProducts.product',
+          'orderProducts.productDetail',
           'bizplace',
           'bizplace.company',
           'bizplace.company.domain'
@@ -138,7 +144,7 @@ export async function completeBatchPicking(
           if (marketplaceStore?.isAutoUpdateShipment) {
             await ecommerceCtrl.createOrderShip(foundReleaseGood, marketplaceStore, marketplaceOrder, companyDomain)
           }
-          await ecommerceCtrl.createOrderPackage(
+          foundReleaseGood = await ecommerceCtrl.createOrderPackage(
             tx,
             marketplaceOrder,
             companyDomain,
@@ -148,7 +154,7 @@ export async function completeBatchPicking(
           break
 
         default:
-          const orderPackage: OrderPackage = {
+          let orderPackage: OrderPackage = {
             name: OrderNoGenerator.orderPackage(),
             packageId: null,
             trackingNo: null,
@@ -178,8 +184,16 @@ export async function completeBatchPicking(
           })
 
           await tx.getRepository(OrderPackageItem).save(orderPackageItems)
+          orderPackage.orderPackageItems = orderPackageItems
+          foundReleaseGood.orderPackages = [orderPackage]
           break
       }
+
+      // trigger LMD API to create parcel
+      if (foundReleaseGood?.orderPackages?.length && foundReleaseGood.lmdOption && foundReleaseGood.lastMileDelivery && foundReleaseGood?.orderPackages?.some(op => op.parcelId == null)){
+        await createLmdParcel([foundReleaseGood], tx)
+      }
+      //
     }
 
     const pickPackTargetInventories: OrderInventory[] = targetInventories