@things-factory/worksheet-base 4.3.239 → 4.3.242

package/server/graphql/resolvers/worksheet/loading/undo-loading.ts

@@ -5,9 +5,9 @@ import { EntityManager } from 'typeorm'
 import { LoadingWorksheetController } from '../../../../controllers'
 
 export const undoLoadingResolver = {
-  async undoLoading(_: any, { deliveryOrder, palletIds }, context: any) {
+  async undoLoading(_: any, { deliveryOrder, palletIds, productIds }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    await undoLoading(tx, domain, user, deliveryOrder, palletIds)
+    await undoLoading(tx, domain, user, deliveryOrder, palletIds, productIds)
   }
 }
 
@@ -16,8 +16,9 @@ export async function undoLoading(
   domain: Domain,
   user: User,
   deliveryOrder: Partial<DeliveryOrder>,
-  palletIds: string[]
+  palletIds: string[],
+  productIds: string[]
 ): Promise<void> {
   const worksheetController: LoadingWorksheetController = new LoadingWorksheetController(tx, domain, user)
-  await worksheetController.undoLoading(deliveryOrder, palletIds)
+  await worksheetController.undoLoading(deliveryOrder, palletIds, productIds)
 }

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

@@ -6,6 +6,7 @@ import {
   OrderInventory,
   ReleaseGood,
   OrderTote,
+  OrderVas,
   OrderToteItem
 } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
@@ -70,6 +71,7 @@ export const loadingWorksheetResolver = {
       },
       relations: [
         'targetInventory',
+        'targetInventory.product',
         'targetInventory.orderProduct',
         'targetInventory.inventory',
         'targetInventory.inventory.location',
@@ -111,6 +113,20 @@ export const loadingWorksheetResolver = {
       foundWSD.sort((a, b) => (a.toteName > b.toteName ? 1 : -1))
     }
 
+    let foundOV: OrderVas[] = await getRepository(OrderVas).find({
+      where: {
+        domain,
+        releaseGood: releaseGood,
+        status: Not(Equal(WORKSHEET_STATUS.DONE))
+      },
+      relations: ['newProduct', 'product', 'newProductDetail']
+    })
+
+    if (foundOV.length > 0) {
+      foundWSD = await insertVas(foundWSD, foundOV)
+      //   foundWSD = await formatLoadingDataVas(foundWSD)
+    }
+
     let worksheetDetailInfos = foundWSD
       .filter(itm => itm.targetInventory.releaseQty > 0)
       .map((loadingWSD: any) => {
@@ -121,7 +137,8 @@ export const loadingWorksheetResolver = {
           palletId: inventory.palletId,
           batchId: inventory.batchId,
           batchIdRef: inventory.batchIdRef,
-          product: inventory.product,
+          product: targetInventory.product,
+          pickedQty: targetInventory.pickedQty,
           releaseQty: targetInventory.releaseQty,
           releaseUomValue: targetInventory.releaseUomValue,
           status: loadingWSD.status,
@@ -130,7 +147,8 @@ export const loadingWorksheetResolver = {
           packingType: inventory.packingType,
           packingSize: inventory.packingSize,
           inventory: targetInventory.inventory,
-          toteName: loadingWSD.toteName
+          toteName: loadingWSD.toteName,
+          targetVas: loadingWSD.targetVas
         }
       })
 
@@ -146,3 +164,51 @@ export const loadingWorksheetResolver = {
     }
   }
 }
+
+export async function insertVas(wsd, ov) {
+  wsd = wsd.map(wd => {
+    for (let i = 0; i < ov.length; i++) {
+      // if (ov[i].newTargetProduct) {
+      if (wd.targetInventory.productId == ov[i].product.id && wd.targetInventory.batchId == ov[i].batchId) {
+        wd.targetVas = ov[i]
+      }
+      // }
+    }
+    return wd
+  })
+  return wsd
+  // }
+}
+
+// export async function formatLoadingDataVas(wsd) {
+//   let formattedData: WorksheetDetail[] = []
+//   formattedData = wsd.map(wd => {
+//     if (wd.targetVas) {
+//       if (wd.targetVas.newTargetProduct) {
+//         const newQty = wd.targetInventory.releaseQty - wd.targetVas.qty
+//         wd.targetInventory.releaseQty = newQty
+//         wd.targetInventory.pickedQty = newQty
+//         const newSku: WorksheetDetail = {
+//           ...wd,
+//           targetVas: null,
+//           targetInventory: {
+//             ...wd.targetInventory,
+//             releaseQty: wd.targetVas.outputQty,
+//             pickedQty: wd.targetVas.outputQty,
+//             inventory: { ...wd.targetInventory.inventory, product: wd.targetVas.newTargetProduct }
+//           }
+//         }
+//         wsd.push(newSku)
+//       }
+//     }
+//     return wd
+//   })
+
+//   formattedData = wsd.splice(wd => wd.targetInventory.pickedQty == 0)
+
+//   // formattedData = formattedData.sort((a, b) =>
+//   //   a.targetInventory.inventory.batchId > b ? 1 : a.targetVas && !b.targetVas ? -1 : a.targetVas && !b.targetVas ? 1 : 0
+//   // )
+
+//   return formattedData
+// }

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

@@ -23,6 +23,7 @@ import {
   OrderPackage,
   OrderPackageItem,
   OrderProduct,
+  OrderVas,
   ReleaseGood,
   Replenishment
 } from '@things-factory/sales-base'
@@ -43,6 +44,7 @@ import { EcommerceController } from '../../../../controllers/ecommerce'
 import { WorksheetController } from '../../../../controllers/worksheet-controller'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
 import { createLmdParcel } from '../../../../utils'
+import { activateVas } from '../vas/activate-vas'
 
 export const completePickingResolver = {
   async completePicking(_: any, { releaseGoodNo }, context: any) {
@@ -400,8 +402,25 @@ export async function completePicking(
           }
         })
 
+        let orderVas: OrderVas[] = await tx.getRepository(OrderVas).find({ where: { domain: domain, releaseGood } })
+        if (orderVas) {
+          try {
+            const vasWorksheet: Worksheet = await tx
+              .getRepository(Worksheet)
+              .findOne({ where: { releaseGood, type: WORKSHEET_TYPE.VAS } })
+
+            const vasWorksheetDetails: WorksheetDetail[] = await tx
+              .getRepository(WorksheetDetail)
+              .find({ where: { domain: domain, worksheet: vasWorksheet.id } })
+
+            if (vasWorksheet) {
+              await activateVas(tx, domain, user, vasWorksheet.name, vasWorksheetDetails)
+            }
+          } catch (e) { }
+        }
+        // Can improve by applying "Else" since if got VAS user has to complete then only we generate loading worksheet
         if (!existLoadingWorksheet && !releaseGood.courierOption && !releaseGood.packingOption) {
-          if (pickedTargetInventories.length > 0) {
+          if (pickedTargetInventories.length > 0 && orderVas.length == 0) {
             const loadingWSCtrl: LoadingWorksheetController = new LoadingWorksheetController(tx, domain, user)
             let loadingWorksheet: Worksheet = await loadingWSCtrl.generateLoadingWorksheet(
               releaseGoodNo,

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

@@ -1,7 +1,7 @@
 import { User } from '@things-factory/auth-base'
 import { ArrivalNotice, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+import { EntityManager, getRepository, In } from 'typeorm'
 import { WORKSHEET_TYPE } from '../../../../constants'
 import { LoadingWorksheetController, PutawayWorksheetController, VasWorksheetController } from '../../../../controllers'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
@@ -9,6 +9,24 @@ import { Worksheet, WorksheetDetail } from '../../../../entities'
 export const completeVasResolver = {
   async completeVas(_: any, { orderNo, orderType, worksheetDetails }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    if (!worksheetDetails) {
+      const releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({
+        domain: domain.id,
+        name: orderNo
+      })
+      const worksheet: Worksheet[] = await getRepository(Worksheet).find({
+        domain: domain.id,
+        releaseGood: releaseGood.id,
+        type: WORKSHEET_TYPE.VAS
+      })
+      const worksheetId = worksheet.map(w => {
+        return w.id
+      })
+      worksheetDetails = await getRepository(WorksheetDetail).find({
+        domain: domain.id,
+        worksheet: In(worksheetId)
+      })
+    }
     await completeVAS(tx, domain, user, orderNo, orderType, worksheetDetails)
   }
 }
@@ -22,7 +40,14 @@ export async function completeVAS(
   worksheetDetails: WorksheetDetail[]
 ): Promise<Worksheet> {
   const worksheetController: VasWorksheetController = new VasWorksheetController(tx, domain, user)
-  let worksheet: Worksheet = await worksheetController.completeVAS(orderNo, orderType, worksheetDetails)
+  let worksheet: Worksheet = await worksheetController.completeVAS(
+    tx,
+    domain,
+    user,
+    orderNo,
+    orderType,
+    worksheetDetails
+  )
 
   // if (orderType === ORDER_TYPES.ARRIVAL_NOTICE) {
   //   if (!worksheet.worksheetDetails?.length || !worksheet.arrivalNotice?.id) {

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

@@ -43,10 +43,11 @@ export const vasWorksheetResolver = {
       [
         'worksheetDetails',
         'worksheetDetails.targetVas',
-        'worksheetDetails.targetVas.vas',
         'worksheetDetails.targetVas.inventory',
-        'worksheetDetails.targetVas.targetProduct',
-        'worksheetDetails.targetVas.inventory.location',
+        'worksheetDetails.targetVas.product',
+        'worksheetDetails.targetVas.newProduct',
+        'worksheetDetails.targetVas.orderVasItems',
+        'worksheetDetails.targetVas.orderVasItems.vas',
         'creator',
         'updater'
       ],
@@ -83,7 +84,7 @@ export const vasWorksheetResolver = {
             relatedOrderInv: wsd.targetInventory,
             batchId: targetVas?.batchId,
             targetName: targetVas?.name,
-            vas: targetVas?.vas,
+            vas: targetVas?.orderVasItems?.vas,
             set: targetVas?.set,
             inventory: targetVas?.inventory,
             locationInv: targetVas?.inventory?.location?.name,
@@ -98,7 +99,8 @@ export const vasWorksheetResolver = {
             description: wsd.description,
             remark: targetVas?.remark,
             actualQty: targetVas?.actualQty,
-            actualUomValue: targetVas?.actualUomValue
+            actualUomValue: targetVas?.actualUomValue,
+            targetVas: targetVas ? targetVas : null
           }
         })
     }

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

@@ -8,6 +8,7 @@ import { Inventory, INVENTORY_STATUS, InventoryHistory } from '@things-factory/w
 
 import { WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
+import { OrderTargetFields } from 'server/controllers'
 
 interface WorksheetInterface extends Worksheet {
   orderProducts: OrderProduct[]
@@ -47,10 +48,15 @@ export const worksheetResolver = {
         'worksheetDetails.targetProduct',
         'worksheetDetails.targetProduct.product',
         'worksheetDetails.targetVas',
+        'worksheetDetails.targetVas.orderInventory',
         'worksheetDetails.targetVas.vas',
         'worksheetDetails.targetVas.inventory',
         'worksheetDetails.targetVas.inventory.location',
-        'worksheetDetails.targetVas.targetProduct',
+        'worksheetDetails.targetVas.product',
+        'worksheetDetails.targetVas.newProduct',
+        'worksheetDetails.targetVas.newProductDetail',
+        'worksheetDetails.targetVas.orderVasItems',
+        'worksheetDetails.targetVas.orderVasItems.vas',
         'worksheetDetails.targetInventory',
         'worksheetDetails.targetInventory.releaseGood',
         'worksheetDetails.targetInventory.product',
@@ -255,13 +261,16 @@ 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)
-        )
-      })
+    // need use promise all for better performance
+    for (let i = 0; i < worksheet.worksheetDetails.length; i++) {
+      if (worksheet.worksheetDetails[i].targetInventory !== null) {
+        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) {
@@ -310,7 +319,6 @@ export const worksheetResolver = {
     return worksheet
   },
 
-
   async inboundWorksheetDetails(_: any, { name }, context: any) {
     const { domain }: { domain: Domain } = context.state
 
@@ -339,7 +347,8 @@ export const worksheetResolver = {
 
     let worksheetDetails: WorksheetDetail[] = []
     if (foundWorksheet.type === 'UNLOADING') {
-      qbWorksheetDetails.select('worksheetDetails')
+      qbWorksheetDetails
+        .select('worksheetDetails')
         .leftJoinAndSelect('worksheetDetails.targetProduct', 'targetProduct')
         .leftJoinAndSelect('targetProduct.product', 'product')
         .where('worksheetDetails.worksheet_id =:worksheetId', { worksheetId: foundWorksheet.id })
@@ -360,11 +369,23 @@ export const worksheetResolver = {
       worksheetDetails = await qbWorksheetDetails.getMany()
     }
 
-    let orderInventories: OrderInventory[] = worksheetDetails.filter(wd => { if (wd.targetInventory) { return wd.targetInventory } })
+    let orderInventories: OrderInventory[] = worksheetDetails.filter(wd => {
+      if (wd.targetInventory) {
+        return wd.targetInventory
+      }
+    })
 
-    let orderProducts: OrderProduct[] = worksheetDetails.filter(wd => { if (wd.targetProduct) { return wd.targetProduct } })
+    let orderProducts: OrderProduct[] = worksheetDetails.filter(wd => {
+      if (wd.targetProduct) {
+        return wd.targetProduct
+      }
+    })
 
-    let orderVas: OrderVas[] = worksheetDetails.filter(wd => { if (wd.targetVas) { return wd.targetVas } })
+    let orderVas: OrderVas[] = worksheetDetails.filter(wd => {
+      if (wd.targetVas) {
+        return wd.targetVas
+      }
+    })
 
     // console.time('map')
     let worksheet: WorksheetInterface = {

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

@@ -2,7 +2,7 @@ import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
 import { EntityManager } from 'typeorm'
 import { getPermittedBizplaceIds, Worker } from '@things-factory/biz-base'
-import { OrderProduct, OrderVas } from '@things-factory/sales-base'
+import { OrderProduct, OrderVas, OrderInventory } from '@things-factory/sales-base'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 
 export const createWorksheetDetail = {
@@ -24,6 +24,10 @@ export const createWorksheetDetail = {
       worksheetDetail.targetProduct = await tx.getRepository(OrderProduct).findOne(worksheetDetail.targetProduct.id)
     }
 
+    if (worksheetDetail.targetInventory && worksheetDetail.targetInventory.id) {
+      worksheetDetail.targetInventory = await tx.getRepository(OrderInventory).findOne(worksheetDetail.targetInventory.id)
+    }
+
     if (worksheetDetail.targetVas && worksheetDetail.targetVas.id) {
       worksheetDetail.targetVas = await tx.getRepository(OrderVas).findOne(worksheetDetail.targetVas.id)
     }

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

@@ -14,7 +14,7 @@ export const worksheetDetailResolver = {
         bizplace: In(await getPermittedBizplaceIds(domain, user)),
         name
       },
-      relations: ['domain', 'bizplace', 'worksheet', 'worker', 'targetProduct', 'targetVas', 'creator', 'updater']
+      relations: ['domain', 'bizplace', 'worksheet', 'worker', 'targetInventory', 'targetProduct', 'targetVas', 'creator', 'updater']
     })
   }
 }

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

@@ -314,6 +314,7 @@ export const Mutation = /* GraphQL */ `
   undoLoading (
     deliveryOrder: ObjectRef!
     palletIds: [String]!
+    productIds: [String]!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   transfer (
@@ -497,7 +498,7 @@ export const Mutation = /* GraphQL */ `
   completeVas (
     orderNo: String!
     orderType: String!
-    worksheetDetails: [WorksheetDetailPatch]!
+    worksheetDetails: [WorksheetDetailPatch]
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   repalletizing (

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

@@ -41,6 +41,7 @@ export const WorksheetDetailInfo = gql`
     targetType: String
     targetBatchId: String
     targetProduct: Product
+    targetVas: OrderVas
     otherTarget: String
     vas: Vas
     targetName: String