@things-factory/worksheet-base 5.0.0-alpha.5 → 5.0.0-alpha.52

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

@@ -16,9 +16,15 @@ export const worksheetsResolver = {
       const arrivalNoticeParam: any = params.filters.find((param: any) => param.name === 'arrivalNoticeNo')
       const arrivalNoticeRefNoParam = params.filters.find(param => param.name === 'arrivalNoticeRefNo')
       const arrivalNoticeCrossDockingParam = params.filters.find(param => param.name === 'crossDocking')
+      const arrivalNoticeEtaDateParam = params.filters.find(param => param.name === 'etaDate')
       const typeParam = params.filters.find(param => param.name === 'type')
 
-      if (arrivalNoticeParam || arrivalNoticeRefNoParam || arrivalNoticeCrossDockingParam) {
+      if (
+        arrivalNoticeParam ||
+        arrivalNoticeRefNoParam ||
+        arrivalNoticeCrossDockingParam ||
+        arrivalNoticeEtaDateParam
+      ) {
         let arrFilters = []
         if (arrivalNoticeParam) {
           params.filters.splice(
@@ -41,6 +47,9 @@ export const worksheetsResolver = {
           )
           arrFilters.push({ ...arrivalNoticeCrossDockingParam, name: 'crossDocking' })
         }
+        if (arrivalNoticeEtaDateParam) {
+          params.filters.splice(params.filters.findIndex(item => item.name == 'etaDate'))
+        }
         const foundArrivalNotices: ArrivalNotice[] = await getRepository(ArrivalNotice).find({
           ...convertListParams({ filters: arrFilters })
         })
@@ -99,12 +108,16 @@ export const worksheetsResolver = {
       const releaseGoodCrossDockingParam = params.filters.find(param => param.name === 'crossDocking')
       const releaseGoodCourierOptionParam = params.filters.find(param => param.name === 'courierOption')
       const releaseGoodPackingOptionParam = params.filters.find(param => param.name === 'packingOption')
+      const orderRemarkParam = params.filters.find(param => param.name === 'orderRemark')
+
+      const releaseGoodPickerOptionParam = params.filters.find(param => param.name === 'assignee')
       if (
         releaseGoodParam ||
         releaseGoodRefNoParam ||
         releaseGoodCrossDockingParam ||
         releaseGoodCourierOptionParam ||
-        releaseGoodPackingOptionParam
+        releaseGoodPackingOptionParam ||
+        orderRemarkParam
       ) {
         let arrFilters = []
         if (releaseGoodParam) {
@@ -114,6 +127,7 @@ export const worksheetsResolver = {
           )
           arrFilters.push({ ...releaseGoodParam, name: 'name' })
         }
+
         if (releaseGoodRefNoParam) {
           params.filters.splice(
             params.filters.findIndex(item => item.name == 'releaseGoodRefNo'),
@@ -146,8 +160,21 @@ export const worksheetsResolver = {
           arrFilters.push({ ...releaseGoodPackingOptionParam, name: 'packingOption' })
         }
 
+        if (orderRemarkParam) {
+          params.filters.splice(
+            params.filters.findIndex(item => item.name == 'orderRemark'),
+            1
+          )
+
+          if (orderRemarkParam?.value == true) {
+            arrFilters.push({ operator: 'is_not_null', name: 'remark' })
+          } else if (orderRemarkParam?.value == false) {
+            arrFilters.push({ operator: 'is_null', name: 'remark' })
+          }
+        }
+
         const foundReleaseGoods: ReleaseGood[] = await getRepository(ReleaseGood).find({
-          ...convertListParams({ filters: arrFilters })
+          ...convertListParams({ filters: arrFilters }, { searchables: ['arrivalNoticeNo', 'releaseGoodNo'] })
         })
 
         if (foundReleaseGoods && foundReleaseGoods.length) {
@@ -252,6 +279,31 @@ export const worksheetsResolver = {
         }
       }
 
+      //find assignee
+
+      const assigneeParam = params.filters.find(param => param.name === 'assignee')
+      let assigneeFilter = []
+      if (assigneeParam) {
+        params.filters.splice(
+          params.filters.findIndex(item => item.name == 'assignee'),
+          1
+        )
+        assigneeFilter.push({ ...assigneeParam, name: 'name' })
+
+        const foundAssignee: User[] = await getRepository(User).find({
+          ...convertListParams({ filters: assigneeFilter })
+        })
+
+        if (foundAssignee) {
+          params.filters.push({
+            name: 'assigneeId',
+            operator: 'in',
+            value: foundAssignee.map((foundIC: User) => foundIC.id),
+            relation: false
+          })
+        }
+      }
+
       ////Set default bizplace filter
       const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId')
       if (!bizplaceFilter && typeParam.value[0] !== WORKSHEET_TYPE.BATCH_PICKING) {
@@ -276,7 +328,7 @@ export const worksheetsResolver = {
         params.filters = params.filters.filter(param => param.name !== 'name')
       }
 
-      buildQuery(qb, params, context)
+      buildQuery(qb, params, context, { searchables: ['arrivalNoticeNo'] })
 
       if (orderName !== '') {
         qb.andWhere(
@@ -379,7 +431,14 @@ export const worksheetsResolver = {
 
       qb.orderBy(sort)
 
-      const [items, total] = await qb.getManyAndCount()
+      let [items, total] = await qb.getManyAndCount()
+
+      items = items.map(item => {
+        return {
+          ...item,
+          orderRemark: item?.releaseGood?.remark ? true : false
+        }
+      })
 
       return { items, total }
     } catch (error) {

package/server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details-by-bulk.ts

@@ -1,20 +1,26 @@
-import { Product } from '@things-factory/product-base'
-import { OrderInventory, OrderNoGenerator, ORDER_INVENTORY_STATUS, ORDER_TYPES } from '@things-factory/sales-base'
-import { Inventory } from '@things-factory/warehouse-base'
+import { EntityManager, getRepository } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import {
+  ORDER_INVENTORY_STATUS,
+  ORDER_PRODUCT_STATUS,
+  ORDER_TYPES,
+  OrderInventory,
+  OrderNoGenerator,
+  OrderProduct
+} from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
-import { EntityManager, In, getRepository } from 'typeorm'
+import { Domain } from '@things-factory/shell'
+import { Inventory } from '@things-factory/warehouse-base'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
-import { WorksheetNoGenerator, inventoriesByStrategy } from '../../../utils'
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
-import { generateBatchPickingWorksheetDetailsResolver } from './generate-batch-picking-worksheet-details'
-import orderBy from 'lodash/orderBy'
+import { inventoriesByStrategy, WorksheetNoGenerator } from '../../../utils'
 
 export const generateBatchPickingWorksheetDetailsByBulkResolver = {
   async generateBatchPickingWorksheetDetailsByBulk(
     _: any,
-    { worksheetId, bizplaceId, selectedItems, pickingStrategy },
+    { worksheetId, bizplaceId, selectedItems },
     context: any
   ): Promise<Boolean> {
     const { tx, user, domain }: { tx: EntityManager; user: User; domain: Domain } = context.state
@@ -50,7 +56,7 @@ export const generateBatchPickingWorksheetDetailsByBulkResolver = {
       })
 
       await Promise.all(
-        selectedItems.map(async (oi: OrderInventory) => {
+        selectedItems.map(async (oi: OrderInventory & { pickingStrategy: string }) => {
           try {
             let pOrderInventories = tx.getRepository(OrderInventory).find({
               where: {
@@ -61,7 +67,7 @@ export const generateBatchPickingWorksheetDetailsByBulkResolver = {
                 packingSize: oi.packingSize,
                 status: ORDER_INVENTORY_STATUS.PENDING_SPLIT
               },
-              relations: ['product', 'releaseGood', 'bizplace'],
+              relations: ['product', 'releaseGood', 'bizplace', 'orderProduct'],
               order: {
                 releaseQty: 'DESC'
               }
@@ -72,7 +78,6 @@ export const generateBatchPickingWorksheetDetailsByBulkResolver = {
                 ...oi,
                 worksheetId: worksheet.id,
                 bizplaceId,
-                pickingStrategy,
                 locationSortingRules: inventoryAssignmentSetting ? JSON.parse(inventoryAssignmentSetting.value) : false
               },
               domain,
@@ -122,6 +127,14 @@ export const generateBatchPickingWorksheetDetailsByBulkResolver = {
                     .where('id = :id', { id: targetInventory.id })
                   await qbInv.execute()
 
+                  // update order product status to ASSIGNED
+                  await tx
+                    .getRepository(OrderProduct)
+                    .update(
+                      { id: orderInventory.orderProduct.id },
+                      { status: ORDER_PRODUCT_STATUS.ASSIGNED, updater: user }
+                    )
+
                   // Create new order inventory with status -> READY_TO_PICK, type -> RELEASE_OF_GOODS
                   let newTargetInventory: OrderInventory = new OrderInventory()
                   newTargetInventory = {
@@ -139,7 +152,9 @@ export const generateBatchPickingWorksheetDetailsByBulkResolver = {
                     creator: user,
                     inventory: targetInventory,
                     releaseQty: allocatedQty,
-                    releaseUomValue: allocatedUomValue
+                    releaseUomValue: allocatedUomValue,
+                    uom: orderInventory.uom,
+                    orderProduct: orderInventory.orderProduct
                   }
                   newTargetInventory = await tx.getRepository(OrderInventory).save(newTargetInventory)
 
@@ -152,6 +167,7 @@ export const generateBatchPickingWorksheetDetailsByBulkResolver = {
                     bizplace: orderInventory.bizplace,
                     name: WorksheetNoGenerator.batchPickingDetail(),
                     targetInventory: newTargetInventory,
+                    targetProduct: newTargetInventory.orderProduct,
                     type: WORKSHEET_TYPE.BATCH_PICKING,
                     status: WORKSHEET_STATUS.DEACTIVATED,
                     creator: user

package/server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details.ts

@@ -1,12 +1,20 @@
+import { EntityManager } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
 import { Product } from '@things-factory/product-base'
-import { OrderInventory, OrderNoGenerator, ORDER_INVENTORY_STATUS } from '@things-factory/sales-base'
+import {
+  ORDER_INVENTORY_STATUS,
+  ORDER_PRODUCT_STATUS,
+  OrderInventory,
+  OrderNoGenerator,
+  OrderProduct
+} from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
-import { EntityManager } from 'typeorm'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 import { WorksheetNoGenerator } from '../../../utils'
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
 
 export const generateBatchPickingWorksheetDetailsResolver = {
   async generateBatchPickingWorksheetDetails(
@@ -15,7 +23,7 @@ export const generateBatchPickingWorksheetDetailsResolver = {
     context: any
   ): Promise<void> {
     const { tx, user, domain }: { tx: EntityManager; user: User; domain: Domain } = context.state
-    
+
     // 1. Find Related Worksheet
     const worksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
       where: { name: worksheetNo, domain },
@@ -28,14 +36,21 @@ export const generateBatchPickingWorksheetDetailsResolver = {
     })
 
     // Only proceed if worksheet status IS "DEACTIVATED"
-    if(worksheet.status != WORKSHEET_STATUS.DEACTIVATED){
+    if (worksheet.status != WORKSHEET_STATUS.DEACTIVATED) {
       return
     }
 
     // 2. Find all existing order inventory that is related to the product
     let prevOrdInvs: OrderInventory[] = await tx.getRepository(OrderInventory).find({
-      where: { domain, refWorksheetId: worksheet.id, product: productId, batchId, packingType, status: ORDER_INVENTORY_STATUS.PENDING_SPLIT },
-      relations: ['releaseGood', 'bizplace']
+      where: {
+        domain,
+        refWorksheetId: worksheet.id,
+        product: productId,
+        batchId,
+        packingType,
+        status: ORDER_INVENTORY_STATUS.PENDING_SPLIT
+      },
+      relations: ['releaseGood', 'bizplace', 'orderProduct']
     })
 
     // Sort all release qty from highest to lowest
@@ -80,6 +95,8 @@ export const generateBatchPickingWorksheetDetailsResolver = {
         newTargetInventory.packingType = prevOrdInv.packingType
         newTargetInventory.packingSize = parseFloat(prevOrdInv.packingSize)
         newTargetInventory.creator = user
+        newTargetInventory.uom = selectedOrdInv.uom
+        newTargetInventory.orderProduct = prevOrdInv.orderProduct
 
         let inventory: Inventory = await tx.getRepository(Inventory).findOne(selectedOrdInv.inventory.id)
 
@@ -100,7 +117,7 @@ export const generateBatchPickingWorksheetDetailsResolver = {
 
         requiredQty = fulfiledQty <= 0 ? 0 : fulfiledQty
         requiredUomValue = fulfiledUomValue <= 0 ? 0 : fulfiledUomValue
-            
+
         await tx.getRepository(Inventory).update(
           { domain, id: inventory.id },
           {
@@ -115,6 +132,11 @@ export const generateBatchPickingWorksheetDetailsResolver = {
           }
         )
 
+        // update order product status to ASSIGNED
+        await tx
+          .getRepository(OrderProduct)
+          .update({ id: prevOrdInv.orderProduct.id }, { status: ORDER_PRODUCT_STATUS.ASSIGNED, updater: user })
+
         // Generate Worksheet Detail
         let newWorksheetDetail: WorksheetDetail = new WorksheetDetail()
         newWorksheetDetail = {
@@ -124,6 +146,7 @@ export const generateBatchPickingWorksheetDetailsResolver = {
           bizplace: prevOrdInv.bizplace,
           name: WorksheetNoGenerator.batchPickingDetail(),
           targetInventory: newTargetInventory,
+          targetProduct: prevOrdInv.orderProduct,
           type: WORKSHEET_TYPE.BATCH_PICKING,
           status: WORKSHEET_STATUS.DEACTIVATED,
           creator: user
@@ -134,11 +157,16 @@ export const generateBatchPickingWorksheetDetailsResolver = {
         selectedOrdInv.releaseUomValue = remainingUomValue <= 0 ? 0 : remainingUomValue
 
         // insufficient qty for current order inventory, use the next inventory qty
-        if (selectedOrdInv.releaseQty == 0){
+        if (selectedOrdInv.releaseQty == 0) {
           j = j + 1
         }
       }
-      await tx.getRepository(OrderInventory).update({id: prevOrdInvs[i].id},{status: ORDER_INVENTORY_STATUS.COMPLETE_SPLIT, updater: user, updatedAt: new Date()})
+      await tx
+        .getRepository(OrderInventory)
+        .update(
+          { id: prevOrdInvs[i].id },
+          { status: ORDER_INVENTORY_STATUS.COMPLETE_SPLIT, updater: user, updatedAt: new Date() }
+        )
     }
   }
 }

package/server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts

@@ -1,33 +1,22 @@
-import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+import { EntityManager, In } from 'typeorm'
+
 import { generateId } from '@things-factory/id-rule-base'
-import { In } from 'typeorm'
+import { Domain } from '@things-factory/shell'
+
 import { WorksheetDetail } from '../../../entities'
 
 export const generatePalletIdResolver = {
   async generatePalletId(_: any, { targets, type }, context: any) {
     const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state
-    // 1. get and set the date
-    const today = new Date()
-    const year = today.getFullYear()
-    const month = today.getMonth()
-    const day = today.getDate()
-
-    const yy = String(year).substr(String(year).length - 2)
-    const mm = String(month + 1).padStart(2, '0')
-    const dd = String(day).padStart(2, '0')
-
-    const date = yy + mm + dd
+    // 1. get date in yymmdd format
+    const date = new Date().toJSON().slice(0, 10).replace(/-/g, '').slice(2, 8)
     let results = []
 
-    // 2. get worksheet detail
-    let ids = targets.map(target => target.id)
-
-    // - getRepository using In(array) to pass the value to defined variable
+    // 2. get worksheet details
     const foundWorksheetDetails: WorksheetDetail[] = await tx.getRepository(WorksheetDetail).find({
       where: {
         domain,
-        id: In(ids)
+        id: In(targets.map(target => target.id))
       },
       relations: [
         'domain',
@@ -35,6 +24,8 @@ export const generatePalletIdResolver = {
         'worksheet',
         'worker',
         'targetProduct',
+        'targetProduct.arrivalNotice',
+        'targetProduct.arrivalNotice.purchaseOrder',
         'targetProduct.product',
         'targetInventory',
         'targetInventory.product',
@@ -44,8 +35,7 @@ export const generatePalletIdResolver = {
     })
 
     // 3. from worksheet detail get product name, product type, batchid, packing type, bizplace
-
-    if (foundWorksheetDetails.length <= 0) throw new Error('Unable to find worksheet details')
+    if (!foundWorksheetDetails?.length) throw new Error('Unable to find worksheet details')
     else {
       for (let i = 0; i < foundWorksheetDetails.length; i++) {
         let foundWSD = foundWorksheetDetails[i]
@@ -53,39 +43,46 @@ export const generatePalletIdResolver = {
           if (foundWSD.id === targets[idx].id) {
             // 4. generate pallet id based on print qty > call generateId resolver
             for (let i = 0; i < targets[idx].printQty; i++) {
-              const generatedPalletId = await generateId({
-                domain,
-                type,
-                seed: {
-                  batchId: foundWSD?.targetProduct?.batchId
-                    ? foundWSD.targetProduct.batchId
-                    : foundWSD?.targetInventory?.batchId
-                      ? foundWSD.targetInventory.batchId
-                      : foundWSD.targetVas.targetBatchId,
-                  date: date
-                }
-              })
-
+              let result: any = {}
               // 5. map all data to be returned
-              if (foundWSD.targetProduct != null) {
-                results.push({
+              if (foundWSD.targetProduct) {
+                result = {
                   ...foundWSD.targetProduct,
-                  palletId: generatedPalletId,
-                  bizplace: foundWSD.bizplace
-                })
-              } else if (foundWSD.targetInventory != null) {
-                results.push({
+                  bizplace: foundWSD.bizplace,
+                  orderProductRemark: foundWSD.targetProduct.remark,
+                  purchaseOrderNo: foundWSD.targetProduct.arrivalNotice?.purchaseOrder?.name || '',
+                  arrivalNoticeRefNo: foundWSD.targetProduct.arrivalNotice?.refNo || ''
+                }
+              } else if (foundWSD.targetInventory) {
+                result = {
                   ...foundWSD.targetInventory,
-                  palletId: generatedPalletId,
-                  bizplace: foundWSD.bizplace
-                })
-              } else if (foundWSD.targetVas != null) {
-                results.push({
+                  bizplace: foundWSD.bizplace,
+                  orderProductRemark: '',
+                  purchaseOrderNo: '',
+                  arrivalNoticeRefNo: ''
+                }
+              } else if (foundWSD.targetVas) {
+                result = {
                   ...foundWSD.targetVas,
-                  palletId: generatedPalletId,
-                  bizplace: foundWSD.bizplace
-                })
+                  bizplace: foundWSD.bizplace,
+                  batchId: foundWSD.targetVas.targetBatchId,
+                  orderProductRemark: '',
+                  purchaseOrderNo: '',
+                  arrivalNoticeRefNo: ''
+                }
               }
+
+              results.push({
+                ...result,
+                palletId: await generateId({
+                  domain,
+                  type,
+                  seed: {
+                    batchId: result.batchId || '',
+                    date
+                  }
+                })
+              })
             }
           }
         }

package/server/graphql/resolvers/worksheet-detail/generate-picking-worksheet-details.ts

@@ -3,10 +3,12 @@ import { EntityManager } from 'typeorm'
 import { User } from '@things-factory/auth-base'
 import {
   ORDER_INVENTORY_STATUS,
+  ORDER_PRODUCT_STATUS,
   ORDER_TYPES,
   OrderInventory,
   OrderInventoryPatch,
   OrderNoGenerator,
+  OrderProduct,
   ReleaseGood
 } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
@@ -20,7 +22,7 @@ import { WorksheetNoGenerator } from '../../../utils'
 export const generatePickingWorksheetDetailsResolver = {
   async generatePickingWorksheetDetails(
     _: any,
-    { bizplaceId, selectedItems, pickingStrategy, worksheetNo, locationSortingRules },
+    { bizplaceId, selectedItems, worksheetNo, locationSortingRules },
     context: any
   ): Promise<Boolean> {
     const { tx, user, domain }: { tx: EntityManager; user: User; domain: Domain } = context.state
@@ -54,7 +56,6 @@ export const generatePickingWorksheetDetailsResolver = {
         bizplaceId,
         worksheetId,
         selectedItems,
-        pickingStrategy,
         locationSortingRules,
         tx
       )
@@ -117,6 +118,11 @@ export const generatePickingWorksheetDetailsResolver = {
           .where('id = :id', { id: targetInventory.inventory.id })
           .execute()
 
+        // update order product status to ASSIGNED
+        await tx
+          .getRepository(OrderProduct)
+          .update({ id: targetInventory.orderProduct.id }, { status: ORDER_PRODUCT_STATUS.ASSIGNED, updater: user })
+
         // 7. collect new worksheet details records
         const worksheetDetail: WorksheetDetail = Object.assign(new WorksheetDetail(), {
           domain,
@@ -125,6 +131,7 @@ export const generatePickingWorksheetDetailsResolver = {
           name: WorksheetNoGenerator.pickingDetail(),
           seq: 0,
           targetInventory,
+          targetProduct: targetInventory.orderProduct,
           type: WORKSHEET_TYPE.PICKING,
           status: WORKSHEET_STATUS.DEACTIVATED,
           creator: user,
@@ -162,6 +169,9 @@ function _composeWorksheetDetails(
 
   while (compReleaseQty < record.releaseQty) {
     const inv = inventories[idx]
+
+    if (!inv) break
+
     let releaseQty: number = 0
     let releaseUomValue: number = 0
 
@@ -196,7 +206,9 @@ function _composeWorksheetDetails(
         creator: user,
         updater: user,
         status: ORDER_INVENTORY_STATUS.READY_TO_PICK,
-        type: ORDER_TYPES.RELEASE_OF_GOODS.value
+        type: ORDER_TYPES.RELEASE_OF_GOODS,
+        uom: record.uom,
+        orderProduct: { id: inv.orderProductId }
       }
     })
 

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

@@ -2,7 +2,13 @@ import { EntityManager } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Product } from '@things-factory/product-base'
-import { ORDER_INVENTORY_STATUS, OrderInventory, OrderNoGenerator } from '@things-factory/sales-base'
+import {
+  ORDER_INVENTORY_STATUS,
+  ORDER_PRODUCT_STATUS,
+  OrderInventory,
+  OrderNoGenerator,
+  OrderProduct
+} from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
@@ -74,6 +80,10 @@ export async function generateReleaseGoodWorksheetDetails(
       let targetInventory: OrderInventory = wsd.targetInventory
       const inventory: Inventory = await tx.getRepository(Inventory).findOne(targetInventory.inventory.id)
 
+      let targetProduct: OrderProduct = await tx
+        .getRepository(OrderProduct)
+        .findOne({ where: { id: wsd.targetProduct.id } })
+
       targetInventory = await tx.getRepository(OrderInventory).save({
         ...targetInventory,
         domain,
@@ -87,6 +97,7 @@ export async function generateReleaseGoodWorksheetDetails(
         product: await tx.getRepository(Product).findOne(productId),
         packingType,
         packingSize,
+        orderProduct: targetProduct,
         creator: user,
         updater: user
       })
@@ -105,6 +116,11 @@ export async function generateReleaseGoodWorksheetDetails(
         updater: user
       })
 
+      // update order product status to ASSIGNED
+      await tx
+        .getRepository(OrderProduct)
+        .update({ id: targetProduct.id }, { status: ORDER_PRODUCT_STATUS.ASSIGNED, updater: user })
+
       // 3. Create worksheet details
       await tx.getRepository(WorksheetDetail).save({
         ...wsd,
@@ -112,6 +128,7 @@ export async function generateReleaseGoodWorksheetDetails(
         bizplace: worksheet.bizplace,
         worksheet,
         name: WorksheetNoGenerator.pickingDetail(),
+        targetProduct,
         targetInventory,
         type: WORKSHEET_TYPE.PICKING,
         status: WORKSHEET_STATUS.DEACTIVATED,

package/server/graphql/resolvers/worksheet-movement/create-worksheet-movement.ts

@@ -1,13 +1,13 @@
 import { EntityManager } from 'typeorm'
 import { WorksheetMovement } from '../../../entities'
-import uuid from 'uuid/v4'
+import { v4 as uuidv4 } from 'uuid'
 
 export const createWorksheetMovement = {
   async createWorksheetMovement(_, { worksheetMovement: attrs }, context: any) {
     const { tx }: { tx: EntityManager } = context.state
     const repository = tx.getRepository(WorksheetMovement)
     const newWorksheetMovement = {
-      id: uuid(),
+      id: uuidv4(),
       ...attrs
     }
 

package/server/graphql/types/worksheet/find-release-orders-by-task-no.ts

@@ -0,0 +1,8 @@
+import { gql } from 'apollo-server-koa'
+
+export const FindReleaseOrdersByTaskNo = gql`
+  type FindReleaseOrdersByTaskNo {
+    taskNo: String
+    releaseGoods: [ReleaseGood]
+  }
+`