@things-factory/worksheet-base 4.3.247 → 4.3.249

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

@@ -1,28 +1,17 @@
-import {
-  Brackets,
-  getRepository,
-  SelectQueryBuilder
-} from 'typeorm'
+import { Brackets, getRepository, SelectQueryBuilder } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { ORDER_INVENTORY_STATUS } from '@things-factory/sales-base'
-import {
-  buildCondition,
-  buildQuery,
-  Domain
-} from '@things-factory/shell'
-import {
-  Inventory,
-  LOCATION_TYPE
-} from '@things-factory/warehouse-base'
+import { buildCondition, buildQuery, Domain } from '@things-factory/shell'
+import { Inventory, LOCATION_TYPE } from '@things-factory/warehouse-base'
 
 export const inventoriesByPalletResolver = {
   async inventoriesByPallet(_: any, { filters, pagination, sortings, locationSortingRules }, context: any) {
     const { domain, user }: { domain: Domain; user: User } = context.state
     const params = { filters, pagination }
     let permittedBizplaceIds: string[] = await getPermittedBizplaceIds(domain, user)
-    const bizplaceId =  params.filters.find(x => x.name == 'bizplace_id')
+    const bizplaceId = params.filters.find(x => x.name == 'bizplace_id')
     const productFilters = params.filters.filter(x => x.name == 'productName')
     const recallFilters = params.filters.find(x => x.name === 'recall')
     const skipLockCheckFilters = params.filters.find(x => x.name === 'skipLockCheck')
@@ -46,6 +35,7 @@ export const inventoriesByPalletResolver = {
       .leftJoinAndSelect('iv.bizplace', 'bizplace')
       .leftJoinAndSelect('iv.product', 'product')
       .leftJoinAndSelect('iv.productDetail', 'productDetail')
+      .leftJoin('product_detail_stocks', 'pds', 'pds.product_detail_id = iv.product_detail_id')
       .leftJoinAndSelect('iv.warehouse', 'warehouse')
       .leftJoinAndSelect('iv.location', 'location')
       .leftJoinAndSelect('iv.creator', 'creator')
@@ -56,7 +46,7 @@ export const inventoriesByPalletResolver = {
       .andWhere(
         `location.type ${recallFilters?.value === true ? '' : 'NOT'} IN ('${LOCATION_TYPE.QUARANTINE}', '${
           LOCATION_TYPE.RESERVE
-        }')`
+        }', '${LOCATION_TYPE.DAMAGE}')`
       )
       .andWhere(
         `(iv.batch_id, product.name, iv.packing_type, product.brand) NOT IN (
@@ -73,14 +63,43 @@ export const inventoriesByPalletResolver = {
           AND oi.domain_id = (:domainId)
           AND oi.bizplace_id = (:bizplaceId)
         )`,
-        { bizplaceId: bizplaceId.value , domainId: domain.id }
+        { bizplaceId: bizplaceId.value, domainId: domain.id }
       )
 
-      if (locationFilters) {
-        qb.andWhere
-        (`location.name ilike '${locationFilters.value}'`)
-      }  
+    if (locationFilters) {
+      qb.andWhere(`location.name ilike '${locationFilters.value}'`)
+    }
+
+    if (productFilters && productFilters.length > 0) {
+      let productInfo = productFilters[0]
+      qb.andWhere(
+        new Brackets(qb2 => {
+          productFilterColumns.forEach(filter => {
+            const condition = buildCondition(
+              'product',
+              filter,
+              'i_like',
+              productInfo.value,
+              false,
+              Object.keys(qb.getParameters()).length
+            )
+
+            qb2.orWhere(condition.clause, condition.parameters)
+          })
+        })
+      )
+    }
 
+    if (!skipLockCheck) {
+      qb.andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END >= 0')
+      qb.andWhere('iv.qty - CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END > 0')
+    }
+
+    if (recallFilters?.value === true) {
+      qb.orWhere('(iv.domain_id = (:domainId) and iv.bizplace_id = (:bizplaceId)')
+      if (locationFilters) {
+        qb.andWhere(`location.name ilike '${locationFilters.value}'`)
+      }
       if (productFilters && productFilters.length > 0) {
         let productInfo = productFilters[0]
         qb.andWhere(
@@ -94,53 +113,18 @@ export const inventoriesByPalletResolver = {
                 false,
                 Object.keys(qb.getParameters()).length
               )
-  
+
               qb2.orWhere(condition.clause, condition.parameters)
             })
           })
         )
       }
-
-    if (!skipLockCheck) {
-      qb.andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END >= 0')
-      qb.andWhere('iv.qty - CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END > 0')
-    }
-
-    if (recallFilters?.value === true) {
-      qb.orWhere(
-        '(iv.domain_id = (:domainId) and iv.bizplace_id = (:bizplaceId)'
-        )
-        if (locationFilters){
-          qb.andWhere
-        (`location.name ilike '${locationFilters.value}'`)
-        }
-        if (productFilters && productFilters.length > 0) {
-          let productInfo = productFilters[0]
-          qb.andWhere(
-            new Brackets(qb2 => {
-              productFilterColumns.forEach(filter => {
-                const condition = buildCondition(
-                  'product',
-                  filter,
-                  'i_like',
-                  productInfo.value,
-                  false,
-                  Object.keys(qb.getParameters()).length
-                )
-    
-                qb2.orWhere(condition.clause, condition.parameters)
-              })
-            })
-          )
-        }
-        if (batchIdFilters) {
-          qb.andWhere(
-            `iv.batch_id ilike '${batchIdFilters.value}'`
-            )
-        }
+      if (batchIdFilters) {
+        qb.andWhere(`iv.batch_id ilike '${batchIdFilters.value}'`)
+      }
       qb.andWhere(
         'iv.obsolete = true and case when iv.expiration_date is not null and product.shelf_life is not null then CURRENT_DATE > iv.expiration_date - product.shelf_life else true end)'
-        )
+      )
     } else {
       qb.andWhere('iv.obsolete = false')
       qb.andWhere(
@@ -201,4 +185,4 @@ async function getRemainAmount(inventory: Inventory): Promise<{ remainQty: numbe
     remainQty: inventory.qty - (inventory.lockedQty || 0),
     remainUomValue: inventory.uomValue - (inventory.lockedUomValue || 0)
   }
-}
+}

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

@@ -38,6 +38,8 @@ export const worksheetResolver = {
         'releaseGood.arrivalNotice',
         'releaseGood.shippingOrder',
         'releaseGood.orderPackages',
+        'releaseGood.orderProducts',
+        'releaseGood.orderProducts.product',
         'replenishment',
         'returnOrder',
         'inventoryCheck',
@@ -47,6 +49,7 @@ export const worksheetResolver = {
         'worksheetDetails.toLocation',
         'worksheetDetails.targetProduct',
         'worksheetDetails.targetProduct.product',
+        'worksheetDetails.targetProduct.releaseGood',
         'worksheetDetails.targetVas',
         'worksheetDetails.targetVas.product',
         'worksheetDetails.targetVas.newProduct',
@@ -187,7 +190,7 @@ export const worksheetResolver = {
       worksheet.orderInventories = orderInventories
     }
 
-    if (worksheet?.releaseGood?.id) {
+    if (worksheet?.releaseGood?.id && worksheet?.releaseGood?.assignedInventory) {
       let qbOrderInventories = getRepository(OrderInventory)
         .createQueryBuilder('oi')
         .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
@@ -258,11 +261,15 @@ export const worksheetResolver = {
     }
 
     // before VAS
-    if (worksheet.orderInventories) {
+    if (worksheet?.orderInventories?.length > 0) {
       worksheet.worksheetDetails.sort(function (a, b) {
         return (
-          worksheet.orderInventories.map(oi => oi.id).indexOf(worksheet.type == 'VAS' ? a.targetVas.id : a.targetInventory.id) - 
-          worksheet.orderInventories.map(oi => oi.id).indexOf(worksheet.type == 'VAS' ? b.targetVas.id : b.targetInventory.id)
+          worksheet.orderInventories
+            .map(oi => oi.id)
+            .indexOf(worksheet.type == 'VAS' ? a.targetVas.id : a.targetInventory.id) -
+          worksheet.orderInventories
+            .map(oi => oi.id)
+            .indexOf(worksheet.type == 'VAS' ? b.targetVas.id : b.targetInventory.id)
         )
       })
     }

package/server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.ts

@@ -194,4 +194,5 @@ export async function regenerateReleaseGoodWorksheetDetails(
       })
     })
   )
+  await tx.getRepository(Worksheet).update({ id: worksheet.id }, { status: WORKSHEET_STATUS.DEACTIVATED })
 }

package/server/utils/inventory-util.ts

@@ -254,12 +254,12 @@ export async function isInventoryExpiring(inventory: Inventory): Promise<boolean
   }
 
   const { expirationDate } = inventory
-  const { isRequiredCheckExpiry, expirationPeriod } = product
+  const { isRequiredCheckExpiry, minInboundShelfLife } = product
 
-  if (!isRequiredCheckExpiry || !expirationPeriod || expirationDate <= 0) return false
+  if (!isRequiredCheckExpiry || !minInboundShelfLife || expirationDate <= 0) return false
 
   let date: Date = new Date()
-  const acceptBefore: Date = new Date(date.setDate(date.getDate() + expirationPeriod))
+  const acceptBefore: Date = new Date(date.setDate(date.getDate() + minInboundShelfLife))
   const expiryDate: Date = new Date(expirationDate)
 
   return expiryDate < acceptBefore
@@ -280,13 +280,13 @@ export async function isInventoryObsolete(inventories: Inventory[]): Promise<any
     }
 
     let { expirationDate } = inventories[i]
-    const { shelfLife } = product
+    const { minOutboundShelfLife } = product
 
-    if (shelfLife && expirationDate) {
+    if (minOutboundShelfLife && expirationDate) {
       let date: Date = new Date()
       expirationDate = new Date(expirationDate)
 
-      const releaseBefore: Date = new Date(expirationDate.setDate(expirationDate.getDate() - shelfLife))
+      const releaseBefore: Date = new Date(expirationDate.setDate(expirationDate.getDate() - minOutboundShelfLife))
 
       if (date > releaseBefore) {
         obsoleteInventories.push(inventories[i].id)