@things-factory/operato-wms 3.8.5 → 3.8.9

package/client/pages/bulk-operation/bulk-operation.js

@@ -134,8 +134,6 @@ class BulkOperation extends localize(i18next)(PageView) {
 
   static get properties() {
     return {
-      _files: Array,
-      _releaseOrders: Array,
       _bizplaceId: String,
       _bizplaceName: String
     }
@@ -159,33 +157,13 @@ class BulkOperation extends localize(i18next)(PageView) {
     return this.shadowRoot.querySelector('#upload-document')
   }
 
-  get _dummyData() {
-    return this._releaseOrders.map(x => {
-      x.orderInventories = x.orderInventories.map(y => {
-        return {
-          ...y,
-          availableQty: Math.floor(Math.random() * 50) + 30
-        }
-      })
-      return {
-        ...x,
-        releaseDate: new Date().toISOString().split('T')
-      }
-    })
-  }
-
   render() {
-    let subtitle = 'Release Order'
-    let attachment = {
-      path: ''
-    }
-
     return html`
       <ul export-form>
         <li>
           <div subtitle>
-            ${subtitle} &nbsp;
-            <a href="${location.origin}/attachment/${attachment.path}" download>
+            Release Order &nbsp;
+            <a @click=${async () => await this._getReleaseOrderTemplate()}" download>
               <mwc-icon>file_download</mwc-icon>
             </a>
           </div>
@@ -223,17 +201,39 @@ class BulkOperation extends localize(i18next)(PageView) {
     `
   }
 
-  updated(changeProps) {
-    if (changeProps.has('_rawROData')) {
-      if (this._releaseOrders.length) {
-        // this._validateReleaseOrder(this._releaseOrders)
-        this._validateReleaseOrder(this._rawROData)
+  async _getReleaseOrderTemplate() {
+    const data = [
+      {
+        refNo: '',
+        refNo2: '',
+        refNo3: '',
+        releaseDate: '',
+        attentionTo: '',
+        deliveryAddress1: '',
+        deliveryAddress2: '',
+        deliveryAddress3: '',
+        deliveryAddress4: '',
+        postalCode: '',
+        city: '',
+        state: '',
+        country: '',
+        phone1: '',
+        sku: '',
+        packingType: '',
+        packingSize: 0,
+        uom: '',
+        releaseQty: 0
       }
-    }
-  }
+    ]
+    /* make the worksheet */
+    const ws = XLSX.utils.json_to_sheet(data)
+
+    /* add to workbook */
+    const wb = XLSX.utils.book_new()
+    XLSX.utils.book_append_sheet(wb, ws)
 
-  _getReleaseOrderTemplate() {
-    /* download excel template for Create RO */
+    /* generate an XLSX file */
+    XLSX.writeFile(wb, 'release_orders.xlsx')
   }
 
   async _extractRawDataFromExcel() {
@@ -261,26 +261,41 @@ class BulkOperation extends localize(i18next)(PageView) {
           let rawData = XLSX.utils.sheet_to_json(worksheet)
           rawData = rawData.map(raw => {
             if (!raw.releaseDate || raw.releaseDate.constructor !== String) raw.releaseDate = ''
-            else new Date(raw.releaseDate)
-            return raw
+            //return entries without empty strings
+            return Object.fromEntries(Object.entries(raw).filter(([_, val]) => !/^\s*$/.test(val)))
           })
-          /* return rawData to validate with inventory stocks */
           this._validateReleaseOrder(rawData)
         }
       } else if (_docs.files.length > 1)
-        this._showToast({ level: 'error', message: i18next.t('text.you_can_only_upload_maximum_one_file') })
+        this._showToast({ level: 'error', message: i18next.t('text.you_can_only_upload_one_file_max') })
       else this._showToast({ level: 'error', message: i18next.t('text.please_attach_the_file') })
     } else this._showToast({ level: 'error', message: i18next.t('text.please_attach_the_file') })
   }
 
   async _validateReleaseOrder(records) {
     /* validate excel that user uploaded */
-    openPopup(html` <validate-ro-popup .records=${records} .bizplaceId=${this._bizplaceId}></validate-ro-popup> `, {
-      backdrop: true,
-      escapable: false,
-      size: 'large',
-      title: i18next.t('title.import')
-    })
+    openPopup(
+      html`
+        <validate-ro-popup
+          .records=${records.map(record => {
+            return {
+              ...record,
+              postalCode: String(record.postalCode || ''),
+              phone1: String(record.phone1 || ''),
+              releaseDate: String(record.releaseDate || ''),
+              releaseQty: Number(record.releaseQty || 0)
+            }
+          })}
+          .bizplaceId=${this._bizplaceId}
+        ></validate-ro-popup>
+      `,
+      {
+        backdrop: true,
+        escapable: false,
+        size: 'large',
+        title: i18next.t('title.import')
+      }
+    )
   }
 
   _openBizplacesSelector() {

package/client/pages/bulk-operation/validate-ro-popup.js

@@ -7,7 +7,7 @@ import { css, html, LitElement } from 'lit-element'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, CustomAlert } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
-import { isMobileDevice, sleep } from '@things-factory/utils'
+import { isMobileDevice } from '@things-factory/utils'
 
 class ValidateRoPopup extends localize(i18next)(LitElement) {
   static get properties() {
@@ -79,11 +79,11 @@ class ValidateRoPopup extends localize(i18next)(LitElement) {
           return {
             // if the condition not met, the grist row will be red
             emphasized:
-              record.assignedQty <= 0 ||
+              record.assignedQty < record.releaseQty ||
               !record.refNo ||
               record?.refNo == '' ||
-              !record.releaseDate ||
-              record?.releaseDate == ''
+              record?.releaseDate == '' ||
+              record?.releaseDate < this._getStdDateStr(new Date())
           }
         }
       },
@@ -192,8 +192,8 @@ class ValidateRoPopup extends localize(i18next)(LitElement) {
         },
         {
           type: 'string',
-          name: 'name',
-          header: i18next.t('field.name'),
+          name: 'productInfo',
+          header: i18next.t('field.product_info'),
           width: 400
         },
         {
@@ -226,6 +226,18 @@ class ValidateRoPopup extends localize(i18next)(LitElement) {
           header: i18next.t('field.uom'),
           width: 100
         },
+        {
+          type: 'string',
+          name: 'packingType',
+          header: i18next.t('field.packing_type'),
+          width: 100
+        },
+        {
+          type: 'string',
+          name: 'packingSize',
+          header: i18next.t('field.packing_size'),
+          width: 100
+        },
         {
           type: 'string',
           name: 'remark',
@@ -295,6 +307,7 @@ class ValidateRoPopup extends localize(i18next)(LitElement) {
             country
             sku
             productId
+            productInfo
             batchId
             packingType
             packingSize
@@ -338,16 +351,21 @@ class ValidateRoPopup extends localize(i18next)(LitElement) {
 
     if (!response.errors) {
       this.records = response.data.bulkReleaseGoodsAvailableItems.map(item => {
+        let releaseDate = this._getStdDateStr(new Date(item.releaseDate || ''))
+
         return {
           ...item,
+          releaseDate,
           remark: !item.productId
             ? i18next.t('text.product_not_found')
             : item.releaseQty <= 0
             ? i18next.t('text.invalid_release_qty')
-            : item.assignedQty == 0
+            : item.assignedQty < item.releaseQty
             ? i18next.t('text.insufficient_stock')
-            : !item.releaseDate
+            : releaseDate == ''
             ? i18next.t('text.release_date_is_empty')
+            : releaseDate < this._getStdDateStr(new Date())
+            ? i18next.t('text.backdate_is_not_allowed')
             : !item.refNo
             ? i18next.t('text.ref_no_is_empty')
             : ''
@@ -374,11 +392,12 @@ class ValidateRoPopup extends localize(i18next)(LitElement) {
         `,
         variables: {
           rawReleaseGoods: this.records.map(x => {
+            // list out all properties again to avoid additional props added by user in excel
             return {
               refNo: x.refNo,
               refNo2: x.refNo2,
               refNo3: x.refNo3,
-              releaseDate: String(x.releaseDate),
+              releaseDate: x.releaseDate,
               deliveryAddress1: x.deliveryAddress1,
               deliveryAddress2: x.deliveryAddress2,
               deliveryAddress3: x.deliveryAddress3,
@@ -401,21 +420,22 @@ class ValidateRoPopup extends localize(i18next)(LitElement) {
         }
       })
 
-      this.dataGrist.hideSpinner()
-      await sleep(1)
-
       if (!response.errors) {
         this._showToast({ message: i18next.t('text.release_order_created') })
         history.back()
+      } else {
+        let insufficientStockError = response.errors.find(err => err.extensions.exception.errorCode == 'ins1')
+        if (insufficientStockError) {
+          // if system suddenly found that any item is insufficient,
+          // display the available items again.
+          await this._getAvailableItems(this.records)
+          this._showToast({ message: i18next.t('text.please_recheck_your_request_data') })
+        }
       }
     } catch (e) {
-      let insufficientStockError = response.errors.find(err => err.extensions.exception.errorCode == 'ins1')
-      if (insufficientStockError) {
-        // if system suddenly found that any item is insufficient,
-        // display the available items again.
-        await this._getAvailableItems(this.records)
-        this._showToast({ message: i18next.t('text.please_recheck_your_request_data') })
-      } else this._showToast(e)
+      this._showToast(e)
+    } finally {
+      this.dataGrist.hideSpinner()
     }
   }
 
@@ -423,11 +443,21 @@ class ValidateRoPopup extends localize(i18next)(LitElement) {
     if (this.records.some(record => !record.refNo || record?.refNo == ''))
       throw new Error(i18next.t('text.ref_no_is_required'))
 
-    if (this.records.some(record => !record.releaseDate || record?.releaseDate == ''))
-      throw new Error(i18next.t('text.release_date_is_required'))
-
     if (this.records.some(record => !record.releaseQty || record.releaseQty > record.assignedQty))
       throw new Error(i18next.t('text.invalid_release_qty'))
+
+    if (this.records.some(record => record?.releaseDate == ''))
+      throw new Error(i18next.t('text.release_date_is_required'))
+    else if (this.records.some(record => record.releaseDate < this._getStdDateStr(new Date())))
+      throw new Error(i18next.t('text.backdate_is_not_allowed'))
+  }
+
+  _getStdDateStr(date) {
+    if (isNaN(date.getFullYear())) return ''
+    else {
+      date.setHours(date.getHours() + 8)
+      return date.toISOString().split('T')[0]
+    }
   }
 
   _showToast({ type, message }) {

package/client/pages/master/product/product-list.js

@@ -960,7 +960,7 @@ class ProductList extends localize(i18next)(PageView) {
       if (_.isEmpty(itm.uom) || '') {
         if (!errors.find(err => err.type == 'uom')) errors.push({ type: 'uom', value: 'UOM is required' })
       }
-      if (!_.isNumber(itm.uomValue) || _.isNaN(itm.uomValue) || '' || itm?.uomValue < 1) {
+      if (!_.isNumber(itm.uomValue) || _.isNaN(itm.uomValue) || '' || itm?.uomValue <= 0) {
         if (!errors.find(err => err.type == 'uomValue'))
           errors.push({ type: 'uomValue', value: 'UOM Value is required' })
       }

package/client/pages/order/release-order/b2b/b2b-order-requests.js

@@ -1,6 +1,7 @@
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
 import '../batch-picking-popup'
+import '../batch-generate-single-picking-worksheet-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
@@ -65,6 +66,11 @@ class B2bOrderRequests extends localize(i18next)(PageView) {
           title: i18next.t('button.batch_picking'),
           action: this._openBatchPickingPopup.bind(this),
           ...CommonButtonStyles.activate
+        },
+        {
+          title: i18next.t('button.generate_worksheet'),
+          action: this._openBatchGenerateSinglePickingWorksheetPopup.bind(this),
+          ...CommonButtonStyles.activate
         }
       ],
       exportable: {
@@ -442,6 +448,24 @@ class B2bOrderRequests extends localize(i18next)(PageView) {
     )
   }
 
+  _openBatchGenerateSinglePickingWorksheetPopup() {
+    openPopup(
+      html`
+        <batch-generate-single-picking-worksheet-popup
+          @generated="${() => {
+            this._showToast({ message: i18next.t('text.orders_has_been_activated') })
+            this.dataGrist.fetch()
+          }}"
+        ></batch-generate-single-picking-worksheet-popup>
+      `,
+      {
+        backdrop: true,
+        size: 'large',
+        title: i18next.t('title.generate_picking_worksheet')
+      }
+    )
+  }
+
   _compareValues(key, order = 'asc') {
     return function innerSort(a, b) {
       if (!a.hasOwnProperty(key) || !b.hasOwnProperty(key)) {

package/client/pages/order/release-order/b2c/b2c-order-requests.js

@@ -1,6 +1,7 @@
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
 import '../batch-picking-popup'
+import '../batch-generate-single-picking-worksheet-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
@@ -70,6 +71,11 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
           title: i18next.t('button.batch_picking'),
           action: this._openBatchPickingPopup.bind(this),
           ...CommonButtonStyles.activate
+        },
+        {
+          title: i18next.t('button.generate_worksheet'),
+          action: this._openBatchGenerateSinglePickingWorksheetPopup.bind(this),
+          ...CommonButtonStyles.activate
         }
       ],
       exportable: {
@@ -209,6 +215,7 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
     this.config = {
       rows: { selectable: { multiple: true }, appendable: false },
       list: { fields: ['name', 'bizplace', 'releaseDate', 'status', 'updatedAt'] },
+      pagination: { limit: 100, pages: [20, 50, 100, 200, 500] },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         { type: 'gutter', gutterName: 'row-selector', multiple: true },
@@ -562,6 +569,43 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
     }
   }
 
+  _openBatchGenerateSinglePickingWorksheetPopup() {
+    openPopup(
+      html`
+        <batch-generate-single-picking-worksheet-popup
+          @generated="${() => {
+            this._showToast({ message: i18next.t('text.orders_has_been_activated') })
+            this.dataGrist.fetch()
+          }}"
+        ></batch-generate-single-picking-worksheet-popup>
+      `,
+      {
+        backdrop: true,
+        size: 'large',
+        title: i18next.t('title.generate_picking_worksheet')
+      }
+    )
+  }
+
+  _compareValues(key, order = 'asc') {
+    return function innerSort(a, b) {
+      if (!a.hasOwnProperty(key) || !b.hasOwnProperty(key)) {
+        return 0
+      }
+
+      const varA = typeof a[key] === 'string' ? a[key].toUpperCase() : a[key]
+      const varB = typeof b[key] === 'string' ? b[key].toUpperCase() : b[key]
+
+      let comparison = 0
+      if (varA > varB) {
+        comparison = 1
+      } else if (varA < varB) {
+        comparison = -1
+      }
+      return order === 'desc' ? comparison * -1 : comparison
+    }
+  }
+
   _modifyDateRange(e) {
     const fromDate = e.currentTarget.value
 

package/client/pages/order/release-order/batch-generate-single-picking-worksheet-popup.js

@@ -0,0 +1,314 @@
+import '@things-factory/grist-ui'
+import { MultiColumnFormStyles } from '@things-factory/form-ui'
+import { openPopup } from '@things-factory/layout-base'
+import { client, CustomAlert } from '@things-factory/shell'
+import { i18next, localize } from '@things-factory/i18n-base'
+import { isMobileDevice } from '@things-factory/utils'
+import { css, html, LitElement } from 'lit-element'
+import gql from 'graphql-tag'
+import { ScrollbarStyles } from '@things-factory/styles'
+import { ORDER_STATUS } from '../../constants'
+import '@things-factory/biz-ui'
+
+class BatchGenerateSinglePickingWorksheetPopup extends localize(i18next)(LitElement) {
+  static get properties() {
+    return {
+      _searchFields: Array,
+      config: Object,
+      data: Object
+    }
+  }
+
+  static get styles() {
+    return [
+      MultiColumnFormStyles,
+      ScrollbarStyles,
+      css`
+        :host {
+          display: flex;
+          flex-direction: column;
+          overflow: hidden;
+          background-color: white;
+          padding: var(--padding-default);
+        }
+        search-form {
+          overflow: visible;
+        }
+        .grist {
+          display: flex;
+          flex-direction: column;
+          flex: 1;
+          overflow-y: auto;
+        }
+        .grist-container {
+          overflow-y: hidden;
+          display: flex;
+          flex: 1;
+        }
+        data-grist {
+          overflow-y: hidden;
+          flex: 1;
+        }
+        h2 {
+          padding: var(--subtitle-padding);
+          font: var(--subtitle-font);
+          color: var(--subtitle-text-color);
+          border-bottom: var(--subtitle-border-bottom);
+        }
+        .grist h2 {
+          font: var(--grist-title-font);
+        }
+        .button-container {
+          padding: var(--button-container-padding);
+          margin: var(--button-container-margin);
+          text-align: var(--button-container-align);
+          background-color: var(--button-container-background);
+          height: var(--button-container-height);
+        }
+      `
+    ]
+  }
+
+  submit() {
+    this.dispatchEvent(new CustomEvent('submit'))
+  }
+
+  render() {
+    return html`
+      <search-form .fields=${this._searchFields} @submit=${() => this.releaseOrderGrist.fetch()}></search-form>
+
+      <div class="grist-container">
+        <div class="grist">
+          <h2>${i18next.t('title.release_order')}</h2>
+          <data-grist
+            id="releaseOrder"
+            .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
+            .config=${this.roConfig}
+            .fetchHandler="${this.fetchReadyToPickOrders.bind(this)}"
+          ></data-grist>
+        </div>
+      </div>
+
+      <div class="button-container">
+        <mwc-button
+          @click="${this.generatePickingWorksheet.bind(this)}"
+          raised
+          label="${i18next.t('button.generate_worksheet')}"
+        ></mwc-button>
+      </div>
+    `
+  }
+
+  async firstUpdated() {
+    const partners = await this._fetchPartners()
+    this._searchFields = [
+      {
+        label: i18next.t('field.company'),
+        name: 'bizplace',
+        type: 'select',
+        options: [
+          { value: '' },
+          ...partners
+            .map(partner => {
+              return {
+                name: `${partner.name} ${partner.description ? `(${partner.description})` : ''}`,
+                value: partner.id
+              }
+            })
+            .sort(this._compareValues('name', 'asc'))
+        ],
+        props: { searchOper: 'eq' }
+      },
+      {
+        label: i18next.t('field.release_date'),
+        name: 'releaseDate',
+        type: 'date',
+        props: { searchOper: 'lte' }
+      }
+    ]
+
+    this.roConfig = {
+      pagination: { pages: [100, 200, 300, 500], limit: 200 },
+      rows: {
+        selectable: { multiple: true },
+        appendable: false
+      },
+      list: { fields: ['name', 'refNo', 'bizplace', 'releaseDate'] },
+      columns: [
+        { type: 'gutter', gutterName: 'sequence' },
+        { type: 'gutter', gutterName: 'row-selector', multiple: true },
+        {
+          type: 'string',
+          name: 'name',
+          header: i18next.t('field.release_good_no'),
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'refNo',
+          header: i18next.t('field.ref_no'),
+          width: 130
+        },
+        {
+          type: 'object',
+          name: 'bizplace',
+          header: i18next.t('field.company'),
+          width: 200
+        },
+        {
+          type: 'date',
+          name: 'releaseDate',
+          header: i18next.t('field.release_date'),
+          sortable: true,
+          width: 150
+        }
+      ]
+    }
+  }
+
+  get searchForm() {
+    return this.renderRoot.querySelector('search-form')
+  }
+
+  get releaseOrderGrist() {
+    return this.shadowRoot.querySelector('data-grist#releaseOrder')
+  }
+
+  get orderInventoryGrist() {
+    return this.shadowRoot.querySelector('data-grist#orderInventory')
+  }
+
+  async _fetchPartners() {
+    const response = await client.query({
+      query: gql`
+        query partnersBizplaces($filters: [Filter!]) {
+          partnersBizplaces(filters: $filters) {
+            items {
+              id
+              name
+              description
+            }
+          }
+        }
+      `,
+      variables: { filters: [] }
+    })
+
+    if (!response.errors) {
+      return response.data.partnersBizplaces.items
+    }
+  }
+
+  async fetchReadyToPickOrders({ page, limit, sorters = [{ name: 'releaseDate' }] }) {
+    // if (!this.partnerBizplace) return { total: 0, records: [] }
+
+    const filters = [
+      ...(await this.searchForm.getQueryFilters()).filter(x => x.name != 'partnerBizplace'),
+      { name: 'status', operator: 'eq', value: ORDER_STATUS.PENDING_WORKSHEET.value },
+      { name: 'crossDocking', operator: 'eq', value: false }
+    ]
+
+    if (this.partnerBizplace) {
+      filters.push({ name: 'bizplaceId', operator: 'eq', value: this.partnerBizplace.id })
+    }
+
+    const pagination = { page, limit }
+    const sortings = sorters
+
+    const response = await client.query({
+      query: gql`
+        query releaseGoodRequests($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+          releaseGoodRequests(filters: $filters, pagination: $pagination, sortings: $sortings) {
+            items {
+              id
+              name
+              refNo
+              releaseDate
+              type
+              bizplace {
+                id
+                name
+                description
+              }
+            }
+            total
+          }
+        }
+      `,
+      variables: { filters, pagination, sortings }
+    })
+    if (!response.errors) {
+      return {
+        total: response.data.releaseGoodRequests.total || 0,
+        records: response.data.releaseGoodRequests.items || []
+      }
+    }
+  }
+
+  async generatePickingWorksheet() {
+    try {
+      let releaseGoodNos = []
+      releaseGoodNos = this.releaseOrderGrist.selected.map(record => record.name)
+
+      if (releaseGoodNos.length <= 0) throw new Error('Please select one or more order to generate worksheet')
+
+      let result = await CustomAlert({
+        title: i18next.t('title.are_you_sure'),
+        text: i18next.t('text.generate_worksheet'),
+        confirmButton: { text: i18next.t('button.submit') },
+        cancelButton: { text: i18next.t('button.cancel') }
+      })
+
+      if (!result.value) return
+
+      const response = await client.mutate({
+        mutation: gql`
+          mutation generateMultipleReleaseGoodWorksheet($releaseGoodNos: [String!]) {
+            generateMultipleReleaseGoodWorksheet(releaseGoodNos: $releaseGoodNos)
+          }
+        `,
+        variables: {
+          releaseGoodNos
+        }
+      })
+
+      if (!response.errors) {
+        this.dispatchEvent(new CustomEvent('generated'))
+        history.back()
+      }
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
+  _compareValues(key, order = 'asc') {
+    return function innerSort(a, b) {
+      if (!a.hasOwnProperty(key) || !b.hasOwnProperty(key)) {
+        return 0
+      }
+
+      const varA = typeof a[key] === 'string' ? a[key].toUpperCase() : a[key]
+      const varB = typeof b[key] === 'string' ? b[key].toUpperCase() : b[key]
+
+      let comparison = 0
+      if (varA > varB) {
+        comparison = 1
+      } else if (varA < varB) {
+        comparison = -1
+      }
+      return order === 'desc' ? comparison * -1 : comparison
+    }
+  }
+
+  _showToast({ type, message }) {
+    document.dispatchEvent(
+      new CustomEvent('notify', {
+        detail: {
+          type,
+          message
+        }
+      })
+    )
+  }
+}
+window.customElements.define('batch-generate-single-picking-worksheet-popup', BatchGenerateSinglePickingWorksheetPopup)

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

@@ -433,7 +433,8 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
                   auxValue1: product.auxValue1 || '',
                   auxUnit2: product.auxUnit2 || '',
                   auxValue2: product.auxValue2 || '',
-                  bizplaceId: arrivalNotice.bizplace.id
+                  bizplaceId: arrivalNotice.bizplace.id,
+                  bizplaceName: arrivalNotice.bizplace.name
                 }
 
                 if (product.productDetails && product.productDetails.length) {
@@ -551,6 +552,7 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
                     auxUnit2: product.auxUnit2 || '',
                     auxValue2: product.auxValue2 || '',
                     bizplaceId: releaseGood.bizplace.id,
+                    bizplaceName: releaseGood.bizplace.name,
                     printQty: oi.releaseQty || 0
                   }
 
@@ -590,7 +592,8 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
                     auxValue1: product.auxValue1 || '',
                     auxUnit2: product.auxUnit2 || '',
                     auxValue2: product.auxValue2 || '',
-                    bizplaceId: releaseGood.bizplace.id
+                    bizplaceId: releaseGood.bizplace.id,
+                    bizplaceName: releaseGood.bizplace.name
                   }
 
                   if (product.productDetails && product.productDetails.length) {
@@ -626,7 +629,7 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
   async _fetchInventories(fetcherDetail, filters) {
     const response = await client.query({
       query: gql`
-        query inventories($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+        query inventories($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
           inventories(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               palletId
@@ -650,6 +653,7 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
               }
               bizplace {
                 id
+                name
               }
               expirationDate
             }
@@ -685,7 +689,8 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
               auxUnit2: product.auxUnit2 || '',
               auxValue2: product.auxValue2 || '',
               productInfo: product.description ? `${product.name} (${product.description})` : `${product.name}`,
-              bizplaceId: inventory.bizplace.id
+              bizplaceId: inventory.bizplace.id,
+              bizplaceName: inventory.bizplace.name
             }
 
             if (product.productDetails && product.productDetails.length) {
@@ -757,6 +762,7 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
         searchParams.append('aux_value_2', record.auxValue2)
         searchParams.append('expiration_date', record.expirationDate)
         searchParams.append('location', record.location)
+        searchParams.append('company_name', record.bizplaceName)
 
         let printCounter = 0
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "3.8.5",
+  "version": "3.8.9",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -46,7 +46,7 @@
     "@things-factory/attachment-ui": "^3.8.0",
     "@things-factory/auth-ui": "^3.8.0",
     "@things-factory/barcode-ui": "^3.8.0",
-    "@things-factory/biz-ui": "^3.8.0",
+    "@things-factory/biz-ui": "^3.8.8",
     "@things-factory/board-service": "^3.8.0",
     "@things-factory/board-ui": "^3.8.0",
     "@things-factory/code-ui": "^3.8.0",
@@ -69,9 +69,9 @@
     "@things-factory/print-proxy-service": "^3.8.0",
     "@things-factory/print-service": "^3.8.0",
     "@things-factory/print-ui": "^3.8.0",
-    "@things-factory/product-base": "^3.8.3",
+    "@things-factory/product-base": "^3.8.9",
     "@things-factory/resource-ui": "^3.8.0",
-    "@things-factory/sales-ui": "^3.8.5",
+    "@things-factory/sales-ui": "^3.8.9",
     "@things-factory/scene-chartjs": "^3.7.5",
     "@things-factory/scene-clock": "^3.7.5",
     "@things-factory/scene-clone": "^3.7.5",
@@ -102,11 +102,11 @@
     "@things-factory/system-ui": "^3.8.0",
     "@things-factory/transport-base": "^3.8.0",
     "@things-factory/tutorial-ui": "^3.8.0",
-    "@things-factory/warehouse-base": "^3.8.5",
-    "@things-factory/worksheet-base": "^3.8.5"
+    "@things-factory/warehouse-base": "^3.8.9",
+    "@things-factory/worksheet-base": "^3.8.9"
   },
   "devDependencies": {
     "@things-factory/builder": "^3.7.5"
   },
-  "gitHead": "1f8f8ca9c0d96737732388c9cc685e64b0759a96"
+  "gitHead": "7a9270f0a733762814364529eb6c54f258a7417f"
 }

package/translations/en.json

@@ -1,4 +1,5 @@
 {
+  "title.generate_picking_worksheet": "generate picking worksheet",
   "arrival_notice_created": "arrival notice created",
   "button.activate": "activate",
   "button.add_edit": "add & edit",
@@ -1066,6 +1067,7 @@
   "text.gan_pending_company_approval": "GAN pending company approval",
   "text.gan_will_be_sent_for_company_approval": "GAN will be sent for company approval",
   "text.generate_putaway_worksheet": "generate putaway worksheet",
+  "text.generate_worksheet": "generate worksheet",
   "text.goods_delivery_note_uploaded": "goods delivery note uploaded",
   "text.goods_received_note_has_been_received": "GRN has been marked received",
   "text.goods_received_note_has_been_sent_successfully": "GRN has been sent successfully",
@@ -1148,6 +1150,7 @@
   "text.picking_worksheet_will_be_activated": "picking worksheet will be activated",
   "text.picking_worksheet_will_be_generated": "picking worksheet will be generated",
   "text.pickup_info_is_not_completed": "pickup info is not completed",
+  "text.please_attach_the_file": "please attach the file",
   "text.please_check_your_setting": "please check your setting",
   "text.please_check_your_vas_target": "please check your vas target",
   "text.please_key_in_new_serial_number": "please key in new serial number",
@@ -1157,6 +1160,7 @@
   "text.please_select_a_truck": "select a truck",
   "text.please_select_label_indicator": "please select label indicator",
   "text.please_select_release_order": "please select release order",
+  "text.please_select_the_company": "please select the company",
   "text.please_select_the_contact_type": "please select the contact type",
   "text.please_select_the_location_again": "please select the location again",
   "text.please_select_the_location": "please select the location",
@@ -1190,6 +1194,7 @@
   "text.related_arrival_notice_will_be_deleted": "related arrival notice will be deleted",
   "text.related_release_order_will_be_rejected": "related release order will be rejected",
   "text.release_date_is_empty": "release date is empty",
+  "text.backdate_is_not_allowed": "backdate is not allowed",
   "text.release_date_is_required": "release date is required",
   "text.release_order_confirmed": "release order confirmed",
   "text.release_order_created": "release order created",
@@ -1202,8 +1207,8 @@
   "text.release_order_rejected": "release order rejected",
   "text.release_order_will_be_deleted": "release order will be deleted",
   "text.release_qty_cannot_exceed_stored_qty": "release qty cannot exceed stored qty",
-  "text.release_qty_is_empty": "release quantity is empty",
   "text.release_qty_invalid": "release quantity is invalid",
+  "text.release_qty_is_empty": "release quantity is empty",
   "text.release_qty_is_more_than_expected": "release qty is more than expected",
   "text.remark_is_empty": "remark is empty",
   "text.remark_updated": "remark updated",
@@ -1315,6 +1320,7 @@
   "text.x_should_be_positive": "{state.x} should be positive value",
   "text.yes": "yes",
   "text.you_can_only_select_one_transport_type": "you can only select one transport type",
+  "text.you_can_only_upload_one_file_max": "you can only upload one file max",
   "text.you_wont_be_able_to_revert_this": "you won't be able to revert this",
   "text.you.are.now.in": "you are now in {state.text}",
   "text.your_work_has_completed": "your work has completed",

package/translations/ko.json

@@ -1,4 +1,5 @@
 {
+  "title.generate_picking_worksheet": "[ko]generate picking worksheet",
   "arrival_notice_created": "입고주문이 생성 되었습니다.",
   "arrival_notice_updated": "[ko]arrival notice updated",
   "button.activate": "활성화",
@@ -1232,6 +1233,7 @@
   "text.picking_worksheet_will_be_activated": "피킹 작업지시서가 활성화 됩니다",
   "text.picking_worksheet_will_be_generated": "피킹 작업지시서가 생성 됩니다",
   "text.pickup_info_is_not_completed": "픽업 정보가 완료되지 않았습니다",
+  "text.please_attach_the_file": "[ko]please attach the file",
   "text.please_check_your_setting": "설정을 확인해 주세요",
   "text.please_check_your_vas_target": "[ko] please check your vas target",
   "text.please_key_in_new_serial_number": "[ko]please key in new serial number",
@@ -1246,6 +1248,7 @@
   "text.please_select_an_arrival_notice": "select arrival notice",
   "text.please_select_label_indicator": "라벨 포시기 선택",
   "text.please_select_release_order": "[ko] please select release order",
+  "text.please_select_the_company": "[ko]please select the company",
   "text.please_select_the_contact_type": "연락처 유형 선택",
   "text.please_select_the_label_format": "please select the label format",
   "text.please_select_the_location_again": "로케이션을 다시 선택해 주세요",
@@ -1287,6 +1290,7 @@
   "text.related_arrival_notice_will_be_deleted": "관련된 입고주문이 삭제 됩니다",
   "text.related_release_order_will_be_rejected": "관련된 출고주문이 삭제 됩니다",
   "text.release_date_is_empty": "[ko]release date is empty",
+  "text.backdate_is_not_allowed": "[ko]backdate is not allowed",
   "text.release_date_is_required": "[ko]release date is required",
   "text.release_order_confirmed": "출고주문 확인",
   "text.release_order_created": "출고주문 생성",
@@ -1300,6 +1304,7 @@
   "text.release_order_submit_for_cancellation": "release order submit for cancellation",
   "text.release_order_will_be_deleted": "출고주문이 삭제 됩니다",
   "text.release_qty_cannot_exceed_stored_qty": "출고수량은 재고수량을 초과 할 수 없습니다",
+  "text.release_qty_invalid": "[ko] release quantity is invalid",
   "text.release_qty_is_empty": "출고수량이 없습니다",
   "text.release_qty_is_more_than_expected": "출고수량이 예상보다 많습니다",
   "text.remark_is_empty": "비고가 없습니다",
@@ -1431,6 +1436,7 @@
   "text.x_should_be_positive": "{state.x}은(는) 반드시 양의 값이여야 합니다",
   "text.yes": "예",
   "text.you_can_only_select_one_transport_type": "운송유형은 하나만 선택 할 수 있습니다",
+  "text.you_can_only_upload_one_file_max": "[ko]you can only upload one file max",
   "text.you_wont_be_able_to_revert_this": "되돌릴 수 없습니다",
   "text.you.are.now.in": "당신은 {state} 입니다",
   "text.your_work_has_completed": "작업이 완료 되었습니다",
@@ -1602,6 +1608,7 @@
   "title.loaded": "상차 완료",
   "title.loading": "상차 중",
   "title.location_label_format": "로케이션 라벨 형식",
+  "title.location_scanned_is_not_quarantine_zone": "[ko] Location scanned is not a quarantine zone!",
   "title.location_sorting_rule": "로케이션 정렬 규칙",
   "title.location": "로케이션",
   "title.lot_information": "lot 정보",
@@ -1818,6 +1825,5 @@
   "title.worksheet_vas": "부가서비스 작업지시서",
   "title.worksheet": "작업지시서",
   "vas_order_created": "부가서비스주문 생성됨",
-  "title.location_scanned_is_not_quarantine_zone": "[ko] Location scanned is not a quarantine zone!",
-  "text.release_qty_invalid": "[ko] release quantity is invalid"
+  "text.generate_worksheet": "[ko] generate worksheet"
 }

package/translations/ms.json

@@ -1,4 +1,5 @@
 {
+  "title.generate_picking_worksheet": "[ms]generate picking worksheet",
   "arrival_notice_created": "notis ketibaan telah dicipta",
   "arrival_notice_updated": "notis ketibaan telah dikemaskinikan",
   "button.activate": "aktifkan",
@@ -1179,6 +1180,7 @@
   "text.picking_worksheet_will_be_activated": "lembaran kerja pengambilan akan diaktifkan",
   "text.picking_worksheet_will_be_generated": "lembaran kerja pengambilan akan dijana",
   "text.pickup_info_is_not_completed": "maklumat pengambilan  tidak lengkap",
+  "text.please_attach_the_file": "[ms]please attach the file",
   "text.please_check_your_setting": "tolong semak tetapan anda",
   "text.please_check_your_vas_target": "sila semak sasaran vas anda",
   "text.please_key_in_new_serial_number": "[ms]please key in new serial number",
@@ -1188,6 +1190,7 @@
   "text.please_select_a_truck": "sila pilih trak",
   "text.please_select_label_indicator": "sila pilih petunjuk label",
   "text.please_select_release_order": "[ms] please select release order",
+  "text.please_select_the_company": "[ms]please select the company",
   "text.please_select_the_contact_type": "sila pilih jenis kenalan",
   "text.please_select_the_location_again": "sila pilih lokasi sekali lagi",
   "text.please_select_the_location": "sila pilih lokasi",
@@ -1223,6 +1226,7 @@
   "text.related_arrival_notice_will_be_deleted": "notis ketibaan yang berkaitan akan dipadam",
   "text.related_release_order_will_be_rejected": "pelepasan pesanan yang berkaitan akan ditolak",
   "text.release_date_is_empty": "[ms]release date is empty",
+  "text.backdate_is_not_allowed": "[ms]backdate is not allowed",
   "text.release_date_is_required": "[ms]release date is required",
   "text.release_order_confirmed": "stok pelepasan pesanan disahkan",
   "text.release_order_created": "pelepasan pesanan dicipta",
@@ -1235,6 +1239,7 @@
   "text.release_order_rejected": "stok pelepasan pesanan keluar ditolak",
   "text.release_order_will_be_deleted": "stok pelepasan pesanan akan dipadam",
   "text.release_qty_cannot_exceed_stored_qty": "kuantiti pelepasan melebihi kuantiti disimpan dalam gudang",
+  "text.release_qty_invalid": "[ms] release quantity is invalid",
   "text.release_qty_is_empty": "stok pelepasan kuantiti tiada nilai",
   "text.release_qty_is_more_than_expected": "kuantiti pelepasan melebihi",
   "text.remark_is_empty": "disemak tidak diisi",
@@ -1344,6 +1349,7 @@
   "text.x_should_be_positive": "{state.x} should be positive value",
   "text.yes": "ya",
   "text.you_can_only_select_one_transport_type": "you can only select one transport type",
+  "text.you_can_only_upload_one_file_max": "[ms]you can only upload one file max",
   "text.you_wont_be_able_to_revert_this": "anda tidak boleh kembali selepas langkah ini",
   "text.you.are.now.in": "anda berada di {state}",
   "text.your_work_has_completed": "kerja anda telah selesai",
@@ -1496,6 +1502,7 @@
   "title.loaded": "telah muat naik",
   "title.loading": "muat naik",
   "title.location_label_format": "format label lokasi",
+  "title.location_scanned_is_not_quarantine_zone": "[ms] Location scanned is not a quarantine zone!",
   "title.location_sorting_rule": "peraturan susunan lokasi",
   "title.location": "lokasi",
   "title.lot_information": "informasi lot",
@@ -1688,6 +1695,5 @@
   "title.worksheet_vas": "VAS worksheet",
   "title.worksheet": "lembaran kerja",
   "vas_order_created": "pesanan value added service telah dicipta",
-  "title.location_scanned_is_not_quarantine_zone": "[ms] Location scanned is not a quarantine zone!",
-  "text.release_qty_invalid": "[ms] release quantity is invalid"
+  "text.generate_worksheet": "[ms] generate worksheet"
 }

package/translations/zh.json

@@ -1,4 +1,5 @@
 {
+  "title.generate_picking_worksheet": "[zh]generate picking worksheet",
   "arrival_notice_created": "arrival notice created",
   "button.activate": "activate",
   "button.add_edit": "add & edit",
@@ -1147,6 +1148,7 @@
   "text.picking_worksheet_will_be_activated": "picking worksheet will be activated",
   "text.picking_worksheet_will_be_generated": "picking worksheet will be generated",
   "text.pickup_info_is_not_completed": "pickup info is not completed",
+  "text.please_attach_the_file": "[zh]please attach the file",
   "text.please_check_your_setting": "please check your setting",
   "text.please_check_your_vas_target": "[zh] please check your vas target",
   "text.please_key_in_new_serial_number": "[zh]please key in new serial number",
@@ -1156,6 +1158,7 @@
   "text.please_select_a_truck": "select a truck",
   "text.please_select_label_indicator": "please select label indicator",
   "text.please_select_release_order": "[zh] please select release order",
+  "text.please_select_the_company": "[zh]please select the company",
   "text.please_select_the_contact_type": "please select the contact type",
   "text.please_select_the_location_again": "please select the location again",
   "text.please_select_the_location": "please select the location",
@@ -1189,6 +1192,7 @@
   "text.related_arrival_notice_will_be_deleted": "related arrival notice will be deleted",
   "text.related_release_order_will_be_rejected": "related release order will be rejected",
   "text.release_date_is_empty": "[zh]release date is empty",
+  "text.backdate_is_not_allowed": "[zh]backdate is not allowed",
   "text.release_date_is_required": "[zh]release date is required",
   "text.release_order_confirmed": "release order confirmed",
   "text.release_order_created": "release order created",
@@ -1201,6 +1205,7 @@
   "text.release_order_rejected": "release order rejected",
   "text.release_order_will_be_deleted": "release order will be deleted",
   "text.release_qty_cannot_exceed_stored_qty": "release qty cannot exceed stored qty",
+  "text.release_qty_invalid": "[zh] release quantity is invalid",
   "text.release_qty_is_empty": "release quantity is empty",
   "text.release_qty_is_more_than_expected": "release qty is more than expected",
   "text.remark_is_empty": "remark is empty",
@@ -1310,6 +1315,7 @@
   "text.x_should_be_positive": "{state.x} should be positive value",
   "text.yes": "yes",
   "text.you_can_only_select_one_transport_type": "you can only select one transport type",
+  "text.you_can_only_upload_one_file_max": "[zh]you can only upload one file max",
   "text.you_wont_be_able_to_revert_this": "you won't be able to revert this",
   "text.you.are.now.in": "you are now in {state.text}",
   "text.your_work_has_completed": "your work has completed",
@@ -1453,6 +1459,7 @@
   "title.loaded": "loaded",
   "title.loading": "loading",
   "title.location_label_format": "location label format",
+  "title.location_scanned_is_not_quarantine_zone": "[zh] Location scanned is not a quarantine zone!",
   "title.location_sorting_rule": "location sorting rule",
   "title.location": "location",
   "title.lot_information": "lot information",
@@ -1638,6 +1645,5 @@
   "title.worksheet_vas": "worksheet vas",
   "title.worksheet": "worksheet",
   "vas_order_created": "vas order created",
-  "title.location_scanned_is_not_quarantine_zone": "[zh] Location scanned is not a quarantine zone!",
-  "text.release_qty_invalid": "[zh] release quantity is invalid"
+  "text.generate_worksheet": "[zh] generate worksheet"
 }