@things-factory/operato-wms 5.0.13 → 6.0.0-alpha.1

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

@@ -0,0 +1,19 @@
+
+import { PageSettingType, PageSetting, PageSettingDetails, PageSettingInput } from './page-setting'
+
+export const Query = `
+  pageSettings(
+    codes: [Filter!]
+    partners: [Filter!]
+  ): [PageSettingType] @transaction
+`
+
+export const Mutation = /* GraphQL */ `
+  addReleaseGoodProducts (
+    name: String!
+    orderInventories: [NewOrderInventory]
+    existingOrderInventories: [NewOrderInventory]
+  ): Boolean @privilege(category: "order_customer", privilege: "mutation") @transaction
+`
+
+export const Types = [PageSettingType, PageSetting, PageSettingDetails, PageSettingInput]

package/server/graphql/types/other/page-setting.ts

@@ -0,0 +1,33 @@
+import gql from 'graphql-tag'
+
+export const PageSettingType = gql`
+  type PageSettingType {
+    type: String
+    details: [PageSetting]
+  }
+`
+
+export const PageSetting = gql`
+  type PageSetting {
+    id: String
+    name: String
+    description: String
+    settingDetails: [PageSettingDetails]
+  }
+`
+
+export const PageSettingDetails = gql`
+  type PageSettingDetails {
+    id: String
+    name: String
+    description: String
+    rank: Int
+  }
+`
+
+export const PageSettingInput = gql`
+  input PageSettingInput {
+    query: Boolean
+    filters: [Filter!]
+  }
+`

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

@@ -12,6 +12,8 @@ import { ProductLabelReportList } from './product-label-report-list'
 
 import { CostingReport } from './costing-report'
 import { CostingReportList } from './costing-report-list'
+import { ReleaseInventoryReport } from './release-inventory-report'
+import { ReleaseInventoryReportList } from './release-inventory-report-list'
 
 export const Query = `
   inboundSerialNumberReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): InboundSerialNumberReportList @transaction
@@ -20,6 +22,7 @@ export const Query = `
   outboundOrderDetailsReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): OutboundOrderDetailsReportList @transaction
   productLabelReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): ProductLabelReportList @transaction
   costingReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): CostingReportList @transaction
+  releaseInventoryReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): ReleaseInventoryReportList @transaction
 `
 
 export const Types = [
@@ -34,5 +37,7 @@ export const Types = [
   ProductLabelReport,
   ProductLabelReportList,
   CostingReport,
-  CostingReportList
+  CostingReportList,
+  ReleaseInventoryReport,
+  ReleaseInventoryReportList
 ]

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

@@ -6,17 +6,31 @@ export const OutboundOrderDetailsReport = gql`
     doNo: String
     doDeliveryDate: String
     deliveryAddress: String
+    manifestNo: String
     roNo: String
     roType: String
     status: String
     refNo1: String
     refNo2: String
     refNo3: String
+    exportOption: Boolean
+    containerNo: String
+    containerSize: String
+    transportOption: String
+    vehicleNo: String
+    driverName: String
+    palletQty: Int
     acceptedBy: String
     acceptedAt: String
     orderCreatedAt: String
     pickingStart: String
     pickingComplete: String
+    packingStart: String
+    packingComplete: String
+    sortingStart: String
+    sortingComplete: String
+    loadingStart: String
+    loadingComplete: String
     orderLineItem: Int
     product: Product
     packType: String
@@ -48,6 +62,8 @@ export const OutboundOrderDetailsReport = gql`
     checkedRemarkAt: String
     loadedAt: String
     loadedBy: String
-    shippedAt: String
+    manifestedAt: String
+    manifestedBy: String
+    dispatchedAt: String
   }
 `

package/server/graphql/types/reports/release-inventory-report-list.ts

@@ -0,0 +1,8 @@
+import gql from 'graphql-tag'
+
+export const ReleaseInventoryReportList = gql`
+  type ReleaseInventoryReportList {
+    items: [ReleaseInventoryReport]
+    total: Int
+  }
+`

package/server/graphql/types/reports/release-inventory-report.ts

@@ -0,0 +1,23 @@
+import gql from 'graphql-tag'
+
+export const ReleaseInventoryReport = gql`
+  type ReleaseInventoryReport {
+    bizplace: Bizplace
+    product: Product
+    packingType: String
+    assignedQty: Float
+    assignedUomValue: Float
+    assignedUom: String
+    orderNo: String
+    type: String
+    orderAt: String
+    releaseDate: String
+    palletId: String
+    cartonId: String
+    batchId: String
+    batchIdRef: String
+    expirationDate: String
+    manufactureDate: String
+    location: Location
+  }
+`

package/server/migrations/1568858861188-SeedSetting.ts

@@ -1,8 +1,8 @@
-import { getRepository, MigrationInterface, QueryRunner } from 'typeorm'
+import { MigrationInterface, QueryRunner } from 'typeorm'
 
 import { logger } from '@things-factory/env'
 import { Setting } from '@things-factory/setting-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 
 import {
   LOCATION_LABEL_SETTING_KEY,
@@ -35,7 +35,7 @@ export class SeedSetting1568858861188 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<any> {
     const repository = getRepository(Setting)
     const domainRepository = getRepository(Domain)
-    const domain = await domainRepository.findOne({ name: 'SYSTEM' })
+    const domain = await domainRepository.findOneBy({ name: 'SYSTEM' })
 
     try {
       SEED_SETTINGS.forEach(async setting => {
@@ -50,7 +50,7 @@ export class SeedSetting1568858861188 implements MigrationInterface {
     const repository = getRepository(Setting)
 
     SEED_SETTINGS.reverse().forEach(async setting => {
-      let record = await repository.findOne({ name: setting.name })
+      let record = await repository.findOneBy({ name: setting.name })
       await repository.remove(record)
     })
   }

package/server/migrations/1623308919899-SeedLocationRecommendSetting.ts

@@ -1,11 +1,12 @@
+import { EntityManager, getConnection, MigrationInterface, QueryRunner } from 'typeorm'
+
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager, getConnection, MigrationInterface, QueryRunner } from 'typeorm'
 
 export class SeedLocationRecommendSetting1623308919899 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<any> {
     await getConnection().transaction(async (trx: EntityManager) => {
-      const domains: Domain = await trx.getRepository(Domain).find({ where: { extType: 'warehouse' } })
+      const domains: Domain[] = await trx.getRepository(Domain).find({ where: { extType: 'warehouse' } })
       await Promise.all(
         domains.map(async (domain: Domain) => {
           await trx.getRepository(Setting).save({

package/server/migrations/1623381200659-SeedStoringRule.ts

@@ -1,11 +1,12 @@
+import { EntityManager, getConnection, MigrationInterface, QueryRunner } from 'typeorm'
+
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager, getConnection, MigrationInterface, QueryRunner } from 'typeorm'
 
 export class SeedSetting1623381200659 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<any> {
     await getConnection().transaction(async (trx: EntityManager) => {
-      const domains: Domain = await trx.getRepository(Domain).find({ where: { extType: 'warehouse' } })
+      const domains: Domain[] = await trx.getRepository(Domain).find({ where: { extType: 'warehouse' } })
       await Promise.all(
         domains.map(async (domain: Domain) => {
           await trx.getRepository(Setting).save({

package/server/utils/report-query-util.ts

@@ -19,6 +19,8 @@ export async function rawProductsQuery(tx: EntityManager, params: ListParam, biz
       Lower(prd.name) LIKE ANY(ARRAY[${productValue}])
       OR Lower(prd.sku) LIKE ANY(ARRAY[${productValue}])
       OR Lower(prd.description) LIKE ANY(ARRAY[${productValue}])
+      OR Lower(prd.brand) LIKE ANY(ARRAY[${productValue}])
+      OR Lower(prd.brand_sku) LIKE ANY(ARRAY[${productValue}])
     )`
   }
 
@@ -31,13 +33,14 @@ export async function rawProductsQuery(tx: EntityManager, params: ListParam, biz
     `
     create temp table temp_products on commit drop AS
     (
-      select prd.id, prd.sku, prd.name, prd.description, prd.type, prd.id::varchar as product_id from products prd
+      select prd.id, prd.sku, prd.name, prd.description, prd.type, prd.id::varchar as product_id, prd.brand, prd.brand_sku 
+      from products prd
       inner join bizplaces b on b.id = prd.bizplace_id 
       inner join companies c on c.domain_id = b.domain_id 
       inner join bizplaces b2 on b2.company_id = c.id
       where b2.id = $1
       ${productQuery}
-      GROUP BY prd.id, prd.sku, prd.name, prd.description
+      GROUP BY prd.id, prd.sku, prd.name, prd.description, prd.brand, prd.brand_sku
     )`,
     [bizplace.id]
   )

package/things-factory.config.js

@@ -489,6 +489,10 @@ export default {
       tagname: 'costing-report',
       page: 'costing_report'
     },
+    {
+      tagname: 'release-inventory-report',
+      page: 'release_inventory_report'
+    },
 
     /**
      * Custom ELCCL Menus Section