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

package/dist-server/utils/report-query-util.js

@@ -17,6 +17,8 @@ async function rawProductsQuery(tx, params, bizplace) {
       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}])
     )`;
     }
     let productDescQuery = '';
@@ -26,13 +28,14 @@ async function rawProductsQuery(tx, params, bizplace) {
     await tx.query(`
     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]);
 }
 exports.rawProductsQuery = rawProductsQuery;

package/dist-server/utils/report-query-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"report-query-util.js","sourceRoot":"","sources":["../../server/utils/report-query-util.ts"],"names":[],"mappings":";;;AAIO,KAAK,UAAU,gBAAgB,CAAC,EAAiB,EAAE,MAAiB,EAAE,QAAkB;IAC7F,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAA;IAClE,IAAI,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,oBAAoB,CAAC,CAAA;IAEjF,IAAI,YAAY,GAAG,EAAE,CAAA;IACrB,IAAI,OAAO,EAAE;QACX,IAAI,YAAY,GAAG,OAAO,CAAC,KAAK;aAC7B,WAAW,EAAE;aACb,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,IAAI,CAAC,EAAE;YACV,OAAO,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,IAAI,CAAA;QACtD,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,CAAA;QACZ,YAAY,GAAG;uCACoB,YAAY;yCACV,YAAY;iDACJ,YAAY;MACvD,CAAA;KACH;IAED,IAAI,gBAAgB,GAAG,EAAE,CAAA;IACzB,IAAI,WAAW,EAAE;QACf,gBAAgB,GAAG,gCAAgC,GAAG,WAAW,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,IAAI,CAAA;KAC7F;IAED,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;QAQI,YAAY;;MAEd,EACF,CAAC,QAAQ,CAAC,EAAE,CAAC,CACd,CAAA;AACH,CAAC;AAvCD,4CAuCC","sourcesContent":["import { ListParam } from '@things-factory/shell'\nimport { EntityManager } from 'typeorm'\nimport { Bizplace } from '@things-factory/biz-base'\n\nexport async function rawProductsQuery(tx: EntityManager, params: ListParam, bizplace: Bizplace) {\n  let product = params.filters.find(data => data.name === 'product')\n  let productDesc = params.filters.find(data => data.name === 'productDescription')\n\n  let productQuery = ''\n  if (product) {\n    let productValue = product.value\n      .toLowerCase()\n      .split(',')\n      .map(prod => {\n        return \"'%\" + prod.trim().replace(/'/g, \"''\") + \"%'\"\n      })\n      .join(',')\n    productQuery = `AND (\n      Lower(prd.name) LIKE ANY(ARRAY[${productValue}])\n      OR Lower(prd.sku) LIKE ANY(ARRAY[${productValue}])\n      OR Lower(prd.description) LIKE ANY(ARRAY[${productValue}])\n    )`\n  }\n\n  let productDescQuery = ''\n  if (productDesc) {\n    productDescQuery = \"AND Lower(description) LIKE '%\" + productDesc.value.toLowerCase() + \"%'\"\n  }\n\n  await tx.query(\n    `\n    create temp table temp_products on commit drop AS\n    (\n      select prd.id, prd.sku, prd.name, prd.description, prd.type, prd.id::varchar as product_id from products prd\n      inner join bizplaces b on b.id = prd.bizplace_id \n      inner join companies c on c.domain_id = b.domain_id \n      inner join bizplaces b2 on b2.company_id = c.id\n      where b2.id = $1\n      ${productQuery}\n      GROUP BY prd.id, prd.sku, prd.name, prd.description\n    )`,\n    [bizplace.id]\n  )\n}\n"]}
+{"version":3,"file":"report-query-util.js","sourceRoot":"","sources":["../../server/utils/report-query-util.ts"],"names":[],"mappings":";;;AAIO,KAAK,UAAU,gBAAgB,CAAC,EAAiB,EAAE,MAAiB,EAAE,QAAkB;IAC7F,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAA;IAClE,IAAI,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,oBAAoB,CAAC,CAAA;IAEjF,IAAI,YAAY,GAAG,EAAE,CAAA;IACrB,IAAI,OAAO,EAAE;QACX,IAAI,YAAY,GAAG,OAAO,CAAC,KAAK;aAC7B,WAAW,EAAE;aACb,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,IAAI,CAAC,EAAE;YACV,OAAO,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,IAAI,CAAA;QACtD,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,CAAA;QACZ,YAAY,GAAG;uCACoB,YAAY;yCACV,YAAY;iDACJ,YAAY;2CAClB,YAAY;+CACR,YAAY;MACrD,CAAA;KACH;IAED,IAAI,gBAAgB,GAAG,EAAE,CAAA;IACzB,IAAI,WAAW,EAAE;QACf,gBAAgB,GAAG,gCAAgC,GAAG,WAAW,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,IAAI,CAAA;KAC7F;IAED,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;;QASI,YAAY;;MAEd,EACF,CAAC,QAAQ,CAAC,EAAE,CAAC,CACd,CAAA;AACH,CAAC;AA1CD,4CA0CC","sourcesContent":["import { ListParam } from '@things-factory/shell'\nimport { EntityManager } from 'typeorm'\nimport { Bizplace } from '@things-factory/biz-base'\n\nexport async function rawProductsQuery(tx: EntityManager, params: ListParam, bizplace: Bizplace) {\n  let product = params.filters.find(data => data.name === 'product')\n  let productDesc = params.filters.find(data => data.name === 'productDescription')\n\n  let productQuery = ''\n  if (product) {\n    let productValue = product.value\n      .toLowerCase()\n      .split(',')\n      .map(prod => {\n        return \"'%\" + prod.trim().replace(/'/g, \"''\") + \"%'\"\n      })\n      .join(',')\n    productQuery = `AND (\n      Lower(prd.name) LIKE ANY(ARRAY[${productValue}])\n      OR Lower(prd.sku) LIKE ANY(ARRAY[${productValue}])\n      OR Lower(prd.description) LIKE ANY(ARRAY[${productValue}])\n      OR Lower(prd.brand) LIKE ANY(ARRAY[${productValue}])\n      OR Lower(prd.brand_sku) LIKE ANY(ARRAY[${productValue}])\n    )`\n  }\n\n  let productDescQuery = ''\n  if (productDesc) {\n    productDescQuery = \"AND Lower(description) LIKE '%\" + productDesc.value.toLowerCase() + \"%'\"\n  }\n\n  await tx.query(\n    `\n    create temp table temp_products on commit drop AS\n    (\n      select prd.id, prd.sku, prd.name, prd.description, prd.type, prd.id::varchar as product_id, prd.brand, prd.brand_sku \n      from products prd\n      inner join bizplaces b on b.id = prd.bizplace_id \n      inner join companies c on c.domain_id = b.domain_id \n      inner join bizplaces b2 on b2.company_id = c.id\n      where b2.id = $1\n      ${productQuery}\n      GROUP BY prd.id, prd.sku, prd.name, prd.description, prd.brand, prd.brand_sku\n    )`,\n    [bizplace.id]\n  )\n}\n"]}

package/helps/release-note.ko.md

@@ -2,34 +2,22 @@
 
 <div align="center">
 
-## 20 May Update
+## 22 August Update
 
-#### V4.4.0 Release Note
+#### V4.8.0 Release Note
 
 #### Greetings to all,
 
-#### We are back with more features and enhancements to digitize your warehouse operation!
+#### This month, we are getting the Packing process even better than before!
 
-<div>
-1. Volume Summary Report (beta)
-</div>
-<div>
-2. Excel upload for Purchase Order
-</div>
-<div>
-3. Non-loaded inventory in Onhand Inventory
-</div>
-<div>
-4. Manufacture date in Onhand Inventory
-</div>
-<br>
-<a href="https://bit.ly/220519_Hatio_Release">V4.4.0 Release Note</a>
-<br>
+#### Meanwhile, our team is working on getting the bugs fixed, for a stable and consistent Operato WMS.
 
-Should you have any inquiry, feel free to contact support@hatio.asia!
 <br>
-Don't forget to stay cool and we shall together beat the heat away! Stay safe and positively negative!
+For additional information about the aspects of the release, see the following link
+<a href="https://bit.ly/20220821_Hatio_Release">V4.8.0 Release Note</a>
+<br>
 
+Should you have any inquiries, feel free to contact support@hatio.asia! Stay safe and positively negative!
 <br>
 
 _**Team Hatio**  

package/helps/release-note.md

@@ -2,34 +2,22 @@
 
 <div align="center">
 
-## 20 May Update
+## 22 August Update
 
-#### V4.4.0 Release Note
+#### V4.8.0 Release Note
 
 #### Greetings to all,
 
-#### We are back with more features and enhancements to digitize your warehouse operation!
+#### This month, we are getting the Packing process even better than before!
 
-<div>
-1. Volume Summary Report (beta)
-</div>
-<div>
-2. Excel upload for Purchase Order
-</div>
-<div>
-3. Non-loaded inventory in Onhand Inventory
-</div>
-<div>
-4. Manufacture date in Onhand Inventory
-</div>
-<br>
-<a href="https://bit.ly/220519_Hatio_Release">V4.4.0 Release Note</a>
-<br>
+#### Meanwhile, our team is working on getting the bugs fixed, for a stable and consistent Operato WMS.
 
-Should you have any inquiry, feel free to contact support@hatio.asia!
 <br>
-Don't forget to stay cool and we shall together beat the heat away! Stay safe and positively negative!
+For additional information about the aspects of the release, see the following link
+<a href="https://bit.ly/20220821_Hatio_Release">V4.8.0 Release Note</a>
+<br>
 
+Should you have any inquiries, feel free to contact support@hatio.asia! Stay safe and positively negative!
 <br>
 
 _**Team Hatio**  

package/helps/release-note.ms.md

@@ -2,34 +2,22 @@
 
 <div align="center">
 
-## 20 May Update
+## 22 August Update
 
-#### V4.4.0 Release Note
+#### V4.8.0 Release Note
 
 #### Greetings to all,
 
-#### We are back with more features and enhancements to digitize your warehouse operation!
+#### This month, we are getting the Packing process even better than before!
 
-<div>
-1. Volume Summary Report (beta)
-</div>
-<div>
-2. Excel upload for Purchase Order
-</div>
-<div>
-3. Non-loaded inventory in Onhand Inventory
-</div>
-<div>
-4. Manufacture date in Onhand Inventory
-</div>
-<br>
-<a href="https://bit.ly/220519_Hatio_Release">V4.4.0 Release Note</a>
-<br>
+#### Meanwhile, our team is working on getting the bugs fixed, for a stable and consistent Operato WMS.
 
-Should you have any inquiry, feel free to contact support@hatio.asia!
 <br>
-Don't forget to stay cool and we shall together beat the heat away! Stay safe and positively negative!
+For additional information about the aspects of the release, see the following link
+<a href="https://bit.ly/20220821_Hatio_Release">V4.8.0 Release Note</a>
+<br>
 
+Should you have any inquiries, feel free to contact support@hatio.asia! Stay safe and positively negative!
 <br>
 
 _**Team Hatio**  

package/helps/release-note.zh.md

@@ -2,34 +2,22 @@
 
 <div align="center">
 
-## 20 May Update
+## 22 August Update
 
-#### V4.4.0 Release Note
+#### V4.8.0 Release Note
 
 #### Greetings to all,
 
-#### We are back with more features and enhancements to digitize your warehouse operation!
+#### This month, we are getting the Packing process even better than before!
 
-<div>
-1. Volume Summary Report (beta)
-</div>
-<div>
-2. Excel upload for Purchase Order
-</div>
-<div>
-3. Non-loaded inventory in Onhand Inventory
-</div>
-<div>
-4. Manufacture date in Onhand Inventory
-</div>
-<br>
-<a href="https://bit.ly/220519_Hatio_Release">V4.4.0 Release Note</a>
-<br>
+#### Meanwhile, our team is working on getting the bugs fixed, for a stable and consistent Operato WMS.
 
-Should you have any inquiry, feel free to contact support@hatio.asia!
 <br>
-Don't forget to stay cool and we shall together beat the heat away! Stay safe and positively negative!
+For additional information about the aspects of the release, see the following link
+<a href="https://bit.ly/20220821_Hatio_Release">V4.8.0 Release Note</a>
+<br>
 
+Should you have any inquiries, feel free to contact support@hatio.asia! Stay safe and positively negative!
 <br>
 
 _**Team Hatio**  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "5.0.13",
+  "version": "6.0.0-alpha.1",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -70,52 +70,52 @@
     "@operato/scene-tab": "^1.0.0",
     "@operato/scene-table": "^1.0.0",
     "@operato/scene-wheel-sorter": "^1.0.0",
-    "@things-factory/apptool-ui": "^5.0.11",
-    "@things-factory/auth-ui": "^5.0.11",
-    "@things-factory/barcode-ui": "^5.0.11",
-    "@things-factory/biz-ui": "^5.0.11",
-    "@things-factory/board-service": "^5.0.11",
-    "@things-factory/board-ui": "^5.0.11",
-    "@things-factory/code-ui": "^5.0.11",
-    "@things-factory/context-ui": "^5.0.11",
-    "@things-factory/env": "^5.0.0",
-    "@things-factory/export-ui": "^5.0.11",
-    "@things-factory/export-ui-csv": "^5.0.11",
-    "@things-factory/export-ui-excel": "^5.0.11",
-    "@things-factory/fav-base": "^5.0.11",
-    "@things-factory/form-ui": "^5.0.1",
-    "@things-factory/geography": "^5.0.11",
-    "@things-factory/grist-ui": "^5.0.11",
-    "@things-factory/help": "^5.0.11",
-    "@things-factory/i18n-base": "^5.0.11",
-    "@things-factory/id-rule-base": "^5.0.11",
-    "@things-factory/import-ui": "^5.0.11",
-    "@things-factory/import-ui-excel": "^5.0.11",
-    "@things-factory/menu-ui": "^5.0.11",
-    "@things-factory/more-ui": "^5.0.11",
-    "@things-factory/notification": "^5.0.11",
-    "@things-factory/pdf": "^5.0.11",
-    "@things-factory/print-proxy-service": "^5.0.11",
-    "@things-factory/print-service": "^5.0.11",
-    "@things-factory/print-ui": "^5.0.11",
-    "@things-factory/product-base": "^5.0.11",
-    "@things-factory/resource-ui": "^5.0.11",
-    "@things-factory/sales-ui": "^5.0.13",
-    "@things-factory/scene-google-map": "^5.0.0",
-    "@things-factory/scene-visualizer": "^5.0.0",
-    "@things-factory/setting-ui": "^5.0.11",
-    "@things-factory/system-ui": "^5.0.11",
-    "@things-factory/transport-base": "^5.0.11",
-    "@things-factory/tutorial-ui": "^5.0.11",
-    "@things-factory/warehouse-base": "^5.0.12",
-    "@things-factory/worksheet-base": "^5.0.13"
+    "@things-factory/apptool-ui": "^6.0.0-alpha.0",
+    "@things-factory/auth-ui": "^6.0.0-alpha.1",
+    "@things-factory/barcode-ui": "^6.0.0-alpha.0",
+    "@things-factory/biz-ui": "^6.0.0-alpha.0",
+    "@things-factory/board-service": "^6.0.0-alpha.0",
+    "@things-factory/board-ui": "^6.0.0-alpha.0",
+    "@things-factory/code-ui": "^6.0.0-alpha.0",
+    "@things-factory/context-ui": "^6.0.0-alpha.0",
+    "@things-factory/env": "^6.0.0-alpha.0",
+    "@things-factory/export-ui": "^6.0.0-alpha.0",
+    "@things-factory/export-ui-csv": "^6.0.0-alpha.0",
+    "@things-factory/export-ui-excel": "^6.0.0-alpha.0",
+    "@things-factory/fav-base": "^6.0.0-alpha.0",
+    "@things-factory/form-ui": "^6.0.0-alpha.0",
+    "@things-factory/geography": "^6.0.0-alpha.0",
+    "@things-factory/grist-ui": "^6.0.0-alpha.0",
+    "@things-factory/help": "^6.0.0-alpha.0",
+    "@things-factory/i18n-base": "^6.0.0-alpha.0",
+    "@things-factory/id-rule-base": "^6.0.0-alpha.0",
+    "@things-factory/import-ui": "^6.0.0-alpha.0",
+    "@things-factory/import-ui-excel": "^6.0.0-alpha.0",
+    "@things-factory/menu-ui": "^6.0.0-alpha.0",
+    "@things-factory/more-ui": "^6.0.0-alpha.0",
+    "@things-factory/notification": "^6.0.0-alpha.0",
+    "@things-factory/pdf": "^6.0.0-alpha.0",
+    "@things-factory/print-proxy-service": "^6.0.0-alpha.0",
+    "@things-factory/print-service": "^6.0.0-alpha.0",
+    "@things-factory/print-ui": "^6.0.0-alpha.0",
+    "@things-factory/product-base": "^6.0.0-alpha.0",
+    "@things-factory/resource-ui": "^6.0.0-alpha.1",
+    "@things-factory/sales-ui": "^6.0.0-alpha.1",
+    "@things-factory/scene-google-map": "^6.0.0-alpha.0",
+    "@things-factory/scene-visualizer": "^6.0.0-alpha.0",
+    "@things-factory/setting-ui": "^6.0.0-alpha.0",
+    "@things-factory/system-ui": "^6.0.0-alpha.0",
+    "@things-factory/transport-base": "^6.0.0-alpha.0",
+    "@things-factory/tutorial-ui": "^6.0.0-alpha.0",
+    "@things-factory/warehouse-base": "^6.0.0-alpha.1",
+    "@things-factory/worksheet-base": "^6.0.0-alpha.1"
   },
   "devDependencies": {
-    "@things-factory/builder": "^5.0.8",
+    "@things-factory/builder": "^6.0.0-alpha.0",
     "cypress": "^9.4.1",
     "cypress-file-upload": "^5.0.8",
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "72dfd33e398eab9872600e91d1b13fef0595c174"
+  "gitHead": "b978f296de5c8be4a3f3450929821e5554855438"
 }

package/server/graphql/resolvers/board-setting/board-settings.ts

@@ -1,25 +1,23 @@
-import { getRepository } from 'typeorm'
-
 import { User } from '@things-factory/auth-base'
 import { Board } from '@things-factory/board-service'
 import { Setting } from '@things-factory/setting-base'
-import { Domain } from '@things-factory/shell'
+import { getRepository } from '@things-factory/shell'
 
 import {
   CARTON_LABEL_SETTING_KEY,
   HOME_DASHBOARD_PREFIX,
+  INTENALIZED_AWB_SETTING_KEY,
   LOCATION_LABEL_SETTING_KEY,
   PALLET_LABEL_SETTING_KEY,
   PRODUCT_LABEL_SETTING_KEY,
   REUSABLE_PALLET_LABEL_SETTING_KEY,
-  INTENALIZED_AWB_SETTING_KEY,
   ROUTE_LABEL_SETTING_KEY,
   TOTE_LABEL_SETTING_KEY
 } from '../../../opa-app-setting-constants'
 
 export const boardSettingsResolver = {
-  async boardSettings(_: any, params: any, context: any) {
-    const { domain }: { domain: Domain } = context.state
+  async boardSettings(_: any, params: any, context: ResolverContext) {
+    const { domain } = context.state
 
     /***********************************************************************************
      * Temporary solution for dashboard user type

package/server/graphql/resolvers/custom/elccl/elccl-daily-collection-report.ts

@@ -1,15 +1,14 @@
 import { Bizplace } from '@things-factory/biz-base'
-import { ListParam } from '@things-factory/shell'
-import { EntityManager, getRepository } from 'typeorm'
+import { getRepository, ListParam } from '@things-factory/shell'
 
 export const elcclDailyCollectionReport = {
-  async elcclDailyCollectionReport(_: any, params: ListParam, context: any) {
+  async elcclDailyCollectionReport(_: any, params: ListParam, context: ResolverContext) {
     try {
-      const { tx }: { tx: EntityManager } = context.state
+      const { tx } = context.state
 
       let bizplaceQuery = ''
       if (params.filters.find((filter: any) => filter.name === 'bizplace')) {
-        const bizplace: Bizplace = await getRepository(Bizplace).findOne({
+        const bizplace: Bizplace = await getRepository(Bizplace).findOneBy({
           id: params.filters.find(data => data.name === 'bizplace').value
         })
         bizplaceQuery = "AND rg.bizplace_id = '" + bizplace.id + "'"

package/server/graphql/resolvers/custom/elccl/elccl-daily-order-inventory-report.ts

@@ -1,25 +1,24 @@
+import { Bizplace } from '@things-factory/biz-base'
 import { ListParam } from '@things-factory/shell'
-import { getManager, EntityManager, getRepository } from 'typeorm'
-import { User } from '@things-factory/auth-base'
-import { Bizplace, BizplaceUser } from '@things-factory/biz-base'
 
 export const elcclDailyOrderInventoryReport = {
-  async elcclDailyOrderInventoryReport(_: any, params: ListParam, context: any) {
+  async elcclDailyOrderInventoryReport(_: any, params: ListParam, context: ResolverContext) {
     try {
-      const { tx }: { tx: EntityManager } = context.state
-      
-      let bizplaceFilter = params.filters.find(data => data.name === 'bizplace')      
+      const { tx } = context.state
+
+      let bizplaceFilter = params.filters.find(data => data.name === 'bizplace')
 
       let month = params.filters.find(data => data.name === 'month').value + '-01'
       let tzoffset = params.filters.find(data => data.name === 'tzoffset').value + ' seconds'
 
       if (!bizplaceFilter || !month) throw 'Invalid input'
 
-      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOneBy({
         id: bizplaceFilter.value
       })
 
-      await tx.query(`
+      await tx.query(
+        `
         create temp table temp_invHistory as (
           select rih.pallet_id, rih.seq, 
           coalesce(grn.name, do2.name, rih.order_no) as order_no , rih.order_ref_no , an.delivery_order_no as do_ref_no, 
@@ -140,7 +139,7 @@ export const elcclDailyOrderInventoryReport = {
         }
       })
 
-      return { items, total: items.length}
+      return { items, total: items.length }
     } catch (error) {
       throw error
     }

package/server/graphql/resolvers/custom/elccl/elccl-inventory-history-pallet-detail-report.ts

@@ -1,11 +1,10 @@
 import { Bizplace } from '@things-factory/biz-base'
-import { ListParam } from '@things-factory/shell'
-import { EntityManager, getRepository } from 'typeorm'
+import { getRepository, ListParam } from '@things-factory/shell'
 
 export const elcclInventoryHistoryPalletDetailReport = {
-  async elcclInventoryHistoryPalletDetailReport(_: any, params: ListParam, context: any) {
+  async elcclInventoryHistoryPalletDetailReport(_: any, params: ListParam, context: ResolverContext) {
     try {
-      const { tx }: { tx: EntityManager } = context.state
+      const { tx } = context.state
 
       let bizplaceFilter = params.filters.find(data => data.name === 'bizplace')
 
@@ -16,7 +15,7 @@ export const elcclInventoryHistoryPalletDetailReport = {
 
       let bizplaceQuery = ''
       if (bizplaceFilter) {
-        const bizplace: Bizplace = await getRepository(Bizplace).findOne({
+        const bizplace: Bizplace = await getRepository(Bizplace).findOneBy({
           id: bizplaceFilter.value
         })
 

package/server/graphql/resolvers/custom/elccl/elccl-inventory-history-report.ts

@@ -4,10 +4,10 @@ import { Bizplace } from '@things-factory/biz-base'
 import { ListParam } from '@things-factory/shell'
 
 export const elcclInventoryHistoryReport = {
-  async elcclInventoryHistoryReport(_: any, params: ListParam, context: any) {
+  async elcclInventoryHistoryReport(_: any, params: ListParam, context: ResolverContext) {
     try {
       // const convertedParams = convertListParams(params)
-      const { tx }: { tx: EntityManager } = context.state
+      const { tx } = context.state
 
       let bizplaceFilter = params.filters.find(data => data.name === 'bizplace')
 
@@ -18,15 +18,16 @@ export const elcclInventoryHistoryReport = {
 
       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
       })
 
       let batchNoQuery = ''
       if (batchNo) {
         batchNoQuery =
-          'AND invh.batch_id ILIKE ANY(ARRAY[' +
+          'AND Lower(invh.batch_id) LIKE ANY(ARRAY[' +
           batchNo.value
+            .toLowerCase()
             .split(',')
             .map(prod => {
               return "'%" + prod.trim().replace(/'/g, "''") + "%'"
@@ -37,21 +38,18 @@ export const elcclInventoryHistoryReport = {
 
       let productQuery = ''
       if (product) {
-        let productValue =
-          product.value
-            .toLowerCase()
-            .split(',')
-            .map(prod => {
-              return "'%" + prod.trim().replace(/'/g, "''") + "%'"
-            })
-            .join(',') + ']) '
-        productQuery =
-          'AND prd.name ILIKE ANY(ARRAY[' +
-          productValue +
-          'OR prd.sku ILIKE ANY(ARRAY[' +
-          productValue +
-          'OR prd.description ILIKE ANY(ARRAY[' +
-          productValue
+        let productValue = product.value
+          .toLowerCase()
+          .split(',')
+          .map(prod => {
+            return "'%" + prod.trim().replace(/'/g, "''") + "%'"
+          })
+          .join(',')
+        productQuery = `AND (
+          Lower(prd.name) LIKE ANY(ARRAY[${productValue}])
+          OR Lower(prd.sku) LIKE ANY(ARRAY[${productValue}])
+          OR Lower(prd.description) LIKE ANY(ARRAY[${productValue}])
+        )`
       }
 
       await tx.query(

package/server/graphql/resolvers/custom/elccl/elccl-inventory-history-summary-report.ts

@@ -1,12 +1,10 @@
-import { EntityManager, getRepository } from 'typeorm'
-
 import { Bizplace } from '@things-factory/biz-base'
-import { ListParam } from '@things-factory/shell'
+import { getRepository, ListParam } from '@things-factory/shell'
 
 export const elcclInventoryHistorySummaryReport = {
-  async elcclInventoryHistorySummaryReport(_: any, params: ListParam, context: any) {
+  async elcclInventoryHistorySummaryReport(_: any, params: ListParam, context: ResolverContext) {
     try {
-      const { tx }: { tx: EntityManager } = context.state
+      const { tx } = context.state
 
       await inventoryHistorySummaryReportQuery(_, params, context)
 
@@ -48,9 +46,13 @@ export const elcclInventoryHistorySummaryReport = {
   }
 }
 
-export async function inventoryHistorySummaryReportQuery(_: any, params: ListParam, context: any): Promise<void> {
+export async function inventoryHistorySummaryReportQuery(
+  _: any,
+  params: ListParam,
+  context: ResolverContext
+): Promise<void> {
   try {
-    const { tx }: { tx: EntityManager } = context.state
+    const { tx } = context.state
 
     let balanceOnlyFilter = params.filters.find(data => data.name === 'balanceOnly')
 
@@ -61,7 +63,7 @@ export async function inventoryHistorySummaryReportQuery(_: any, params: ListPar
 
     if (!bizplaceFilter || !fromDate || !toDate) throw 'Invalid input'
 
-    const bizplace: Bizplace = await getRepository(Bizplace).findOne({
+    const bizplace: Bizplace = await getRepository(Bizplace).findOneBy({
       id: bizplaceFilter.value
     })
 

package/server/graphql/resolvers/custom/elccl/elccl-onhand-inventory-counter.ts

@@ -1,14 +1,15 @@
-import { ListParam } from '@things-factory/shell'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { getRepository } from 'typeorm'
+import { getRepository, ListParam } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
 export const elcclOnhandInventoryCounterResolver = {
-  async elcclOnhandInventoryCounter(_: any, params: ListParam, context: any) {
+  async elcclOnhandInventoryCounter(_: any, params: ListParam, context: ResolverContext) {
     let bizplaces = await getPermittedBizplaceIds(context.state.domain, context.state.user)
-    bizplaces = bizplaces.map(bizplace => {
-                  return "'" + bizplace.trim() + "'"
-                }).join(',')
+    bizplaces = bizplaces
+      .map(bizplace => {
+        return "'" + bizplace.trim() + "'"
+      })
+      .join(',')
 
     const result = await getRepository(Inventory).query(`
       select sum(qty) as total from (
@@ -26,9 +27,8 @@ export const elcclOnhandInventoryCounterResolver = {
           and domain_id = '${context.state.domain.id}'
           group by reusable_pallet_id
       ) as foo
-    `
-    )
-    
+    `)
+
     const total = parseInt(result[0].total)
 
     return total

package/server/graphql/resolvers/custom/kimeda/kimeda-onhand-inventory-counter.ts

@@ -1,14 +1,15 @@
-import { ListParam } from '@things-factory/shell'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { getRepository } from 'typeorm'
+import { getRepository, ListParam } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
 export const kimedaOnhandInventoryCounterResolver = {
-  async kimedaOnhandInventoryCounter(_: any, params: ListParam, context: any) {
+  async kimedaOnhandInventoryCounter(_: any, params: ListParam, context: ResolverContext) {
     let bizplaces = await getPermittedBizplaceIds(context.state.domain, context.state.user)
-    bizplaces = bizplaces.map(bizplace => {
-                  return "'" + bizplace.trim() + "'"
-                }).join(',')
+    bizplaces = bizplaces
+      .map(bizplace => {
+        return "'" + bizplace.trim() + "'"
+      })
+      .join(',')
 
     const result = await getRepository(Inventory).query(`
       select sum(qty) as total from (
@@ -32,9 +33,8 @@ export const kimedaOnhandInventoryCounterResolver = {
         and l2.type = 'FLOOR'
         group by l2.name
       ) as foo
-    `
-    )
-    
+    `)
+
     const total = parseInt(result[0].total)
 
     return total