@things-factory/operato-wms 4.1.30 → 5.0.0-alpha.3

package/server/graphql/resolvers/reports/outbound-order-details-report.ts

@@ -16,7 +16,6 @@ export const outboundOrderDetailsReport = {
       let toDate = params.filters.find(data => data.name === 'toDate')
       let roNo = params.filters.find(data => data.name === 'roNo')
       let doNo = params.filters.find(data => data.name === 'doNo')
-      let status = params.filters.find(data => data.name === 'status')
 
       if (userFilter) {
         const user: User = await tx.getRepository(User).findOne({
@@ -49,35 +48,60 @@ export const outboundOrderDetailsReport = {
         extraQueryFilters = `${extraQueryFilters} and delivery_order_no like '%${doNo.value}%' `
       }
 
-      console.time('temp')
       await tx.query(
         `
         create temp table temp_outbound_order_report on commit drop as (
           select * from (
-            select oi.id, '${bizplace.id}' AS "bizplace_id", '${bizplace.name}' AS "bizplace_name", '${bizplace.description}' AS "bizplace_description", 
-            do2.name AS "delivery_order_no", do2.delivery_date as "delivery_order_date",
-            do2."to", do2.contact_point_ref_id,
-            rg.name AS "ro_no", rg."type" as "ro_type", rg.ref_no AS "ref_no_1", rg.ref_no_2 AS "ref_no_2", rg.ref_no_3 AS "ref_no_3", rg.status as "ro_status", 
+            select b2.id AS "bizplace_id", b2.name AS "bizplace_name", b2.description AS "bizplace_description", 
+            do2.name AS "delivery_order_no", do2.delivery_date as "delivery_order_date", coalesce(do2."to", concat(cp.address, cp.address_2)) as "delivery_address",
+            rg.name AS "ro_no", rg."type" as "ro_type", rg.ref_no AS "ref_no_1", rg.ref_no_2 AS "ref_no_2", rg.ref_no_3 AS "ref_no_3", 
             rg.created_at AS "order_created_at", rg.accepted_at, u4.name as accepted_by,
             p.id as "product_id", p.sku as "product_sku", p.name AS "product_name", p.description AS "product_description", p.type as "product_type",
-            i.packing_type as "pack_type", i.packing_size as "pack_size", oi.release_qty AS "release_qty",
-            oi.picked_at, oi.picked_by, oi.packed_at, oi.packed_by, oi.loaded_at, oi.loaded_by, oi.shipped_at,
-            oi.release_qty as "qty", oi.release_uom_value as "uom_value", i.uom, 
-            oi.return_to_location_qty, oi.return_to_location_uom_value, 
-            i.pallet_id, i.carton_id, i.batch_id, i.batch_id_ref, i.expiration_date, i.manufacture_date
-            from order_inventories oi
-            inner join release_goods rg on rg.id = oi.release_good_id 
+            oi.packing_type as "pack_type", oi.packing_size as "pack_size", oi.release_qty AS "release_qty",
+            w.started_at as "picking_start", w.ended_at as "picking_complete",
+            ih.qty as "qty", ih.uom_value as "uom_value", ih.uom, ih.pallet_id, ih.carton_id, ih.batch_id, ih.batch_id_ref, 
+            i.expiration_date, i.manufacture_date,
+            ih.created_at as "picked_at", u.name as "picked_by",
+            ih2.created_at as "packed_at", u2.name as "packed_by",
+            ih3.created_at as "loaded_at", u3.name as "loaded_by",
+            ih4.created_at as "shipped_at",
+            coalesce((select volume from product_details pd where pd.product_id = i.product_id and pd.packing_type = i.packing_type and pd.packing_size = i.packing_size 
+            order by created_at desc
+            fetch first 1 rows only),0) as unit_volume,
+            coalesce((select nett_weight from product_details pd where pd.product_id = i.product_id and pd.packing_type = i.packing_type and pd.packing_size = i.packing_size 
+            order by created_at desc
+            fetch first 1 rows only),0) as unit_nett_weight,
+            coalesce((select gross_weight from product_details pd where pd.product_id = i.product_id and pd.packing_type = i.packing_type and pd.packing_size = i.packing_size 
+            order by created_at desc
+            fetch first 1 rows only),0) as unit_gross_weight,
+            coalesce((select weight_unit from product_details pd where pd.product_id = i.product_id and pd.packing_type = i.packing_type and pd.packing_size = i.packing_size 
+            order by created_at desc
+            fetch first 1 rows only),'') as weight_unit
+            from (
+              select * from release_goods 
+              where domain_id = $1 and bizplace_id = $2 and status ='DONE'
+              and created_at >= $3 and created_at <= $4
+            ) rg 
             left join users u4 on u4.id = rg.accepted_by_id 
+            inner join bizplaces b2 ON b2.id = rg.bizplace_id 
+            inner join order_inventories oi on oi.release_good_id = rg.id
             inner join inventories i on i.id = oi.inventory_id 
             inner join temp_products p on p.id = oi.product_id
+            left join worksheets w on w.release_good_id = rg.id and w."type" ='PICKING'
+            left join reduced_inventory_histories ih on ih.inventory_id = oi.inventory_id and ih.transaction_type ='PICKING' and ih.ref_order_id = rg.id::varchar
+            left join users u on u.id = ih.creator_id 
+            left join reduced_inventory_histories ih2 on ih2.inventory_id = oi.inventory_id and ih2.transaction_type ='PACKING' and ih2.ref_order_id = rg.id::varchar
+            left join users u2 on u2.id = ih2.creator_id 
+            left join reduced_inventory_histories ih3 on ih3.inventory_id = oi.inventory_id and ih3.transaction_type ='LOADING' and ih3.ref_order_id = rg.id::varchar
+            left join users u3 on u3.id = ih3.creator_id 
+            left join reduced_inventory_histories ih4 on ih4.inventory_id = oi.inventory_id and ih4.transaction_type ='SHIPPING' and ih4.ref_order_id = rg.id::varchar
+            left join worksheets w2 on w2.release_good_id = rg.id and w2."type" ='PACKING'
+            left join worksheets w3 on w3.release_good_id = rg.id and w2."type" ='LOADING'
             left join delivery_orders do2 on do2.id = oi.delivery_order_id 
-            where exists (
-              select rg2.id from release_goods rg2
-              where rg2.domain_id = $1 and rg2.bizplace_id = $2
-              and rg2.created_at >= $3 and rg2.created_at <= $4 and rg2.id = oi.release_good_id 
-            )
-            and oi.status <> 'REPLACED'
-            ${status ? `and rg.status = '${status.value}' ` : ``}
+            left join contact_points cp on cp.id = do2.contact_point_ref_id
+            left join marketplace_orders mo on mo.release_order_id::uuid = rg.id
+            where oi.status <> 'REPLACED'           
+            order by rg.name, p.sku
           ) src
           where 1=1
           ${extraQueryFilters}
@@ -86,49 +110,22 @@ export const outboundOrderDetailsReport = {
         [context.state.domain.id, bizplace.id, fromDate.value, toDate.value]
       )
 
-      console.timeEnd('temp')
       const total: any = await tx.query(`
         select count(*) from temp_outbound_order_report
       `)
 
-      console.time('result')
       const result: any = await tx.query(
         `
         select *,  
         round((qty * unit_volume)::numeric ,4) as total_volume, 
         round((qty * unit_nett_weight)::numeric ,4) as total_unit_nett_weight, 
-        round((qty * unit_gross_weight)::numeric ,4) as total_unit_gross_weight
-        from (
-          select *,
-          w.started_at as picking_start,
-          w.ended_at as picking_complete,
-          coalesce(oi."to", concat(cp.address, cp.address_2)) as "delivery_address",
-          coalesce((select volume from product_details pd where pd.product_id = oi.product_id and pd.packing_type = oi.pack_type and pd.packing_size = oi.pack_size 
-          order by created_at desc
-          fetch first 1 rows only),0) as unit_volume,
-          coalesce((select nett_weight from product_details pd where pd.product_id = oi.product_id and pd.packing_type = oi.pack_type and pd.packing_size = oi.pack_size 
-          order by created_at desc
-          fetch first 1 rows only),0) as unit_nett_weight,
-          coalesce((select gross_weight from product_details pd where pd.product_id = oi.product_id and pd.packing_type = oi.pack_type and pd.packing_size = oi.pack_size 
-          order by created_at desc
-          fetch first 1 rows only),0) as unit_gross_weight,
-          coalesce((select weight_unit from product_details pd where pd.product_id = oi.product_id and pd.packing_type = oi.pack_type and pd.packing_size = oi.pack_size 
-          order by created_at desc
-          fetch first 1 rows only),'') as weight_unit
-          from temp_outbound_order_report oi
-          left join worksheet_details wd on wd.target_inventory_id = oi.id
-          left join worksheets w on w.id = wd.worksheet_id
-          left join contact_points cp on cp.id = oi.contact_point_ref_id
-          where (w.type= 'PICKING' OR w.type = 'BATCH_PICKING')  
-          order by oi.ro_no, oi.product_sku
-          offset $1 limit $2
-        ) src  
+        round((qty * unit_gross_weight)::numeric ,4) as total_unit_gross_weight 
+        from temp_outbound_order_report
+        offset $1 limit $2
       `,
         [(params.pagination.page - 1) * params.pagination.limit, params.pagination.limit]
       )
 
-      console.timeEnd('result')
-
       let items = result.map(itm => {
         return {
           bizplace: {
@@ -141,10 +138,9 @@ export const outboundOrderDetailsReport = {
           deliveryAddress: itm.delivery_address,
           roNo: itm.ro_no,
           roType: itm.ro_type,
-          status: itm.ro_status,
           refNo1: itm.ref_no_1,
-          refNo3: itm.ref_no_3,
           refNo2: itm.ref_no_2,
+          refNo3: itm.ref_no_3,
           acceptedBy: itm.accepted_by,
           acceptedAt: itm.accepted_at,
           orderCreatedAt: itm.order_created_at,
@@ -162,8 +158,6 @@ export const outboundOrderDetailsReport = {
           qty: Math.abs(itm.qty),
           uomValue: Math.abs(itm.uom_value),
           uom: itm.uom,
-          returnToLocationQty: itm.return_to_location_qty,
-          returnToLocationUomValue: itm.return_to_location_uom_value,
           unitVolume: itm.unit_volume,
           totalVolume: itm.total_volume,
           unitNettWeight: itm.unit_nett_weight,

package/server/graphql/types/reports/outbound-order-details-report.ts

@@ -8,7 +8,6 @@ export const OutboundOrderDetailsReport = gql`
     deliveryAddress: String
     roNo: String
     roType: String
-    status: String
     refNo1: String
     refNo2: String
     refNo3: String
@@ -23,8 +22,6 @@ export const OutboundOrderDetailsReport = gql`
     packSize: Int
     qty: Int
     uomValue: Float
-    returnToLocationQty: Int
-    returnToLocationUomValue: Float
     uom: String
     unitVolume: Float
     totalVolume: Float

package/translations/en.json

@@ -104,7 +104,6 @@
   "delivery_order_form_invalid": "delivery order form invalid",
   "field.accepted_at": "accepted at",
   "field.accepted_by": "accepted by",
-  "field.actual_lot_qty": "actual lot qty",
   "field.actual_pack_qty": "actual pack qty",
   "field.actual_pallet_qty": "actual pallet qty",
   "field.actual_qty": "actual qty",
@@ -294,7 +293,6 @@
   "field.location": "location",
   "field.loose_item": "loose item",
   "field.lot_id": "lot id",
-  "field.lot_qty": "lot qty",
   "field.low_on_stock": "low on stock",
   "field.main_bizplace": "main customer",
   "field.manifest_no": "manifest no",
@@ -752,7 +750,6 @@
   "label.order_status_ready_to_unload": "ready to unload",
   "label.order_status_received": "received",
   "label.order_status_rejected": "rejected",
-  "label.order_status_sorting": "sorting",
   "label.order_type": "order type",
   "label.other_destination": "other destination",
   "label.other": "other",
@@ -1113,14 +1110,15 @@
   "text.invalid_form": "invalid form",
   "text.invalid_format_of_location_id": "invalid format of location id",
   "text.invalid_inventory": "invalid_inventory",
+  "text.manufacture-date-cannot-be-later-than-today": "manufacture date cannot be later than today",
   "text.invalid_no_of_random_item_value": "invalid no of random item value",
   "text.invalid_pack_qty": "invalid pack qty",
   "text.invalid_pallet_id": "invalid pallet id",
   "text.invalid_pallet_qty": "invalid pallet qty",
   "text.invalid_print_qty": "invalid print qty",
   "text.invalid_product_combination": "invalid product combination",
-  "text.invalid_qty": "invalid quantity",
   "text.invalid_quantity_input": "invalid quantity input",
+  "text.invalid_qty": "invalid quantity",
   "text.invalid_release_date": "invalid release date",
   "text.invalid_release_qty": "invalid release qty",
   "text.invalid_return_location": "invalid return location",
@@ -1153,7 +1151,6 @@
   "text.manifest_has_been_dispatched_and_closed": "manifest has been dispatched and closed",
   "text.manifest_has_been_generated": "manifest has been generated",
   "text.manifest_items_is_empty": "manifest items is empty",
-  "text.manufacture-date-cannot-be-later-than-today": "manufacture date cannot be later than today",
   "text.missing_zone_name": "missing zone name",
   "text.new_batch_id_is_empty": "new batch no is empty",
   "text.no_changes_to_be_submitted": "no changes to be submitted",
@@ -1200,7 +1197,6 @@
   "text.please_select_a_truck": "select a truck",
   "text.please_select_an_inventory": "please select an inventory",
   "text.please_select_label_indicator": "please select label indicator",
-  "text.please_select_one_or_more_order_to_generate_worksheet": "please select one or more order to generate worksheet",
   "text.please_select_release_order": "please select release order",
   "text.please_select_the_company": "please select the company",
   "text.please_select_the_contact_type": "please select the contact type",
@@ -1284,10 +1280,8 @@
   "text.selected_inventory_not_using_carton_label": "selected inventory not using carton label",
   "text.selected_item_qty_is_less_than_order_release_qty": "selected item qty is less than order release qty",
   "text.selected_item_qty_is_more_than_order_release_qty": "selected item qty is more than order release qty",
-  "text.scanned_product_status_is_done": "scanned product status is done",
   "text.selected_qty_is_less_than_expected": "selected qty is less than expected",
   "text.selected_qty_is_more_than_expected": "selected qty is more than expected",
-  "text.selected_release_order(s)_has_existing_worksheet": "selected release order(s) has existing worksheet",
   "text.send_goods_received_note": "send GRN",
   "text.set_order_to_ready_to_ship": "set order to ready to ship",
   "text.shelf_is_not_allowed_as_an_indicator_for_partial_format": "shelf is not allowed as an indicator for partial format",
@@ -1363,7 +1357,6 @@
   "text.warehouse_not_found": "warehouse not found!",
   "text.worksheet_activated": "worksheet activated",
   "text.worksheet_has_been_generated": "worksheet has been generated",
-  "text.worksheet(s)_has_been_generated": "worksheet(s) has been generated",
   "text.wrong_carton_id": "wrong carton id",
   "text.wrong_lot_id": "wrong lot id",
   "text.wrong_release_qty": "wrong release qty",
@@ -1692,5 +1685,7 @@
   "title.worksheet_unloading": "worksheet unloading",
   "title.worksheet_vas": "worksheet vas",
   "title.worksheet": "worksheet",
-  "vas_order_created": "vas order created"
+  "vas_order_created": "vas order created",
+  "field.lot_qty": "lot qty",
+  "field.actual_lot_qty": "actual lot qty"
 }

package/translations/ko.json

@@ -1,5 +1,4 @@
 {
-  "label.order_status_sorting": "[ko]sorting",
   "button.print_internal_awb": "[ko]print internal awb",
   "arrival_notice_created": "입고주문이 생성 되었습니다.",
   "arrival_notice_updated": "[ko]arrival notice updated",
@@ -1877,15 +1876,10 @@
   "title.undo_putaway": "[ko] undo putaway",
   "field.lot_qty": "[ko] lot qty",
   "field.actual_lot_qty": "[ko] actual lot qty",
-  "text.scanned_product_status_is_done": "[ko] scanned product status is done",
   "field.manufacture_date": "[ko] manufacture date",
   "text.manufacture-date-cannot-be-later-than-today": "[ko] manufacture date cannot be later than today",
   "text.please_select_an_inventory": "[ko] please select an inventory",
   "text.carton_id_not_found": "[ko] carton id not found",
   "text.lot_id_not_found": "[ko] lot id not found",
-  "field.volume_m3": "[ko] volume (M3)",
-  "text.scanned_product_status_is_done": "[ko] scanned product status is done",
-  "text.selected_release_order(s)_has_existing_worksheet": "[ko] selected release order(s) has existing worksheet",
-  "text.please_select_one_or_more_order_to_generate_worksheet": "[ko] please select one or more order to generate worksheet",
-  "text.worksheet(s)_has_been_generated": "[ko] worksheet(s) has been generated"
+  "field.volume_m3": "[ko] volume (M3)"
 }

package/translations/ms.json

@@ -1,5 +1,4 @@
 {
-  "label.order_status_sorting": "[ms]sorting",
   "button.print_internal_awb": "[ms]print internal awb",
   "arrival_notice_created": "notis ketibaan telah dicipta",
   "arrival_notice_updated": "notis ketibaan telah dikemaskinikan",
@@ -1747,15 +1746,10 @@
   "title.undo_putaway": "[ms] undo putaway",
   "field.lot_qty": "[ms] lot qty",
   "field.actual_lot_qty": "[ms] actual lot qty",
-  "text.scanned_product_status_is_done": "[ms] scanned product status is done",
   "field.manufacture_date": "[ms] manufacture date",
   "text.manufacture-date-cannot-be-later-than-today": "[ms] manufacture date cannot be later than today",
   "text.please_select_an_inventory": "[ms] please select an inventory",
   "text.carton_id_not_found": "[ms] carton id not found",
   "text.lot_id_not_found": "[ms] lot id not found",
-  "field.volume_m3": "[ms] volume (M3)",
-  "text.scanned_product_status_is_done": "[ms] scanned product status is done",
-  "text.selected_release_order(s)_has_existing_worksheet": "[ms] selected release order(s) has existing worksheet",
-  "text.please_select_one_or_more_order_to_generate_worksheet": "[ms] please select one or more order to generate worksheet",
-  "text.worksheet(s)_has_been_generated": "[ms] worksheet(s) has been generated"
+  "field.volume_m3": "[ms] volume (M3)"
 }

package/translations/zh.json

@@ -1,5 +1,4 @@
 {
-  "label.order_status_sorting": "[zh]sorting",
   "button.print_internal_awb": "[zh]print internal awb",
   "arrival_notice_created": "arrival notice created",
   "button.activate": "activate",
@@ -1697,15 +1696,10 @@
   "title.undo_putaway": "[zh] undo putaway",
   "field.lot_qty": "[zh] lot qty",
   "field.actual_lot_qty": "[zh] actual lot qty",
-  "text.scanned_product_status_is_done": "[zh] scanned product status is done",
   "field.manufacture_date": "[zh] manufacture date",
   "text.manufacture-date-cannot-be-later-than-today": "[zh] manufacture date cannot be later than today",
   "text.please_select_an_inventory": "[zh] please select an inventory",
   "text.carton_id_not_found": "[zh] carton id not found",
   "text.lot_id_not_found": "[zh] lot id not found",
-  "field.volume_m3": "[zh] volume (M3)",
-  "text.scanned_product_status_is_done": "[zh] scanned product status is done",
-  "text.selected_release_order(s)_has_existing_worksheet": "[zh] selected release order(s) has existing worksheet",
-  "text.please_select_one_or_more_order_to_generate_worksheet": "[zh] please select one or more order to generate worksheet",
-  "text.worksheet(s)_has_been_generated": "[zh] worksheet(s) has been generated"
+  "field.volume_m3": "[zh] volume (M3)"
 }