@things-factory/worksheet-base 4.3.384 → 4.3.388

package/server/entities/active-worksheet-picking-view.ts

@@ -1,10 +1,4 @@
-import {
-  EntityManager,
-  getConnection,
-  Index,
-  ViewColumn,
-  ViewEntity
-} from 'typeorm'
+import { EntityManager, getConnection, Index, ViewColumn, ViewEntity } from 'typeorm'
 
 @ViewEntity({
   materialized: true,
@@ -15,8 +9,8 @@ import {
   w.id as "worksheetId",
   w.domain_id as "domainId",
   op.id as "targetProductId",
-  op.product_id as "productId",
-  op.product_detail_id as "productDetailId",
+  oi.product_id as "productId",
+  oi.product_detail_id as "productDetailId",
   op.uom_value as "uomValue",
   pb.id  as "productBarcodeId",
   pb.gtin,
@@ -39,15 +33,18 @@ import {
   inner join release_goods rg on rg.id = oi.release_good_id
   left join inventory_check_items ici on ici.inventory_id = oi.inventory_id
   inner join products p on p.id = oi.product_id
-  LEFT JOIN product_barcodes pb ON pb.product_detail_id = op.product_detail_id
+  left join product_bundles pb2 on pb2.id = op.product_bundle_id
+  LEFT JOIN product_barcodes pb ON pb.product_detail_id = oi.product_detail_id 
+  left join product_bundle_settings pbs on pbs.product_bundle_id = pb2.id and pbs.product_id = oi.product_id and pbs.product_detail_id = oi.product_detail_id
   WHERE w.type::text = 'PICKING'::text AND w.status::text = 'EXECUTING'::text
-  ORDER BY w.domain_id, w.bizplace_id, wd.id
-  `
+  ORDER BY w.domain_id, w.bizplace_id, wd.id`
 })
 export class ActiveWorksheetPickingView {
   static async refreshView() {
     await getConnection().transaction(async (tx: EntityManager) => {
-      await tx.getRepository(ActiveWorksheetPickingView).query('REFRESH MATERIALIZED VIEW CONCURRENTLY active_worksheet_picking_views')
+      await tx
+        .getRepository(ActiveWorksheetPickingView)
+        .query('REFRESH MATERIALIZED VIEW CONCURRENTLY active_worksheet_picking_views')
         .then(resp => console.log('update active_worksheet_picking_views ok'))
         .catch(err => console.error('update active_worksheet_picking_views error'))
     })
@@ -55,18 +52,19 @@ export class ActiveWorksheetPickingView {
 
   @Index(
     'ix_active-worksheet-picking_0',
-    (ActiveWorksheetPickingView: ActiveWorksheetPickingView) => [ActiveWorksheetPickingView.orderInventoryId, ActiveWorksheetPickingView.productBarcodeId],
+    (ActiveWorksheetPickingView: ActiveWorksheetPickingView) => [
+      ActiveWorksheetPickingView.orderInventoryId,
+      ActiveWorksheetPickingView.productBarcodeId
+    ],
     { unique: true }
   )
-  @Index(
-    'ix_active-worksheet-picking_1',
-    (ActiveWorksheetPickingView: ActiveWorksheetPickingView) => [ActiveWorksheetPickingView.worksheetDetailId]
-  )
-  @Index(
-    'ix_active-worksheet-picking_2',
-    (ActiveWorksheetPickingView: ActiveWorksheetPickingView) => [ActiveWorksheetPickingView.domainId, ActiveWorksheetPickingView.worksheetDetailName]
-  )
-
+  @Index('ix_active-worksheet-picking_1', (ActiveWorksheetPickingView: ActiveWorksheetPickingView) => [
+    ActiveWorksheetPickingView.worksheetDetailId
+  ])
+  @Index('ix_active-worksheet-picking_2', (ActiveWorksheetPickingView: ActiveWorksheetPickingView) => [
+    ActiveWorksheetPickingView.domainId,
+    ActiveWorksheetPickingView.worksheetDetailName
+  ])
   @ViewColumn()
   worksheetDetailId: string
 
@@ -129,5 +127,4 @@ export class ActiveWorksheetPickingView {
 
   @ViewColumn()
   inventoryCheckItemStatus: string
-
 }

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

@@ -123,10 +123,11 @@ export const packingWorksheetResolver = {
           relations: [
             'orderPackageItems',
             'orderPackageItems.orderProduct',
-            'orderPackageItems.orderProduct.product',
-            'orderPackageItems.orderProduct.product.productDetails',
-            'orderPackageItems.orderProduct.product.productDetails.productBarcodes'
-          ]
+            'orderPackageItems.productDetail',
+            'orderPackageItems.productDetail.product',
+            'orderPackageItems.productDetail.product.productDetails',
+            'orderPackageItems.productDetail.product.productDetails.productBarcodes',
+]
         })
 
         if (packingWorksheet.status === WORKSHEET_STATUS.DONE) {
@@ -289,33 +290,38 @@ export const packingWorksheetResolver = {
           orderPackages
         },
         worksheetDetailInfos: processingOrderPackage[0].orderPackageItems
-          .map(opi => {
-            const orderProduct: OrderProduct = opi.orderProduct
-            return {
+        .reduce((curr, opi) => {
+          const orderProduct = opi.orderProduct
+          const productDetailId = opi.productDetail.id
+        
+          const duplicateProduct = curr.findIndex(item => item.productDetail.id === productDetailId)
+        
+          if (duplicateProduct !== -1) {
+            curr [duplicateProduct].id = `${curr[duplicateProduct].id}, ${opi.id}`
+            curr [duplicateProduct].name = `${curr[duplicateProduct].name}, ${opi.name}`
+            curr[duplicateProduct].releaseQty += opi.releaseQty
+            curr[duplicateProduct].packedQty += opi?.packedQty || 0
+          } else {
+            curr.push({
               id: opi.id,
               name: opi.name,
-              // palletId: inventory.palletId,
-              // cartonId: inventory.cartonId,
               batchId: orderProduct.batchId,
-              // batchIdRef: inventory.batchIdRef,
-              product: orderProduct.product,
-              sku: orderProduct.product.sku,
+              product: opi.productDetail.product,
+              productDetail: opi.productDetail,
+              sku: opi.productDetail.product.sku,
               releaseQty: opi.releaseQty,
               packedQty: opi?.packedQty || 0,
               status: opi.status,
-              // description: packingWSD.description,
-              // targetName: targetInventory.name,
-              // packingType: inventory.packingType,
-              // packingSize: inventory.packingSize,
-              // this is the problem
               binLocation: binLocation
-                ? releaseGood.orderInventories.find(oi => oi.orderProductId == opi.orderProduct.id)?.binLocation
+                ? releaseGood.orderInventories.find(oi => oi.orderProductId === opi.orderProduct.id)?.binLocation
                 : binLocation,
-              isBatchPicking
-              // location: inventory.location,
-              // relatedOrderInv: targetInventory
-            }
-          })
+              isBatchPicking: isBatchPicking,
+            });
+          }
+        
+          return curr
+        }, [])
+        
           .sort((a, b) => {
             if (a?.binLocation && b?.binLocation) {
               if (a.binLocation.name < b.binLocation.name) return -1
@@ -521,12 +527,14 @@ async function queryPackingWorksheet(tx, domain, assignee, binLocation) {
   qb.innerJoinAndSelect('rg.bizplace', 'b')
     .innerJoinAndSelect('b.domain', 'd')
     .innerJoinAndSelect('rg.orderInventories', 'oi')
+    .innerJoinAndSelect('oi.binLocation', 'l')
     .leftJoinAndSelect('rg.orderPackages', 'op')
     .innerJoinAndSelect('op.orderPackageItems', 'opi')
     .innerJoinAndSelect('opi.orderProduct', 'opr')
-    .innerJoinAndSelect('opr.product', 'p')
-    .innerJoinAndSelect('p.productDetails', 'pd')
-    .innerJoinAndSelect('pd.productBarcodes', 'pb')
+    .innerJoinAndSelect('opi.productDetail', 'pd')
+    .innerJoinAndSelect('pd.product', 'p')
+    .innerJoinAndSelect('p.productDetails', 'pd2')
+    .innerJoinAndSelect('pd2.productBarcodes', 'pb')
     .innerJoin('worksheets', 'w', 'w.release_good_id = rg.id')
     .where('rg.domain_id = :domainId', { domainId: domain.id })
     .andWhere('oi.status IN (:...orderInventoryStatus)', {
@@ -547,49 +555,18 @@ async function queryPackingWorksheet(tx, domain, assignee, binLocation) {
     .addOrderBy('rg.status', 'ASC')
     .addOrderBy('w.created_at', 'ASC')
 
-  // let qb: SelectQueryBuilder<OrderInventory> = tx.getRepository(OrderInventory).createQueryBuilder('orderInventory')
-
-  // qb.select('releaseGood.id', 'id')
-  //   .innerJoinAndSelect('orderInventory.location', 'binLocation')
-  //   .innerJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
-  //   .innerJoinAndSelect('releaseGood.bizplace', 'bizplace')
-  //   .innerJoinAndSelect('bizplace.domain', 'domain')
-  //   .innerJoinAndSelect(
-  //     'worksheets',
-  //     'ws',
-  //     `orderInventory.release_good_id = ws.release_good_id AND ws.type = 'PACKING' AND (ws.status = 'EXECUTING' OR ws.status = 'DEACTIVATED')`
-  //   )
-  // .innerJoinAndSelect('releaseGood.orderPackages', 'op')
-  // .innerJoinAndSelect('op.orderPackageItems', 'opi')
-  // .innerJoinAndSelect('opi.orderProduct', 'opr')
-  // .innerJoinAndSelect('opr.product', 'p')
-  // .innerJoinAndSelect('p.productDetails', 'pd')
-  // .innerJoinAndSelect('pd.productBarcodes', 'pb')
-  //   .where('orderInventory.domain_id = :domainId', { domainId: domain.id })
-  //   .andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
-  //     orderInventoryStatus: [
-  //       ORDER_INVENTORY_STATUS.READY_TO_PACK,
-  //       ORDER_INVENTORY_STATUS.PACKING,
-  //       ORDER_INVENTORY_STATUS.PACKED
-  //     ]
-  //   })
-  //   .andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
-  //   .andWhere('releaseGood.status IN (:...status)', {
-  //     status: [ORDER_STATUS.READY_TO_PACK, ORDER_STATUS.PACKING]
-  //   })
-
-  // if (assignee) {
-  //   qb.andWhere('ws.assignee_id = :assigneeId', { assigneeId: assignee.id })
-  // } else {
-  //   qb.andWhere('ws.assignee_id is null')
-  // }
-
-  // qb.orderBy('releaseGood.status', 'ASC')
-  //   .addOrderBy('ws.created_at', 'ASC')
-  //   .addOrderBy('releaseGood.name', 'ASC')
-  //   .groupBy('ws.created_at')
-  //   .addGroupBy('releaseGood.name')
-  //   .addGroupBy('releaseGood.id')
+  if (assignee) {
+    qb.andWhere('ws.assignee_id = :assigneeId', { assigneeId: assignee.id })
+  } else {
+    qb.andWhere('ws.assignee_id is null')
+  }
+
+  qb.orderBy('releaseGood.status', 'ASC')
+    .addOrderBy('ws.created_at', 'ASC')
+    .addOrderBy('releaseGood.name', 'ASC')
+    .groupBy('ws.created_at')
+    .addGroupBy('releaseGood.name')
+    .addGroupBy('releaseGood.id')
 
   let releaseGood = await qb.getOne()
 

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

@@ -103,6 +103,9 @@ export async function completeBatchPicking(
           'orderProducts',
           'orderProducts.product',
           'orderProducts.productDetail',
+          'orderProducts.productBundle',
+          'orderProducts.productBundle.productBundleSettings',
+          'orderProducts.productBundle.productBundleSettings.productDetail',
           'bizplace',
           'bizplace.domain',
           'bizplace.company',
@@ -221,18 +224,35 @@ export async function completeBatchPicking(
 
             let savedOrderPackage: OrderPackage = await tx.getRepository(OrderPackage).save(orderPackage)
             const orderPackageItems: OrderPackageItem[] = foundReleaseGood.orderProducts.map(op => {
-              return {
-                name: OrderNoGenerator.orderPackageItem(),
-                orderProduct: op,
-                status: ORDER_STATUS.PROCESSING,
-                releaseQty: op.releaseQty,
-                orderPackage: savedOrderPackage,
-                domain: foundReleaseGood.domain,
-                bizplace: foundReleaseGood.bizplace,
-                creator: foundReleaseGood.creator,
-                updater: foundReleaseGood.updater
+              if (op.product){
+                return {
+                  name: OrderNoGenerator.orderPackageItem(),
+                  orderProduct: op,
+                  status: ORDER_STATUS.PROCESSING,
+                  releaseQty: op.releaseQty,
+                  orderPackage: savedOrderPackage,
+                  domain: foundReleaseGood.domain,
+                  bizplace: foundReleaseGood.bizplace,
+                  creator: foundReleaseGood.creator,
+                  updater: foundReleaseGood.updater,
+                  productDetail: op.productDetail
+                }
+              } else {
+                let productBundle = op.productBundle
+                return productBundle.productBundleSettings.map(pbs => ({
+                  name: OrderNoGenerator.orderPackageItem(),
+                  orderProduct: op,
+                  status: ORDER_STATUS.PROCESSING,
+                  releaseQty: op.releaseQty * pbs.bundleQty,
+                  orderPackage: savedOrderPackage,
+                  domain: foundReleaseGood.domain,
+                  bizplace: foundReleaseGood.bizplace,
+                  creator: foundReleaseGood.creator,
+                  updater: foundReleaseGood.updater,
+                  productDetail: pbs.productDetail
+                }))
               }
-            })
+            }).flat()
 
             await tx.getRepository(OrderPackageItem).save(orderPackageItems)
             orderPackage.orderPackageItems = orderPackageItems

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

@@ -116,12 +116,17 @@ export async function completePicking(
         'lastMileDelivery',
         'orderPackages',
         'orderPackages.orderPackageItems',
+        'orderPackages.orderPackageItems.productDetail',
+        'orderPackages.orderPackageItems.productDetail.product',
         'orderPackages.orderPackageItems.orderProduct',
         'orderPackages.orderPackageItems.orderProduct.product',
         'orderPackages.orderPackageItems.orderProduct.productDetail',
         'orderProducts',
         'orderProducts.product',
         'orderProducts.productDetail',
+        'orderProducts.productBundle',
+        'orderProducts.productBundle.productBundleSettings',
+        'orderProducts.productBundle.productBundleSettings.productDetail',
         'creator',
         'updater'
       ]
@@ -371,18 +376,35 @@ export async function completePicking(
 
             let savedOrderPackage: OrderPackage = await tx.getRepository(OrderPackage).save(orderPackage)
             const orderPackageItems: OrderPackageItem[] = releaseGood.orderProducts.map(op => {
-              return {
-                name: OrderNoGenerator.orderPackageItem(),
-                orderProduct: op,
-                status: ORDER_STATUS.PROCESSING,
-                releaseQty: op.releaseQty,
-                orderPackage: savedOrderPackage,
-                domain: releaseGood.domain,
-                bizplace: releaseGood.bizplace,
-                creator: releaseGood.creator,
-                updater: releaseGood.updater
+              if (op.product){
+                return {
+                  name: OrderNoGenerator.orderPackageItem(),
+                  orderProduct: op,
+                  status: ORDER_STATUS.PROCESSING,
+                  releaseQty: op.releaseQty,
+                  orderPackage: savedOrderPackage,
+                  domain: releaseGood.domain,
+                  bizplace: releaseGood.bizplace,
+                  creator: releaseGood.creator,
+                  updater: releaseGood.updater,
+                  productDetail: op.productDetail
+                }
+              } else {
+                let productBundle = op.productBundle
+                return productBundle.productBundleSettings.map(pbs => ({
+                  name: OrderNoGenerator.orderPackageItem(),
+                  orderProduct: op,
+                  status: ORDER_STATUS.PROCESSING,
+                  releaseQty: op.releaseQty * pbs.bundleQty,
+                  orderPackage: savedOrderPackage,
+                  domain: releaseGood.domain,
+                  bizplace: releaseGood.bizplace,
+                  creator: releaseGood.creator,
+                  updater: releaseGood.updater,
+                  productDetail: pbs.productDetail
+                }))
               }
-            })
+            }).flat()
             await tx.getRepository(OrderPackageItem).save(orderPackageItems)
             orderPackage.orderPackageItems = orderPackageItems
             releaseGood.orderPackages = [orderPackage]

package/server/utils/lmd-util.ts

@@ -155,20 +155,20 @@ export async function createLmdParcel(releaseGoods, tx, domain, user, marketplac
           ...data,
           refNo: op.name,
           items: op.orderPackageItems.map(opi => {
-            let lengthUnit = opi?.orderProduct.productDetail?.lengthUnit?.toString()?.toLowerCase() || ''
+            let lengthUnit = opi?.productDetail?.lengthUnit?.toString()?.toLowerCase() || ''
 
             let items = {
               quantity: opi?.releaseQty?.toString() || ' ',
-              item: opi.orderProduct.product.name.slice(0, 49).trim() || ' ',
-              sku: opi.orderProduct.product.sku || ' ',
+              item: opi.productDetail.product.name.slice(0, 49).trim() || ' ',
+              sku: opi.productDetail.product.sku || ' ',
               price:
                 opi?.orderProduct?.paidAmount?.toString() ||
-                (opi?.releaseQty * opi?.orderProduct.productDetail?.costPrice || 0)?.toString() ||
+                (opi?.releaseQty * opi?.productDetail?.costPrice || 0)?.toString() ||
                 ' ',
-              weight: opi?.orderProduct.productDetail?.grossWeight?.toString() || ' ',
-              width: opi?.orderProduct.productDetail?.width || ' ',
-              length: opi?.orderProduct.productDetail?.depth || ' ',
-              height: opi?.orderProduct.productDetail?.height || ' '
+              weight: opi?.productDetail?.grossWeight?.toString() || ' ',
+              width: opi?.productDetail?.width || ' ',
+              length: opi?.productDetail?.depth || ' ',
+              height: opi?.productDetail?.height || ' '
             }
 
             if (lmd.platform == 'SAPX' || lmd.platform == 'VIETTEL_POST') {