@things-factory/operato-wms 3.6.30 → 3.6.37

package/client/pages/constants/setting.js

@@ -1,5 +1,6 @@
+export const CARTON_LABEL_SETTING_KEY = 'carton-label'
+export const HOME_DASHBOARD_SETTING_KEY = 'dashboard'
 export const LOCATION_LABEL_SETTING_KEY = 'location-label'
 export const PALLET_LABEL_SETTING_KEY = 'pallet-label'
-export const CARTON_LABEL_SETTING_KEY = 'carton-label'
+export const PRODUCT_LABEL_SETTING_KEY = 'product-label'
 export const REUSABLE_PALLET_LABEL_SETTING_KEY = 'reusable-pallet-label'
-export const HOME_DASHBOARD_SETTING_KEY = 'dashboard'

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

@@ -0,0 +1,530 @@
+import '@things-factory/form-ui'
+import '@things-factory/grist-ui'
+import '@things-factory/import-ui'
+import '@things-factory/barcode-ui'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+import { connect } from 'pwa-helpers/connect-mixin'
+
+import { DirectPrinter } from '@things-factory/barcode-base'
+import { MultiColumnFormStyles } from '@things-factory/form-ui'
+import { i18next, localize } from '@things-factory/i18n-base'
+import { client, CustomAlert, PageView, store } from '@things-factory/shell'
+import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
+import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
+
+import { PRODUCT_LABEL_SETTING_KEY } from '../constants'
+
+class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
+  static get styles() {
+    return [
+      MultiColumnFormStyles,
+      ScrollbarStyles,
+      css`
+        :host {
+          display: flex;
+          flex-direction: column;
+          overflow: hidden;
+        }
+        search-form {
+          overflow: visible;
+        }
+
+        data-grist {
+          overflow-y: auto;
+          flex: 1;
+        }
+      `
+    ]
+  }
+
+  static get properties() {
+    return {
+      config: Object,
+      _selectedRecords: Array,
+      _searchingType: String
+    }
+  }
+
+  render() {
+    const SEARCH_TYPES = [
+      { name: 'gan', value: 'GAN' },
+      { name: 'ro', value: 'RO' },
+      { name: 'inventory', value: 'INVENTORY' }
+    ]
+
+    return html`
+      <form class="multi-column-form" id="info-form">
+        <fieldset>
+          <legend>${i18next.t('title.search_area')}</legend>
+          <label>${i18next.t('label.search_type')}</label>
+          <select name="orderType" @change="${e => (this._searchingType = e.currentTarget.value)}">
+            ${Object.keys(SEARCH_TYPES).map(
+              key => html`
+                <option value="${SEARCH_TYPES[key].value}">${i18next.t(`label.${SEARCH_TYPES[key].name}`)}</option>
+              `
+            )}
+          </select>
+
+          ${this._searchingType === SEARCH_TYPES.find(type => type.name === 'inventory').value
+            ? html`
+                <label>${i18next.t('label.product_info')}</label>
+                <input name="productInfo" value="" type="text" @keypress="${this.orderNoKeypressHandler.bind(this)}" />
+              `
+            : html`
+                <label>${i18next.t('label.order_no')}</label>
+                <barcode-scanable-input
+                  name="orderNo"
+                  custom-input
+                  @keypress="${this.orderNoKeypressHandler.bind(this)}"
+                ></barcode-scanable-input>
+              `}
+        </fieldset>
+      </form>
+
+      <data-grist
+        .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
+        .config=${this.config}
+        .fetchHandler="${this.fetchHandler.bind(this)}"
+        @select-record-change=${e => (this._selectedRecords = e.detail.selectedRecords)}
+        }
+      ></data-grist>
+    `
+  }
+
+  constructor() {
+    super()
+    this._searchingType = 'GAN'
+  }
+
+  get context() {
+    return {
+      title: i18next.t('title.print_product_label'),
+      actions: [
+        {
+          title: i18next.t('button.print_label'),
+          action: this._printProductLabels.bind(this),
+          ...CommonButtonStyles.label
+        }
+      ]
+    }
+  }
+
+  get dataGrist() {
+    return this.shadowRoot.querySelector('data-grist')
+  }
+
+  get orderNoInput() {
+    return this.shadowRoot.querySelector('barcode-scanable-input[name=orderNo]').shadowRoot.querySelector('input')
+  }
+
+  get productInfoInput() {
+    return this.shadowRoot.querySelector('input[name=productInfo]')
+  }
+
+  get searchInfo() {
+    if (this._searchingType == 'INVENTORY') return this.shadowRoot.querySelector('input[name=productInfo]')
+    else return this.shadowRoot.querySelector('barcode-scanable-input[name=orderNo]').shadowRoot.querySelector('input')
+  }
+
+  get targetData() {
+    return this.dataGrist.selected.map(record => {
+      if (!record.printQty || record.printQty == '' || Number(record.printQty) < 1) {
+        return {
+          ...record,
+          printQty: 1
+        }
+      } else {
+        return record
+      }
+    })
+  }
+
+  pageInitialized() {
+    this.config = {
+      pagination: { infinite: true },
+      rows: { selectable: { multiple: true } },
+      list: {
+        fields: [
+          'palletId',
+          'batchId',
+          'sku',
+          'productInfo',
+          'auxUnit1',
+          'auxValue1',
+          'auxUnit2',
+          'auxValue2',
+          'expirationDate',
+          'printQty'
+        ]
+      },
+      columns: [
+        { type: 'gutter', gutterName: 'sequence' },
+        { type: 'gutter', gutterName: 'row-selector', multiple: true },
+        {
+          type: 'string',
+          name: 'palletId',
+          header: i18next.t('field.lot_id'),
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'batchId',
+          header: i18next.t('field.batch_id'),
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'sku',
+          header: i18next.t('field.sku'),
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'productInfo',
+          header: i18next.t('field.product_info'),
+          sortable: true,
+          width: 200
+        },
+        {
+          type: 'string',
+          name: 'type',
+          header: i18next.t('field.product_type'),
+          sortable: true,
+          width: 120
+        },
+        {
+          type: 'string',
+          name: 'auxUnit1',
+          header: i18next.t('field.aux_unit'),
+          sortable: true,
+          width: 80
+        },
+        {
+          type: 'string',
+          name: 'auxValue1',
+          header: i18next.t('field.aux_value'),
+          sortable: true,
+          width: 80
+        },
+        {
+          type: 'string',
+          name: 'auxUnit2',
+          header: i18next.t('field.aux_unit_2'),
+          sortable: true,
+          width: 100
+        },
+        {
+          type: 'string',
+          name: 'auxValue2',
+          header: i18next.t('field.aux_value_2'),
+          sortable: true,
+          width: 100
+        },
+        {
+          type: 'string',
+          name: 'expirationDate',
+          header: i18next.t('field.exp_date'),
+          sortable: true,
+          width: 100
+        },
+        {
+          type: 'number',
+          name: 'printQty',
+          header: i18next.t('field.print_qty'),
+          record: { editable: true },
+          width: 80
+        }
+      ]
+    }
+  }
+
+  async fetchHandler({ page, limit, sorters = [] }) {
+    const fetcherDetail = { page, limit, sorters }
+    const searchInfo = this.searchInfo.value
+    const searchType = this._searchingType
+
+    if (searchInfo == '') return
+
+    switch (searchType) {
+      case 'GAN':
+        return await this._fetchOrderInventories([
+          {
+            name: 'arrivalNoticeNo',
+            operator: 'eq',
+            value: searchInfo
+          }
+        ])
+
+      case 'RO':
+        return await this._fetchOrderInventories([
+          {
+            name: 'releaseGoodNo',
+            operator: 'eq',
+            value: searchInfo
+          }
+        ])
+
+      case 'INVENTORY':
+        const filters = [
+          { name: 'product_info', operator: 'eq', value: searchInfo },
+          { name: 'status', operator: 'notin', value: ['INTRANSIT', 'TERMINATED', 'DELETED'] }
+        ]
+        return await this._fetchInventories(fetcherDetail, filters)
+    }
+  }
+
+  async _fetchOrderInventories(filters) {
+    try {
+      const response = await client.query({
+        query: gql`
+          query {
+            orderInventories(${gqlBuilder.buildArgs({
+              filters
+            })}) {
+              items {
+                inventory {
+                  batchId
+                  palletId
+                  expirationDate
+                  product {
+                    name
+                    sku
+                    description
+                    type
+                    auxUnit1
+                    auxValue1
+                    auxUnit2
+                    auxValue2
+                  }
+                }
+              }
+              total
+            }
+          }
+        `
+      })
+
+      if (!response.errors) {
+        const orderInventories = response.data.orderInventories
+
+        return {
+          total: orderInventories.total,
+          records: orderInventories.items.map(item => {
+            const inventory = item.inventory
+
+            return {
+              batchId: inventory.batchId,
+              palletId: inventory.palletId,
+              expirationDate: inventory.expirationDate || '',
+              productName: inventory.product.name,
+              sku: inventory.product.sku,
+              description: inventory.product.description,
+              type: inventory.product.type,
+              auxUnit1: inventory.product.auxUnit1 || '',
+              auxValue1: inventory.product.auxValue1 || '',
+              auxUnit2: inventory.product.auxUnit2 || '',
+              auxValue2: inventory.product.auxValue2 || '',
+              productInfo: inventory.product.description
+                ? `${inventory.product.name} (${inventory.product.description})`
+                : `${inventory.product.name}`
+            }
+          })
+        }
+      } else
+        return {
+          records: [],
+          total: 0
+        }
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
+  async _fetchInventories(fetcherDetail, filters) {
+    const response = await client.query({
+      query: gql`
+        query inventories($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+          inventories(filters: $filters, pagination: $pagination, sortings: $sortings) {
+            items {
+              palletId
+              batchId
+              product {
+                name
+                sku
+                description
+                type
+                auxUnit1
+                auxValue1
+                auxUnit2
+                auxValue2
+              }
+              expirationDate
+            }
+            total
+          }
+        }
+      `,
+      variables: {
+        filters,
+        pagination: { page: 1, limit: 99999 },
+        sortings: fetcherDetail.sorters
+      }
+    })
+
+    if (!response.errors) {
+      const inventories = response.data.inventories
+
+      return {
+        total: inventories.total,
+        records: inventories.items.map(item => {
+          return {
+            batchId: item.batchId,
+            palletId: item.palletId,
+            expirationDate: item.expirationDate || '',
+            productName: item.product.name,
+            sku: item.product.sku,
+            description: item.product.description,
+            type: item.product.type,
+            auxUnit1: item.product.auxUnit1 || '',
+            auxValue1: item.product.auxValue1 || '',
+            auxUnit2: item.product.auxUnit2 || '',
+            auxValue2: item.product.auxValue2 || '',
+            productInfo: item.product.description
+              ? `${item.product.name} (${item.product.description})`
+              : `${item.product.name}`
+          }
+        })
+      }
+    } else
+      return {
+        records: [],
+        total: 0
+      }
+  }
+
+  async _printProductLabels() {
+    const labelId = this._productLabel && this._productLabel.id
+
+    if (
+      this.dataGrist.selected.some(record => !record.printQty || record.printQty == '' || Number(record.printQty) < 1)
+    ) {
+      const result = await CustomAlert({
+        title: i18next.t('title.are_you_sure'),
+        text: i18next.t('text.print_1_label_for_item_with_non_specified_print_qty'),
+        confirmButton: { text: i18next.t('button.confirm') },
+        cancelButton: { text: i18next.t('button.cancel') }
+      })
+
+      if (!result.value) return
+    }
+
+    const records = this.targetData
+
+    if (!records?.length) {
+      this._showToast({ message: `${i18next.t('text.please_select_the_product')}.` })
+      return
+    }
+
+    if (!labelId) {
+      this._showToast({
+        level: 'error',
+        message: `${i18next.t('text.no_label_setting_was_found')}. ${i18next.t('text.please_check_your_setting')}`
+      })
+    } else {
+      for (var record of records) {
+        let searchParams = new URLSearchParams()
+
+        searchParams.append('pallet_id', record.palletId)
+        searchParams.append('batch_id', record.batchId)
+        searchParams.append('aux_unit_1', record.auxUnit1)
+        searchParams.append('aux_value_1', record.auxValue1)
+        searchParams.append('aux_unit_2', record.auxUnit2)
+        searchParams.append('aux_value_2', record.auxValue2)
+        searchParams.append('expiration_date', record.expirationDate)
+
+        let printCounter = 0
+        try {
+          for (let i = 0; i < record.printQty; i++) {
+            const response = await fetch(`label-command/${labelId}?${searchParams.toString()}`, {
+              method: 'GET'
+            })
+
+            if (response.status !== 200) {
+              throw `Error : Can't get label command from server (response: ${response.status})`
+            }
+
+            var command = await response.text()
+
+            if (!this.printer) {
+              this.printer = new DirectPrinter()
+            }
+
+            await this.printer.print(command)
+            printCounter += 1
+          }
+        } 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) await this._updatePrintedLabelSequence(record.type, printCounter)
+        }
+      }
+    }
+  }
+
+  async _updatePrintedLabelSequence(pattern, counter) {
+    try {
+      const response = await client.mutate({
+        mutation: gql`
+          mutation upsertSequence($pattern: String!, $counter: Int) {
+            upsertSequence(pattern: $pattern, counter: $counter) {
+              pattern
+              seq
+            }
+          }
+        `,
+        variables: {
+          pattern,
+          counter
+        }
+      })
+    } catch (e) {
+      this._showToast({ message: e })
+    }
+  }
+
+  stateChanged(state) {
+    const productLabelSetting = state.dashboard[PRODUCT_LABEL_SETTING_KEY]
+    this._productLabel = (productLabelSetting && productLabelSetting.board) || {}
+  }
+
+  orderNoKeypressHandler(e) {
+    if (e.keyCode === 13) {
+      e.preventDefault()
+
+      this.dataGrist.fetch()
+    }
+  }
+
+  _showToast({ level, type, message }) {
+    document.dispatchEvent(
+      new CustomEvent('notify', {
+        detail: {
+          type,
+          level,
+          message
+        }
+      })
+    )
+  }
+}
+
+window.customElements.define('print-product-label', PrintProductLabel)

package/client/route.js

@@ -351,6 +351,10 @@ export default function route(page) {
       import('./pages/vas/vas-worksheet-list')
       return page
 
+    case 'print_product_label':
+      import('./pages/vas/print-product-label')
+      return page
+
     case 'inbound_reusable_pallet':
       import('./pages/inbound/inbound-reusable-pallet')
       return page
@@ -439,7 +443,7 @@ export default function route(page) {
     case 'inbound_order_details_report':
       import('./pages/report/inbound-order-details-report')
       return page
-      
+
     case 'outbound_order_details_report':
       import('./pages/report/outbound-order-details-report')
       return page

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

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.boardSettingsResolver = void 0;
+const typeorm_1 = require("typeorm");
 const auth_base_1 = require("@things-factory/auth-base");
 const board_service_1 = require("@things-factory/board-service");
 const setting_base_1 = require("@things-factory/setting-base");
-const typeorm_1 = require("typeorm");
 const opa_app_setting_constants_1 = require("../../../opa-app-setting-constants");
 exports.boardSettingsResolver = {
     async boardSettings(_, params, context) {
@@ -24,7 +24,14 @@ exports.boardSettingsResolver = {
         const HOME_BOARD = `${opa_app_setting_constants_1.HOME_DASHBOARD_PREFIX}:${userType}`;
         // const HOME_BOARD = `${HOME_DASHBOARD_PREFIX}:${context.state.user.userType}`
         const queryBuilder = (0, typeorm_1.getRepository)(setting_base_1.Setting).createQueryBuilder();
-        const names = [opa_app_setting_constants_1.LOCATION_LABEL_SETTING_KEY, opa_app_setting_constants_1.PALLET_LABEL_SETTING_KEY, opa_app_setting_constants_1.REUSABLE_PALLET_LABEL_SETTING_KEY, HOME_BOARD, opa_app_setting_constants_1.CARTON_LABEL_SETTING_KEY];
+        const names = [
+            opa_app_setting_constants_1.LOCATION_LABEL_SETTING_KEY,
+            opa_app_setting_constants_1.PRODUCT_LABEL_SETTING_KEY,
+            opa_app_setting_constants_1.PALLET_LABEL_SETTING_KEY,
+            opa_app_setting_constants_1.REUSABLE_PALLET_LABEL_SETTING_KEY,
+            HOME_BOARD,
+            opa_app_setting_constants_1.CARTON_LABEL_SETTING_KEY
+        ];
         var qb = queryBuilder
             // .innerJoin(Board, 'Board', 'Board.id = CAST(Setting.value AS uuid)')
             .innerJoin(board_service_1.Board, 'Board', 'Setting.value = CAST(Board.id AS char(36))')

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,yDAAgD;AAChD,iEAAqD;AACrD,+DAAsD;AAEtD,qCAAuC;AACvC,kFAM2C;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,CAAC,sDAA0B,EAAE,oDAAwB,EAAE,6DAAiC,EAAE,UAAU,EAAE,oDAAwB,CAAC,CAAA;QAE7I,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":";;;AAAA,qCAAuC;AAEvC,yDAAgD;AAChD,iEAAqD;AACrD,+DAAsD;AAGtD,kFAO2C;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;SACzB,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"}

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

@@ -47,7 +47,7 @@ exports.elcclInventoryHistorySummaryReport = {
             sum(case when ih.created_at > $1 then case when ih.qty > 0 and ih.transaction_type <> 'ADJUSTMENT' and ih.transaction_type <> 'RETURN' and rtn.id is null then ih.qty else 0 end else 0 end) as total_in_qty,
             sum(case when ih.created_at > $1 then case when (ih.qty < 0 and ih.transaction_type <> 'ADJUSTMENT')  or ih.transaction_type = 'RETURN' then ih.qty else 0 end else 0 end) as total_out_qty,
             ih.product_id,
-            sum(case when rtn.id is not null and ih.transaction_type <> 'ADJUSTMENT' then qty else 0 end) as total_return_qty
+            sum(case when rtn.id is not null and ih.transaction_type <> 'ADJUSTMENT' and ih.created_at > $1 then qty else 0 end) as total_return_qty
             from temp_inv_history ih
             left join return_orders rtn on rtn.id = ih.ref_order_id
             group by ih.batch_id, ih.product_id, ih.packing_type

package/dist-server/opa-app-setting-constants.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HOME_DASHBOARD_PREFIX = exports.REUSABLE_PALLET_LABEL_SETTING_KEY = exports.CARTON_LABEL_SETTING_KEY = exports.PALLET_LABEL_SETTING_KEY = exports.LOCATION_LABEL_SETTING_KEY = void 0;
+exports.PRODUCT_LABEL_SETTING_KEY = exports.HOME_DASHBOARD_PREFIX = exports.REUSABLE_PALLET_LABEL_SETTING_KEY = exports.CARTON_LABEL_SETTING_KEY = exports.PALLET_LABEL_SETTING_KEY = exports.LOCATION_LABEL_SETTING_KEY = void 0;
 exports.LOCATION_LABEL_SETTING_KEY = 'location-label';
 exports.PALLET_LABEL_SETTING_KEY = 'pallet-label';
 exports.CARTON_LABEL_SETTING_KEY = 'carton-label';
 exports.REUSABLE_PALLET_LABEL_SETTING_KEY = 'reusable-pallet-label';
 exports.HOME_DASHBOARD_PREFIX = 'dashboard';
+exports.PRODUCT_LABEL_SETTING_KEY = 'product-label';
 //# sourceMappingURL=opa-app-setting-constants.js.map

package/dist-server/opa-app-setting-constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"opa-app-setting-constants.js","sourceRoot":"","sources":["../server/opa-app-setting-constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,0BAA0B,GAAG,gBAAgB,CAAA;AAC7C,QAAA,wBAAwB,GAAG,cAAc,CAAA;AACzC,QAAA,wBAAwB,GAAG,cAAc,CAAA;AACzC,QAAA,iCAAiC,GAAG,uBAAuB,CAAA;AAC3D,QAAA,qBAAqB,GAAG,WAAW,CAAA"}
+{"version":3,"file":"opa-app-setting-constants.js","sourceRoot":"","sources":["../server/opa-app-setting-constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,0BAA0B,GAAG,gBAAgB,CAAA;AAC7C,QAAA,wBAAwB,GAAG,cAAc,CAAA;AACzC,QAAA,wBAAwB,GAAG,cAAc,CAAA;AACzC,QAAA,iCAAiC,GAAG,uBAAuB,CAAA;AAC3D,QAAA,qBAAqB,GAAG,WAAW,CAAA;AACnC,QAAA,yBAAyB,GAAG,eAAe,CAAA"}