@things-factory/worksheet-base 4.1.36 → 4.1.40

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

@@ -468,7 +468,7 @@ export class PickingWorksheetController extends VasWorksheetController {
         let totalInventoryItems = await this.trxMgr.getRepository(InventoryItem).count({
           where: {
             inventory,
-            status: Not(Equal(INVENTORY_STATUS.TERMINATED))
+            status: Not(In([INVENTORY_STATUS.TERMINATED, INVENTORY_STATUS.PICKED]))
           }
         })
 
@@ -481,11 +481,14 @@ export class PickingWorksheetController extends VasWorksheetController {
             throw new Error('Serial Number scanned is in another inventory')
           }
 
-          if (foundSerialNumber.status !== INVENTORY_STATUS.STORED || foundSerialNumber.outboundOrderId) {
-            throw new Error('Inventory Item is not available')
+          if (foundSerialNumber.outboundOrderId) {
+            let releaseGood: ReleaseGood = await this.trxMgr
+              .getRepository(ReleaseGood)
+              .findOne({ where: { id: foundSerialNumber.outboundOrderId } })
+            throw new Error(`Inventory Item is already picked in ${releaseGood.name}`)
           }
 
-          foundSerialNumber.status = INVENTORY_STATUS.PICKED
+          foundSerialNumber.status = INVENTORY_STATUS.PICKING
           foundSerialNumber.updater = this.user
           foundSerialNumber.outboundOrderId = releaseGood.id
 
@@ -498,7 +501,7 @@ export class PickingWorksheetController extends VasWorksheetController {
           let inventoryItem: InventoryItem = new InventoryItem()
           inventoryItem.name = InventoryNoGenerator.inventoryItemName()
           inventoryItem.serialNumber = serialNumber
-          inventoryItem.status = INVENTORY_STATUS.PICKED
+          inventoryItem.status = INVENTORY_STATUS.PICKING
           inventoryItem.outboundOrderId = releaseGood.id
           inventoryItem.source = INVENTORY_ITEM_SOURCE.OUTBOUND
           inventoryItem.product = product
@@ -586,7 +589,7 @@ export class PickingWorksheetController extends VasWorksheetController {
             throw new Error('Inventory Item is not available')
           }
 
-          foundSerialNumber.status = INVENTORY_STATUS.PICKED
+          foundSerialNumber.status = INVENTORY_STATUS.PICKING
           foundSerialNumber.updater = this.user
           foundSerialNumber.outboundOrderId = releaseGood.id
 
@@ -599,7 +602,7 @@ export class PickingWorksheetController extends VasWorksheetController {
           let inventoryItem: InventoryItem = new InventoryItem()
           inventoryItem.name = InventoryNoGenerator.inventoryItemName()
           inventoryItem.serialNumber = serialNumber
-          inventoryItem.status = INVENTORY_STATUS.PICKED
+          inventoryItem.status = INVENTORY_STATUS.PICKING
           inventoryItem.outboundOrderId = releaseGood.id
           inventoryItem.product = product
           inventoryItem.inventory = scannedPalletIdInventory
@@ -1123,6 +1126,19 @@ export class PickingWorksheetController extends VasWorksheetController {
       worksheetDetail.updater = this.user
       await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
 
+      let InventoryItems: InventoryItem = await this.trxMgr
+        .getRepository(InventoryItem)
+        .find({ where: { outboundOrderId: releaseGood.id } })
+
+      if (InventoryItems.length > 0) {
+        InventoryItems.forEach((itm: InventoryItem) => {
+          itm.status = INVENTORY_STATUS.PICKED
+          itm.updater = this.user
+        })
+
+        await this.trxMgr.getRepository(InventoryItem).save(InventoryItems)
+      }
+
       if (leftQty === 0) {
         inventory.status = INVENTORY_STATUS.TERMINATED
         await this.transactionInventory(inventory, releaseGood, 0, 0, INVENTORY_TRANSACTION_TYPE.TERMINATED)
@@ -1177,7 +1193,7 @@ export class PickingWorksheetController extends VasWorksheetController {
           newOrderInventory.releaseQty * (targetInventory.releaseUomValue / targetInventory.releaseQty)
 
         oldOrderInventory.releaseQty = targetInventory.pickedQty
-        oldOrderInventory.status = INVENTORY_STATUS.PICKED
+        oldOrderInventory.status = ORDER_INVENTORY_STATUS.PICKED
         oldOrderInventory.releaseUomValue =
           (targetInventory.releaseUomValue / targetInventory.releaseQty) * oldOrderInventory.releaseQty
 
@@ -1281,7 +1297,7 @@ export class PickingWorksheetController extends VasWorksheetController {
           newOrderInventoryReleaseQty * (targetInventory.releaseUomValue / targetInventory.releaseQty)
 
         oldOrderInventory.releaseQty = targetInventory.pickedQty
-        oldOrderInventory.status = INVENTORY_STATUS.PICKED
+        oldOrderInventory.status = ORDER_INVENTORY_STATUS.PICKED
         oldOrderInventory.releaseUomValue =
           (targetInventory.releaseUomValue / targetInventory.releaseQty) * oldOrderInventory.releaseQty
 
@@ -1365,8 +1381,12 @@ export class PickingWorksheetController extends VasWorksheetController {
     })
 
     let targetInventory: OrderInventory = worksheetDetail.targetInventory
+    let releaseGood: ReleaseGood = worksheetDetail.worksheet.releaseGood
 
-    if (targetInventory.releaseQty == targetInventory.pickedQty && targetInventory.status == INVENTORY_STATUS.PICKED) {
+    if (
+      targetInventory.releaseQty == targetInventory.pickedQty &&
+      targetInventory.status == ORDER_INVENTORY_STATUS.PICKED
+    ) {
       targetInventory.status = INVENTORY_STATUS.PICKING
 
       await this.trxMgr
@@ -1383,11 +1403,24 @@ export class PickingWorksheetController extends VasWorksheetController {
       await this.trxMgr.getRepository(Inventory).save(targetInventory.inventory)
     }
 
+    let InventoryItems: InventoryItem = await this.trxMgr
+      .getRepository(InventoryItem)
+      .find({ where: { outboundOrderId: releaseGood.id } })
+
     let removeInventoryItem: InventoryItem = await this.trxMgr
       .getRepository(InventoryItem)
       .findOne({ where: { id: inventoryItemId } })
 
-    if (removeInventoryItem.source == 'OUTBOUND') {
+    if (InventoryItems.length > 0) {
+      InventoryItems.forEach((itm: InventoryItem) => {
+        itm.status = INVENTORY_STATUS.PICKING
+        itm.updater = this.user
+      })
+
+      await this.trxMgr.getRepository(InventoryItem).save(InventoryItems)
+    }
+
+    if (removeInventoryItem.source == INVENTORY_ITEM_SOURCE.OUTBOUND) {
       await this.trxMgr.getRepository(InventoryItem).delete(removeInventoryItem.id)
     } else {
       await this.trxMgr.getRepository(InventoryItem).update(

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

@@ -167,7 +167,13 @@ export class ReturningWorksheetController extends VasWorksheetController {
         where: {
           domain: this.domain,
           name: toLocationName,
-          type: In([LOCATION_TYPE.SHELF, LOCATION_TYPE.BUFFER, LOCATION_TYPE.FLOOR, LOCATION_TYPE.BIN])
+          type: In([
+            LOCATION_TYPE.SHELF,
+            LOCATION_TYPE.BUFFER,
+            LOCATION_TYPE.FLOOR,
+            LOCATION_TYPE.BIN,
+            LOCATION_TYPE.QUARANTINE
+          ])
         },
         relations: ['warehouse']
       })

package/server/controllers/render-grn.ts

@@ -1,7 +1,8 @@
+import _ from 'lodash'
 import FormData from 'form-data'
 import fetch from 'node-fetch'
 import { getRepository, IsNull, Not } from 'typeorm'
-
+import { InventoryItem } from '@things-factory/warehouse-base'
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
 import { Partner } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint } from '@things-factory/biz-base'
@@ -32,6 +33,10 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
   const foundGAN: ArrivalNotice = foundGRN.arrivalNotice
   const ownRefNo = foundGAN.refNo
 
+  const foundInventoryItem: InventoryItem[] = await getRepository(InventoryItem).query(
+    `select row_number() over (partition by p.sku) as "seq",p.sku,p.brand_sku, ii.serial_number from inventory_items ii left join products p on ii.product_id = p.id where inbound_order_id = '${foundGAN.id}' group by p.sku,ii.serial_number,p.brand_sku`
+  )
+
   // 4. find customer bizplace
   const partnerBiz: Bizplace = foundGRN.bizplace
 
@@ -142,6 +147,31 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
     cop = 'data:' + foundSignature.mimetype + ';base64,' + (await STORAGE.readFile(foundCop.path, 'base64'))
   }
 
+  const filterInventoryItem = _.groupBy(foundInventoryItem, i => i.sku)
+
+  const tempIndexArr = []
+
+  const tempTotalQuantity = []
+
+  Object.keys(filterInventoryItem).forEach(k => {
+    const tempIndex = foundInventoryItem.findIndex(i => {
+      return i.sku == k
+    })
+
+    tempIndexArr.push(tempIndex)
+  })
+
+  Object.values(filterInventoryItem).forEach(k => {
+    const tempQuantity = k.length
+
+    tempTotalQuantity.push(tempQuantity)
+  })
+
+  tempIndexArr.forEach((t, index) => {
+    foundInventoryItem[t].totalQuantity = tempTotalQuantity[index]
+  })
+
+
   const data = {
     logo_url: logo,
     sign_url: signature,
@@ -166,6 +196,7 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
     gan_accepted_at: foundGAN.acceptedAt ? DateTimeConverter.datetime(foundGAN.acceptedAt, timezoneOffSet) : '',
     unload_date: DateTimeConverter.date(foundWS.endedAt),
     ref_no: ownRefNo ? `${foundGAN.name} / ${foundGAN.refNo}` : `${foundGAN.name}`,
+    ref_no_only: ownRefNo ? ` ${foundGAN.refNo}` : '',
     ref_no1: foundGAN.refNo2 ? `${foundGAN.refNo2}` : '',
     ref_no2: foundGAN.refNo3 ? `${foundGAN.refNo3}` : '',
     received_date: DateTimeConverter.date(foundWS.endedAt),
@@ -188,6 +219,7 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
       return {
         list_no: idx + 1,
         product_sku: `${item.product.sku}`,
+        product_brand_sku: `${item.product.brandSku}`,
         product_name: `${item.product.name}(${item.product.description})`,
         product_desc: item.product.description,
         product_nameOnly: item.product.name,
@@ -205,10 +237,12 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
         product_gross_weight: item.product.grossWeight || null,
         unit_price: item.unitPrice || null,
         expiry_date: unloadInvHistory.expiryDate || '',
+        manufacture_date:item.manufactureDate,
         reusable_pallet_id: unloadInvHistory.reusablePalletId || '',
         remark: (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '')
       }
-    })
+    }),
+    serialNumber: foundInventoryItem
   }
 
   const formData = new FormData()

package/server/controllers/render-orientage-do.ts

@@ -1,3 +1,4 @@
+import _ from 'lodash'
 import FormData from 'form-data'
 import fetch from 'node-fetch'
 import { Equal, getRepository, In } from 'typeorm'
@@ -10,7 +11,7 @@ import { ProductDetail } from '@things-factory/product-base'
 import { DeliveryOrder, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, Pallet } from '@things-factory/warehouse-base'
-
+import { InventoryItem } from '@things-factory/warehouse-base'
 import { TEMPLATE_TYPE, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
 import { Worksheet, WorksheetDetail } from '../entities'
 
@@ -35,6 +36,10 @@ export async function renderOrientageDO({ doNo }, context: any) {
     ]
   }) // .. find do from deliveryOrderId
 
+  let foundInventoryItem: InventoryItem[] = await getRepository(InventoryItem).query(
+    `select row_number() over (partition by p.sku),p.sku,p.brand_sku, ii.serial_number from inventory_items ii left join products p on ii.product_id = p.id where outbound_order_id = '${foundDO.releaseGood.id}' group by p.sku,ii.serial_number,p.brand_sku`
+  )
+
   const ownTransportFlag: Boolean = foundDO.ownCollection
 
   let foundCP: ContactPoint = null
@@ -263,6 +268,47 @@ export async function renderOrientageDO({ doNo }, context: any) {
         })
       }
     }, [])
+    
+    let tempFoundInventoryItem:any = []
+
+    productList.forEach((product) => {
+
+       tempFoundInventoryItem = foundInventoryItem.filter((item) =>{
+        return item.sku == product.product_sku
+      })
+
+      tempFoundInventoryItem.concat(tempFoundInventoryItem);
+    })
+
+    foundInventoryItem = tempFoundInventoryItem;
+
+  const filterInventoryItem = _.groupBy(foundInventoryItem, i => i.sku)
+
+  const tempIndexArr = []
+
+  const tempTotalQuantity = []
+
+  Object.keys(filterInventoryItem).forEach(k => {
+    const tempIndex = foundInventoryItem.findIndex(i => {
+      return i.sku == k
+    })
+
+    tempIndexArr.push(tempIndex)
+  })
+
+  Object.values(filterInventoryItem).forEach(k => {
+    const tempQuantity = k.length
+
+    tempTotalQuantity.push(tempQuantity)
+  })
+
+  tempIndexArr.forEach((t, index) => {
+    foundInventoryItem[t].totalQuantity = tempTotalQuantity[index]
+  })
+
+  foundInventoryItem[0].ref_no = ownRefNo
+
+
 
   const data = {
     // logo_url: logo,
@@ -305,6 +351,9 @@ export async function renderOrientageDO({ doNo }, context: any) {
         batch_id_ref: prod.product_batch_ref,
         batch_id: prod.product_batch
       }
+    }),
+    serialNumber: foundInventoryItem.map((item: any, idx) => {
+      return { ...item, delivery_to: foundDO.to }
     })
   } //.. make data from do
   const formData = new FormData()

package/server/controllers/render-orientage-grn.ts

@@ -1,7 +1,7 @@
+import _ from 'lodash'
 import FormData from 'form-data'
 import fetch from 'node-fetch'
 import { getRepository, IsNull, Not } from 'typeorm'
-
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
 import { Partner } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint } from '@things-factory/biz-base'
@@ -14,6 +14,7 @@ import {
   ORDER_STATUS,
   OrderProduct
 } from '@things-factory/sales-base'
+import { InventoryItem } from '@things-factory/warehouse-base'
 import { Domain } from '@things-factory/shell'
 
 import { TEMPLATE_TYPE } from '../constants'
@@ -40,6 +41,10 @@ export async function renderOrientageGRN({ grnNo }, context: any) {
   const ownRefNo2 = foundGAN.refNo2
   const ownRefNo3 = foundGAN.refNo3
 
+  const foundInventoryItem: InventoryItem[] = await getRepository(InventoryItem).query(
+    `select row_number() over (partition by p.sku),p.sku,p.brand_sku, ii.serial_number from inventory_items ii left join products p on ii.product_id = p.id where inbound_order_id = '${foundGAN.id}' group by p.sku,ii.serial_number,p.brand_sku`
+  )
+
   // 4. find customer bizplace
   const partnerBiz: Bizplace = foundGRN.bizplace
 
@@ -90,6 +95,31 @@ export async function renderOrientageGRN({ grnNo }, context: any) {
     logo = 'data:' + foundLogo.mimetype + ';base64,' + (await STORAGE.readFile(foundLogo.path, 'base64'))
   }
 
+  const filterInventoryItem = _.groupBy(foundInventoryItem, i => i.sku)
+
+  const tempIndexArr = []
+
+  const tempTotalQuantity = []
+
+  Object.keys(filterInventoryItem).forEach(k => {
+    const tempIndex = foundInventoryItem.findIndex(i => {
+      return i.sku == k
+    })
+
+    tempIndexArr.push(tempIndex)
+  })
+
+  Object.values(filterInventoryItem).forEach(k => {
+    const tempQuantity = k.length
+
+    tempTotalQuantity.push(tempQuantity)
+  })
+
+  tempIndexArr.forEach((t, index) => {
+    foundInventoryItem[t].totalQuantity = tempTotalQuantity[index]
+  })
+
+
   const data = {
     logo_url: logo,
     customer_biz: partnerBiz.name,
@@ -151,6 +181,7 @@ export async function renderOrientageGRN({ grnNo }, context: any) {
           : item?.product?.volume
           ? Number((item.product.volume * item.actualPackQty).toFixed(4))
           : 0,
+        manufacture_year: item.manufactureDate ? new Date(item.manufactureDate).getFullYear() : null,
         manufacture_date: item.manufactureDate ? item.manufactureDate : null,
         literage: matchedProductDetail
           ? matchedProductDetail.packingSize
@@ -161,7 +192,8 @@ export async function renderOrientageGRN({ grnNo }, context: any) {
           : 0,
         remark: item.remark || ''
       }
-    })
+    }),
+    serialNumber: foundInventoryItem
   }
 
   const formData = new FormData()

package/server/controllers/render-ro-do.ts

@@ -1,3 +1,4 @@
+import _ from 'lodash'
 import FormData from 'form-data'
 import fetch from 'node-fetch'
 import { Equal, getRepository, In } from 'typeorm'
@@ -10,9 +11,10 @@ import { ProductDetail } from '@things-factory/product-base'
 import { DeliveryOrder, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, Pallet } from '@things-factory/warehouse-base'
-
+import { InventoryItem } from '@things-factory/warehouse-base'
 import { TEMPLATE_TYPE, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
 import { Worksheet, WorksheetDetail } from '../entities'
+import { DateTimeConverter } from '../utils/datetime-util'
 
 const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
 
@@ -48,6 +50,10 @@ export async function renderRODO({ doNo }, context: any) {
   const partnerBiz: Bizplace = foundDO.bizplace //customer bizplace
   const ownRefNo = foundRO.refNo
 
+  let foundInventoryItem: InventoryItem[] = await getRepository(InventoryItem).query(
+    `select row_number() over (partition by p.sku) as "seq",p.sku,p.brand_sku, ii.serial_number from inventory_items ii left join products p on ii.product_id = p.id where outbound_order_id = '${foundDO.releaseGood.id}' group by p.sku,ii.serial_number,p.brand_sku`
+  )
+
   const partnerDomain: Partner = await getRepository(Partner).findOne({
     where: { partnerDomain: partnerBiz.domain, domain },
     relations: ['domain']
@@ -70,6 +76,11 @@ export async function renderRODO({ doNo }, context: any) {
     relations: ['updater']
   })
 
+  const foundLoadingWS: Worksheet = await getRepository(Worksheet).findOne({
+    where: { domain, releaseGood: foundRO, type: WORKSHEET_TYPE.LOADING },
+    relations: ['updater']
+  })
+
   //find reusable pallet
   const foundRP: Pallet[] = await getRepository(Pallet).find({
     where: { domain, refOrderNo: foundRO.name }
@@ -211,6 +222,67 @@ export async function renderRODO({ doNo }, context: any) {
       }
     }, [])
 
+
+        
+    let tempFoundInventoryItem:any = []
+
+    const sepProductList = productList.flatMap(p=>Array.from({length:p.product_qty},()=>({...p})))
+
+    sepProductList.forEach((product) => {
+
+       let temp = foundInventoryItem.filter((item) =>{
+        return item.sku == product.product_sku
+      })
+
+      if(temp.length>1){
+        temp.forEach(res=>{
+          console.log(res)
+    
+          if(tempFoundInventoryItem.length==0){
+            tempFoundInventoryItem.push(res)
+          }else{
+            const index = tempFoundInventoryItem.findIndex(res=>res.serial_number == res.serial_number)
+    
+            if(!index){
+              tempFoundInventoryItem.push(res)
+            }
+          }
+    
+          tempFoundInventoryItem = _.uniqWith(tempFoundInventoryItem,_.isEqual)
+        })
+     }else{
+       tempFoundInventoryItem.push(Object.assign({}, ...temp))
+     }
+    })
+
+    foundInventoryItem = tempFoundInventoryItem;
+
+  const filterInventoryItem = _.groupBy(foundInventoryItem, i => i.sku)
+
+  const tempIndexArr = []
+
+  const tempTotalQuantity = []
+
+  Object.keys(filterInventoryItem).forEach(k => {
+    const tempIndex = foundInventoryItem.findIndex(i => {
+      return i.sku == k
+    })
+
+    tempIndexArr.push(tempIndex)
+  })
+
+  Object.values(filterInventoryItem).forEach(k => {
+    const tempQuantity = k.length
+
+    tempTotalQuantity.push(tempQuantity)
+  })
+
+  tempIndexArr.forEach((t, index) => {
+    foundInventoryItem[t].totalQuantity = tempTotalQuantity[index]
+  })
+
+  foundInventoryItem[0].ref_no = ownRefNo || ""
+
   const data = {
     logo_url: logo,
     customer_biz: partnerBiz.name,
@@ -231,9 +303,16 @@ export async function renderRODO({ doNo }, context: any) {
     customer_name: foundCP ? foundCP.name : null,
     customer_delivery_address: foundCP ? foundCP.address : null,
     customer_billing_address: foundCP ? foundCP.billingAddress : null,
+    new_billing_address: foundRO?.billingAddress || null,
     new_delivery_address: foundRO?.deliveryAddress1 || null,
     new_delivery_address2: foundRO?.deliveryAddress2 || null,
-    new_billing_address: foundRO?.billingAddress || null,
+    new_delivery_address3: foundRO?.deliveryAddress3 || null,
+    new_delivery_address4: foundRO?.deliveryAddress4 || null,
+    new_delivery_address5: foundRO?.deliveryAddress5 || null,
+    new_delivery_city: foundRO?.city || null,
+    new_delivery_state: foundRO?.state || null,
+    new_delivery_postal_code: foundRO?.postalCode || null,
+    new_delivery_country: foundRO?.country || null,
     new_attention_to: foundRO?.attentionTo || null,
     new_attention_company: foundRO?.attentionCompany || null,
     new_phone_no: foundRO?.phone1 || null,
@@ -251,6 +330,8 @@ export async function renderRODO({ doNo }, context: any) {
     ref_no3: foundRO.refNo3 ? `${foundRO.refNo3}` : '',
     order_no: foundDO.name,
     delivery_date: foundDO.deliveryDate || '',
+    complete_loading_date: DateTimeConverter.date(foundLoadingWS.endedAt),
+    ro_created_date: DateTimeConverter.date(foundRO.createdAt),
     truck_no: foundDO.truckNo,
     driver_name: foundDriver || '',
     pallet_qty: foundDO.palletQty,
@@ -275,6 +356,9 @@ export async function renderRODO({ doNo }, context: any) {
         inventory_remark: prod?.inventory_remark ? prod.inventory_remark : '',
         batch_id_ref: prod.product_batch_ref
       }
+    }),
+    serialNumber: foundInventoryItem.map((item: any, idx) => {
+      return { ...item, delivery_to: foundDO.to }
     })
   } //.. make data from do
   const formData = new FormData()

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

@@ -7,7 +7,7 @@ import { Worksheet } from '../../../../entities'
 export const assignPickingWorkerResolver = {
   async assignPickingWorker(
     _parentObj: void,
-    { worksheetId, userId }: { worksheetId: string; userId: string },
+    { worksheetId, userId }: { worksheetId: [string]; userId: string },
     context: any
   ): Promise<void> {
     const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state
@@ -17,16 +17,19 @@ export const assignPickingWorkerResolver = {
 
     if (!assignee) throw new Error('failed to find target user')
 
-    const worksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
-      id: worksheetId,
-      type: WORKSHEET_TYPE.PICKING
-    })
+    await Promise.all(worksheetId.map(async (worksheetId)=>{
+      const worksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
+        id: worksheetId,
+        type: WORKSHEET_TYPE.PICKING
+      })
+  
+      if (!worksheet) throw new Error('failed to find target picking worksheet')
+      if (worksheet.status !== WORKSHEET_STATUS.DEACTIVATED)
+        throw new Error(`current status of worksheet is not able to assign worker`)
+  
+      worksheet.assignee = assignee
+      await tx.getRepository(Worksheet).save(worksheet)
 
-    if (!worksheet) throw new Error('failed to find target picking worksheet')
-    if (worksheet.status !== WORKSHEET_STATUS.DEACTIVATED)
-      throw new Error(`current status of worksheet is not able to assign worker`)
-
-    worksheet.assignee = assignee
-    await tx.getRepository(Worksheet).save(worksheet)
+    }))
   }
 }

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

@@ -10,7 +10,7 @@ type AssignmentStatusByUserType = { user: User; pending?: Worksheet[]; picking?:
 export const pickingAssignmentStatusByUsersResolver = {
   async pickingAssignmentStatusByUsers(
     _: void,
-    { bizplaceId, name, email }: { bizplaceId: string; name?: string; email?: string },
+    { name, email }: { name?: string; email?: string },
     context: any
   ): Promise<AssignmentStatusByUserType[]> {
     const { domain }: { domain: Domain } = context.state
@@ -25,11 +25,9 @@ export const pickingAssignmentStatusByUsersResolver = {
 
     const users: User[] = await getRepository(User).find(findOneOption)
 
-    const bizplace: Bizplace = await getRepository(Bizplace).findOne(bizplaceId)
     const assignedPickingWorksheets: Worksheet[] = await getRepository(Worksheet).find({
       where: {
         domain,
-        bizplace,
         type: WORKSHEET_TYPE.PICKING,
         status: In([WORKSHEET_STATUS.DEACTIVATED, WORKSHEET_STATUS.EXECUTING]),
         assignee: In(users.map((u: User) => u.id))

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

@@ -530,7 +530,7 @@ export const Mutation = /* GraphQL */ `
   ): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
   assignPickingWorker (
-    worksheetId: String!
+    worksheetId: [String]!
     userId: String!
   ): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
@@ -671,7 +671,6 @@ export const Query = /* GraphQL */ `
   ): [Inventory] @privilege(category: "worksheet", privilege: "query")
 
   pickingAssignmentStatusByUsers(
-    bizplaceId: String!
     name: String
     email: String
   ): [PickingAssignmentStatus] @privilege(category: "worksheet", privilege: "query")