@things-factory/worksheet-base 4.3.493 → 4.3.495

package/server/controllers/inspect/cycle-count-worksheet-controller.ts

@@ -27,7 +27,8 @@ export class CycleCountWorksheetController extends WorksheetController {
     executionDate: string,
     inventoryCheckItem: InventoryCheckItem[],
     selectedLocation: string[],
-    limit: number
+    limit: number,
+    lockInventory: Boolean
   ): Promise<Worksheet> {
     const cycleCount: InventoryCheck = await generateCycleCount(
       this.trxMgr,
@@ -114,6 +115,7 @@ export class CycleCountWorksheetController extends WorksheetController {
       targetInventoryCheckItem.originQty = inventory.qty
       targetInventoryCheckItem.originWeight = 0
       targetInventoryCheckItem.originUomValue = inventory.uomValue
+      targetInventoryCheckItem.originExpirationDate = inventory.expirationDate
       targetInventoryCheckItem.originBatchNo = inventory.batchId
       targetInventoryCheckItem.originLocation = inventory.location
       targetInventoryCheckItem.inventory = inventory
@@ -123,15 +125,16 @@ export class CycleCountWorksheetController extends WorksheetController {
       targetInventoryCheckItem.creator = this.user
       targetInventoryCheckItem.updater = this.user
       targetInventoryCheckItems.push(targetInventoryCheckItem)
-
-      inventory.updater = this.user
     }
 
     targetInventoryCheckItems = await this.trxMgr
       .getRepository(InventoryCheckItem)
       .save(targetInventoryCheckItems, { chunk: 500 })
 
-    inventories = await this.trxMgr.getRepository(Inventory).save(inventories, { chunk: 500 })
+    await this.trxMgr.getRepository(Inventory).update(
+      inventories.map(itm => itm.id),
+      { updater: this.user, lockInventory: lockInventory }
+    )
 
     let cycleCountWorksheetDetails: WorksheetDetail[] = []
     for (let i: number = 0; i < targetInventoryCheckItems.length; i++) {
@@ -202,10 +205,12 @@ export class CycleCountWorksheetController extends WorksheetController {
         nextRoundItem.originUomValue = currentItem.inspectedUomValue || currentItem.originUomValue
         nextRoundItem.originBatchNo = currentItem.inspectedBatchNo || currentItem.originBatchNo
         nextRoundItem.originLocation = currentItem.inspectedLocationId || currentItem.originLocationId
+        nextRoundItem.originExpirationDate = currentItem.inspectedExpirationDate
         nextRoundItem.inspectedQty = null
         nextRoundItem.inspectedUomValue = null
         nextRoundItem.inspectedBatchNo = null
         nextRoundItem.inspectedLocationId = null
+        nextRoundItem.inspectedExpirationDate = null
         nextRoundItem.countNo = currentItem.countNo + 1
         nextRoundItem.inventory = currentItem.inventoryId
         nextRoundItem.product = currentItem.productId
@@ -428,7 +433,8 @@ export class CycleCountWorksheetController extends WorksheetController {
     inventoryCheckItem: InventoryCheckItem[] = [],
     limit: number = 0,
     selectedLocation: string[] = [],
-    cycleCountNo: string
+    cycleCountNo: string,
+    lockInventory?: Boolean
   ): Promise<Worksheet> {
     const customerBizplace: Bizplace = await this.trxMgr.getRepository(Bizplace).findOne(customerId)
 
@@ -495,7 +501,8 @@ export class CycleCountWorksheetController extends WorksheetController {
         executionDate,
         inventoryCheckItem,
         selectedLocation,
-        limit
+        limit,
+        lockInventory
       )
     }
   }
@@ -626,7 +633,8 @@ export class CycleCountWorksheetController extends WorksheetController {
     worksheetDetailName: string,
     inspectedBatchNo: string,
     inspectedQty: number,
-    inspectedUomValue: number
+    inspectedUomValue: number,
+    inspectedExpirationDate: Date
   ): Promise<void> {
     let worksheetDetail: WorksheetDetail = await this.findExecutableWorksheetDetailByName(
       worksheetDetailName,
@@ -639,11 +647,24 @@ export class CycleCountWorksheetController extends WorksheetController {
       originBatchNo,
       originQty,
       originUomValue,
+      originExpirationDate,
       originLocationId
-    }: { originBatchNo: string; originQty: number; originUomValue: number, originLocationId: string } = targetInventoryCheckItem
+    }: {
+      originBatchNo: string
+      originQty: number
+      originUomValue: number
+      originExpirationDate: Date
+      originLocationId: string
+    } = targetInventoryCheckItem
+
+    let checkedExpDate = inspectedExpirationDate ? formatDate(inspectedExpirationDate) : null
+    let checkOrgExpDate = originExpirationDate?.toString() || null
 
     const isChanged: boolean =
-      originBatchNo !== inspectedBatchNo || originQty !== inspectedQty || originUomValue !== inspectedUomValue
+      originBatchNo !== inspectedBatchNo ||
+      originQty !== inspectedQty ||
+      originUomValue !== inspectedUomValue ||
+      checkedExpDate !== checkOrgExpDate
     const worksheetDetailStatus: string = isChanged ? WORKSHEET_STATUS.NOT_TALLY : WORKSHEET_STATUS.DONE
     const targetInventoryCheckItemStatus: string = isChanged
       ? INVENTORY_CHECK_ITEM_STATUS.NOT_TALLY
@@ -656,6 +677,7 @@ export class CycleCountWorksheetController extends WorksheetController {
     targetInventoryCheckItem.inspectedBatchNo = inspectedBatchNo
     targetInventoryCheckItem.inspectedQty = inspectedQty
     targetInventoryCheckItem.inspectedUomValue = inspectedUomValue
+    targetInventoryCheckItem.inspectedExpirationDate = checkedExpDate
     targetInventoryCheckItem.inspectedLocation = originLocationId
     targetInventoryCheckItem.status = targetInventoryCheckItemStatus
     targetInventoryCheckItem.updater = this.user
@@ -669,7 +691,8 @@ export class CycleCountWorksheetController extends WorksheetController {
     locationId: string,
     inspectedBatchNo: string,
     inspectedQty: number,
-    inspectedUomValue: number
+    inspectedUomValue: number,
+    inspectedExpirationDate: Date
   ): Promise<void> {
     const productDetail: ProductDetail = await this.trxMgr.getRepository(ProductDetail).findOne({
       where: { id: productDetailId },
@@ -715,23 +738,24 @@ export class CycleCountWorksheetController extends WorksheetController {
       .andWhere('inventoryCheckItem.status = :status', { status: 'INSPECTING' })
       .getMany()
 
-    const totalOriginQty = inventoryCheckItems.reduce((total, item) => total + (item.originQty || 0), 0)
-    const totalOriginUomValue = inventoryCheckItems.reduce((total, item) => total + (item.originUomValue || 0), 0)
-
-    const hasQtyDiscrepancy = totalOriginQty !== inspectedQty
-    const hasUomValueDiscrepancy = totalOriginUomValue !== inspectedUomValue
-
-    const hasBatchNoDiscrepancy = inventoryCheckItems.some(checkItem => checkItem.originBatchNo !== inspectedBatchNo)
+    const { totalOriginQty, totalOriginUomValue } = inventoryCheckItems.reduce(
+      (total, item) => {
+        total.totalOriginQty += item.originQty || 0
+        total.totalOriginUomValue += item.originUomValue || 0
 
-    const hasDiscrepancies = hasQtyDiscrepancy || hasUomValueDiscrepancy || hasBatchNoDiscrepancy
-
-    let inventoryCheckItemStatus
-    let worksheetDetailStatus
+        return total
+      },
+      { totalOriginQty: 0, totalOriginUomValue: 0 }
+    )
 
-    inventoryCheckItemStatus = hasDiscrepancies
-      ? INVENTORY_CHECK_ITEM_STATUS.NOT_TALLY
-      : INVENTORY_CHECK_ITEM_STATUS.INSPECTED
-    worksheetDetailStatus = hasDiscrepancies ? WORKSHEET_STATUS.NOT_TALLY : WORKSHEET_STATUS.DONE
+    const hasDiscrepancies =
+      totalOriginQty !== inspectedQty ||
+      totalOriginUomValue !== inspectedUomValue ||
+      inventoryCheckItems.some(
+        checkItem =>
+          checkItem.originExpirationDate !== formatDate(inspectedExpirationDate) ||
+          checkItem.originBatchNo !== inspectedBatchNo
+      )
 
     let totalInspectedQty = inspectedQty
     let totalInspectedUomValue = inspectedUomValue
@@ -748,20 +772,32 @@ export class CycleCountWorksheetController extends WorksheetController {
       totalInspectedUomValue -= uomValueToInspect
 
       checkItem.inspectedBatchNo = inspectedBatchNo
+      checkItem.inspectedExpirationDate = inspectedExpirationDate
       checkItem.inspectedLocation = checkItem.originLocationId
-      checkItem.status = inventoryCheckItemStatus
+      checkItem.status = hasDiscrepancies
+        ? INVENTORY_CHECK_ITEM_STATUS.NOT_TALLY
+        : INVENTORY_CHECK_ITEM_STATUS.INSPECTED
       checkItem.updater = this.user
 
-      await this.trxMgr.getRepository(InventoryCheckItem).save(checkItem)
+      await this.trxMgr.getRepository(InventoryCheckItem).update(checkItem.id, {
+        inspectedQty: checkItem.inspectedQty,
+        inspectedUomValue: checkItem.inspectedUomValue,
+        inspectedBatchNo: checkItem.inspectedBatchNo,
+        inspectedExpirationDate: checkItem.inspectedExpirationDate,
+        inspectedLocation: checkItem.inspectedLocation,
+        status: checkItem.status,
+        updater: this.user
+      })
 
       let worksheetDetail = await this.trxMgr.getRepository(WorksheetDetail).findOne({
         where: { targetInventoryCheckItem: checkItem.id, type: WORKSHEET_TYPE.CYCLE_COUNT }
       })
 
       if (worksheetDetail) {
-        worksheetDetail.status = worksheetDetailStatus
-        worksheetDetail.updater = this.user
-        await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
+        await this.trxMgr.getRepository(WorksheetDetail).update(worksheetDetail.id, {
+          status: hasDiscrepancies ? WORKSHEET_STATUS.NOT_TALLY : WORKSHEET_STATUS.DONE,
+          updater: this.user
+        })
       }
     }
 
@@ -769,7 +805,12 @@ export class CycleCountWorksheetController extends WorksheetController {
       const lastItem = inventoryCheckItems[inventoryCheckItems.length - 1]
       lastItem.inspectedQty = (lastItem.inspectedQty ?? 0) + totalInspectedQty
       lastItem.inspectedUomValue = (lastItem.inspectedUomValue ?? 0) + totalInspectedUomValue
-      await this.trxMgr.getRepository(InventoryCheckItem).save(lastItem)
+
+      await this.trxMgr.getRepository(InventoryCheckItem).update(lastItem.id, {
+        inspectedQty: lastItem.inspectedQty,
+        inspectedUomValue: lastItem.inspectedUomValue,
+        updater: this.user
+      })
     }
   }
 
@@ -785,6 +826,7 @@ export class CycleCountWorksheetController extends WorksheetController {
     targetInventoryCheckItem.inspectedWeight = null
     targetInventoryCheckItem.inspectedUomValue = null
     targetInventoryCheckItem.inspectedLocation = null
+    targetInventoryCheckItem.inspectedExpirationDate = null
     targetInventoryCheckItem.status = targetInventoryCheckItem.status = INVENTORY_CHECK_ITEM_STATUS.INSPECTING
     targetInventoryCheckItem.updater = this.user
     await this.updateOrderTargets([targetInventoryCheckItem])
@@ -832,6 +874,7 @@ export class CycleCountWorksheetController extends WorksheetController {
       checkItem.inspectedQty = null
       checkItem.inspectedWeight = null
       checkItem.inspectedUomValue = null
+      checkItem.inspectedExpirationDate = null
       checkItem.inspectedLocation = null
       checkItem.status = INVENTORY_CHECK_ITEM_STATUS.INSPECTING
       checkItem.updater = this.user
@@ -918,7 +961,8 @@ export class CycleCountWorksheetController extends WorksheetController {
     inspectedBatchNo: string,
     inspectedQty: number,
     inspectedUomValue: number,
-    countNo: number
+    countNo: number,
+    inspectedExpirationDate: Date
   ): Promise<void> {
     let today = new Date(),
       year = today.getFullYear(),
@@ -1014,6 +1058,7 @@ export class CycleCountWorksheetController extends WorksheetController {
     newInventory.uom = productDetail.uom
     newInventory.qty = inspectedQty
     newInventory.uomValue = inspectedUomValue
+    newInventory.expirationDate = inspectedExpirationDate
     newInventory.location = location
     newInventory.warehouse = location.warehouse
     newInventory.zone = location.zone
@@ -1032,6 +1077,7 @@ export class CycleCountWorksheetController extends WorksheetController {
     targetInventoryCheckItem.inspectedBatchNo = inspectedBatchNo
     targetInventoryCheckItem.inspectedQty = inspectedQty
     targetInventoryCheckItem.inspectedUomValue = inspectedUomValue
+    targetInventoryCheckItem.inspectedExpirationDate = inspectedExpirationDate
     targetInventoryCheckItem.inspectedLocation = location
     targetInventoryCheckItem.productDetail = productDetail
     targetInventoryCheckItem.product = product
@@ -1301,7 +1347,17 @@ export class CycleCountWorksheetController extends WorksheetController {
       })
       await this.trxMgr.getRepository(InventoryCheckItem).save(tallyTargetInventoryCheckItems, { chunk: 500 })
 
-      await this.trxMgr.getRepository(Inventory).save(tallyInventories, { chunk: 500 })
+      // await this.trxMgr.getRepository(Inventory).save(tallyInventories, { chunk: 500 })
+
+      if (tallyInventories.length > 0) {
+        await this.trxMgr.getRepository(Inventory).update(
+          tallyInventories.map(inv => inv.id),
+          {
+            updater: this.user,
+            lockInventory: false
+          }
+        )
+      }
 
       if (notTallyTargetInventoryCheckItems.length) {
         worksheet.status = WORKSHEET_STATUS.NOT_TALLY
@@ -1322,3 +1378,12 @@ export class CycleCountWorksheetController extends WorksheetController {
     return worksheet
   }
 }
+
+function formatDate(data) {
+  let date = {
+    year: data.getFullYear().toString(),
+    month: (data.getMonth() + 1).toString(),
+    day: data.getDate().toString()
+  }
+  return `${date.year}-${date.month.padStart(2, '0')}-${date.day.padStart(2, '0')}`
+}

package/server/graphql/resolvers/worksheet/cycle-count-adjustment.ts

@@ -102,7 +102,7 @@ export async function cycleCountAdjustment(
     const inventory = checkItem.inventory
 
     // Exclude items that are under inspection elsewhere
-    if (inspectingInventoryIds.has(inventory.id)) {
+    if (inspectingInventoryIds.has(inventory?.id)) {
       return false
     }
 
@@ -114,7 +114,8 @@ export async function cycleCountAdjustment(
       checkItem.inspectedQty !== inventory.qty ||
       checkItem.inspectedBatchNo !== inventory.batchId ||
       checkItem.inspectedLocation.id !== inventory.location.id ||
-      checkItem.inspectedUomValue !== inventory.uomValue
+      checkItem.inspectedUomValue !== inventory.uomValue ||
+      checkItem.inspectedExpirationDate !== inventory.expirationDate
     )
   })
 
@@ -157,6 +158,7 @@ export async function cycleCountAdjustment(
       inventory.lockeduomValue = 0
       inventory.updater = user
       inventory.status = INVENTORY_STATUS.TERMINATED
+      inventory.lockInventory = false
       inventory = await tx.getRepository(Inventory).save(inventory)
 
       // create TERMINATED, TERMINATED history
@@ -193,6 +195,7 @@ export async function cycleCountAdjustment(
       inventory.warehouse = targetInventoryCheckItem.inspectedLocation.warehouse
       inventory.status = INVENTORY_STATUS.TERMINATED
       inventory.updater = user
+      inventory.lockInventory = false
       inventory = await tx.getRepository(Inventory).save(inventory)
 
       // create TERMINATED, TERMINATED history
@@ -218,47 +221,37 @@ export async function cycleCountAdjustment(
       for (let inventory of inventories) {
         inventory.qty = targetInventoryCheckItem.inspectedQty
         inventory.uomValue = targetInventoryCheckItem.inspectedUomValue
+        inventory.expirationDate = targetInventoryCheckItem.inspectedExpirationDate || null
         inventory.status = INVENTORY_STATUS.STORED
         inventory.creator = user
         inventory.updater = user
-        await tx.getRepository(Inventory).save(inventory)
-
-        await tx.getRepository(InventoryHistory).save({
-          ...targetInventoryCheckItem,
-          seq: inventory.lastSeq,
-          refOrderId: targetInventoryCheckItem.inventoryCheckId,
-          orderNo: targetInventoryCheckItem.inventoryCheck.name,
-          name: InventoryNoGenerator.inventoryHistoryName(),
-          palletId: inventory.palletId,
-          batchId: inventory.batchId,
-          zone: inventory.zone,
-          packingType: inventory.packingType,
-          qty: inventory.qty || 0,
-          openingQty: 0,
-          uomValue: inventory.uomValue || 0,
-          openingUomValue: 0,
+
+
+        await tx.getRepository(Inventory).update(inventory.id, {
+          qty: inventory.qty,
+          uomValue: inventory.uomValue,
+          expirationDate: inventory.expirationDate,
           status: inventory.status,
-          transactionType: INVENTORY_TRANSACTION_TYPE.CC_ADJUSTMENT,
-          createdAt: inventory.createdAt,
-          updatedAt: inventory.updatedAt,
-          domain: domain,
-          bizplace: targetInventoryCheckItem.inventory.bizplace,
-          inventory: inventory.id,
-          cartonId: inventory.cartonId,
-          creator: user,
           updater: user,
-          product: targetInventoryCheckItem.inventory.product,
-          productDetail: targetInventoryCheckItem.inventory.productDetail,
-          packingSize: inventory.packingSize,
-          warehouse: targetInventoryCheckItem.inventory.warehouse,
-          location: targetInventoryCheckItem.inventory.location
+          lockInventory: false
         })
+
+        await generateInventoryHistory(
+          inventory,
+          cycleCount,
+          INVENTORY_TRANSACTION_TYPE.CC_ADJUSTMENT,
+          inventory.qty,
+          inventory.uomValue,
+          user,
+          tx
+        )
       }
     } else if (
       targetInventoryCheckItem.inspectedQty !== inventory.qty ||
       targetInventoryCheckItem.inspectedBatchNo !== inventory.batchId ||
       targetInventoryCheckItem.inspectedLocation.id !== inventory.location.id ||
-      targetInventoryCheckItem.inspectedUomValue !== inventory.uomValue
+      targetInventoryCheckItem.inspectedUomValue !== inventory.uomValue ||
+      targetInventoryCheckItem.inspectedExpirationDate !== inventory.expirationDate
     ) {
       const prevLocationId: string = inventory.location.id
 
@@ -290,7 +283,20 @@ export async function cycleCountAdjustment(
       inventory.warehouse = targetInventoryCheckItem.inspectedLocation.warehouse || inventory.warehouse
       inventory.status = INVENTORY_STATUS.STORED
       inventory.updater = user
-      inventory = await tx.getRepository(Inventory).save(inventory)
+      inventory.lockInventory = false
+      inventory.expirationDate = targetInventoryCheckItem.inspectedExpirationDate
+
+      await tx.getRepository(Inventory).update(inventory.id, {
+        batchId: inventory.batchId,
+        qty: inventory.qty,
+        uomValue: inventory.uomValue,
+        location: inventory.location,
+        warehouse: inventory.warehouse,
+        status: inventory.status,
+        updater: user,
+        lockInventory: false,
+        expirationDate: targetInventoryCheckItem.inspectedExpirationDate
+      })
 
       if (prevLocationId !== targetInventoryCheckItem.inspectedLocation.id) {
         const prevLocation: Location = await tx.getRepository(Location).findOne(prevLocationId)

package/server/graphql/resolvers/worksheet/cycle-count-worksheet-for-carton.ts

@@ -1,9 +1,7 @@
 import { createQueryBuilder, getRepository, In, SelectQueryBuilder } from 'typeorm'
-
 import { InventoryCheck, ORDER_STATUS, InventoryCheckItem } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory } from '@things-factory/warehouse-base'
-import { ProductDetail, Product } from '@things-factory/product-base'
+
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
@@ -11,10 +9,16 @@ import { Worksheet, WorksheetDetail } from '../../../entities'
 export const cycleCountWorksheetForCartonResolver = {
   async cycleCountWorksheetForCarton(
     _: any,
-    { inventoryCheckNo, locationSortingRules, locationName, cartonId, palletId, inventoryCheckItemStatus },
+    { inventoryCheckNo, locationSortingRules, locationName, cartonId, palletId, inventoryCheckItemStatus, locationFilter},
     context: any
   ) {
     const { domain }: { domain: Domain } = context.state
+    const filterMap = {
+      zone: 'zone',
+      column: 'column',
+      row: 'row',
+      shelf: 'shelf'
+    }
     const cycleCount: InventoryCheck = await getRepository(InventoryCheck).findOne({
       where: { domain, name: inventoryCheckNo, status: ORDER_STATUS.INSPECTING }
     })
@@ -58,6 +62,16 @@ export const cycleCountWorksheetForCartonResolver = {
       )
     }
 
+    if (Object.keys(locationFilter).length > 0) {
+      Object.entries(filterMap).forEach(([key, value]) => {
+        if (locationFilter?.[key]) {
+          qb.andWhere(`"LOC_INV"."${value}" = :${key}`, {
+            [key]: locationFilter[key]
+          })
+        }
+      })
+    }
+
     if (cartonId) {
       qb.andWhere('"INV"."carton_id" = :cartonId', { cartonId })
     }
@@ -99,6 +113,7 @@ export const cycleCountWorksheetForCartonResolver = {
             uom: inventory?.uom,
             originLocation: targetInventoryCheckItem?.originLocation,
             inspectedQty: targetInventoryCheckItem?.inspectedQty,
+            inspectedExpirationDate: targetInventoryCheckItem?.inspectedExpirationDate,
             inspectedUomValue: targetInventoryCheckItem?.inspectedUomValue,
             inspectedLocation: targetInventoryCheckItem?.inspectedLocation,
             inspectedBatchNo: targetInventoryCheckItem?.inspectedBatchNo,
@@ -112,4 +127,4 @@ export const cycleCountWorksheetForCartonResolver = {
       )
     }
   }
-}
+}

package/server/graphql/resolvers/worksheet/cycle-count-worksheet-for-pallet.ts

@@ -1,9 +1,6 @@
 import { createQueryBuilder, getRepository, In, SelectQueryBuilder } from 'typeorm'
-
 import { InventoryCheck, ORDER_STATUS, InventoryCheckItem } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory } from '@things-factory/warehouse-base'
-import { ProductDetail, Product } from '@things-factory/product-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
@@ -11,13 +8,27 @@ import { Worksheet, WorksheetDetail } from '../../../entities'
 export const cycleCountWorksheetForPalletResolver = {
   async cycleCountWorksheetForPallet(
     _: any,
-    { inventoryCheckNo, locationSortingRules, locationName, cartonId, palletId, inventoryCheckItemStatus },
+    {
+      inventoryCheckNo,
+      locationSortingRules,
+      locationName,
+      cartonId,
+      palletId,
+      inventoryCheckItemStatus,
+      locationFilter
+    },
     context: any
   ) {
     const { domain }: { domain: Domain } = context.state
     const cycleCount: InventoryCheck = await getRepository(InventoryCheck).findOne({
       where: { domain, name: inventoryCheckNo, status: ORDER_STATUS.INSPECTING }
     })
+    const filterMap = {
+      zone: 'zone',
+      column: 'column',
+      row: 'row',
+      shelf: 'shelf'
+    }
 
     if (!cycleCount) throw new Error('Failed to find cycle count worksheet')
 
@@ -54,11 +65,21 @@ export const cycleCountWorksheetForPalletResolver = {
 
     if (locationName) {
       qb.andWhere(
-        '"ORG_LOC"."name" = :locationName OR "LOC_INV"."name" = :locationName OR "INS_LOC"."name" = :locationName',
+        '("ORG_LOC"."name" = :locationName OR "LOC_INV"."name" = :locationName OR "INS_LOC"."name" = :locationName)',
         { locationName }
       )
     }
 
+    if (Object.keys(locationFilter).length > 0) {
+      Object.entries(filterMap).forEach(([key, value]) => {
+        if (locationFilter?.[key]) {
+          qb.andWhere(`"LOC_INV"."${value}" = :${key}`, {
+            [key]: locationFilter[key]
+          })
+        }
+      })
+    }
+
     if (cartonId) {
       qb.andWhere('"INV"."carton_id" = :cartonId', { cartonId })
     }
@@ -101,6 +122,7 @@ export const cycleCountWorksheetForPalletResolver = {
             originLocation: targetInventoryCheckItem?.originLocation,
             inspectedQty: targetInventoryCheckItem?.inspectedQty,
             inspectedUomValue: targetInventoryCheckItem?.inspectedUomValue,
+            inspectedExpirationDate: targetInventoryCheckItem?.inspectedExpirationDate,
             inspectedLocation: targetInventoryCheckItem?.inspectedLocation,
             inspectedBatchNo: targetInventoryCheckItem?.inspectedBatchNo,
             status: cycleCountWSD.status,

package/server/graphql/resolvers/worksheet/generate-worksheet/generate-cycle-count-worksheet.ts

@@ -10,7 +10,7 @@ import { Worksheet } from '../../../../entities'
 export const generateCycleCountWorksheetResolver = {
   async generateCycleCountWorksheet(
     _: any,
-    { executionDate, customerId, inventoryCheckItemIds, inventoryCheckItems, limit, selectedLocation, cycleCountNo },
+    { executionDate, customerId, inventoryCheckItemIds, inventoryCheckItems, limit, selectedLocation, cycleCountNo,lockInventory },
     context: any
   ) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
@@ -25,7 +25,8 @@ export const generateCycleCountWorksheetResolver = {
       inventoryCheckItems,
       limit,
       selectedLocation,
-      cycleCountNo
+      cycleCountNo,
+      lockInventory 
     )
 
     return cycleCountWorksheet
@@ -42,7 +43,8 @@ export async function generateCycleCountWorksheet(
   inventoryCheckItems: InventoryCheckItem[],
   limit: number,
   selectedLocation: string[] = [],
-  cycleCountNo: string
+  cycleCountNo: string,
+  lockInventory?: Boolean
 ): Promise<Worksheet> {
   const worksheetController: CycleCountWorksheetController = new CycleCountWorksheetController(tx, domain, user)
   return await worksheetController.generateCycleCountWorksheet(
@@ -52,6 +54,7 @@ export async function generateCycleCountWorksheet(
     inventoryCheckItems,
     limit,
     selectedLocation,
-    cycleCountNo
+    cycleCountNo,
+    lockInventory
   )
 }

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

@@ -159,6 +159,7 @@ export async function mmsProcessOrder(
       },
       relations: [
         'marketplaceStore',
+        'marketplaceStore.marketplaceDistributors',
         'marketplaceOrderPackages',
         'marketplaceOrderPackages.marketplaceOrderPackageItems',
         'marketplaceOrderPackages.marketplaceOrderPackageItems.marketplaceOrderItem',

package/server/graphql/resolvers/worksheet/inspecting/add-extra-inventory.ts

@@ -14,7 +14,8 @@ export const addExtraInventoryResolver = {
       inspectedBatchNo,
       inspectedQty,
       inspectedUomValue,
-      countNo
+      countNo,
+      inspectedExpirationDate
     },
     context: any
   ) {
@@ -30,7 +31,8 @@ export const addExtraInventoryResolver = {
       inspectedBatchNo,
       inspectedQty,
       inspectedUomValue,
-      countNo
+      countNo,
+      inspectedExpirationDate
     )
   }
 }
@@ -46,7 +48,8 @@ export async function addExtraInventory(
   inspectedBatchNo: string,
   inspectedQty: number,
   inspectedUomValue: number,
-  countNo: number
+  countNo: number,
+  inspectedExpirationDate: Date
 ) {
   const worksheetController: CycleCountWorksheetController = new CycleCountWorksheetController(tx, domain, user)
   await worksheetController.addExtraInventory(
@@ -57,6 +60,7 @@ export async function addExtraInventory(
     inspectedBatchNo,
     inspectedQty,
     inspectedUomValue,
-    countNo
+    countNo,
+    inspectedExpirationDate
   )
 }

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
   )
 }