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

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

@@ -3,6 +3,7 @@ import '@things-factory/grist-ui'
 import './inventory-assign-popup'
 import './inventory-auto-assign-popup'
 import './select-operator-popup'
+import './inventory-reassign-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
@@ -133,11 +134,18 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
     }
 
     if (this.activatable) {
-      actions.push({
-        title: i18next.t('button.activate'),
-        action: this._activateWorksheet.bind(this),
-        ...CommonButtonStyles.activate
-      })
+      actions.push(
+        {
+          title: i18next.t('button.reassign'),
+          action: this._openReassignInventoryPopup.bind(this),
+          ...CommonButtonStyles.assignment
+        },
+        {
+          title: i18next.t('button.activate'),
+          action: this._activateWorksheet.bind(this),
+          ...CommonButtonStyles.activate
+        }
+      )
     }
 
     if (this.assignable) {
@@ -861,6 +869,7 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
                   description
                 }
                 packingType
+                packingSize
                 inventory {
                   qty
                   lockedQty
@@ -1221,6 +1230,31 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
     }
   }
 
+  _openReassignInventoryPopup() {
+    openPopup(
+      html`
+        <inventory-reassign-popup
+          .bizplaceId=${this.targetBizpace?.id}
+          .taskNo=${this._taskNo}
+          .worksheetNo=${this._worksheetNo}
+          @reassignment-completed="${async () => {
+            await this.fetchOrderInventories()
+            await this.fetchWorksheetDetails(this._worksheetNo)
+
+            this.updateContext()
+          }}"
+        ></inventory-reassign-popup>
+      `,
+      {
+        escapable: false,
+        closable: false,
+        backdrop: true,
+        size: 'large',
+        title: i18next.t('title.reassign_inventory')
+      }
+    )
+  }
+
   _showToast({ type, message }) {
     document.dispatchEvent(
       new CustomEvent('notify', {

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

@@ -24,7 +24,8 @@ class WorksheetPacking extends localize(i18next)(PageView) {
       orderInformation: Object,
       wsdGristConfig: Object,
       worksheetDetailData: Object,
-      _logisticsInitiated: Boolean
+      _logisticsInitiated: Boolean,
+      _isManifested: Boolean
     }
   }
 
@@ -167,7 +168,10 @@ class WorksheetPacking extends localize(i18next)(PageView) {
             <label>${i18next.t('label.ref_no_2')}</label>
             <input name="refNo2" readonly />
 
-            <label>${i18next.t('label.shipping_provider')}</label>
+            <label>${i18next.t('label.ref_no_3')}</label>
+            <input name="refNo3" readonly />
+
+            <label>${i18next.t('label.transporter')}</label>
             <input name="shippingProvider" readonly />
 
             <label>${i18next.t('label.tracking_no')}</label>
@@ -182,6 +186,9 @@ class WorksheetPacking extends localize(i18next)(PageView) {
                 key => html`<option value="${WORKSHEET_STATUS[key].value}">${WORKSHEET_STATUS[key].name}</option>`
               )}
             </select>
+
+            <input id="manifested" type="checkbox" name="manifested" ?checked="${this._isManifested}" disabled />
+            <label for="manifested">${i18next.t('label.manifested')}</label>
           </fieldset>
         </form>
 
@@ -307,12 +314,17 @@ class WorksheetPacking extends localize(i18next)(PageView) {
             releaseGood {
               name
               description
+              transporter
+              trackingNo
               refNo
               refNo2
               refNo3
               ownTransport
               releaseDate
               remark
+              manifest {
+                id
+              }
             }
             marketplaceOrder {
               name
@@ -401,6 +413,7 @@ class WorksheetPacking extends localize(i18next)(PageView) {
       this._trackingNo = worksheet.marketplaceOrder?.trackingNo
       this._refNo = worksheet?.releaseGood?.refNo
       this._roNo = worksheet?.releaseGood?.name || ''
+      this._isManifested = worksheet?.releaseGood?.manifest?.id ? true : false
 
       this._fillupForm({
         ...worksheet,
@@ -411,8 +424,8 @@ class WorksheetPacking extends localize(i18next)(PageView) {
         refNo3: worksheet.releaseGood.refNo3,
         ownCollection: worksheet.releaseGood.ownTransport,
         releaseDate: worksheet.releaseGood.releaseDate,
-        shippingProvider: worksheet.marketplaceOrder?.shippingProvider || '',
-        trackingNo: worksheet.marketplaceOrder?.trackingNo || '',
+        shippingProvider: worksheet.releaseGood?.transporter || '',
+        trackingNo: worksheet.releaseGood?.trackingNo || '',
         remark: worksheet.releaseGood.remark || ''
       })
 

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

@@ -3,6 +3,7 @@ import '@things-factory/grist-ui'
 import './inventory-assign-popup'
 import './inventory-auto-assign-popup'
 import './select-operator-popup'
+import './inventory-reassign-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
@@ -32,6 +33,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
       _worksheetNo: String,
       _worksheetStatus: String,
       _roNo: String,
+      _roId: String,
       _statusList: Array,
       ganNo: String,
       assignee: Object,
@@ -154,11 +156,18 @@ class WorksheetPicking extends localize(i18next)(PageView) {
     }
 
     if (this.activatable) {
-      actions.push({
-        title: i18next.t('button.activate'),
-        action: this._activateWorksheet.bind(this),
-        ...CommonButtonStyles.activate
-      })
+      actions.push(
+        {
+          title: i18next.t('button.reassign'),
+          action: this._openReassignInventoryPopup.bind(this),
+          ...CommonButtonStyles.assignment
+        },
+        {
+          title: i18next.t('button.activate'),
+          action: this._activateWorksheet.bind(this),
+          ...CommonButtonStyles.activate
+        }
+      )
     }
 
     if (this.assignable) {
@@ -641,6 +650,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
               name
             }
             releaseGood {
+              id
               name
               description
               refNo
@@ -736,6 +746,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
 
       this.worksheetDetails = worksheet.worksheetDetails
       this._worksheetStatus = worksheet.status
+      this._roId = worksheet?.releaseGood?.id || ''
       this._roNo = worksheet?.releaseGood?.name || ''
       this.worksheetType = worksheet?.type
       this.crossDocking = worksheet?.releaseGood?.crossDocking
@@ -1152,7 +1163,10 @@ class WorksheetPicking extends localize(i18next)(PageView) {
       this.preWsdGristConfig.columns.splice(palletIdColumnIdx, 1, cartonIdColumnConfig)
     }
 
-    if (this.worksheetDetailData.records.some(e => e.batchIdRef)) {
+    if (
+      this.worksheetDetailData.records.some(e => e.batchIdRef) &&
+      !this.preWsdGristConfig.columns.find(column => column.name === 'batchIdRef')
+    ) {
       this.preWsdGristConfig.columns = [...this.preWsdGristConfig.columns, batchIdRefColumnConfig]
     }
 
@@ -1372,6 +1386,31 @@ class WorksheetPicking extends localize(i18next)(PageView) {
     })
   }
 
+  _openReassignInventoryPopup() {
+    openPopup(
+      html`
+        <inventory-reassign-popup
+          .bizplaceId=${this.targetBizpace?.id}
+          .roId=${this._roId}
+          .worksheetNo=${this._worksheetNo}
+          @reassignment-completed="${async () => {
+            await this.fetchOrderInventories()
+            await this.fetchWorksheetDetails(this._worksheetNo)
+
+            this.updateContext()
+          }}"
+        ></inventory-reassign-popup>
+      `,
+      {
+        escapable: false,
+        closable: false,
+        backdrop: true,
+        size: 'large',
+        title: i18next.t('title.reassign_inventory')
+      }
+    )
+  }
+
   _selectOperator() {
     openPopup(
       html`

package/client/pages/report/inbound-serial-number-report.js

@@ -57,6 +57,10 @@ class InboundSerialNumberReport extends connect(store)(localize(i18next)(PageVie
         accept: ['preview'],
         content: this
       },
+      exportable: {
+        name: i18next.t('title.inbound_serial_number_report'),
+        data: this._exportableData.bind(this)
+      },
       help: 'operato-wms/report/inbound-serial-number-report'
     }
   }
@@ -137,22 +141,54 @@ class InboundSerialNumberReport extends connect(store)(localize(i18next)(PageVie
             let date = new Date()
             date.setMonth(date.getMonth() - 1)
             return date.toISOString().split('T')[0]
-          })()
+          })(),
+          max: new Date().toISOString().split('T')[0]
         },
         value: new Date().toISOString().split('T')[0],
         handlers: { change: this._submit.bind(this) }
+      },
+      {
+        label: i18next.t('field.order_no'),
+        name: 'orderNo',
+        type: 'text',
+        props: { searchOper: 'custom' }
+      },
+      {
+        label: i18next.t('field.ref_no'),
+        name: 'ref',
+        type: 'string',
+        props: { searchOper: 'in' }
+      },
+      {
+        label: i18next.t('field.lot_id'),
+        name: 'palletId',
+        type: 'text',
+        props: { searchOper: 'i_like' }
+      },
+      {
+        label: i18next.t('field.carton_id'),
+        name: 'cartonId',
+        type: 'text',
+        props: { searchOper: 'i_like' }
+      },
+      {
+        label: i18next.t('field.product_info'),
+        name: 'product',
+        type: 'string',
+        props: { searchOper: 'in' }
+      },
+      {
+        label: i18next.t('field.serial_number'),
+        name: 'serialNumber',
+        type: 'text',
+        props: { searchOper: 'eq' }
       }
     ]
   }
 
   get reportConfig() {
     let columns = [
-      {
-        type: 'number',
-        name: 'no',
-        header: i18next.t('field.no'),
-        width: 50
-      },
+      { type: 'gutter', gutterName: 'sequence' },
       {
         type: 'string',
         name: 'bizplace|name',
@@ -246,7 +282,6 @@ class InboundSerialNumberReport extends connect(store)(localize(i18next)(PageVie
     ]
     let list = {
       fields: [
-        'no',
         'bizplace|name',
         'orderNo',
         'refNo1',
@@ -279,6 +314,7 @@ class InboundSerialNumberReport extends connect(store)(localize(i18next)(PageVie
 
   async pageInitialized() {
     this._gristData = { total: 0, records: [] }
+    this._products = []
     this._partners = [...(await this._fetchPartners())]
 
     this._searchFields = this.searchFields
@@ -320,7 +356,6 @@ class InboundSerialNumberReport extends connect(store)(localize(i18next)(PageVie
           query inboundSerialNumberReport($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
             inboundSerialNumberReport(filters: $filters, pagination: $pagination, sortings: $sortings) {
               items {
-                no
                 bizplace {
                   name
                   description
@@ -369,6 +404,42 @@ class InboundSerialNumberReport extends connect(store)(localize(i18next)(PageVie
     }
   }
 
+  async _exportableData() {
+    try {
+      var headerSetting = [
+        { header: i18next.t('field.company'), key: 'bizplace|name', width: 25, type: 'string' },
+        { header: i18next.t('field.order_no'), key: 'orderNo', width: 25, type: 'string' },
+        { header: i18next.t('field.ref_no'), key: 'refNo1', width: 25, type: 'string' },
+        { header: i18next.t('field.ref_no_2'), key: 'refNo2', width: 25, type: 'string' },
+        { header: i18next.t('field.ref_no_3'), key: 'refNo3', width: 25, type: 'string' },
+        { header: i18next.t('field.lot_id'), key: 'palletId', width: 25, type: 'string' },
+        { header: i18next.t('field.carton_id'), key: 'cartonId', width: 25, type: 'string' },
+        { header: i18next.t('field.sku'), key: 'product|sku', width: 25, type: 'string' },
+        { header: i18next.t('field.brand_sku'), key: 'product|brandSku', width: 25, type: 'string' },
+        { header: i18next.t('field.product_name'), key: 'product|name', width: 80, type: 'string' },
+        { header: i18next.t('field.product_description'), key: 'product|description', width: 25, type: 'string' },
+        { header: i18next.t('field.product_type'), key: 'product|type', width: 25, type: 'string' },
+        { header: i18next.t('field.volume'), key: 'product|volume', width: 25, type: 'string' },
+        { header: i18next.t('field.serial_number'), key: 'serialNumber', width: 25, type: 'string' },
+        { header: i18next.t('field.etd'), key: 'etd', width: 25, type: 'datetime' }
+      ]
+
+      var exportData = {
+        header: [...headerSetting],
+        data: (await this.fetchHandler({ page: 1, limit: 9999999 })).records.map(itm => {
+          return {
+            ...itm,
+            etd: itm.etd ? new Date(parseInt(itm.etd)).toLocaleString() : ''
+          }
+        })
+      }
+
+      return exportData
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
   async _fetchPartners() {
     const filters = []
     const response = await client.query({
@@ -423,11 +494,17 @@ class InboundSerialNumberReport extends connect(store)(localize(i18next)(PageVie
     if (this._toDateInput.value < fromDate) this._toDateInput.value = fromDate
 
     let min = new Date(fromDate)
+    let max = new Date(fromDate)
     let today = new Date()
     today.setHours(0, 0, 0, 0)
+    max.setMonth(max.getMonth() + 1)
+    max.setDate(max.getDate() - 1)
 
     min = min.toISOString().split('T')[0]
+    max = max.toISOString().split('T')[0]
 
+    this._toDateInput.value = max
+    this._toDateInput.max = max
     this._toDateInput.min = min
     this._submit()
   }

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

@@ -159,6 +159,7 @@ class InventoryReport extends connect(store)(localize(i18next)(PageView)) {
       rows: {
         selectable: false,
         groups: [
+          { column: 'product|sku' },
           { column: 'product|name' },
           { column: 'product|type' },
           { column: 'packingType', title: 'Sub Total' },
@@ -168,6 +169,14 @@ class InventoryReport extends connect(store)(localize(i18next)(PageView)) {
         totals: ['qty', 'uomValue']
       },
       columns: [
+        {
+          type: 'string',
+          name: 'product|sku',
+          header: i18next.t('field.sku'),
+          sortable: false,
+          imex: { header: i18next.t('field.sku'), key: 'product|sku', width: 75, type: 'string' },
+          width: 400
+        },
         {
           type: 'string',
           name: 'product|name',
@@ -282,6 +291,7 @@ class InventoryReport extends connect(store)(localize(i18next)(PageView)) {
                 description
               }
               product {
+                sku
                 name
                 description
                 type

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

@@ -47,7 +47,6 @@ class InventorySummaryReport extends connect(store)(localize(i18next)(PageView))
       _searchFields: Object,
       _config: Object,
       _partners: Object,
-      _productType: Object,
       _gristData: Object,
       _byPallet: Boolean,
       data: Object
@@ -175,15 +174,7 @@ class InventorySummaryReport extends connect(store)(localize(i18next)(PageView))
         label: i18next.t('field.product_type'),
         name: 'productType',
         type: 'select',
-        options: [
-          { value: '' },
-          ...this._productType.map(type => {
-            return {
-              name: type.name,
-              value: type.name
-            }
-          })
-        ],
+        options: [{ value: '' }],
         props: { searchOper: 'eq' }
       },
       {
@@ -322,7 +313,6 @@ class InventorySummaryReport extends connect(store)(localize(i18next)(PageView))
     this._gristData = { total: 0, totalWithOpeningBalance: 0, records: [] }
     this._products = []
     this._partners = [...(await this._fetchPartners())]
-    this._productType = []
 
     this._searchFields = this.searchFields
     this._config = this.reportConfig
@@ -468,25 +458,44 @@ class InventorySummaryReport extends connect(store)(localize(i18next)(PageView))
 
     if (this._toDateInput.value < fromDate) this._toDateInput.value = fromDate
 
-    let min = new Date(fromDate)
-    let today = new Date()
-    today.setHours(0, 0, 0, 0)
-
-    min = min.toISOString().split('T')[0]
-
+    let min = new Date(fromDate).toISOString().split('T')[0]
     this._toDateInput.min = min
     this._submit()
   }
 
   async _companyChanged(e) {
-    this._productType = !this._bizplaceSelector.value
+    const _productType = !this._bizplaceSelector.value
       ? []
       : await getPartnerCodeByName(
           'PRODUCT_TYPES',
           this._partners.find(p => p.id == this._bizplaceSelector.value)?.company?.domainId || ''
         )
 
-    this._searchFields = [...this.searchFields]
+    // update searchFields with the latest productTypes and toDate's min props
+    this._searchFields = this._searchFields.map(field => {
+      switch (field.name) {
+        case 'productType':
+          field.options = [
+            { value: '' },
+            ..._productType.map(type => {
+              return {
+                name: type.name,
+                value: type.name
+              }
+            })
+          ]
+          break
+
+        case 'toDate':
+          field.props = {
+            ...field.props,
+            min: this._toDateInput.min
+          }
+          break
+      }
+
+      return field
+    })
   }
 
   _submit(e) {