@things-factory/worksheet-base 4.3.430 → 4.3.434

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

@@ -372,6 +372,7 @@ export class PickingWorksheetController extends VasWorksheetController {
           break
 
         default:
+          if (!releaseGood?.orderPackages?.length){
           let orderPackage: OrderPackage = {
             name: OrderNoGenerator.orderPackage(),
             packageId: null,
@@ -387,6 +388,7 @@ export class PickingWorksheetController extends VasWorksheetController {
             updater: releaseGood.updater
           }
           await createOrderPackageAndItems(this.trxMgr, releaseGood, orderPackage)
+        }
           break
       }
     } catch (error) {
@@ -2631,6 +2633,7 @@ export class PickingWorksheetController extends VasWorksheetController {
               break
 
             default:
+              if(!releaseGood?.orderPackages?.length){
               let orderPackage: OrderPackage = {
                 name: OrderNoGenerator.orderPackage(),
                 packageId: null,
@@ -2646,6 +2649,7 @@ export class PickingWorksheetController extends VasWorksheetController {
                 updater: releaseGood.updater
               }
               await createOrderPackageAndItems(this.trxMgr, releaseGood, orderPackage)
+            }
               break
           }
         } catch (e) {

package/server/controllers/render-manual-do.ts

@@ -101,10 +101,13 @@ export async function renderManualDO({ doNo }, context: any) {
 
   // #8. find truck driver name
   let foundDriver: any = null
+  let foundDriverCode: any = null
   if (foundDO?.ownCollection && foundDO?.otherDriver) {
     foundDriver = foundDO.otherDriver
+    foundDriverCode = foundDO.otherDriverCode
   } else {
     foundDriver = foundDO.transportDriver.name
+    foundDriverCode = foundDO.transportDriver.driverCode
   }
 
   // #9. get product data
@@ -207,6 +210,7 @@ export async function renderManualDO({ doNo }, context: any) {
     delivery_date: foundDO.deliveryDate || '',
     truck_no: foundDO.truckNo,
     driver_name: foundDriver || '',
+    driver_code: foundDriverCode || '',
     pallet_qty: foundDO.palletQty,
     worker_name: '',
     do_remark: foundDO.remark,

package/server/controllers/render-ro-do.ts

@@ -151,11 +151,14 @@ export async function renderRODO({ doNo }, context: any) {
   })
 
   let foundDriver: any = null
+  let foundDriverCode: any = null
   if (foundDO.status !== ORDER_STATUS.READY_TO_DISPATCH) {
     if (foundDO?.ownCollection && foundDO?.otherDriver) {
       foundDriver = foundDO.otherDriver
+      foundDriverCode = foundDO.otherDriverCode
     } else {
       foundDriver = foundDO?.transportDriver?.name
+      foundDriverCode = foundDO?.transportDriver?.driverCode
     }
   }
 
@@ -382,6 +385,7 @@ export async function renderRODO({ doNo }, context: any) {
     ro_created_date: DateTimeConverter.date(foundRO.createdAt),
     truck_no: foundDO.truckNo,
     driver_name: foundDriver || '',
+    driver_code: foundDriverCode || '',
     pallet_qty: foundDO.palletQty,
     worker_name: foundWS.updater.name,
     do_remark: foundDO.remark,

package/server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts

@@ -78,9 +78,11 @@ export const deliveryOrderByWorksheetResolver = {
           deliverTo: foundDO.contactPointRefId || '',
           deliveryDate: foundDO.deliveryDate || '',
           driverName: foundTransportDriver.name,
+          driverCode: foundTransportDriver.driverCode,
           otherDestination: foundDO.otherDestination || false,
           contactName: foundDO.contactName || '',
           otherDriver: foundDO.otherDriver || '',
+          otherDriverCode: foundDO.otherDriverCode || '',
           looseItem: foundDO.looseItem || false,
           remark: foundDO.remark || '',
           reusablePallet: foundDO.reusablePallet || '',

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

@@ -1,29 +1,18 @@
-import {
-  EntityManager,
-  getManager,
-  In
-} from 'typeorm'
+import { EntityManager, getManager, In } from 'typeorm'
 
-import {
-  ApplicationType,
-  User
-} from '@things-factory/auth-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,
   OrderInventory,
   OrderNoGenerator,
   OrderPackage,
-  OrderPackageItem,
   PowrupController,
   ReleaseGood
 } from '@things-factory/sales-base'
@@ -39,10 +28,7 @@ import {
   SortingWorksheetController
 } from '../../../../controllers/'
 import { EcommerceController } from '../../../../controllers/ecommerce'
-import {
-  Worksheet,
-  WorksheetDetail
-} from '../../../../entities'
+import { Worksheet, WorksheetDetail } from '../../../../entities'
 
 export const completeBatchPickingResolver = {
   async completeBatchPicking(_: any, { taskNo }, context: any) {
@@ -167,7 +153,6 @@ export async function completeBatchPicking(
                   if (rtsTriggerLevel && parseInt(rtsTriggerLevel?.value || 0) == 1) {
                     await sellercraftCtrl.initiateOrderShipment(sellercraft, foundReleaseGood)
                   }
-                  
                 })
               }
 
@@ -220,7 +205,7 @@ export async function completeBatchPicking(
             break
 
           default:
-            if(!foundReleaseGood?.orderPackages?.length){
+            if (!foundReleaseGood?.orderPackages?.length) {
               let orderPackage: OrderPackage = {
                 name: OrderNoGenerator.orderPackage(),
                 packageId: null,
@@ -234,8 +219,9 @@ export async function completeBatchPicking(
                 creator: foundReleaseGood.creator,
                 updater: foundReleaseGood.updater
               }
-            
-            await createOrderPackageAndItems(tx, foundReleaseGood, orderPackage)
+
+              await createOrderPackageAndItems(tx, foundReleaseGood, orderPackage)
+            }
             break
         }
 
@@ -309,35 +295,32 @@ export async function completeBatchPicking(
           } catch (e) {
             logger.error(`[get-lmd-awb-sof-trigger]: ${e}`)
           }
-          //
         }
-        //
-      }
 
-      // generate packing worksheet based on orders WITH packing option
-      const pickPackOrders: ReleaseGood[] = uniqueReleaseGoods.filter(rg => rg.packingOption)
+        // generate packing worksheet based on orders WITH packing option
+        const pickPackOrders: ReleaseGood[] = uniqueReleaseGoods.filter(rg => rg.packingOption)
 
-      if (pickPackOrders?.length) {
-        const roNoList: string[] = pickPackOrders.map((rg: ReleaseGood) => rg.name)
-        const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
-        await packingWSCtrl.generatePackingWorksheetByBulk(roNoList)
-      }
+        if (pickPackOrders?.length) {
+          const roNoList: string[] = pickPackOrders.map((rg: ReleaseGood) => rg.name)
+          const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
+          await packingWSCtrl.generatePackingWorksheetByBulk(roNoList)
+        }
 
-      // generate packing worksheet with orderInventory based on orders WITHOUT packing option
-      const pickSortTargetInventories: OrderInventory[] = targetInventories
-        .filter(targetInventory => !targetInventory.releaseGood.packingOption)
-        .map((pickSortTargetInventory: OrderInventory) => {
-          return pickSortTargetInventory
-        })
+        // generate packing worksheet with orderInventory based on orders WITHOUT packing option
+        const pickSortTargetInventories: OrderInventory[] = targetInventories
+          .filter(targetInventory => !targetInventory.releaseGood.packingOption)
+          .map((pickSortTargetInventory: OrderInventory) => {
+            return pickSortTargetInventory
+          })
 
-      // loop to generate sorting worksheet
-      if (pickSortTargetInventories?.length) {
-        const sortingWSCtrl: SortingWorksheetController = new SortingWorksheetController(tx, domain, user)
-        await sortingWSCtrl.generateSortingWorksheet(worksheet, pickSortTargetInventories)
-      }
+        // loop to generate sorting worksheet
+        if (pickSortTargetInventories?.length) {
+          const sortingWSCtrl: SortingWorksheetController = new SortingWorksheetController(tx, domain, user)
+          await sortingWSCtrl.generateSortingWorksheet(worksheet, pickSortTargetInventories)
+        }
 
-      return false
-    }
+        return false
+      }
     } else {
       let foundObsoleteInventories: any = worksheet
       await tx.getRepository(Inventory).update({ id: In(foundObsoleteInventories) }, { obsolete: true })

package/server/graphql/types/worksheet/delivery-order-info.ts

@@ -10,9 +10,11 @@ export const DeliveryOrderInfo = gql`
     deliverTo: String
     deliveryDate: String
     driverName: String
+    driverCode: String
     otherDestination: Boolean
     contactName: String
     otherDriver: String
+    otherDriverCode: String
     looseItem: Boolean
     remark: String
     reusablePallet: String

package/server/utils/lmd-util.ts

@@ -93,8 +93,9 @@ export async function createLmdParcel(releaseGoods, tx, domain, user, marketplac
         }
 
         if (lmd?.platform == 'CITYLINK') {
-          const currentDate = new Date().toISOString()
-          if (currentDate > lmd?.expiresIn) {
+          const currentDate = new Date()
+          let expiredDate = new Date(lmd?.expiresIn)
+          if (currentDate > expiredDate) {
             let lastMileDelivery = await getAccessTokenCityLink(lmd?.id, { state: { tx } })
             lmd.accessToken = lastMileDelivery.accessToken
           }