@things-factory/operato-wms 3.6.37 → 3.6.41

package/server/graphql/resolvers/dashboard/collection-orders-by-status.ts

@@ -0,0 +1,25 @@
+import { getRepository, SelectQueryBuilder } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { CollectionOrder } from '@things-factory/sales-base'
+import { buildQuery, Domain, ListParam } from '@things-factory/shell'
+
+export const collectionOrdersByStatusResolver = {
+  async collectionOrdersByStatus(_: any, params: ListParam, context: any) {
+    const { domain, user }: { domain: Domain; user: User } = context.state
+
+    if (!params.filters.find((filter: any) => filter.name === 'bizplace')) {
+      params.filters.push({
+        name: 'bizplaceId',
+        operator: 'in',
+        value: await getPermittedBizplaceIds(domain, user),
+        relation: false
+      })
+    }
+
+    const qb: SelectQueryBuilder<CollectionOrder> = getRepository(CollectionOrder).createQueryBuilder('co')
+    buildQuery(qb, params, context)
+    return qb.select('co.status', 'status').addSelect('COUNT(*) AS count').groupBy('co.status').getRawMany()
+  }
+}

package/server/graphql/resolvers/dashboard/delivery-orders-by-status.ts

@@ -0,0 +1,25 @@
+import { getRepository, SelectQueryBuilder } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { DeliveryOrder } from '@things-factory/sales-base'
+import { buildQuery, Domain, ListParam } from '@things-factory/shell'
+
+export const deliveryOrdersByStatusResolver = {
+  async deliveryOrdersByStatus(_: any, params: ListParam, context: any) {
+    const { domain, user }: { domain: Domain; user: User } = context.state
+
+    if (!params.filters.find((filter: any) => filter.name === 'bizplace')) {
+      params.filters.push({
+        name: 'bizplaceId',
+        operator: 'in',
+        value: await getPermittedBizplaceIds(domain, user),
+        relation: false
+      })
+    }
+
+    const qb: SelectQueryBuilder<DeliveryOrder> = getRepository(DeliveryOrder).createQueryBuilder('do')
+    buildQuery(qb, params, context)
+    return qb.select('do.status', 'status').addSelect('COUNT(*) AS count').groupBy('do.status').getRawMany()
+  }
+}

package/server/graphql/resolvers/dashboard/index.ts

@@ -0,0 +1,11 @@
+import { arrivalNoticesByStatusResolver } from './arrival-notices-by-status'
+import { collectionOrdersByStatusResolver } from './collection-orders-by-status'
+import { deliveryOrdersByStatusResolver } from './delivery-orders-by-status'
+import { releaseGoodsByStatusResolver } from './release-goods-by-status'
+
+export const Query = {
+  ...arrivalNoticesByStatusResolver,
+  ...collectionOrdersByStatusResolver,
+  ...deliveryOrdersByStatusResolver,
+  ...releaseGoodsByStatusResolver
+}

package/server/graphql/resolvers/dashboard/release-goods-by-status.ts

@@ -0,0 +1,25 @@
+import { getRepository, SelectQueryBuilder } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { ReleaseGood } from '@things-factory/sales-base'
+import { buildQuery, Domain, ListParam } from '@things-factory/shell'
+
+export const releaseGoodsByStatusResolver = {
+  async releaseGoodsByStatus(_: any, params: ListParam, context: any) {
+    const { domain, user }: { domain: Domain; user: User } = context.state
+
+    if (!params.filters.find((filter: any) => filter.name === 'bizplace')) {
+      params.filters.push({
+        name: 'bizplaceId',
+        operator: 'in',
+        value: await getPermittedBizplaceIds(domain, user),
+        relation: false
+      })
+    }
+
+    const qb: SelectQueryBuilder<ReleaseGood> = getRepository(ReleaseGood).createQueryBuilder('rg')
+    buildQuery(qb, params, context)
+    return qb.select('rg.status', 'status').addSelect('COUNT(*) AS count').groupBy('rg.status').getRawMany()
+  }
+}

package/server/graphql/resolvers/index.ts

@@ -1,10 +1,18 @@
-import * as OpaMenu from './opa-menu'
 import * as BoardSetting from './board-setting'
 import * as CustomElccl from './custom/elccl'
 import * as CustomKimeda from './custom/kimeda'
+import * as Dashboard from './dashboard'
 import * as Extra from './extra'
+import * as OpaMenu from './opa-menu'
 import * as Reports from './reports'
 
-export const queries = [OpaMenu.Query, BoardSetting.Query, CustomElccl.Query, CustomKimeda.Query, Reports.Query]
+export const queries = [
+  BoardSetting.Query,
+  CustomElccl.Query,
+  CustomKimeda.Query,
+  Dashboard.Query,
+  OpaMenu.Query,
+  Reports.Query
+]
 
 export const mutations = [Extra.Mutation]

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

@@ -99,7 +99,8 @@ export const outboundOrderDetailsReport = {
             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 
             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            
+            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

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

@@ -0,0 +1,9 @@
+import { OrderStatusCounter } from './order-status-counter'
+
+export const Query = /* GraphQL */ `
+  arrivalNoticesByStatus(filters: [Filter]): [OrderStatusCounter] @transaction
+  collectionOrdersByStatus(filters: [Filter]): [OrderStatusCounter] @transaction
+  deliveryOrdersByStatus(filters: [Filter]): [OrderStatusCounter] @transaction
+  releaseGoodsByStatus(filters: [Filter]): [OrderStatusCounter] @transaction
+`
+export const Types = [OrderStatusCounter]

package/server/graphql/types/dashboard/order-status-counter.ts

@@ -0,0 +1,8 @@
+import gql from 'graphql-tag'
+
+export const OrderStatusCounter = gql`
+  type OrderStatusCounter {
+    status: String
+    count: Int
+  }
+`

package/server/graphql/types/index.ts

@@ -1,12 +1,26 @@
-import * as OpaMenu from './opa-menu'
 import * as BoardSetting from './board-setting'
 import * as CustomElccl from './custom/elccl'
 import * as CustomKimeda from './custom/kimeda'
+import * as Dashboard from './dashboard'
 import * as Extra from './extra'
+import * as OpaMenu from './opa-menu'
 import * as Reports from './reports'
 
-export const queries = [OpaMenu.Query, BoardSetting.Query, CustomElccl.Query, CustomKimeda.Query, Reports.Query]
+export const queries = [
+  BoardSetting.Query,
+  CustomElccl.Query,
+  CustomKimeda.Query,
+  Dashboard.Query,
+  OpaMenu.Query,
+  Reports.Query
+]
 
 export const mutations = [Extra.Mutation]
 
-export const types = [...OpaMenu.Types, ...BoardSetting.Types, ...CustomElccl.Types, ...Reports.Types]
+export const types = [
+  ...BoardSetting.Types,
+  ...CustomElccl.Types,
+  ...Dashboard.Types,
+  ...OpaMenu.Types,
+  ...Reports.Types
+]

package/things-factory.config.js

@@ -207,6 +207,10 @@ export default {
       tagname: 'return-order-assign-buffer-location',
       page: 'return_order_assign_buffer_location'
     },
+    {
+      tagname: 'bulk-print-packing-list',
+      page: 'bulk_print_packing_list'
+    },
     /**
      * Billing Menus Section
      */

package/translations/en.json

@@ -60,6 +60,8 @@
   "button.print_airway_bill": "print airway bill",
   "button.print_invoice": "print invoice",
   "button.print_label": "print label",
+  "button.generate_packing_list": "generate packing list",
+  "button.print_packing_list": "print packing list",
   "button.print": "print",
   "button.product_changes": "product changes",
   "button.qty_checked": "qty checked",
@@ -1071,6 +1073,7 @@
   "text.optional": "optional",
   "text.order_has_been_set_to_ready_to_ship": "order has been set to ready to ship",
   "text.order_no_is_empty": "order no is empty",
+  "text.order_status_not_qualified_for_bulk_printing_packing_list": "order status not qualified for bulk printing packing list",
   "text.packing_is_completed": "packing is completed",
   "text.pallet_is_in_progressing": "pallet is in progressing",
   "text.pallet_qty_is_empty": "pallet qty is empty",
@@ -1145,6 +1148,7 @@
   "text.select_a_shipping_provider": "select a shipping provider",
   "text.select_location_format": "please select location format",
   "text.select_one_of_unloading_list_first": "select one of unloading list first",
+  "text.select_orders_to_generate_merged_packing_list_for_printing": "select orders to generate merged packing list for printing",
   "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",
@@ -1242,6 +1246,7 @@
   "title.attachment": "attachment",
   "title.batch_picking": "batch picking",
   "title.bizplace": "bizplace",
+  "title.bulk_print_packing_list": "bulk print packing list",
   "title.carton_label": "carton label",
   "title.check_arrived_notice": "check arrived notice",
   "title.check_return_order": "check return order",

package/translations/ko.json

@@ -62,6 +62,8 @@
   "button.preview": "미리보기",
   "button.print_airway_bill": "운송장 출력",
   "button.print_do": "[ko]print DO",
+  "button.generate_picking_list": "[ko] generate packing list",
+  "button.print_picking_list": "[ko] print packing list",
   "button.print_invoice": "[ko] print invoice",
   "button.print_label": "라벨 출력",
   "button.print": "인쇄",
@@ -1135,6 +1137,7 @@
   "text.order_no_is_empty": "주문번호가 없습니다",
   "text.order_received": "order received",
   "text.order_status_has_been_updated": "has been updated",
+  "text.order_status_not_qualified_for_bulk_printing_packing_list": "[ko] order status not qualified for bulk printing packing list",
   "text.order_type_is_empty": "order type is empty",
   "text.packing_is_completed": "포장이 완료 되었습니다",
   "text.pallet_id_is_empty": "pallet id is empty",
@@ -1235,6 +1238,7 @@
   "text.select_label_format": "select label format",
   "text.select_location_format": "로케이션 유형 선택",
   "text.select_one_of_unloading_list_first": "[ko]select one of unloading list first",
+  "text.select_orders_to_generate_merged_packing_list_for_printing": "[ko] select orders to generate merged packing list for printing",
   "text.selected_inventory_not_using_carton_label": "[ko]selected inventory not using carton label",
   "text.selected_item_qty_is_less_than_order_release_qty": "선택된 재고의 수량이 출고 수량보다 적습니다",
   "text.selected_item_qty_is_more_than_order_release_qty": "선택된 재고의 수량이 출고 수량을 넘습니다",
@@ -1347,6 +1351,7 @@
   "title.attachment": "첨부파일",
   "title.batch_picking": "일괄 피킹",
   "title.bizplace": "사업장",
+  "title.bulk_print_packing_list": "[ko] bulk print packing list",
   "title.carton_label": "[ko] carton label",
   "title.check_arrived_notice": "입고주문 확인",
   "title.check_return_order": "반품주문 확인",

package/translations/ms.json

@@ -61,6 +61,8 @@
   "button.print_airway_bill": "print airway bill",
   "button.print_do": "cetak DO",
   "button.print_invoice": "[ms] print invoice",
+  "button.generate_picking_list": "[ms] generate packing list",
+  "button.print_picking_list": "[ms] print packing list",
   "button.print_label": "cetak label",
   "button.print": "cetak",
   "button.product_changes": "perubahan produk",
@@ -1083,6 +1085,7 @@
   "text.online": "dalam talian",
   "text.optional": "pilihan",
   "text.order_has_been_set_to_ready_to_ship": "[ms] order has been set to ready to ship",
+  "text.order_status_not_qualified_for_bulk_printing_packing_list": "[ms] order status not qualified for bulk printing packing list",
   "text.order_no_is_empty": "no. pesanan mssong",
   "text.packing_is_completed": "pembungkusan telah selesai",
   "text.pallet_is_in_progressing": "palet sedang diproses",
@@ -1159,6 +1162,7 @@
   "text.select_a_shipping_provider": "[ms]select a shipping provider",
   "text.select_location_format": "pilih format lokasi",
   "text.select_one_of_unloading_list_first": "[ms]select one of unloading list first",
+  "text.select_orders_to_generate_merged_packing_list_for_printing": "[ms] select orders to generate merged packing list for printing",
   "text.selected_inventory_not_using_carton_label": "[ms]selected inventory not using carton label",
   "text.selected_item_qty_is_less_than_order_release_qty": "kuantiti barang dipilih kurang dari kuantiti dilepaskan",
   "text.selected_item_qty_is_more_than_order_release_qty": "kuantiti barang dipilih lebih dari kuantiti dilepaskan",
@@ -1254,6 +1258,7 @@
   "title.attachment": "lampiran",
   "title.batch_picking": "pengambilan berkumpulan",
   "title.bizplace": "tempat bisnes",
+  "title.bulk_print_packing_list": "[ms] bulk print packing list",
   "title.carton_label": "[ms] carton label",
   "title.check_arrived_notice": "semak notis ketibaan",
   "title.check_return_order": "check return order",

package/translations/zh.json

@@ -56,10 +56,12 @@
   "button.pack": "pack",
   "button.partial_complete": "partial complete",
   "button.preview": "preview",
-  "button.print_airway_bill": "print airway bill",
+  "button.print": "print",
   "button.print_invoice": "[zh] print invoice",
+  "button.generate_picking_list": "[zh] generate packing list",
+  "button.print_picking_list": "[zh] print packing list",
+  "button.print_airway_bill": "print airway bill",
   "button.print_label": "print label",
-  "button.print": "print",
   "button.product_changes": "[zh]product changes",
   "button.qty_checked": "[zh]qty checked",
   "button.ready_to_ship": "[zh]ready to ship",
@@ -1051,6 +1053,7 @@
   "text.online": "online",
   "text.optional": "optional",
   "text.order_has_been_set_to_ready_to_ship": "[zh] order has been set to ready to ship",
+  "text.order_status_not_qualified_for_bulk_printing_packing_list": "[zh] order status not qualified for bulk printing packing list",
   "text.order_no_is_empty": "order no is empty",
   "text.packing_is_completed": "packing is completed",
   "text.pallet_is_in_progressing": "pallet is in progressing",
@@ -1126,6 +1129,7 @@
   "text.select_a_shipping_provider": "[zh]select a shipping provider",
   "text.select_location_format": "please select location format",
   "text.select_one_of_unloading_list_first": "[zh]select one of unloading list first",
+  "text.select_orders_to_generate_merged_packing_list_for_printing": "[zh] select orders to generate merged packing list for printing",
   "text.selected_inventory_not_using_carton_label": "[zh]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",
@@ -1221,6 +1225,7 @@
   "title.attachment": "attachment",
   "title.batch_picking": "batch picking",
   "title.bizplace": "bizplace",
+  "title.bulk_print_packing_list": "[zh] bulk print packing list",
   "title.carton_label": "[zh] carton label",
   "title.check_arrived_notice": "check arrived notice",
   "title.check_return_order": "check return order",