@things-factory/worksheet-base 4.3.494 → 4.3.499

package/server/graphql/resolvers/worksheet/inspecting/inspecting-carton.ts

@@ -7,7 +7,7 @@ import { Product } from 'puppeteer'
 export const inspectingCartonResolver = {
   async inspectingCarton(
     _: any,
-    { productDetailId, cartonId, batchId, locationId, inspectedBatchNo, inspectedQty, inspectedUomValue },
+    { productDetailId, cartonId, batchId, locationId, inspectedBatchNo, inspectedQty, inspectedUomValue, inspectedExpirationDate },
     context: any
   ) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
@@ -21,7 +21,8 @@ export const inspectingCartonResolver = {
       locationId,
       inspectedBatchNo,
       inspectedQty,
-      inspectedUomValue
+      inspectedUomValue,
+      inspectedExpirationDate
     )
   }
 }
@@ -36,7 +37,8 @@ export async function executeInspectionCarton(
   locationId: string,
   inspectedBatchNo: string,
   inspectedQty: number,
-  inspectedUomValue: number
+  inspectedUomValue: number,
+  inspectedExpirationDate: Date
 ) {
   const worksheetController: CycleCountWorksheetController = new CycleCountWorksheetController(tx, domain, user)
   await worksheetController.inspectingCarton(
@@ -46,6 +48,7 @@ export async function executeInspectionCarton(
     locationId,
     inspectedBatchNo,
     inspectedQty,
-    inspectedUomValue
+    inspectedUomValue,
+    inspectedExpirationDate
   )
 }

package/server/graphql/resolvers/worksheet/inspecting/inspecting-pallet.ts

@@ -4,9 +4,9 @@ import { EntityManager } from 'typeorm'
 import { CycleCountWorksheetController } from '../../../../controllers'
 
 export const inspectingPalletResolver = {
-  async inspectingPallet(_: any, { worksheetDetailName, inspectedBatchNo, inspectedQty, inspectedUomValue }, context: any) {
+  async inspectingPallet(_: any, { worksheetDetailName, inspectedBatchNo, inspectedQty, inspectedUomValue, inspectedExpirationDate}, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    await executeInspectionPallet(tx, domain, user, worksheetDetailName, inspectedBatchNo, inspectedQty, inspectedUomValue)
+    await executeInspectionPallet(tx, domain, user, worksheetDetailName, inspectedBatchNo, inspectedQty, inspectedUomValue, inspectedExpirationDate)
   }
 }
 
@@ -17,8 +17,9 @@ export async function executeInspectionPallet(
   worksheetDetailName: string,
   inspectedBatchNo: string,
   inspectedQty: number,
-  inspectedUomValue: number
+  inspectedUomValue: number, 
+  inspectedExpirationDate: Date
 ) {
   const worksheetController: CycleCountWorksheetController = new CycleCountWorksheetController(tx, domain, user)
-  await worksheetController.inspectingPallet(worksheetDetailName, inspectedBatchNo, inspectedQty, inspectedUomValue)
+  await worksheetController.inspectingPallet(worksheetDetailName, inspectedBatchNo, inspectedQty, inspectedUomValue, inspectedExpirationDate)
 }

package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts

@@ -43,6 +43,7 @@ export const inventoriesByPalletResolver = {
         .andWhere('iv.qty > 0')
         .andWhere('iv.transfer_qty <= 0')
         .andWhere('iv.transfer_uom_value <= 0')
+      .andWhere('iv.lock_inventory != true')
         .andWhere(
           `location.type ${recallFilters?.value === true ? '' : 'NOT'} IN ('${LOCATION_TYPE.QUARANTINE}', '${
             LOCATION_TYPE.RESERVE

package/server/graphql/resolvers/worksheet/not-tally-target-inventories.ts

@@ -33,6 +33,27 @@ export const notTallyTargetInventoriesResolver = {
       .andWhere('WSD.status = :status', { status: INVENTORY_CHECK_ITEM_STATUS.NOT_TALLY })
       .getMany()
 
-    return worksheetDetails.map((wsd: WorksheetDetail) => wsd.targetInventoryCheckItem)
+      let targetInventoryCheckItem = worksheetDetails.map((wsd: WorksheetDetail) => {
+        let orgExpDate = wsd.targetInventoryCheckItem.originExpirationDate ? formatDate(wsd.targetInventoryCheckItem.originExpirationDate) : null
+        let insExpDate = wsd.targetInventoryCheckItem.inspectedExpirationDate? formatDate(wsd.targetInventoryCheckItem.inspectedExpirationDate) : null
+        return {
+          ...wsd.targetInventoryCheckItem,
+           systemExpiryDate: orgExpDate,
+           inspectedExpiryDate: insExpDate
+        }
+        })
+
+    return targetInventoryCheckItem
   }
 }
+
+function formatDate(date) {
+  const getDate = new Date(date)
+  let formatDate = {
+    year: getDate.getFullYear(),
+    month: String(getDate.getMonth() + 1).padStart(2, '0'),
+    day: String(getDate.getDate()).padStart(2, '0')
+  }
+
+  return `${formatDate.day}-${formatDate.month}-${formatDate.year}`
+}

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

@@ -34,7 +34,13 @@ export async function activatePicking(
 
     const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
       where: { orderNo: releaseGood.refNo, domain: companyDomain },
-      relations: ['marketplaceStore']
+      relations: [
+        'marketplaceStore',
+        'marketplaceStore.marketplaceDistributors',
+        'marketplaceOrderItems',
+        'marketplaceOrderItems.marketplaceOrderShippingItems',
+        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
+      ]
     })
 
     switch (orderSource) {

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

@@ -35,7 +35,13 @@ export async function activateBulkPicking(
 
     const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
       where: { orderNo: releaseGood.refNo, domain: companyDomain },
-      relations: ['marketplaceStore']
+      relations: [
+        'marketplaceStore',
+        'marketplaceStore.marketplaceDistributors',
+        'marketplaceOrderItems',
+        'marketplaceOrderItems.marketplaceOrderShippingItems',
+        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
+      ]
     })
 
     switch (orderSource) {

package/server/graphql/resolvers/worksheet/worksheet-with-pagination.ts

@@ -35,7 +35,21 @@ export const worksheetWithPaginationResolver = {
       findManyOptions.take = limit
     }
 
-    const [worksheetDetails, total] = await getRepository(WorksheetDetail).findAndCount(findManyOptions)
+    let [worksheetDetails, total] = await getRepository(WorksheetDetail).findAndCount(findManyOptions)
+
+    worksheetDetails = worksheetDetails.map(wd => {
+      let orgExpDate = wd.targetInventoryCheckItem.originExpirationDate ? formatDate(wd.targetInventoryCheckItem.originExpirationDate) : null
+      let insExpDate = wd.targetInventoryCheckItem.inspectedExpirationDate? formatDate(wd.targetInventoryCheckItem.inspectedExpirationDate) : null
+
+      return {
+        ...wd,
+        targetInventoryCheckItem: {
+          ...wd.targetInventoryCheckItem,
+          systemExpiryDate: orgExpDate,
+          inspectedExpiryDate: insExpDate
+        }
+      }
+    })
 
     return {
       worksheet,
@@ -44,3 +58,14 @@ export const worksheetWithPaginationResolver = {
     }
   }
 }
+
+function formatDate(date) {
+  const getDate = new Date(date)
+  let formatDate = {
+    year: getDate.getFullYear(),
+    month: String(getDate.getMonth() + 1).padStart(2, '0'),
+    day: String(getDate.getDate()).padStart(2, '0')
+  }
+
+  return `${formatDate.day}-${formatDate.month}-${formatDate.year}`
+}

package/server/graphql/resolvers/worksheet/worksheets.ts

@@ -552,7 +552,7 @@ export const worksheetsResolver = {
             sort.name != 'releaseRefNo' &&
             sort.name != 'returnOrderNo' &&
             sort.name != 'inventoryCheckStatus' &&
-            sort.name != 'executionDate'
+            sort.name != 'executionDate' 
           ) {
             return {
               ...acc,
@@ -619,6 +619,17 @@ export const worksheetsResolver = {
         }
       }
 
+      if (params.sortings.some(e => e.name === 'updatedAt')) {
+        // overwrite the worksheet status sorting since inventory check status is needed
+        sort = {
+          'ws.updatedAt': params.sortings[
+            params.sortings.findIndex(item => item.name == 'updatedAt')
+          ].desc
+            ? 'DESC'
+            : 'ASC'
+        }
+      }
+
       qb.orderBy(sort)
 
       let [items, total] = await qb.getManyAndCount()

package/server/graphql/types/worksheet/index.ts

@@ -28,6 +28,7 @@ import { WorksheetInfo } from './worksheet-info'
 import { WorksheetList } from './worksheet-list'
 import { WorksheetPatch } from './worksheet-patch'
 import { WorksheetWithPagination } from './worksheet-with-pagination'
+import { LocationFilter } from './location-filter'
 
 export const Mutation = /* GraphQL */ `
   createWorksheet (
@@ -100,6 +101,7 @@ export const Mutation = /* GraphQL */ `
     limit: Int
     selectedLocation: [String]
     cycleCountNo: String
+    lockInventory: Boolean
   ): CycleCountWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
   generateCycleCountWorksheetCarton (
@@ -461,6 +463,7 @@ export const Mutation = /* GraphQL */ `
     inspectedBatchNo: String!
     inspectedQty: Int!
     inspectedUomValue: Float!
+    inspectedExpirationDate: Date
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   inspectingCarton (
@@ -471,6 +474,7 @@ export const Mutation = /* GraphQL */ `
     inspectedBatchNo: String!
     inspectedQty: Int!
     inspectedUomValue: Float!
+    inspectedExpirationDate: Date
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   undoInspection (
@@ -525,6 +529,7 @@ export const Mutation = /* GraphQL */ `
     inspectedQty: Int!
     inspectedUomValue: Float!
     countNo: Int!
+    inspectedExpirationDate: Date
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
 
@@ -784,11 +789,11 @@ export const Query = /* GraphQL */ `
   ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
 
   cycleCountWorksheetForPallet (
-    inventoryCheckNo: String!, locationSortingRules: [Sorting], locationName: String, cartonId: String, palletId: String, inventoryCheckItemStatus: String
+    inventoryCheckNo: String!, locationSortingRules: [Sorting], locationName: String, cartonId: String, palletId: String, inventoryCheckItemStatus: String, locationFilter : LocationFilter
   ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
 
   cycleCountWorksheetForCarton (
-    inventoryCheckNo: String!, locationSortingRules: [Sorting], locationName: String, cartonId: String, palletId: String, inventoryCheckItemStatus: String
+    inventoryCheckNo: String!, locationSortingRules: [Sorting], locationName: String, cartonId: String, palletId: String, inventoryCheckItemStatus: String, locationFilter : LocationFilter
   ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
 
   vasCandidates (
@@ -886,5 +891,6 @@ export const Types = /* GraphQL */ [
   FindReleaseOrdersByTaskNo,
   DeliveryOrderRO,
   GenerateBatchPickInfo,
-  MultipleReleaseGoodWorksheet
+  MultipleReleaseGoodWorksheet,
+  LocationFilter
 ]

package/server/graphql/types/worksheet/location-filter.ts

@@ -0,0 +1,10 @@
+import { gql } from 'apollo-server-koa'
+
+export const LocationFilter = gql`
+  input LocationFilter {
+    zone: String
+    row: String
+    column: String
+    shelf: String
+  }
+`

package/server/graphql/types/worksheet/worksheet-detail-info.ts

@@ -35,6 +35,7 @@ export const WorksheetDetailInfo = gql`
     inspectedBatchNo: String
     inspectedQty: Int
     inspectedUomValue: Float
+    inspectedExpirationDate: String
     inspectedLocation: Location
     operationGuide: String
     set: Int

package/server/utils/lmd-util.ts

@@ -3,6 +3,7 @@ import 'jspdf'
 import fetch from 'node-fetch'
 import { Brackets, getRepository, SelectQueryBuilder, ILike } from 'typeorm'
 import { v4 as uuidv4 } from 'uuid'
+import {Domain} from '@things-factory/shell'
 
 import { InvokeCommand, LambdaClient, LogType } from '@aws-sdk/client-lambda'
 import { Attachment, uploadAwb, uploadInvoice } from '@things-factory/attachment-base'
@@ -20,6 +21,7 @@ import {
   getAccessTokenCityLink
 } from '@things-factory/integration-lmd'
 import { createReleaseGoodLog, OrderPackage, ReleaseGood } from '@things-factory/sales-base'
+import {MarketplaceOrder, MarketplaceStore} from '@things-factory/marketplace-base'
 import { Lambda } from './lambda/lambda-const'
 
 import { EcommerceController } from '../index'
@@ -411,34 +413,34 @@ export async function processAwbAndTrackingNo(orderPackages, tx, domain, user, m
 
         // update tracking no to mms then to Magento
         // comment temporarily to validate db lock
-        // const companyDomain: Domain = releaseGood.bizplace.company.domain
-        // if (!marketplaceOrder) {
-        //   marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-        //     where: { orderNo: releaseGood.refNo, domain: companyDomain },
-        //     relations: [
-        //       'marketplaceStore',
-        //       'marketplaceStore.marketplaceDistributors',
-        //       'marketplaceOrderItems',
-        //       'marketplaceOrderItems.marketplaceOrderShippingItems',
-        //       'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
-        //     ]
-        //   })
-        // }
-
-        // if (marketplaceOrder) {
-        //   const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-        //   const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
-
-        //   if (marketplaceStore?.isAutoUpdateShipment) {
-        //     await ecommerceCtrl.createOrderShip(
-        //       releaseGood,
-        //       marketplaceStore,
-        //       marketplaceOrder,
-        //       companyDomain,
-        //       tracking_no
-        //     )
-        //   }
-        // }
+        const companyDomain: Domain = releaseGood.bizplace.company.domain
+        if (!marketplaceOrder) {
+          marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+            where: { orderNo: releaseGood.refNo, domain: companyDomain },
+            relations: [
+              'marketplaceStore',
+              'marketplaceStore.marketplaceDistributors',
+              'marketplaceOrderItems',
+              'marketplaceOrderItems.marketplaceOrderShippingItems',
+              'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
+            ]
+          })
+        }
+
+        if (marketplaceOrder) {
+          const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+          const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
+
+          if (marketplaceStore?.isAutoUpdateShipment) {
+            await ecommerceCtrl.createOrderShip(
+              releaseGood,
+              marketplaceStore,
+              marketplaceOrder,
+              companyDomain,
+              tracking_no
+            )
+          }
+        }
       }
     } catch (e) {
       let releaseGoodId = orderPackage.releaseGood.id