@things-factory/operato-wms 3.8.4 → 3.8.8

package/client/pages/inbound/putaway-product.js

@@ -803,14 +803,18 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
           if (this._enableCartonLabel) {
             let worksheetDetail = this._getSelectedOrderProducts(this.cartonInput.value)
             worksheetDetailNames.push(worksheetDetail[0].name)
-            if (worksheetDetail[0].expirationPeriod > 0 && locationDetails.type !== 'QUARANTINE') {
-              await this._expiryAlert()
-            }
+            await this._checkExpiry(
+              worksheetDetail[0].expirationPeriod,
+              new Date(worksheetDetail[0].expirationDate),
+              locationDetails.type
+            )
           } else {
             worksheetDetailNames.push(this._selectedOrderProduct.name)
-            if (this._selectedOrderProduct.expirationPeriod > 0 && locationDetails.type !== 'QUARANTINE') {
-              await this._expiryAlert()
-            }
+            await this._checkExpiry(
+              this._selectedOrderProduct.expirationPeriod,
+              new Date(this._selectedOrderProduct.expirationDate),
+              locationDetails.type
+            )
           }
 
           const response = await client.mutate({
@@ -874,16 +878,20 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
           const locationDetails = await this._fetchLocation(this.locationInput.value.trim())
 
           if (this._enableCartonLabel) {
-            worksheetDetailNames.push(worksheetDetail[0].name)
             let worksheetDetail = this._getSelectedOrderProducts(this.cartonInput.value)
-            if (worksheetDetail[0].expirationPeriod > 0 && locationDetails.type !== 'QUARANTINE') {
-              await this._expiryAlert()
-            }
+            worksheetDetailNames.push(worksheetDetail[0].name)
+            await this._checkExpiry(
+              worksheetDetail[0].expirationPeriod,
+              new Date(worksheetDetail[0].expirationDate),
+              locationDetails.type
+            )
           } else {
             worksheetDetailNames.push(this._selectedOrderProduct.name)
-            if (this._selectedOrderProduct.expirationPeriod > 0 && locationDetails.type !== 'QUARANTINE') {
-              await this._expiryAlert()
-            }
+            await this._checkExpiry(
+              this._selectedOrderProduct.expirationPeriod,
+              new Date(this._selectedOrderProduct.expirationDate),
+              locationDetails.type
+            )
           }
 
           const response = await client.mutate({
@@ -945,8 +953,10 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
         await this._validatePutaway()
         if (!this.incompleteLocationName) {
           let worksheetDetailNames = []
-          if (this._enableCartonLabel) worksheetDetailNames = this._getSelectedOrderProducts(this.cartonInput.value)
-          else worksheetDetailNames.push(this._selectedOrderProduct.name)
+          if (this._enableCartonLabel) {
+            const selectedWorksheetDetailName = this._getSelectedOrderProducts(this.cartonInput.value)
+            worksheetDetailNames.push(selectedWorksheetDetailName[0].name)
+          } else worksheetDetailNames.push(this._selectedOrderProduct.name)
 
           const response = await client.mutate({
             mutation: gql`
@@ -1096,6 +1106,15 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
+  async _checkExpiry(expirationPeriod, expiryDate, locationType) {
+    let date = new Date()
+    let acceptBefore = new Date(date.setDate(date.getDate() + expirationPeriod))
+
+    if (expirationPeriod > 0) {
+      if (expiryDate < acceptBefore && locationType !== 'QUARANTINE') await this._expiryAlert()
+    }
+  }
+
   _validateTransfer() {
     // 1. validate for order selection
     if (!this._selectedOrderProduct) throw new Error(i18next.t('text.target_is_not_selected'))

package/client/pages/inbound/unload-product.js

@@ -328,7 +328,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
               <input name="batchIdRef" readonly />
 
               <label>${i18next.t('label.packing_type')}</label>
-              <input name="packingTypeSize" readonly />
+              <input name="packingType" readonly />
 
               <label>${i18next.t('label.total_pallet_qty')}</label>
               <input name="palletQty" type="number" readonly />

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "3.8.4",
+  "version": "3.8.8",
   "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",
@@ -71,7 +71,7 @@
     "@things-factory/print-ui": "^3.8.0",
     "@things-factory/product-base": "^3.8.3",
     "@things-factory/resource-ui": "^3.8.0",
-    "@things-factory/sales-ui": "^3.8.3",
+    "@things-factory/sales-ui": "^3.8.8",
     "@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.3",
-    "@things-factory/worksheet-base": "^3.8.4"
+    "@things-factory/warehouse-base": "^3.8.8",
+    "@things-factory/worksheet-base": "^3.8.8"
   },
   "devDependencies": {
     "@things-factory/builder": "^3.7.5"
   },
-  "gitHead": "9dedf75962d3a804204ae3341588ee91533c63dd"
+  "gitHead": "3f0cf4cd9eba27f4b4a7688c462cc3183dd9df00"
 }

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",

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": "활성화",
@@ -1819,5 +1820,6 @@
   "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.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",
@@ -1689,5 +1690,6 @@
   "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.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",
@@ -1639,5 +1640,6 @@
   "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.release_qty_invalid": "[zh] release quantity is invalid",
+  "text.generate_worksheet": "[zh] generate worksheet"
 }