@things-factory/worksheet-base 4.3.238 → 4.3.241

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