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

package/server/graphql/resolvers/{extra → other}/add-release-good-products.ts

@@ -1,6 +1,5 @@
-import { EntityManager } from 'typeorm'
+import { In, Not } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { Product } from '@things-factory/product-base'
 import {
@@ -11,7 +10,6 @@ import {
   OrderProduct,
   ReleaseGood
 } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 import {
   generatePickingWorksheetDetail,
@@ -22,13 +20,13 @@ import {
 } from '@things-factory/worksheet-base'
 
 export const addReleaseGoodProducts = {
-  async addReleaseGoodProducts(_: any, { name, orderInventories, existingOrderInventories }, context: any) {
+  async addReleaseGoodProducts(_: any, { name, orderInventories, existingOrderInventories }, context: ResolverContext) {
     try {
-      const { tx, user, domain }: { tx: EntityManager; user: User; domain: Domain } = context.state
+      const { tx, user, domain } = context.state
 
       let releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
-        where: { domain, name: name },
-        relations: ['bizplace']
+        where: { domain: { id: domain.id }, name: name },
+        relations: ['bizplace', 'orderProducts']
       })
 
       const bizplace: Bizplace = releaseGood.bizplace
@@ -48,12 +46,12 @@ export const addReleaseGoodProducts = {
           curOrderInv.domain = domain
           curOrderInv.bizplace = bizplace
           curOrderInv.releaseGood = releaseGood
-          curOrderInv.product = await tx.getRepository(Product).findOne(oi.product.id)
+          curOrderInv.product = await tx.getRepository(Product).findOneBy({ id: oi.product.id })
 
           let existingOrderInv: OrderInventory
 
           if (curOrderInv?.inventory?.id) {
-            const foundInv: Inventory = await tx.getRepository(Inventory).findOne(curOrderInv.inventory.id)
+            const foundInv: Inventory = await tx.getRepository(Inventory).findOneBy({ id: curOrderInv.inventory.id })
             curOrderInv.inventory = foundInv
 
             existingOrderInv = await tx.getRepository(OrderInventory).findOne({
@@ -204,17 +202,29 @@ export const addReleaseGoodProducts = {
           newOrderInv.status = pickingWorksheet ? ORDER_INVENTORY_STATUS.PICKING : ORDER_INVENTORY_STATUS.PENDING
           newOrderInv.name = OrderNoGenerator.orderInventory()
           newOrderInv.releaseGood = releaseGood
-          newOrderInv.product = await tx.getRepository(Product).findOne(oi.product.id)
+          newOrderInv.product = await tx.getRepository(Product).findOneBy({ id: oi.product.id })
           newOrderInv.creator = user
           newOrderInv.updater = user
 
           let existingOrderInv: OrderInventory
 
+          let existingOrderProduct: OrderProduct = await tx.getRepository(OrderProduct).findOne({
+            where: {
+              domain: { id: domain.id },
+              releaseGood: { id: releaseGood.id },
+              batchId: oi.batchId,
+              packingType: oi.packingType,
+              product: { id: newOrderInv.product.id }
+            }
+          })
+
           // check if it is release by inventory (has inventory value) or product
           if (newOrderInv.inventory?.id) {
             // if release by inventory, then quantity and uomValue values are updated
-            const foundInv: Inventory = await tx.getRepository(Inventory).findOne(newOrderInv.inventory.id)
+            const foundInv: Inventory = await tx.getRepository(Inventory).findOneBy({ id: newOrderInv.inventory.id })
             newOrderInv.inventory = foundInv
+            newOrderInv.uom = oi?.uom || foundInv.uom
+            newOrderInv.batchIdRef = oi?.batchIdRef || foundInv.batchIdRef
 
             // check for existing released OrderInventory specifying product, batchId, packingType, and inventory
             existingOrderInv = await tx.getRepository(OrderInventory).findOne({
@@ -241,7 +251,9 @@ export const addReleaseGoodProducts = {
               status: ORDER_PRODUCT_STATUS.ASSIGNED
             }
 
-            newOrderProduct = await tx.getRepository(OrderProduct).save(newOrderProduct)
+            if (!existingOrderProduct) newOrderProduct = await tx.getRepository(OrderProduct).save(newOrderProduct)
+
+            newOrderInv.orderProduct = existingOrderProduct ? existingOrderProduct : newOrderProduct
 
             await tx.getRepository(Inventory).save(foundInv)
           } else {
@@ -286,6 +298,7 @@ export const addReleaseGoodProducts = {
             if (existingWorksheetDetail) {
               existingWorksheetDetail = {
                 ...existingWorksheetDetail,
+                targetProduct: newOrderInv.orderProduct,
                 status: WORKSHEET_STATUS.DEACTIVATED
               }
 
@@ -306,11 +319,14 @@ export const addReleaseGoodProducts = {
             savedOrderInv.releaseQty = newOrderInv.releaseQty
             savedOrderInv.releaseUomValue = newOrderInv.releaseUomValue
             savedOrderInv.batchId = newOrderInv.batchId
+            savedOrderInv.batchIdRef = newOrderInv.batchIdRef
             savedOrderInv.packingType = newOrderInv.packingType
+            savedOrderInv.uom = newOrderInv.uom
             savedOrderInv.product = newOrderInv.product
             savedOrderInv.inventory = newOrderInv.inventory
             savedOrderInv.status = newOrderInv.status
             savedOrderInv.releaseGood = newOrderInv.releaseGood
+            savedOrderInv.orderProduct = newOrderInv.orderProduct
             savedOrderInv.bizplace = newOrderInv.bizplace
             savedOrderInv.domain = domain
             savedOrderInv.creator = user
@@ -345,6 +361,51 @@ export const addReleaseGoodProducts = {
 
         await tx.getRepository(Worksheet).save(loadingWorksheet)
       }
+
+      // Update Order Product Release Qty
+      let rgOrderProducts: OrderProduct[] = await tx
+        .getRepository(OrderProduct)
+        .find({ where: { domain: { id: domain.id }, releaseGood } })
+
+      await Promise.all(
+        rgOrderProducts.map(async op => {
+          const orderInventories: OrderInventory[] = await tx.getRepository(OrderInventory).find({
+            where: {
+              domain: { id: domain.id },
+              releaseGood: { id: releaseGood.id },
+              orderProduct: { id: op.id },
+              status: Not(
+                In([
+                  ORDER_INVENTORY_STATUS.TERMINATED,
+                  ORDER_INVENTORY_STATUS.CANCELLED,
+                  ORDER_INVENTORY_STATUS.PENDING_CANCEL
+                ])
+              )
+            }
+          })
+
+          let totalReleaseQty: number = orderInventories.reduce((total, currentValue) => {
+            total += currentValue.releaseQty
+            return total
+          }, 0)
+
+          let totalReleaseUomValue: number = orderInventories.reduce((total, currentValue) => {
+            total += currentValue.releaseUomValue
+            return total
+          }, 0)
+
+          let updateOPInfo: any = {
+            releaseQty: totalReleaseQty,
+            releaseUomValue: totalReleaseUomValue
+          }
+
+          if (totalReleaseQty <= 0) {
+            updateOPInfo.status = ORDER_PRODUCT_STATUS.TERMINATED
+          }
+
+          await tx.getRepository(OrderProduct).update({ id: op.id }, updateOPInfo)
+        })
+      )
     } catch (error) {
       throw error
     }

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

@@ -0,0 +1,10 @@
+import { addReleaseGoodProducts } from './add-release-good-products'
+import { pageSettings } from './page-settings'
+
+export const Query = {
+    ...pageSettings
+}
+
+export const Mutation = {
+    ...addReleaseGoodProducts
+}

package/server/graphql/resolvers/other/page-settings.ts

@@ -0,0 +1,105 @@
+import { getRepository, EntityManager, In } from 'typeorm'
+
+import { Sequence, SEQUENCE_TYPE } from '@things-factory/id-rule-base'
+import { buildQuery, Domain, ListParam, convertListParams } from '@things-factory/shell'
+import { User } from '@things-factory/auth-base'
+import {
+  getMyBizplace,
+  getPartnerBizplaceIds,
+  getPartnersBizplaces,
+  getPartnersCompanyBizplaces,
+  getPermittedBizplaceIds,
+  Bizplace
+} from '@things-factory/biz-base'
+
+import { CommonCode as CommonCodeEntity, CommonCodeDetail as CommonCodeDetailEntity } from '@things-factory/code-base'
+
+export const pageSettings = {
+  async pageSettings(_: any, { codes, partners }, context: any) {
+    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    try {
+      let promiseTask = []
+      if (codes) {
+        promiseTask.push(queryCommonCode(codes, domain, tx, context))
+      }
+
+      if (partners) {
+        promiseTask.push(queryPartners(partners, domain, tx, context))
+      }
+
+      return await Promise.all(promiseTask)
+    } catch (error) {
+      throw error
+    }
+  }
+}
+
+async function queryCommonCode(codes, domain, tx, context) {
+  const codeQb = tx.getRepository(CommonCodeEntity).createQueryBuilder('cc')
+  buildQuery(codeQb, { filters: codes }, context)
+
+  codes = (await codeQb
+    .leftJoinAndSelect('cc.details', 'ccdet')
+    .orderBy('cc.name')
+    .addOrderBy('ccdet.rank')
+    .addOrderBy('ccdet.name')
+    .getMany()).map((cc: CommonCodeEntity) => {
+      return {
+        id: cc.id,
+        name: cc.name,
+        description: cc.description,
+        settingDetails: cc.details.map(det => {
+          return {
+            id: det.id,
+            name: det.name,
+            description: det.description,
+            rank: det.rank
+          }
+        })
+      }
+    })
+
+  return {
+    type: 'code',
+    details: codes
+  }
+}
+
+async function queryPartners(partners, domain, tx, context) {
+  let partnersBizplaceIds = []
+  let bizplaceIndex: any = partners.filters?.findIndex(x => x.name === 'bizplace')
+  if (bizplaceIndex && bizplaceIndex > -1) {
+    partnersBizplaceIds = partners.filters
+      .filter(x => x.name === 'bizplace')
+      .map(item => {
+        return item.value
+      })
+    partners.filters.splice(bizplaceIndex, 1)
+  }
+
+  const convertedParams = convertListParams({ filters: partners })
+
+  if (!(partnersBizplaceIds.length > 0)) {
+    const partnersBizplaces: Bizplace[] = await getPartnersBizplaces(context.state.domain, context.state.user)
+    partnersBizplaceIds = partnersBizplaces.map((bizplace: Bizplace) => bizplace.id || null)
+    convertedParams.where.id = In(partnersBizplaceIds)
+  } else {
+    convertedParams.where.id = In(partnersBizplaceIds)
+  }
+
+  partners = ((await tx.getRepository(Bizplace).find({
+    ...convertedParams,
+    relations: ['domain', 'company', 'users', 'creator', 'updater']
+  })).map((biz: Bizplace) => {
+    return {
+      id: biz.id,
+      name: biz.name,
+      description: biz.description,
+    }
+  }))
+
+  return {
+    type: 'partner',
+    details: partners
+  }
+}

package/server/graphql/resolvers/reports/costing-report.ts

@@ -1,25 +1,23 @@
-import { EntityManager } from 'typeorm'
-
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { ListParam } from '@things-factory/shell'
+import { Filter, ListParam } from '@things-factory/shell'
 
 import { rawProductsQuery } from '../../../utils'
 
 export const costingReport = {
-  async costingReport(_: any, params: ListParam, context: any) {
+  async costingReport(_: any, params: ListParam, context: ResolverContext) {
     try {
-      const { tx }: { tx: EntityManager } = context.state
-      let bizplaceFilter = { name: '', operator: '', value: '' }
+      const { tx } = context.state
+      let bizplaceFilter: Filter = { name: '', operator: '', value: '' }
       let userFilter = params.filters.find(data => data.name === 'user')
       let fromDate = params.filters.find(data => data.name === 'fromDate')
       let toDate = params.filters.find(data => data.name === 'toDate')
 
       if (userFilter) {
-        const user: User = await tx.getRepository(User).findOne({
+        const user = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })
+        })) as User & { bizplaces: Bizplace[] }
 
         const bizplace: Bizplace = user.bizplaces[0]
 
@@ -32,7 +30,7 @@ export const costingReport = {
 
       if (!bizplaceFilter || !fromDate || !toDate) throw 'Invalid input'
 
-      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOneBy({
         id: bizplaceFilter.value
       })
 
@@ -97,7 +95,7 @@ export const costingReport = {
           WITH RECURSIVE cte_forwarded_cost as (
             select src.domain_id, src.bizplace_id, src.product_id, src.packing_type, src.packing_size, src.uom, TO_DATE(src.created_year_month,'YYYY-MM')::timestamp as running_year_month,
             sum(src.qty) as qty, sum(src.total_cost)/ sum(src.qty) as monthly_avg_cost, 
-            coalesce((select sum(closing_qty) from tmp_stored_inv st where st.domain_id = src.domain_id and st.bizplace_id = src.bizplace_id and st.product_id = src.product_id	and st.packing_type = src.packing_type and st.packing_size = src.packing_size	and st.uom = src.uom and st.created_year_month = src.created_year_month),sum(src.qty)) as closing_qty from (
+            coalesce(sum(src.qty)) as closing_qty from (
               select distinct on (pallet_id) 
               ih.domain_id, ih.bizplace_id, ih.pallet_id, ih.unit_cost, (ih.unit_cost * (ih.opening_qty + ih.qty)) as total_cost, ih.status, ih.transaction_type, ih.product_id, ih.packing_type, ih.packing_size, coalesce(ih.uom, pd.uom) as uom, 
               ih.created_at, to_char(ih.created_at, 'YYYY-MM') as created_year_month,

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

@@ -1,16 +1,14 @@
-import { EntityManager } from 'typeorm'
-
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { ListParam } from '@things-factory/shell'
+import { Filter, ListParam } from '@things-factory/shell'
 
 import { rawProductsQuery } from '../../../utils'
 
 export const inboundOrderDetailsReport = {
-  async inboundOrderDetailsReport(_: any, params: ListParam, context: any) {
+  async inboundOrderDetailsReport(_: any, params: ListParam, context: ResolverContext) {
     try {
-      const { tx }: { tx: EntityManager } = context.state
-      let bizplaceFilter = { name: '', operator: '', value: '' }
+      const { tx } = context.state
+      let bizplaceFilter: Filter = { name: '', operator: '', value: '' }
       let userFilter = params.filters.find(data => data.name === 'user')
       let fromDate = params.filters.find(data => data.name === 'fromDate')
       let toDate = params.filters.find(data => data.name === 'toDate')
@@ -20,10 +18,10 @@ export const inboundOrderDetailsReport = {
       let doNo = params.filters.find(data => data.name === 'doNo')
 
       if (userFilter) {
-        const user: User = await tx.getRepository(User).findOne({
+        const user = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })
+        })) as User & { bizplaces: Bizplace[] }
 
         const bizplace: Bizplace = user.bizplaces[0]
 
@@ -36,7 +34,7 @@ export const inboundOrderDetailsReport = {
 
       if (!bizplaceFilter || !fromDate || !toDate) throw 'Invalid input'
 
-      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOneBy({
         id: bizplaceFilter.value
       })
 

package/server/graphql/resolvers/reports/inbound-serial-number-report.ts

@@ -1,26 +1,28 @@
-import { EntityManager } from 'typeorm'
-
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { ListParam } from '@things-factory/shell'
+import { Filter, ListParam } from '@things-factory/shell'
 
 import { rawProductsQuery } from '../../../utils'
 
 export const inboundSerialNumberReport = {
-  async inboundSerialNumberReport(_: any, params: ListParam, context: any) {
+  async inboundSerialNumberReport(_: any, params: ListParam, context: ResolverContext) {
     try {
-      const { tx }: { tx: EntityManager } = context.state
-      let bizplaceFilter = { name: '', operator: '', value: '' }
+      const { tx } = context.state
+      let bizplaceFilter: Filter = { name: '', operator: '', value: '' }
       let userFilter = params.filters.find(data => data.name === 'user')
       let fromDate = params.filters.find(data => data.name === 'fromDate')
       let toDate = params.filters.find(data => data.name === 'toDate')
-      let ganNo = params.filters.find(data => data.name === 'ganNo')
+      let orderNo = params.filters.find(data => data.name === 'orderNo')
+      let ref = params.filters.find(data => data.name === 'ref')
+      let palletId = params.filters.find(data => data.name === 'palletId')
+      let cartonId = params.filters.find(data => data.name === 'cartonId')
+      let serialNumber = params.filters.find(data => data.name === 'serialNumber')
 
       if (userFilter) {
-        const user: User = await tx.getRepository(User).findOne({
+        const user = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })
+        })) as User & { bizplaces: Bizplace[] }
 
         const bizplace: Bizplace = user.bizplaces[0]
 
@@ -33,15 +35,40 @@ export const inboundSerialNumberReport = {
 
       if (!bizplaceFilter || !fromDate || !toDate) throw 'Invalid input'
 
-      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOneBy({
         id: bizplaceFilter.value
       })
 
       await rawProductsQuery(tx, params, bizplace)
 
       let extraQueryFilters = ''
-      if (ganNo) {
-        extraQueryFilters = `${extraQueryFilters} and order_no like '%${ganNo.value}%' `
+      if (orderNo) {
+        extraQueryFilters = `${extraQueryFilters} and order_no like '%${orderNo.value}%' `
+      }
+      if (palletId) {
+        extraQueryFilters = `${extraQueryFilters} and pallet_id like '%${palletId.value}%' `
+      }
+      if (cartonId) {
+        extraQueryFilters = `${extraQueryFilters} and carton_id like '%${cartonId.value}%' `
+      }
+      if (serialNumber) {
+        extraQueryFilters = `${extraQueryFilters} and serial_number like '%${serialNumber.value}%' `
+      }
+
+      let refNoQueryFilter = ''
+      if (ref) {
+        let refValue = ref.value
+          .toLowerCase()
+          .split(',')
+          .map(ref => {
+            return "'%" + ref.trim().replace(/'/g, "''") + "%'"
+          })
+          .join(',')
+        refNoQueryFilter = `AND (
+          Lower(an.ref_no) LIKE ANY(ARRAY[${refValue}])
+          OR Lower(an.ref_no_2) LIKE ANY(ARRAY[${refValue}])
+          OR Lower(an.ref_no_3) LIKE ANY(ARRAY[${refValue}])
+        )`
       }
 
       await tx.query(
@@ -59,13 +86,14 @@ export const inboundSerialNumberReport = {
             coalesce(w.started_at,ii.created_at) as "etd"
             from inventory_items ii 
             inner join inventories i on i.id = ii.inventory_id 
-            inner join products p on p.id = i.product_id
+            inner join temp_products p on p.id = i.product_id
             left join product_details pd on pd.product_id = p.id and pd.packing_type = i.packing_type and pd.packing_size = i.packing_size 
             left join arrival_notices an on an.id = ii.inbound_order_id::uuid
             left join worksheets w on w.arrival_notice_id = an.id and w.type = 'UNLOADING'
             where 
             i.domain_id = $1 and i.bizplace_id = $2
             and coalesce(w.started_at, ii.created_at) between $3 and $4
+            ${refNoQueryFilter}
             order by coalesce(w.started_at, ii.created_at), p.sku
           ) src
           where 1=1

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

@@ -5,6 +5,7 @@ import { costingReport } from './costing-report'
 import { inboundOrderDetailsReport } from './inbound-order-details-report'
 import { outboundOrderDetailsReport } from './outbound-order-details-report'
 import { productLabelReport } from './product-label-report'
+import { releaseInventoryReport } from './release-inventory-report'
 
 export const Query = {
   ...inboundSerialNumberReport,
@@ -12,5 +13,6 @@ export const Query = {
   ...costingReport,
   ...inboundOrderDetailsReport,
   ...outboundOrderDetailsReport,
-  ...productLabelReport
+  ...productLabelReport,
+  ...releaseInventoryReport
 }