@things-factory/worksheet-base 4.3.593 → 4.3.596

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

@@ -2695,35 +2695,38 @@ export class PickingWorksheetController extends VasWorksheetController {
             })
 
             worksheet.releaseGood = { ...worksheet.releaseGood, orderProducts, orderPackages, orderConsignments }
+            if (worksheet.type === WORKSHEET_TYPE.PICKING) {
+              if (worksheet.releaseGood?.assignedInventory == false) {
+                worksheetDetails = await this.assignInventoriesForUnassignedOrder(worksheet, tx)
+                worksheet.worksheetDetails = worksheetDetails
+                worksheet.releaseGood.assignedInventory = true
+              } else {
+                worksheetDetails = worksheet.worksheetDetails.filter(x => x.status == 'DEACTIVATED')
+                const targetInventoryIds: OrderInventory[] = worksheetDetails.map(
+                  (wsd: WorksheetDetail) => wsd.targetInventory.id
+                )
 
-            if (worksheet.releaseGood?.assignedInventory == false) {
-              worksheetDetails = await this.assignInventoriesForUnassignedOrder(worksheet, tx)
-              worksheet.worksheetDetails = worksheetDetails
-              worksheet.releaseGood.assignedInventory = true
-            } else {
-              worksheetDetails = worksheet.worksheetDetails.filter(x => x.status == 'DEACTIVATED')
-              const targetInventoryIds: OrderInventory[] = worksheetDetails.map(
-                (wsd: WorksheetDetail) => wsd.targetInventory.id
-              )
+                await tx.getRepository(OrderInventory).update(
+                  { id: In(targetInventoryIds) },
+                  {
+                    status: ORDER_INVENTORY_STATUS.PICKING,
+                    updater: this.user
+                  }
+                )
+              }
 
-              await tx.getRepository(OrderInventory).update(
-                { id: In(targetInventoryIds) },
+              await tx.getRepository(ReleaseGood).update(
+                { id: worksheet.releaseGood.id },
                 {
-                  status: ORDER_INVENTORY_STATUS.PICKING,
-                  updater: this.user
+                  status: ORDER_STATUS.PICKING,
+                  updater: this.user,
+                  assignedInventory: true
                 }
               )
+            } else {
+              worksheetDetails = worksheet.worksheetDetails
             }
 
-            await tx.getRepository(ReleaseGood).update(
-              { id: worksheet.releaseGood.id },
-              {
-                status: ORDER_STATUS.PICKING,
-                updater: this.user,
-                assignedInventory: true
-              }
-            )
-
             worksheet = await this.activateWorksheet(worksheet, worksheetDetails, [], tx)
             releaseGood = worksheet.releaseGood
             domain = worksheet.domain
@@ -2733,7 +2736,7 @@ export class PickingWorksheetController extends VasWorksheetController {
 
           const orderSource: string = releaseGood?.source
           switch (orderSource) {
-              //disable temporary to prevent duplicates call
+            //disable temporary to prevent duplicates call
             case ApplicationType.SELLERCRAFT:
               // getManager().transaction(async txMgr => {
               //   const sellercraft: Sellercraft = await txMgr

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

@@ -235,7 +235,7 @@ export class ReturningWorksheetController extends VasWorksheetController {
     const releaseGood: ReleaseGood = await this.findRefOrder(ReleaseGood, {
       domain: this.domain,
       name: releaseGoodNo,
-      status: ORDER_STATUS.PARTIAL_RETURN
+      status: In([ORDER_STATUS.PARTIAL_RETURN, ORDER_STATUS.PROCESSING, ORDER_STATUS.PARTIAL_PROCESSING])
     })
 
     const worksheet: Worksheet = await this.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.WAREHOUSE_RETURN, [
@@ -244,6 +244,8 @@ export class ReturningWorksheetController extends VasWorksheetController {
     ])
     this.checkRecordValidity(worksheet, { status: WORKSHEET_STATUS.EXECUTING })
 
-    return await this.completeWorksheet(worksheet, ORDER_STATUS.DONE)
+    let status = ORDER_STATUS.DONE
+    if(releaseGood.status !== ORDER_STATUS.PARTIAL_RETURN) status = releaseGood.status
+    return await this.completeWorksheet(worksheet, status)
   }
 }

package/server/entities/worksheet.ts

@@ -60,6 +60,9 @@ export class Worksheet {
   @ManyToOne(type => ShippingOrder)
   shippingOrder: ShippingOrder
 
+  @ManyToOne(type => User)
+  sorter: User
+
   @ManyToOne(type => Location)
   bufferLocation: Location
 

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

@@ -43,7 +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('iv.lock_inventory is not true')
         .andWhere(
           `location.type ${recallFilters?.value === true ? '' : 'NOT'} IN ('${LOCATION_TYPE.QUARANTINE}', '${
             LOCATION_TYPE.RESERVE

package/server/graphql/resolvers/worksheet/picking/assign-picking-worker.ts

@@ -19,17 +19,24 @@ export const assignPickingWorkerResolver = {
 
     if (!assignee) throw new Error('failed to find target user')
 
-    await Promise.all(worksheetId.map(async (worksheetId)=>{
-      const worksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
-        id: worksheetId,
-      },{where: [{
-        type:WORKSHEET_TYPE.BATCH_PICKING
-      },{type:WORKSHEET_TYPE.PICKING}]})
-  
-      if (!worksheet) throw new Error('failed to find target picking worksheet')
-      worksheet.assignee = assignee
-      await tx.getRepository(Worksheet).save(worksheet)
+    await Promise.all(
+      worksheetId.map(async worksheetId => {
+        const worksheet: Worksheet = await tx.getRepository(Worksheet).findOne(
+          {
+            id: worksheetId
+          },
+          {
+            where: [
+              { type: WORKSHEET_TYPE.BATCH_PICKING },
+              { type: WORKSHEET_TYPE.PICKING },
+              { type: WORKSHEET_TYPE.ZONE_PICKING }
+            ]
+          }
+        )
 
-    }))
+        if (!worksheet) throw new Error('failed to find target picking worksheet')
+        await tx.getRepository(Worksheet).update({ id: worksheet.id }, { assignee: assignee })
+      })
+    )
   }
 }

package/server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.ts

@@ -67,7 +67,7 @@ export const fetchAndAssignPickingTaskResolver = {
               INNER JOIN release_goods rg ON rg.id = ws.release_good_id
               WHERE 
               ws.domain_id = $1 AND 
-              ws.type = 'PICKING' 
+              ws.type = 'PICKING'
               AND ws.status IN ('EXECUTING', 'DEACTIVATED') 
               AND ws.assignee_id IS NULL
               /*

package/server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.ts

@@ -49,7 +49,7 @@ export const pickingAssignmentStatusByUsersResolver = {
     getAssignedWSQb.addSelect("sum(case when ws.status='DEACTIVATED' then 1 else 0 end) as pending")
     getAssignedWSQb.innerJoin('ws.assignee','u')
     getAssignedWSQb.where('ws.domain_id = :id',{id:domain.id})
-    getAssignedWSQb.andWhere('ws.type IN (:...type)', {type: [WORKSHEET_TYPE.PICKING, WORKSHEET_TYPE.BATCH_PICKING]})
+    getAssignedWSQb.andWhere('ws.type IN (:...type)', {type: [WORKSHEET_TYPE.PICKING, WORKSHEET_TYPE.BATCH_PICKING, WORKSHEET_TYPE.ZONE_PICKING]})
     getAssignedWSQb.andWhere('ws.status IN (:...status)', {status: [WORKSHEET_STATUS.DEACTIVATED, WORKSHEET_STATUS.EXECUTING]})
     getAssignedWSQb.groupBy('ws.assignee_id')
     getAssignedWSQb.addGroupBy('u.name')

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

@@ -119,6 +119,7 @@ export async function pickingWorksheet(domain: Domain, orderNo: String, location
 
     return {
       worksheetInfo: {
+        worksheet,
         bizplaceName: releaseGood.bizplace.name,
         partnerDomainId: releaseGood.bizplace?.domain.id,
         startedAt: worksheet.startedAt,

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

@@ -1,8 +1,15 @@
-import { Brackets, getRepository, SelectQueryBuilder } from 'typeorm'
+import { Brackets, getRepository, SelectQueryBuilder, In, createQueryBuilder } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { ArrivalNotice, InventoryCheck, ReleaseGood, ReturnOrder, Replenishment } from '@things-factory/sales-base'
+import {
+  ArrivalNotice,
+  InventoryCheck,
+  ReleaseGood,
+  ReturnOrder,
+  Replenishment,
+  OrderInventory
+} from '@things-factory/sales-base'
 import { buildQuery, convertListParams, Domain, ListParam } from '@things-factory/shell'
 
 import { WORKSHEET_TYPE } from '../../../constants'
@@ -428,7 +435,7 @@ export const worksheetsResolver = {
         qb.andWhere(`replenishment.name ILIKE '${replenishmentParam.value}'`)
       }
 
-      if (releaseGoodParam) {
+      if (releaseGoodParam && typeParam.value[0] !== WORKSHEET_TYPE.ZONE_PICKING) {
         let removeSymbol = releaseGoodParam.value
           .split('')
           .filter(res => res !== '%')
@@ -552,7 +559,7 @@ export const worksheetsResolver = {
             sort.name != 'releaseRefNo' &&
             sort.name != 'returnOrderNo' &&
             sort.name != 'inventoryCheckStatus' &&
-            sort.name != 'executionDate' 
+            sort.name != 'executionDate'
           ) {
             return {
               ...acc,
@@ -622,9 +629,7 @@ 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
+          'ws.updatedAt': params.sortings[params.sortings.findIndex(item => item.name == 'updatedAt')].desc
             ? 'DESC'
             : 'ASC'
         }
@@ -634,12 +639,27 @@ export const worksheetsResolver = {
 
       let [items, total] = await qb.getManyAndCount()
 
-      items = items.map(item => {
-        return {
-          ...item,
-          orderRemark: item?.releaseGood?.remark ? true : false
-        }
-      })
+      //zone picking worksheet is not tied to ro
+      //therefor extra query to fetch extra detail for zone picking worksheet
+      let extraItems
+      if (typeParam.value[0] === WORKSHEET_TYPE.ZONE_PICKING) {
+        extraItems = await zonePickingExtras(items, releaseGoodParam)
+      }
+
+      if (extraItems) {
+        items = extraItems.map(item => {
+          return {
+            ...item
+          }
+        })
+      } else {
+        items = items.map(item => {
+          return {
+            ...item,
+            orderRemark: item?.releaseGood?.remark ? true : false
+          }
+        })
+      }
 
       return { items, total }
     } catch (error) {
@@ -647,3 +667,64 @@ export const worksheetsResolver = {
     }
   }
 }
+
+async function zonePickingExtras(worksheets, releaseGoodParam) {
+  const wsIds = [...new Set(worksheets.map(ws => ws.id))]
+
+  if (wsIds.length === 0) {
+    throw new Error('No worksheet ID found')
+  }
+  
+  const qb = await getRepository(OrderInventory)
+    .createQueryBuilder('oi')
+    .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
+    .leftJoinAndSelect('oi.inventory', 'inventory')
+    .where('oi.refWorksheetId IN (:...wsIds)', { wsIds })
+
+  if (releaseGoodParam) {
+    let removeSymbol = releaseGoodParam.value
+      .split('')
+      .filter(res => res !== '%')
+      .join('')
+
+    let orderInfos = removeSymbol
+      .toLowerCase()
+      .split(',')
+      .map(prod => {
+        return "'%" + prod.trim().replace(/'/g, "''") + "%'"
+      })
+      .join(',')
+
+    qb.andWhere(`(
+          lower(releaseGood.name) like any(array[${orderInfos}])
+          or lower(releaseGood.ref_no) like any(array[${orderInfos}])
+        )`)
+  }
+
+  let orderInventories: OrderInventory[] = await qb.getMany()
+
+  //group oi by refWorksheetId
+  const groupedOi = orderInventories.reduce((acc, oi) => {
+    const worksheetId = oi.refWorksheetId
+    if (!acc[worksheetId]) acc[worksheetId] = []
+    acc[worksheetId].push(oi)
+    return acc
+  }, {})
+
+  //to filter worksheet when outboundOrderInfoFilter is used
+  const filteredWorksheets = worksheets.filter(ws => groupedOi[ws.id])
+
+  //map results to items
+  const extraItems = filteredWorksheets.map(ws => {
+    const inventories = groupedOi[ws.id] || []
+    const releaseGoods = inventories.map(oi => oi.releaseGood)
+    return {
+      ...ws,
+      roCounts: new Set(releaseGoods.map(ro => ro.id)).size,
+      refNo: Array.from(new Set(releaseGoods.map(ro => ro.refNo))).join(','),
+      skuCounts: new Set(inventories.map(oi => oi.inventory?.id)).size
+    }
+  })
+
+  return extraItems
+}

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

@@ -2,6 +2,7 @@ import { gql } from 'apollo-server-koa'
 
 export const WorksheetInfo = gql`
   type WorksheetInfo {
+    worksheet: Worksheet
     arrivalNotice: ArrivalNotice
     releaseGood: ReleaseGood
     replenishment: Replenishment

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

@@ -33,5 +33,8 @@ export const Worksheet = gql`
     updater: User
     createdAt: String
     updatedAt: String
+    roCounts: Int
+    skuCounts: Int
+    refNo: String
   }
 `

package/server/index.ts

@@ -16,5 +16,6 @@ export * from './controllers/render-orientage-grn'
 export * from './controllers/render-orientage-do'
 export * from './controllers/render-ro-do'
 export * from './controllers/ecommerce/ecommerce-controller'
+export * from './controllers/worksheet-controller'
 
 export {createOrderPackageAndItems} from './controllers/outbound/picking-worksheet-controller'

package/server/utils/worksheet-no-generator.ts

@@ -26,6 +26,9 @@ export class WorksheetNoGenerator {
         case WORKSHEET_TYPE.BATCH_PICKING:
           return this.batchPicking()
 
+        case WORKSHEET_TYPE.ZONE_PICKING:
+          return this.zonePicking()
+
         case WORKSHEET_TYPE.SORTING:
           return this.sorting()
 
@@ -77,6 +80,9 @@ export class WorksheetNoGenerator {
       case WORKSHEET_TYPE.BATCH_PICKING:
         return this.batchPickingDetail()
 
+      case WORKSHEET_TYPE.ZONE_PICKING:
+        return this.zonePickingDetail()
+
       case WORKSHEET_TYPE.SORTING:
         return this.sortingDetail()
 
@@ -153,6 +159,13 @@ export class WorksheetNoGenerator {
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
+  static zonePicking() {
+    const currentDate = new Date()
+    return `ZP-${currentDate.getFullYear()}${
+      currentDate.getMonth() + 1
+    }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
+  }
+
   static sorting() {
     const currentDate = new Date()
     return `SORT-${currentDate.getFullYear()}${
@@ -220,6 +233,10 @@ export class WorksheetNoGenerator {
     return `BP-DETAIL-${uuidv4()}`
   }
 
+  static zonePickingDetail() {
+    return `ZP-DETAIL-${uuidv4()}`
+  }
+
   static vasDetail() {
     return `VAS-DETAIL-${uuidv4()}`
   }