@things-factory/operato-wms 4.3.19 → 4.4.0-alpha.3

package/client/pages/outbound/worksheet-batch-picking.js

@@ -264,8 +264,7 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
                 uom: record.uom,
                 releaseQty: record.releaseQty,
                 releaseUomValue: record.releaseUomValue,
-                completed: record.completed,
-                orderProductId: record.orderProduct.id
+                completed: record.completed
               }
 
               this.updateContext()
@@ -297,8 +296,7 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
                 packingSize: record.packingSize,
                 uom: record.uom,
                 releaseQty: record.releaseQty,
-                releaseUomValue: record.releaseUomValue,
-                orderProductId: record.orderProduct.id
+                releaseUomValue: record.releaseUomValue
               }
               this._showInventoryAssignPopup()
             }
@@ -504,10 +502,6 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
                 bizplace {
                   id
                 }
-                orderProduct {
-                  id
-                  name
-                }
                 packingType
                 packingSize
                 uom
@@ -997,7 +991,6 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
               .uom="${this._selectedProduct.uom}"
               .releaseQty="${this._selectedProduct.releaseQty}"
               .releaseUomValue="${this._selectedProduct.releaseUomValue}"
-              .orderProductId="${this._selectedProduct.orderProductId}"
               @completed="${async () => {
                 this._spinner(true)
 

package/client/pages/outbound/worksheet-packing.js

@@ -173,9 +173,6 @@ class WorksheetPacking extends localize(i18next)(PageView) {
             <label>${i18next.t('label.tracking_no')}</label>
             <input name="trackingNo" readonly />
 
-            <label>${i18next.t('label.order_remark')}</label>
-            <textarea name="remark" rows="5" readonly></textarea>
-
             <label>${i18next.t('label.status')}</label>
             <select name="status" disabled>
               ${Object.keys(WORKSHEET_STATUS).map(
@@ -312,7 +309,6 @@ class WorksheetPacking extends localize(i18next)(PageView) {
               refNo3
               ownTransport
               releaseDate
-              remark
             }
             marketplaceOrder {
               name
@@ -412,8 +408,7 @@ class WorksheetPacking extends localize(i18next)(PageView) {
         ownCollection: worksheet.releaseGood.ownTransport,
         releaseDate: worksheet.releaseGood.releaseDate,
         shippingProvider: worksheet.marketplaceOrder?.shippingProvider || '',
-        trackingNo: worksheet.marketplaceOrder?.trackingNo || '',
-        remark: worksheet.releaseGood.remark || ''
+        trackingNo: worksheet.marketplaceOrder?.trackingNo || ''
       })
 
       this.worksheetDetailData = {
@@ -464,7 +459,7 @@ class WorksheetPacking extends localize(i18next)(PageView) {
 
   _fillupForm(data) {
     for (let key in data) {
-      Array.from(this.form.querySelectorAll('input, select, textarea')).forEach(field => {
+      Array.from(this.form.querySelectorAll('input, select')).forEach(field => {
         if (field.name === key && field.type === 'checkbox') {
           field.checked = data[key]
         } else if (field.name === key) {

package/client/pages/outbound/worksheet-picking.js

@@ -347,8 +347,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
                 releaseQty: record.releaseQty,
                 releaseUomValue: record.releaseUomValue,
                 availableQty: record.availableQty,
-                completed: record.completed,
-                orderProductId: record.orderProduct.id
+                completed: record.completed
               }
 
               this.updateContext()
@@ -379,8 +378,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
                 packingSize: record.packingSize,
                 releaseQty: record.releaseQty,
                 releaseUomValue: record.releaseUomValue,
-                uom: record.uom,
-                orderProductId: record.orderProduct.id
+                uom: record.uom
               }
               this._showInventoryAssignPopup()
             }
@@ -673,10 +671,6 @@ class WorksheetPicking extends localize(i18next)(PageView) {
                 brand
                 pickingStrategy
               }
-              orderProduct {
-                id
-                name
-              }
               packingType
               packingSize
               uom
@@ -1208,7 +1202,6 @@ class WorksheetPicking extends localize(i18next)(PageView) {
             .uom="${this._selectedProduct.uom}"
             .releaseQty="${this._selectedProduct.releaseQty}"
             .releaseUomValue="${this._selectedProduct.releaseUomValue}"
-            .orderProductId="${this._selectedProduct.orderProductId}"
             @completed="${async () => {
               await this.fetchOrderInventories()
               await this.fetchWorksheetDetails(

package/client/pages/report/inventory-summary-report.js

@@ -271,13 +271,6 @@ class InventorySummaryReport extends connect(store)(localize(i18next)(PageView))
         header: i18next.t('field.outbound_qty'),
         width: 140
       },
-      {
-        type: 'float',
-        name: 'missingQty',
-        record: { align: 'center' },
-        header: i18next.t('field.missing_qty'),
-        width: 140
-      },
       {
         type: 'float',
         name: 'closingQty',
@@ -303,7 +296,6 @@ class InventorySummaryReport extends connect(store)(localize(i18next)(PageView))
           'openingQty',
           'totalInQty',
           'totalOutQty',
-          'missingQty',
           'closingQty'
         ]
       },

package/client/pages/report/outbound-order-details-report.js

@@ -450,18 +450,6 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         header: i18next.t('field.packed_at'),
         width: 170
       },
-      {
-        type: 'string',
-        name: 'checkedRemarkBy',
-        header: i18next.t('field.remark_checked_by'),
-        width: 170
-      },
-      {
-        type: 'datetime',
-        name: 'checkedRemarkAt',
-        header: i18next.t('field.remark_checked_at'),
-        width: 170
-      },
       {
         type: 'string',
         name: 'loadedBy',
@@ -527,8 +515,6 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         'pickedBy',
         'packedAt',
         'packedBy',
-        'checkedRemarkBy',
-        'checkedRemarkAt',
         'loadedAt',
         'loadedBy',
         'shippedAt'
@@ -648,8 +634,6 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
                 pickedBy
                 packedAt
                 packedBy
-                checkedRemarkAt
-                checkedRemarkBy
                 loadedAt
                 loadedBy
                 shippedAt
@@ -800,8 +784,6 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         { header: i18next.t('field.picked_at'), key: 'pickedAt', width: 15, type: 'string' },
         { header: i18next.t('field.packed_by'), key: 'packedBy', width: 15, type: 'string' },
         { header: i18next.t('field.packed_at'), key: 'packedAt', width: 15, type: 'string' },
-        { header: i18next.t('field.remark_checked_by'), key: 'checkedRemarkBy', width: 15, type: 'string' },
-        { header: i18next.t('field.remark_checked_at'), key: 'checkedRemarkAt', width: 15, type: 'string' },
         { header: i18next.t('field.loaded_by'), key: 'loadedBy', width: 15, type: 'string' },
         { header: i18next.t('field.loaded_at'), key: 'loadedAt', width: 15, type: 'string' },
         { header: i18next.t('field.shipped_at'), key: 'shippedAt', width: 15, type: 'string' }

package/client/pages/vas/abstract-execute-vas.js

@@ -1,23 +1,19 @@
-import '../components/popup-note'
-import '../components/vas-templates'
-
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit-element'
-
-import { sleep } from '@operato/utils'
 import { MultiColumnFormStyles, SingleColumnFormStyles } from '@things-factory/form-ui'
 import { getRenderer } from '@things-factory/grist-ui'
 import { i18next } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
-import { client, CustomAlert, navigate, store, UPDATE_CONTEXT } from '@things-factory/shell'
+import { client, CustomAlert, navigate, UPDATE_CONTEXT, store } from '@things-factory/shell'
 import { CommonButtonStyles } from '@things-factory/styles'
-
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit-element'
+import '../components/popup-note'
+import '../components/vas-templates'
 import {
   VAS_BATCH_AND_PRODUCT_TYPE,
   VAS_BATCH_NO_TYPE,
   VAS_ETC_TYPE,
-  VAS_NAME,
   VAS_PRODUCT_TYPE,
+  VAS_NAME,
   WORKSHEET_STATUS
 } from '../constants'
 
@@ -587,8 +583,7 @@ export class AbstractExecuteVas extends LitElement {
     this._selectedTaskStatus = null
   }
 
-  async _openIssueEditor() {
-    await sleep(1010)
+  _openIssueEditor() {
     openPopup(
       html`
         <popup-note

package/client/pages/vas/print-product-label.js

@@ -786,21 +786,12 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
           }
         } catch (ex) {
           this._showToast({ level: 'error', message: ex })
+
           delete this.printer
           break
         } finally {
           // we only need to update when the counter is more than 0
-          if (printCounter > 0) {
-            try {
-              await this._updatePrintedLabelSequence(record.type, printCounter, record.bizplaceId)
-            } catch (e) {
-              this._showToast({
-                level: 'error',
-                message: i18next.t('text.unable_to_save_print_history_x', { state: { counter: printCounter } })
-              })
-              return
-            }
-          }
+          if (printCounter > 0) await this._updatePrintedLabelSequence(record.type, printCounter, record.bizplaceId)
         }
       }
     }
@@ -810,8 +801,8 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
     try {
       await client.mutate({
         mutation: gql`
-          mutation upsertSequence($type: String!, $counter: Float!, $bizplaceId: String!) {
-            upsertSequence(type: $type, counter: $counter, bizplaceId: $bizplaceId) {
+          mutation updateInsertSequence($type: String!, $counter: Int, $bizplaceId: String!) {
+            updateInsertSequence(type: $type, counter: $counter, bizplaceId: $bizplaceId) {
               pattern
               seq
             }
@@ -823,8 +814,8 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
           bizplaceId
         }
       })
-    } catch (error) {
-      throw error
+    } catch (e) {
+      this._showToast({ message: e })
     }
   }
 

package/client/pages/vas/reverse-kitting/execute-reverse-kitting.js

@@ -5,7 +5,6 @@ import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin.js'
 
-import { sleep } from '@operato/utils'
 import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
@@ -348,8 +347,7 @@ class ExecuteReverseKitting extends connect(store)(localize(i18next)(PageView))
     setTimeout(() => this.orderNoInput.focus(), 100)
   }
 
-  async _openPopupCombinationSets(record) {
-    await sleep(1010)
+  _openPopupCombinationSets(record) {
     openPopup(
       html`
         <popup-combination-sets

package/client/pages/vas/reverse-kitting/popup-reverse-kitting-template.js

@@ -4,7 +4,6 @@ import '../../inbound/select-location-popup'
 import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit-element'
 
-import { sleep } from '@operato/utils'
 import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
@@ -501,8 +500,7 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
     }
   }
 
-  async _openSelectLocationPopup() {
-    await sleep(1010)
+  _openSelectLocationPopup() {
     openPopup(
       html`
         <select-location-popup

package/client/route.js

@@ -41,10 +41,6 @@ export default function route(page) {
       import('./pages/master/product/product-list')
       return page
 
-    case 'totes':
-      import('./pages/master/tote-list')
-      return page
-
     /**
      * Order Menus Section
      */
@@ -522,13 +518,5 @@ export default function route(page) {
     case 'bulk_operation':
       import('./pages/bulk-operation/bulk-operation')
       return page
-
-    case 'draft_release_goods':
-      import('./pages/order/draft-release-good/draft-release-good-list')
-      return page
-
-    case 'draft_release_good_detail':
-      import('./pages/order/draft-release-good/draft-release-good-detail')
-      return page
   }
 }

package/dist-server/entities/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.entities = void 0;
+exports.entities = [];
+//# sourceMappingURL=index.js.map

package/dist-server/entities/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/entities/index.ts"],"names":[],"mappings":";;;AAAa,QAAA,QAAQ,GAAG,EAAE,CAAA"}

package/dist-server/graphql/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist-server/graphql/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/graphql/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAmC;AACnC,uDAAwC;AAE3B,QAAA,MAAM,GAAG;IACpB,QAAQ;IACR,SAAS;CACV,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/graphql/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAmC;AACnC,uDAAwC;AAE3B,QAAA,MAAM,GAAG;IACpB,QAAQ;IACR,SAAS;CACV,CAAA"}

package/dist-server/graphql/resolvers/board-setting/board-settings.js

@@ -32,8 +32,7 @@ exports.boardSettingsResolver = {
             HOME_BOARD,
             opa_app_setting_constants_1.CARTON_LABEL_SETTING_KEY,
             opa_app_setting_constants_1.INTENALIZED_AWB_SETTING_KEY,
-            opa_app_setting_constants_1.ROUTE_LABEL_SETTING_KEY,
-            opa_app_setting_constants_1.TOTE_LABEL_SETTING_KEY
+            opa_app_setting_constants_1.ROUTE_LABEL_SETTING_KEY
         ];
         var qb = queryBuilder
             // .innerJoin(Board, 'Board', 'Board.id = CAST(Setting.value AS uuid)')

package/dist-server/graphql/resolvers/board-setting/board-settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"board-settings.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/board-setting/board-settings.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,yDAAgD;AAChD,iEAAqD;AACrD,+DAAsD;AAGtD,kFAU2C;AAE9B,QAAA,qBAAqB,GAAG;IACnC,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,MAAW,EAAE,OAAY;QACnD,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QAEpD;;6FAEqF;QACrF,MAAM,IAAI,GAAS,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC;aACzC,kBAAkB,CAAC,MAAM,CAAC;aAC1B,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC;aACxC,iBAAiB,CAAC,cAAc,EAAE,cAAc,CAAC;aACjD,KAAK,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;aAC7D,QAAQ,CAAC,6BAA6B,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;aAChE,MAAM,EAAE,CAAA;QAEX,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;QAC3E,oFAAoF;QAEpF,MAAM,UAAU,GAAG,GAAG,iDAAqB,IAAI,QAAQ,EAAE,CAAA;QACzD,+EAA+E;QAE/E,MAAM,YAAY,GAAG,IAAA,uBAAa,EAAC,sBAAO,CAAC,CAAC,kBAAkB,EAAE,CAAA;QAChE,MAAM,KAAK,GAAG;YACZ,sDAA0B;YAC1B,qDAAyB;YACzB,oDAAwB;YACxB,6DAAiC;YACjC,UAAU;YACV,oDAAwB;YACxB,uDAA2B;YAC3B,mDAAuB;YACvB,kDAAsB;SACvB,CAAA;QAED,IAAI,EAAE,GAAG,YAAY;YACnB,uEAAuE;aACtE,SAAS,CAAC,qBAAK,EAAE,OAAO,EAAE,4CAA4C,CAAC;YACxE,yDAAyD;aACxD,MAAM,CAAC;YACN,kBAAkB;YAClB,sBAAsB;YACtB,wBAAwB;YACxB,qBAAqB;YACrB,yBAAyB;YACzB,uCAAuC;YACvC,mCAAmC;SACpC,CAAC;aACD,KAAK,CAAC,6BAA6B,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAA;QAE5E,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM;YAAE,EAAE,CAAC,QAAQ,CAAC,6BAA6B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QAEhF,IAAI,gBAAgB,GAAG,MAAM,EAAE,CAAC,UAAU,EAAE,CAAA;QAE5C,OAAO,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YACzC,IAAI,OAAO,GAAQ;gBACjB,KAAK,EAAE,EAAE;aACV,CAAA;YAED,KAAK,IAAI,GAAG,IAAI,YAAY,EAAE;gBAC5B,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;oBACzB,IAAI,SAAS,GAAG,GAAG,CAAA;oBACnB,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;oBAC5C,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,SAAS,CAAC,CAAA;iBAC7C;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;iBACjC;aACF;YAED,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,iDAAqB,CAAC,IAAI,CAAC,EAAE;gBACpD,OAAO,CAAC,IAAI,GAAG,iDAAqB,CAAA;aACrC;YAED,OAAO,OAAO,CAAA;QAChB,CAAC,CAAC,CAAA;IACJ,CAAC;CACF,CAAA"}
+{"version":3,"file":"board-settings.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/board-setting/board-settings.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/dashboard/inventory-expiry-monitor.js

@@ -16,15 +16,16 @@ exports.inventoryExpiryMonitorResolver = {
     async inventoryExpiryMonitor(_, params, context) {
         const { domain, tx } = context.state;
         const expInventories = await tx.query(`
-      SELECT "location", sum("expired") AS "expired", sum("sixMonths") AS "sixMonths", sum("nineMonths") AS "nineMonths" FROM (
+      SELECT "location", sum("expired") AS "expired", sum("thirtyDays") AS "thirtyDays", sum("fortyFiveDays") AS "fortyFiveDays", sum("sixtyDays") AS "sixtyDays" FROM (
         SELECT 
           CASE WHEN l.TYPE IN ('QUARANTINE','RESERVE') THEN 'QUARANTINED' ELSE 'IN SHELF' END AS "location",
           CASE WHEN i.expiration_date - now()::date <= 0 THEN 1 ELSE 0 END AS "expired",
-          CASE WHEN i.expiration_date - now()::date > 0 AND i.expiration_date - now()::date <= 180 THEN 1 ELSE 0 END AS "sixMonths",
-          CASE WHEN i.expiration_date - now()::date > 180 AND i.expiration_date - now()::date <= 270 THEN 1 ELSE 0 END AS "nineMonths"
+          CASE WHEN i.expiration_date - now()::date > 0 AND i.expiration_date - now()::date <= 30 THEN 1 ELSE 0 END AS "thirtyDays",
+          CASE WHEN i.expiration_date - now()::date > 30 AND i.expiration_date - now()::date <= 45 THEN 1 ELSE 0 END AS "fortyFiveDays",
+          CASE WHEN i.expiration_date - now()::date > 45 AND i.expiration_date - now()::date <= 60 THEN 1 ELSE 0 END AS "sixtyDays"
         FROM inventories i
         INNER JOIN locations l ON i.location_id = l.id
-        WHERE i.expiration_date - now()::date <= 270
+        WHERE i.expiration_date - now()::date <= 60
         AND i.expiration_date NOTNULL
         AND i.status = 'STORED'
         AND i.domain_id = $1
@@ -45,6 +46,6 @@ function getExpiryCountByStatus(expInventories, location) {
             return inv;
         })(matchedInv);
     else
-        return { expired: 0, sixMonths: 0, nineMonths: 0 };
+        return { expired: 0, thirtyDays: 0, fortyFiveDays: 0, sixtyDays: 0 };
 }
 //# sourceMappingURL=inventory-expiry-monitor.js.map

package/dist-server/graphql/resolvers/dashboard/inventory-expiry-monitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"inventory-expiry-monitor.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/dashboard/inventory-expiry-monitor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAKa,QAAA,8BAA8B,GAAG;IAC5C,KAAK,CAAC,sBAAsB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAClE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAEvF,MAAM,cAAc,GAMd,MAAM,EAAE,CAAC,KAAK,CAClB;;;;;;;;;;;;;;;KAeD,EACC,CAAC,MAAM,CAAC,EAAE,CAAC,CACZ,CAAA;QAED,OAAO;YACL,WAAW,EAAE,sBAAsB,CAAC,cAAc,EAAE,aAAa,CAAC;YAClE,OAAO,EAAE,sBAAsB,CAAC,cAAc,EAAE,UAAU,CAAC;SAC5D,CAAA;IACH,CAAC;CACF,CAAA;AAED,SAAS,sBAAsB,CAAC,cAAc,EAAE,QAAQ;IACtD,IAAI,UAAU,GAAQ,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAA;IAE1E,IAAI,UAAU;QAAE,OAAO,CAAC,CAAC,EAAoB,EAAE,EAAE;gBAAxB,EAAE,QAAQ,OAAU,EAAL,GAAG,cAAlB,YAAoB,CAAF;YAAO,OAAA,GAAG,CAAA;SAAA,CAAC,CAAC,UAAU,CAAC,CAAA;;QAC7D,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,CAAA;AACzD,CAAC"}
+{"version":3,"file":"inventory-expiry-monitor.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/dashboard/inventory-expiry-monitor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAKa,QAAA,8BAA8B,GAAG;IAC5C,KAAK,CAAC,sBAAsB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAClE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAEvF,MAAM,cAAc,GAMd,MAAM,EAAE,CAAC,KAAK,CAClB;;;;;;;;;;;;;;;;KAgBD,EACC,CAAC,MAAM,CAAC,EAAE,CAAC,CACZ,CAAA;QAED,OAAO;YACL,WAAW,EAAE,sBAAsB,CAAC,cAAc,EAAE,aAAa,CAAC;YAClE,OAAO,EAAE,sBAAsB,CAAC,cAAc,EAAE,UAAU,CAAC;SAC5D,CAAA;IACH,CAAC;CACF,CAAA;AAED,SAAS,sBAAsB,CAAC,cAAc,EAAE,QAAQ;IACtD,IAAI,UAAU,GAAQ,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAA;IAE1E,IAAI,UAAU;QAAE,OAAO,CAAC,CAAC,EAAoB,EAAE,EAAE;gBAAxB,EAAE,QAAQ,OAAU,EAAL,GAAG,cAAlB,YAAoB,CAAF;YAAO,OAAA,GAAG,CAAA;SAAA,CAAC,CAAC,UAAU,CAAC,CAAA;;QAC7D,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAA;AAC3E,CAAC"}

package/dist-server/graphql/resolvers/dashboard/outbound-order-by-status.js

@@ -3,65 +3,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.outboundOrderByStatusResolver = void 0;
 exports.outboundOrderByStatusResolver = {
     async outboundOrderByStatus(_, params, context) {
-        const { domain, tx } = context.state;
+        const { domain, user, tx } = context.state;
         const orderStatus = await tx.query(`
-      WITH cte_list ("status", "count") as (
-        select 'DONE' as status, 0 as "count"
-        union
-        select 'CANCELLED' as status, 0 as "count"
-        union
-        select 'PICKING UNASSIGNED' as status, 0 as "count"
-        union
-        select 'PACKING' as status, 0 as "count"
-        union
-        select 'AWAITING DISPATCH' as status, 0 as "count"
-        union
-        select 'OUT FROM WAREHOUSE' as status, 0 as "count"
-        union
-        select 'PICKING ASSIGNED' as status, 0 as "count"
-        union
-        select 'OTHERS' as status, 0 as "count"
-      ) select l."status", coalesce(src."count", l."count") as "count" 
-      from cte_list l
-      left join (
+      (
         SELECT "status", COUNT(*) AS "count" FROM (
           SELECT 
-            CASE WHEN "status" = 'DONE' and rg.updated_at::date = CURRENT_DATE THEN 'DONE' 
-              WHEN "status" = 'CANCELLED' THEN 'CANCELLED' 
-              WHEN "status" IN('PENDING_RECEIVE', 'PENDING_WORKSHEET') THEN 'PICKING UNASSIGNED'
-              END AS "status" 
-          FROM release_goods rg
+            CASE WHEN "status" = 'DEACTIVATED' AND "assignee_id" ISNULL AND "type" = 'PICKING' THEN 'PICKING UNASSIGNED' 
+              WHEN "status" = 'EXECUTING' AND "assignee_id" NOTNULL AND "type" = 'PICKING' THEN 'PICKING ASSIGNED' 
+              WHEN "status" = 'EXECUTING' AND "type" = 'PACKING' THEN 'PACKING' 
+              END AS "status" FROM worksheets ws
           WHERE "domain_id" = $1
-          AND rg."status" IN ('CANCELLED','PENDING', 'PENDING_RECEIVE', 'PENDING_WORKSHEET', 'READY_TO_PICK', 'PICKING', 'READY_TO_PACK', 'PACKING', 'DONE')
         ) AS foo 
+        WHERE status IN ('PICKING ASSIGNED', 'PICKING UNASSIGNED', 'PACKING')
         GROUP BY "status"
-        UNION ALL 
-        SELECT "status", COUNT(*) AS "count" FROM (
-          SELECT 
-            CASE WHEN "dispatchment_status" = 'DISPATCHED' THEN 'OUT FROM WAREHOUSE' 
-              END AS "status" 
-          FROM release_goods rg
-          WHERE "domain_id" = $1
-          AND rg."dispatchment_status" IN ('READY_TO_DISPATCH', 'DISPATCHED')
-          AND rg."status" NOT IN ('CANCELLED', 'PENDING_CANCEL')
-          AND rg."tracking_no" NOTNULL
-        ) AS foo 
-        GROUP BY "status"		
-        union all 
-        select 'AWAITING DISPATCH' as "status", count(*) from manifests m 
-        inner join release_goods rg ON rg.manifest_id = m.id
-        where m."status" = 'OPEN' and m."domain_id" = $1
-        union all
-        select 'PICKING ASSIGNED' as "status", count(*) from worksheets w 
-        where w."domain_id" = $1 and w."type" ='PICKING' 
-        and w."status" in ('DEACTIVATED','EXECUTING','PENDING_CANCEL')
-        group by w."status"
-        union all
-        select 'PACKING' as "status", count(*) from worksheets w 
-        where w."domain_id" = $1 and w."type" ='PACKING' 
-        and w."status" in ('DEACTIVATED','EXECUTING','PENDING_CANCEL')
-        group by w."status"
-      ) src on src."status" = l."status"
+      ) UNION ALL (
+        SELECT "status", COUNT(id) AS "count" FROM release_goods rg
+        WHERE "status" IN ('DONE', 'CANCELLED')
+      	AND "domain_id" = $1
+        GROUP BY "status"
+      ) UNION ALL (
+        SELECT 
+          CASE WHEN "status"::VARCHAR = 'OPEN' THEN 'AWAITING DISPATCH' 
+            WHEN "status"::VARCHAR = 'CLOSED' THEN 'OUT FROM WAREHOUSE'
+            END AS "status",
+          COUNT(id) AS "count" 
+        FROM manifests
+        WHERE "domain_id" = $1
+        GROUP BY "status"
+      )
     `, [domain.id]);
         const statusList = [
             'PICKING UNASSIGNED',

package/dist-server/graphql/resolvers/dashboard/outbound-order-by-status.js.map

@@ -1 +1 @@
-{"version":3,"file":"outbound-order-by-status.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/dashboard/outbound-order-by-status.ts"],"names":[],"mappings":";;;AAKa,QAAA,6BAA6B,GAAG;IAC3C,KAAK,CAAC,qBAAqB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACjE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAEvF,MAAM,WAAW,GAAwC,MAAM,EAAE,CAAC,KAAK,CACrE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA0DD,EACC,CAAC,MAAM,CAAC,EAAE,CAAC,CACZ,CAAA;QAED,MAAM,UAAU,GAAa;YAC3B,oBAAoB;YACpB,kBAAkB;YAClB,SAAS;YACT,mBAAmB;YACnB,oBAAoB;YACpB,WAAW;YACX,MAAM;YACN,cAAc;SACf,CAAA;QAED,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,YAAiD,EAAE,MAAc,EAAE,EAAE;YAC7F,IAAI,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,CAAA;YAEjE,IAAI,SAAS;gBAAE,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC,CAAA;;gBAC/D,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;YAE5C,OAAO,YAAY,CAAA;QACrB,CAAC,EAAE,EAAE,CAAC,CAAA;IACR,CAAC;CACF,CAAA"}
+{"version":3,"file":"outbound-order-by-status.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/dashboard/outbound-order-by-status.ts"],"names":[],"mappings":";;;AAKa,QAAA,6BAA6B,GAAG;IAC3C,KAAK,CAAC,qBAAqB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACjE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,MAAM,WAAW,GAAwC,MAAM,EAAE,CAAC,KAAK,CACrE;;;;;;;;;;;;;;;;;;;;;;;;;;;KA2BD,EACC,CAAC,MAAM,CAAC,EAAE,CAAC,CACZ,CAAA;QAED,MAAM,UAAU,GAAa;YAC3B,oBAAoB;YACpB,kBAAkB;YAClB,SAAS;YACT,mBAAmB;YACnB,oBAAoB;YACpB,WAAW;YACX,MAAM;YACN,cAAc;SACf,CAAA;QAED,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,YAAiD,EAAE,MAAc,EAAE,EAAE;YAC7F,IAAI,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,CAAA;YAEjE,IAAI,SAAS;gBAAE,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC,CAAA;;gBAC/D,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;YAE5C,OAAO,YAAY,CAAA;QACrB,CAAC,EAAE,EAAE,CAAC,CAAA;IACR,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -29,7 +33,6 @@ const OpaMenu = __importStar(require("./opa-menu"));
 const Reports = __importStar(require("./reports"));
 const InventoryComparison = __importStar(require("./inventory-comparison"));
 const ShippingProviders = __importStar(require("./shipping-provider"));
-const WarehouseInventoryAdjustment = __importStar(require("./warehouse-inventory-adjustment"));
 exports.queries = [
     BoardSetting.Query,
     CustomElccl.Query,
@@ -38,7 +41,7 @@ exports.queries = [
     OpaMenu.Query,
     Reports.Query,
     InventoryComparison.Query,
-    ShippingProviders.Query,
+    ShippingProviders.Query
 ];
-exports.mutations = [Extra.Mutation, WarehouseInventoryAdjustment.Mutation];
+exports.mutations = [Extra.Mutation];
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/resolvers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA+C;AAC/C,4DAA6C;AAC7C,8DAA+C;AAC/C,uDAAwC;AACxC,+CAAgC;AAChC,oDAAqC;AACrC,mDAAoC;AACpC,4EAA6D;AAC7D,uEAAwD;AACxD,+FAAgF;AAEnE,QAAA,OAAO,GAAG;IACrB,YAAY,CAAC,KAAK;IAClB,WAAW,CAAC,KAAK;IACjB,YAAY,CAAC,KAAK;IAClB,SAAS,CAAC,KAAK;IACf,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,KAAK;IACb,mBAAmB,CAAC,KAAK;IACzB,iBAAiB,CAAC,KAAK;CACxB,CAAA;AAEY,QAAA,SAAS,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/resolvers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA+C;AAC/C,4DAA6C;AAC7C,8DAA+C;AAC/C,uDAAwC;AACxC,+CAAgC;AAChC,oDAAqC;AACrC,mDAAoC;AACpC,4EAA6D;AAC7D,uEAAwD;AAE3C,QAAA,OAAO,GAAG;IACrB,YAAY,CAAC,KAAK;IAClB,WAAW,CAAC,KAAK;IACjB,YAAY,CAAC,KAAK;IAClB,SAAS,CAAC,KAAK;IACf,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,KAAK;IACb,mBAAmB,CAAC,KAAK;IACzB,iBAAiB,CAAC,KAAK;CACxB,CAAA;AAEY,QAAA,SAAS,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA"}

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

@@ -49,7 +49,7 @@ exports.outboundOrderDetailsReport = {
             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", 
-            rg.created_at AS "order_created_at", rg.accepted_at, u4.name as accepted_by, rg.checked_remark_by, rg.checked_remark_at,
+            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,
@@ -170,8 +170,6 @@ exports.outboundOrderDetailsReport = {
                     pickedBy: itm.picked_by,
                     packedAt: itm.packed_at,
                     packedBy: itm.packed_by,
-                    checkedRemarkBy: itm.checked_remark_by,
-                    checkedRemarkAt: itm.checked_remark_at,
                     loadedAt: itm.loaded_at,
                     loadedBy: itm.loaded_by,
                     shippedAt: itm.shipped_at

package/dist-server/graphql/resolvers/reports/outbound-order-details-report.js.map

@@ -1 +1 @@
-{"version":3,"file":"outbound-order-details-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/outbound-order-details-report.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"outbound-order-details-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/outbound-order-details-report.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/types/dashboard/inventory-expiry-counter.js

@@ -8,8 +8,9 @@ const graphql_tag_1 = __importDefault(require("graphql-tag"));
 exports.InventoryExpiryCounter = (0, graphql_tag_1.default) `
   type InventoryExpiryCounter {
     expired: Int
-    sixMonths: Int
-    nineMonths: Int
+    thirtyDays: Int
+    fortyFiveDays: Int
+    sixtyDays: Int
   }
 `;
 //# sourceMappingURL=inventory-expiry-counter.js.map

package/dist-server/graphql/types/dashboard/inventory-expiry-counter.js.map

@@ -1 +1 @@
-{"version":3,"file":"inventory-expiry-counter.js","sourceRoot":"","sources":["../../../../server/graphql/types/dashboard/inventory-expiry-counter.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,sBAAsB,GAAG,IAAA,qBAAG,EAAA;;;;;;CAMxC,CAAA"}
+{"version":3,"file":"inventory-expiry-counter.js","sourceRoot":"","sources":["../../../../server/graphql/types/dashboard/inventory-expiry-counter.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,sBAAsB,GAAG,IAAA,qBAAG,EAAA;;;;;;;CAOxC,CAAA"}