@things-factory/operato-hub 4.3.642 → 4.3.644

package/server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts

@@ -46,16 +46,13 @@ router.get(
 
       const releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({
         where: filter,
-        relations: [
-          'orderPackages',
-          'orderPackages.orderPackageItems',
-          'bizplace'
-        ]
+        relations: ['orderPackages', 'orderPackages.orderPackageItems', 'bizplace']
       })
 
       if (!releaseGood) throw new ApiError('E04', `release order: ${filter['name']} do not exist.`)
 
-      const rgOrderProducts: any[] = await getRepository(OrderProduct).createQueryBuilder('op')
+      const rgOrderProducts: any[] = await getRepository(OrderProduct)
+        .createQueryBuilder('op')
         .leftJoinAndSelect('products', 'p', 'p.id = op.product_id')
         .leftJoinAndSelect('product_details', 'pd', 'pd.id = op.product_detail_id')
         .leftJoinAndSelect('product_bundles', 'pdb', 'pdb.id = op.product_bundle_id')
@@ -71,21 +68,27 @@ router.get(
           packingSize: src.op_packing_size,
           batchId: src.op_batch_id,
           releaseQty: parseFloat(src.op_release_qty),
-          product: src.p_id ? {
-            sku: src.p_sku,
-            productDetail: {
-              refCode: src.pd_ref_code,
-              name: src.pd_name
-            }
-          } : undefined,
-          productBundle: src.pdb_id ? {
-            sku: src.pdb_sku,
-            name: src.pdb_name
-          } : undefined
+          refItemId: src?.op_ref_item_id,
+          product: src.p_id
+            ? {
+                sku: src.p_sku,
+                productDetail: {
+                  refCode: src.pd_ref_code,
+                  name: src.pd_name
+                }
+              }
+            : undefined,
+          productBundle: src.pdb_id
+            ? {
+                sku: src.pdb_sku,
+                name: src.pdb_name
+              }
+            : undefined
         }
       })
 
-      const rgOrderInventories: any[] = await getRepository(OrderInventory).createQueryBuilder('oi')
+      const rgOrderInventories: any[] = await getRepository(OrderInventory)
+        .createQueryBuilder('oi')
         .leftJoinAndSelect('products', 'p', 'p.id = oi.product_id')
         .leftJoinAndSelect('product_details', 'pd', 'pd.id = oi.product_detail_id')
         .leftJoinAndSelect('inventories', 'inv', 'inv.id = oi.inventory_id')
@@ -97,10 +100,13 @@ router.get(
 
       let rgOrderToteItems: any[]
       if (rgOrderInventories.length > 0) {
-        rgOrderToteItems = await getRepository(OrderToteItem).createQueryBuilder('oti')
+        rgOrderToteItems = await getRepository(OrderToteItem)
+          .createQueryBuilder('oti')
           .innerJoinAndSelect('oti.orderTote', 'ot')
           .innerJoinAndSelect('ot.orderToteSeals', 'os')
-          .where('oti.order_inventory_id In (:...orderInventoryIds)', { orderInventoryIds: rgOrderInventories.map(src => src.oi_id) })
+          .where('oti.order_inventory_id In (:...orderInventoryIds)', {
+            orderInventoryIds: rgOrderInventories.map(src => src.oi_id)
+          })
           .getMany()
       }
 
@@ -128,19 +134,21 @@ router.get(
             name: src.pd_name
           },
           orderProducts: orderProducts.find(op => op.id === src.oi_order_product_id),
-          orderToteItems: rgOrderToteItems.filter(oti => oti.orderInventoryId === src.oi_id).map(oti => {
-            return {
-              qty: oti.qty,
-              orderTote: {
-                name: oti.orderTote.name,
-                orderToteSeals: oti.orderTote.orderToteSeals.map(ots => {
-                  return {
-                    name: ots.name
-                  }
-                })
+          orderToteItems: rgOrderToteItems
+            .filter(oti => oti.orderInventoryId === src.oi_id)
+            .map(oti => {
+              return {
+                qty: oti.qty,
+                orderTote: {
+                  name: oti.orderTote.name,
+                  orderToteSeals: oti.orderTote.orderToteSeals.map(ots => {
+                    return {
+                      name: ots.name
+                    }
+                  })
+                }
               }
-            }
-          }),
+            }),
           deliveryOrder: {
             id: src.do_id,
             name: src.do_name
@@ -167,12 +175,7 @@ router.get(
       let deliveryOrders: DeliveryOrder[] = []
       deliveryOrders = await getRepository(DeliveryOrder).find({
         where: { releaseGood: releaseGood.id },
-        relations: [
-          'transportDriver',
-          'transportVehicle',
-          'creator',
-          'updater'
-        ]
+        relations: ['transportDriver', 'transportVehicle', 'creator', 'updater']
       })
 
       deliveryOrders = deliveryOrders.map(deliveryOrder => {