@things-factory/worksheet-base 4.3.61 → 4.3.66

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

@@ -11,8 +11,11 @@ export const inventoriesByPalletResolver = {
     const { domain, user }: { domain: Domain; user: User } = context.state
     const params = { filters, pagination }
     let permittedBizplaceIds: string[] = await getPermittedBizplaceIds(domain, user)
-
     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')
+    let skipLockCheck: Boolean =
+      skipLockCheckFilters && skipLockCheckFilters?.value ? skipLockCheckFilters?.value : false
     const productFilterColumns = ['sku', 'brandSku', 'name', 'description', 'brand', 'subBrand']
     params.filters = params.filters.filter(x => x.name != 'productName')
 
@@ -28,6 +31,12 @@ export const inventoriesByPalletResolver = {
       params.filters.find(filter => filter.name === 'bizplace').relation = true
     }
 
+    const locationFilters = params.filters.find(x => x.name == 'location')
+
+    const removeLocationIndex = params.filters.findIndex(x => x.name == 'location')
+
+    params.filters.splice(removeLocationIndex, 1)
+
     const qb: SelectQueryBuilder<Inventory> = getRepository(Inventory).createQueryBuilder('iv')
     buildQuery(qb, params, context)
 
@@ -39,9 +48,11 @@ export const inventoriesByPalletResolver = {
       .leftJoinAndSelect('iv.creator', 'creator')
       .leftJoinAndSelect('iv.updater', 'updater')
       .andWhere('iv.qty > 0')
-      .andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END >= 0')
-      .andWhere('iv.qty - CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END > 0')
-      .andWhere(`location.type NOT IN ('${LOCATION_TYPE.QUARANTINE}', '${LOCATION_TYPE.RESERVE}')`)
+      .andWhere(
+        `location.type ${recallFilters?.value === true ? '' : 'NOT'} IN ('${LOCATION_TYPE.QUARANTINE}', '${
+          LOCATION_TYPE.RESERVE
+        }')`
+      )
       .andWhere(
         `(iv.batch_id, product.name, iv.packing_type, product.brand) NOT IN (
         SELECT 
@@ -60,14 +71,24 @@ export const inventoriesByPalletResolver = {
         { permittedBizplaceIds, domainId: domain.id }
       )
 
+    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 (locationFilters) {
+      qb.andWhere(`location.name ilike '${locationFilters.value}'`)
+    }
+
     if (sortings?.length !== 0) {
-      const arrChildSortData = ['bizplace', 'product', 'location', 'warehouse', 'zone']
+      const arrChildSortData = ['productName', 'productSKU']
+
+      const remapChildSortData = ['name', 'sku']
       const sort = (sortings || []).reduce(
-        (acc, sort) => ({
+        (acc, sort, idx) => ({
           ...acc,
-          [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'iv.' + sort.name]: sort.desc
-            ? 'DESC'
-            : 'ASC'
+          [arrChildSortData.indexOf(sort.name) >= 0 ? 'product' + '.' + remapChildSortData[idx] : 'iv.' + sort.name]:
+            sort.desc ? 'DESC' : 'ASC'
         }),
         {}
       )
@@ -101,7 +122,6 @@ export const inventoriesByPalletResolver = {
         })
       )
     }
-
     let [items, total] = await qb.getManyAndCount()
 
     items = await Promise.all(
@@ -116,7 +136,8 @@ export const inventoriesByPalletResolver = {
           // product: item.product,
           productName: item.product.name,
           productSKU: item.product.sku,
-          productBrand: item.product.brand
+          productBrand: item.product.brand,
+          productId: item.product.id
         }
       })
     )

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

@@ -2,12 +2,9 @@ import { EntityManager } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import { ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { logger } from '@things-factory/env'
 
-import { EcommerceController, PickingWorksheetController, SellercraftController } from '../../../../controllers'
+import { EcommerceController, PickingWorksheetController } from '../../../../controllers'
 import { Worksheet } from '../../../../entities'
 
 export const activateBatchPickingResolver = {
@@ -28,51 +25,6 @@ export async function activateBatchPicking(
   const worksheetDetails = worksheet.worksheetDetails
   const companyDomain: Domain = worksheet?.bizplace.company.domain
 
-  const sellercraft: Sellercraft = await tx
-    .getRepository(Sellercraft)
-    .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
-
-  if (sellercraft) {
-    const releaseGoods: ReleaseGood[] = worksheetDetails.map(
-      worksheetDetail => worksheetDetail.targetInventory && worksheetDetail.targetInventory.releaseGood
-    )
-    const uniqueReleaseGoods: ReleaseGood[] = []
-    const map = new Map()
-    for (const releaseGood of releaseGoods) {
-      if (!map.has(releaseGood.id)) {
-        map.set(releaseGood.id, true)
-        uniqueReleaseGoods.push({ ...releaseGood })
-      }
-    }
-
-    await Promise.all(
-      uniqueReleaseGoods.map(async releaseGood => {
-        if (releaseGood?.packageId == null || releaseGood?.packageId.trim() == '') {
-          try {
-            const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-            let packageInfo = await sellercraftCtrl.packOrder(sellercraft, {
-              ...releaseGood,
-              orderProducts: releaseGood.orderProducts
-            })
-
-            await tx.getRepository(ReleaseGood).update({ id: releaseGood.id }, { packageId: packageInfo.packageId })
-
-            releaseGood.packageId = packageInfo.packageId
-          } catch (error) {
-            logger.error(
-              `picking-worksheet-controller:activateBatchPicking[packageId][refNo: ${releaseGood.refNo}, refNo2: ${
-                releaseGood.refNo2
-              }]: ${JSON.stringify(error)}`
-            )
-          }
-        }
-
-        // const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-        // await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
-      })
-    )
-  }
-
   // find for any existing marketplace store connections
   const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
     where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },

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

@@ -74,6 +74,14 @@ export async function completeBatchPicking(
 
         if (!foundReleaseGood?.packageId) {
           foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood)
+          if (foundReleaseGood?.packageId) {
+            await tx
+              .getRepository(ReleaseGood)
+              .update(
+                { id: foundReleaseGood.id },
+                { packageId: foundReleaseGood.packageId, updater: foundReleaseGood.updater }
+              )
+          }
         }
 
         sellercraftCtrl.initiateOrderShipment(sellercraft, foundReleaseGood)

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

@@ -95,6 +95,12 @@ export async function completePicking(
           relations: ['product', 'product.productDetails']
         })
         releaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...releaseGood, orderProducts })
+
+        if (releaseGood?.packageId) {
+          await tx
+            .getRepository(ReleaseGood)
+            .update({ id: releaseGood.id }, { packageId: releaseGood.packageId, updater: releaseGood.updater })
+        }
       }
 
       sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)

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

@@ -28,6 +28,7 @@ export const fetchAndAssignPickingTaskResolver = {
         .addSelect('ws.name')
         .addSelect('ws.status')
         .addSelect('ws.release_good_id')
+        .innerJoin('ws.releaseGood', 'rg')
         .where(
           '(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id =:assignee AND (ws.status = :status1 OR ws.status = :status2))',
           {
@@ -50,6 +51,7 @@ export const fetchAndAssignPickingTaskResolver = {
             .getQuery()
           return 'NOT EXISTS ' + subQuery
         })
+        .orderBy('"rg"."created_at"', 'ASC')
 
       worksheet = await worksheetQb.getRawOne()
 
@@ -61,6 +63,7 @@ export const fetchAndAssignPickingTaskResolver = {
           .addSelect('ws.name')
           .addSelect('ws.status')
           .addSelect('ws.release_good_id')
+          .innerJoin('ws.releaseGood', 'rg')
           .where(
             '(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id IS NULL AND (ws.status = :status1 OR ws.status = :status2))',
             {
@@ -82,6 +85,7 @@ export const fetchAndAssignPickingTaskResolver = {
               .getQuery()
             return 'NOT EXISTS ' + subQuery
           })
+          .orderBy('"rg"."created_at"', 'ASC')
 
         worksheet = await worksheetQb.getRawOne()
 

package/server/graphql/resolvers/worksheet/picking/scan-product-batch-picking.ts

@@ -6,7 +6,7 @@ import { PickingWorksheetController } from '../../../../controllers'
 export const scanProductBatchPickingResolver = {
   async scanProductBatchPicking(
     _: any,
-    { taskNo, worksheetType, cartonId, productBarcode, inventory, binLocationName },
+    { taskNo, worksheetType, cartonId, productBarcode, inventory, binLocationName, pickingQty },
     context: any
   ) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
@@ -19,7 +19,8 @@ export const scanProductBatchPickingResolver = {
       cartonId,
       productBarcode,
       inventory,
-      binLocationName
+      binLocationName,
+      pickingQty
     )
   }
 }
@@ -33,7 +34,8 @@ export async function scanProductBatchPicking(
   cartonId: string,
   productBarcode: string,
   inventory: any,
-  binLocationName?: string
+  binLocationName?: string,
+  pickingQty?: number
 ) {
   const worksheetController: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
   await worksheetController.scanProductBatchPicking(
@@ -42,6 +44,7 @@ export async function scanProductBatchPicking(
     cartonId,
     productBarcode,
     inventory,
-    binLocationName
+    binLocationName,
+    pickingQty
   )
 }

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

@@ -6,7 +6,7 @@ import { PickingWorksheetController } from '../../../../controllers'
 export const scanProductPickingResolver = {
   async scanProductPicking(
     _: any,
-    { worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber, toteNo },
+    { worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber, toteNo, pickingQty },
     context: any
   ) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
@@ -20,7 +20,8 @@ export const scanProductPickingResolver = {
       cartonId,
       binLocation,
       serialNumber,
-      toteNo
+      toteNo,
+      pickingQty
     )
   }
 }
@@ -35,7 +36,8 @@ export async function scanProductPicking(
   cartonId: string,
   binLocation?: string,
   serialNumber?: string,
-  toteNo?: string
+  toteNo?: string,
+  pickingQty?: number
 ) {
   const worksheetController: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
   await worksheetController.scanProductPicking(
@@ -45,6 +47,7 @@ export async function scanProductPicking(
     cartonId,
     binLocation,
     serialNumber,
-    toteNo
+    toteNo,
+    pickingQty
   )
 }

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

@@ -100,6 +100,7 @@ export async function pickingWorksheet(
       refNo: releaseGood.refNo,
       refNo2: releaseGood.refNo2,
       refNo3: releaseGood.refNo3,
+      type: releaseGood.type,
       containerNo: shippingOrder?.containerNo,
       marketplaceStatus: releaseGood.marketplaceOrderStatus,
       shippingProvider: releaseGood.transporter,
@@ -113,10 +114,10 @@ export async function pickingWorksheet(
       const inventoryChangesCount: number = await tx.getRepository(InventoryChange).count({
         where: {
           inventory: inventory.id,
-          status:"PENDING",
-          transactionType:"MISSING"
+          status: "PENDING",
+          transactionType: "MISSING"
         },
-        relations:['inventory','product']
+        relations: ['inventory', 'product']
       })
 
       return {
@@ -138,7 +139,7 @@ export async function pickingWorksheet(
         expirationDate: inventory?.expirationDate,
         location: inventory?.location,
         relatedOrderInv: targetInventory,
-        hasMissingInventoryChanges:inventoryChangesCount > 0 ? true:false
+        hasMissingInventoryChanges: inventoryChangesCount > 0 ? true : false
       }
     })
   }

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

@@ -91,7 +91,7 @@ export const worksheetResolver = {
     }
 
     let pWorksheetPickingItemSorting = getRepository(Setting).findOne({
-      where: { domain, category: 'location', name: 'rule-for-worksheet-release-goods-item' }
+      where: { domain, category: 'location', name: 'rule-for-picking-product' }
     })
 
     if (worksheet?.arrivalNotice?.id) {
@@ -172,10 +172,12 @@ export const worksheetResolver = {
       if (sortingSetting?.value) {
         let settingValue = JSON.parse(sortingSetting.value)
         for (const key in settingValue) {
-          qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC')
+          qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] == 'ASC' ? 'ASC' : 'DESC')
         }
       }
 
+      qbOrderInventories.addOrderBy(`product.name`, 'ASC')
+
       let orderInventories: OrderInventory[] = await qbOrderInventories.getMany()
       worksheet.orderInventories = orderInventories
     }
@@ -204,10 +206,12 @@ export const worksheetResolver = {
       if (sortingSetting?.value) {
         let settingValue = JSON.parse(sortingSetting.value)
         for (const key in settingValue) {
-          qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC')
+          qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] == 'ASC' ? 'ASC' : 'DESC')
         }
       }
 
+      qbOrderInventories.addOrderBy(`product.name`, 'ASC')
+
       let orderInventories: OrderInventory[] = await qbOrderInventories.getMany()
       worksheet.orderInventories = orderInventories
 
@@ -248,6 +252,15 @@ export const worksheetResolver = {
       })
     }
 
+    if (worksheet.orderInventories) {
+      worksheet.worksheetDetails.sort(function (a, b) {
+        return (
+          worksheet.orderInventories.map(oi => oi.id).indexOf(a.targetInventory.id) -
+          worksheet.orderInventories.map(oi => oi.id).indexOf(b.targetInventory.id)
+        )
+      })
+    }
+
     if (worksheet?.returnOrder?.id) {
       worksheet.orderInventories = await getRepository(OrderInventory).find({
         where: {

package/server/graphql/resolvers/worksheet-detail/index.ts

@@ -7,6 +7,7 @@ import { generateCartonIdResolver } from './generate-carton-id'
 import { generatePalletIdResolver } from './generate-pallet-id'
 import { generatePickingWorksheetDetailsResolver } from './generate-picking-worksheet-details'
 import { generateReleaseGoodWorksheetDetailsResolver } from './generate-release-good-worksheet-details'
+import { regenerateReleaseGoodWorksheetDetailsResolver } from './regenerate-release-good-worksheet-details'
 import { updateWorksheetDetail } from './update-worksheet-detail'
 import { worksheetDetailResolver } from './worksheet-detail'
 import { worksheetDetailsResolver } from './worksheet-details'
@@ -28,5 +29,6 @@ export const Mutation = {
   ...generateBatchPickingWorksheetDetailsResolver,
   ...generateBatchPickingWorksheetDetailsByBulkResolver,
   ...generatePickingWorksheetDetailsResolver,
-  ...generateReleaseGoodWorksheetDetailsResolver
+  ...generateReleaseGoodWorksheetDetailsResolver,
+  ...regenerateReleaseGoodWorksheetDetailsResolver
 }

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

@@ -0,0 +1,164 @@
+import { EntityManager } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Product } from '@things-factory/product-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 { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
+import { Worksheet, WorksheetDetail } from '../../../entities'
+import { WorksheetNoGenerator } from '../../../utils'
+
+export const regenerateReleaseGoodWorksheetDetailsResolver = {
+  async regenerateReleaseGoodWorksheetDetails(
+    _: any,
+    { worksheetNo, batchId, productId, packingType, packingSize, orderProductId, worksheetDetails },
+    context: any
+  ): Promise<void> {
+    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    return await regenerateReleaseGoodWorksheetDetails(
+      tx,
+      domain,
+      user,
+      worksheetNo,
+      batchId,
+      productId,
+      packingType,
+      packingSize,
+      orderProductId,
+      worksheetDetails
+    )
+  }
+}
+
+export async function regenerateReleaseGoodWorksheetDetails(
+  tx: EntityManager,
+  domain: Domain,
+  user: User,
+  worksheetNo: string,
+  batchId: string,
+  productId: string,
+  packingType: string,
+  packingSize: number,
+  orderProductId: string,
+  worksheetDetails: Partial<WorksheetDetail>[]
+): Promise<void> {
+  // 1. Remove prev worksheet details if it's exists
+  const worksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
+    where: { name: worksheetNo, domain },
+    relations: [
+      'bizplace',
+      'releaseGood',
+      'worksheetDetails',
+      'worksheetDetails.targetInventory',
+      'worksheetDetails.targetInventory.inventory',
+      'worksheetDetails.targetInventory.product',
+      'worksheetDetails.targetInventory.releaseGood',
+      'worksheetDetails.targetInventory.orderProduct',
+      'worksheetDetails.targetInventory.bizplace'
+    ]
+  })
+
+  const prevWSDs: WorksheetDetail[] = worksheet.worksheetDetails.filter((wsd: WorksheetDetail) => {
+    const targetInv: OrderInventory = wsd.targetInventory
+    if (targetInv.orderProductId === orderProductId) return wsd.id
+  })
+
+  // TODO: Update prev inventory locked qty and delete order inventories
+  if (prevWSDs?.length) {
+    const wsdIds: string[] = prevWSDs.map((wsd: WorksheetDetail) => wsd.id)
+    const prevOrderInvIds: string[] = prevWSDs.map((wsd: WorksheetDetail) => wsd.targetInventory.id)
+    const prevOrderInventories: OrderInventory[] = prevWSDs.map((wsd: WorksheetDetail) => wsd.targetInventory)
+    await Promise.all(
+      prevOrderInventories.map(async prevOI => {
+        if (prevOI?.inventory) {
+          await tx.getRepository(Inventory).update(
+            { id: prevOI.inventory.id },
+            {
+              lockedQty: prevOI.inventory.lockedQty - prevOI.releaseQty,
+              lockedUomValue: prevOI.inventory.lockedUomValue - prevOI.releaseUomValue
+            }
+          )
+        }
+      })
+    )
+
+    await tx.getRepository(WorksheetDetail).delete(wsdIds)
+    await tx.getRepository(OrderInventory).delete(prevOrderInvIds)
+  }
+
+  await Promise.all(
+    worksheetDetails.map(async (wsd: WorksheetDetail) => {
+      // 2. Create order inventory
+      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 }, relations: ['releaseGood'] })
+
+      targetInventory = await tx.getRepository(OrderInventory).save({
+        ...targetInventory,
+        domain,
+        bizplace: worksheet.bizplace,
+        name: OrderNoGenerator.orderInventory(),
+        releaseGood: worksheet.type == WORKSHEET_TYPE.BATCH_PICKING ? targetProduct.releaseGood : worksheet.releaseGood,
+        inventory,
+        batchId: inventory.batchId,
+        batchIdRef: inventory.batchIdRef,
+        status: ORDER_INVENTORY_STATUS.READY_TO_PICK,
+        product: await tx.getRepository(Product).findOne(productId),
+        packingType,
+        packingSize,
+        orderProduct: targetProduct,
+        refWorksheetId: worksheet.type == WORKSHEET_TYPE.BATCH_PICKING ? worksheet.id : null,
+        creator: user,
+        updater: user
+      })
+
+      const currentLockedQty: any = inventory.lockedQty
+      const currentLockedUomValue: any = inventory.lockedUomValue
+
+      await tx.getRepository(Inventory).save({
+        ...targetInventory.inventory,
+        lockedQty: Boolean(currentLockedQty)
+          ? targetInventory.releaseQty + currentLockedQty
+          : targetInventory.releaseQty,
+        lockedUomValue: Boolean(currentLockedUomValue)
+          ? targetInventory.releaseUomValue + currentLockedUomValue
+          : targetInventory.releaseUomValue,
+        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,
+        domain,
+        bizplace: worksheet.bizplace,
+        worksheet,
+        name:
+          worksheet.type == WORKSHEET_TYPE.BATCH_PICKING
+            ? WorksheetNoGenerator.batchPickingDetail()
+            : WorksheetNoGenerator.pickingDetail(),
+        targetProduct,
+        targetInventory,
+        type: worksheet.type == WORKSHEET_TYPE.BATCH_PICKING ? WORKSHEET_TYPE.BATCH_PICKING : WORKSHEET_TYPE.PICKING,
+        status: WORKSHEET_STATUS.DEACTIVATED,
+        creator: user,
+        updater: user
+      })
+    })
+  )
+}

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

@@ -0,0 +1,9 @@
+import { gql } from 'apollo-server-koa'
+
+export const GenerateBatchPickInfo = gql`
+  input GenerateBatchPickInfo {
+    releaseGoodNo: String
+    bizplaceId: String
+    bizplaceName: String
+  }
+`

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

@@ -4,6 +4,7 @@ import { ContactPointInfo } from './contact-point-info'
 import { CycleCountWorksheet } from './cycle-count-worksheet'
 import { DeliveryInfo } from './delivery-info'
 import { DeliveryOrderInfo } from './delivery-order-info'
+import { DeliveryOrderRO } from './delivery-order-ro'
 import { DeliveryWorksheet } from './delivery-worksheet'
 import { ExecutingWorksheet } from './executing-worksheet'
 import { FindReleaseOrdersByTaskNo } from './find-release-orders-by-task-no'
@@ -23,7 +24,7 @@ import { WorksheetInfo } from './worksheet-info'
 import { WorksheetList } from './worksheet-list'
 import { WorksheetPatch } from './worksheet-patch'
 import { WorksheetWithPagination } from './worksheet-with-pagination'
-import { DeliveryOrderRO } from './delivery-order-ro'
+import { GenerateBatchPickInfo } from './batch-pick-worksheet-info'
 
 export const Mutation = /* GraphQL */ `
   createWorksheet (
@@ -80,8 +81,7 @@ export const Mutation = /* GraphQL */ `
   ): ReleaseGoodWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
   generateBatchPickingWorksheet (
-    releaseGoodNos: [String!]
-    partnerBizplaceId: String!
+    releaseGoodWithBiz: [[GenerateBatchPickInfo!]]
   ): Worksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
   generateCycleCountWorksheet (
@@ -331,6 +331,7 @@ export const Mutation = /* GraphQL */ `
     binLocation: String
     serialNumber: String
     toteNo: String
+    pickingQty: Int
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   sortingProduct (
@@ -378,6 +379,7 @@ export const Mutation = /* GraphQL */ `
     productBarcode: String!
     inventory: InventoryPatch!
     binLocationName: String
+    pickingQty: Int
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   crossDockPicking (
@@ -709,10 +711,12 @@ export const Query = /* GraphQL */ `
   
   recommendPutawayLocation(worksheetDetailName: String!, optCnt: Int): [Location] @privilege(category: "worksheet", privilege: "query")
 
+  findSortingReleaseOrdersByTaskNo(taskNo: String!): FindReleaseOrdersByTaskNo @privilege(category: "worksheet", privilege: "query") @transaction
+
   findReleaseOrdersByTaskNo(taskNo: String!): FindReleaseOrdersByTaskNo @privilege(category: "worksheet", privilege: "query") @transaction
 `
 
-export const Types = /* GraphQL */ [
+export const Types = /* GraphQL */[
   Worksheet,
   AirwayBill,
   NewWorksheet,
@@ -738,5 +742,6 @@ export const Types = /* GraphQL */ [
   PickingAssignmentStatus,
   MyPickingAssignmentStatus,
   FindReleaseOrdersByTaskNo,
-  DeliveryOrderRO
+  DeliveryOrderRO,
+  GenerateBatchPickInfo
 ]

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

@@ -28,6 +28,16 @@ export const Mutation = /* GraphQL */ `
     worksheetDetails: [NewWorksheetDetail]
   ): Boolean @transaction
 
+  regenerateReleaseGoodWorksheetDetails (
+    worksheetNo: String!
+    batchId: String!
+    productId: String!
+    packingType: String!
+    packingSize: Float!
+    orderProductId: String!
+    worksheetDetails: [NewWorksheetDetail]
+  ): Boolean @transaction
+  
   generateBatchPickingWorksheetDetails (
     worksheetNo: String!
     batchId: String!