@things-factory/operato-wms 3.6.37 → 3.6.41

package/client/pages/constants/order.js

@@ -53,6 +53,7 @@ export const ORDER_STATUS = {
   INPROCESS: { name: 'order_status_in_process', value: 'INPROCESS' },
   READY_TO_PICK: { name: 'order_status_ready_to_pick', value: 'READY_TO_PICK' },
   PICKING: { name: 'order_status_picking', value: 'PICKING' },
+  PACKING: { name: 'order_status_packing', value: 'PACKING' },
   LOADING: { name: 'order_status_loading', value: 'LOADING' },
   READY_TO_DISPATCH: { name: 'order_status_ready_to_dispatch', value: 'READY_TO_DISPATCH' },
   READY_TO_EXECUTE: { name: 'order_status_ready_to_execute', value: 'READY_TO_EXECUTE' },

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

@@ -19,7 +19,6 @@ import './select-product-batch'
 import orderBy from 'lodash/orderBy'
 
 const AVAIL_ORDER_TYPES = { ARRIVAL_NOTICE, RETURN_ORDER }
-
 class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
     return {

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

@@ -61,6 +61,11 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
     return {
       title: i18next.t('title.release_order_requests'),
       actions: [
+        {
+          title: i18next.t('button.generate_packing_list'),
+          action: this._generatePackingList.bind(this),
+          ...CommonButtonStyles.label
+        },
         {
           title: i18next.t('button.batch_picking'),
           action: this._openBatchPickingPopup.bind(this),
@@ -139,6 +144,7 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
       list: { fields: ['name', 'bizplace', 'releaseDate', 'status', 'updatedAt'] },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
+        { type: 'gutter', gutterName: 'row-selector', multiple: true },
         {
           type: 'gutter',
           gutterName: 'button',
@@ -298,6 +304,35 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
     }
   }
 
+  _generatePackingList() {
+    try {
+      if (this.dataGrist.selected?.length == 0) {
+        throw new Error(i18next.t('text.select_orders_to_generate_merged_packing_list_for_printing'))
+      }
+
+      let roNos =
+        this.dataGrist.selected
+          .filter(
+            record =>
+              record.status === ORDER_STATUS.READY_TO_PICK.value ||
+              record.status === ORDER_STATUS.PICKING.value ||
+              record.status === ORDER_STATUS.PACKING.value ||
+              record.status === ORDER_STATUS.LOADING.value
+          )
+          .map(record => record.name) || []
+
+      if (roNos?.length) {
+        const searchParams = new URLSearchParams()
+        searchParams.append('orderNo', roNos)
+        navigate(`bulk_print_packing_list?${searchParams.toString()}`)
+      } else {
+        throw new Error(i18next.t('text.order_status_not_qualified_for_bulk_printing_packing_list'))
+      }
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
   _openBatchPickingPopup() {
     openPopup(
       html`

package/client/pages/order/release-order/bulk-print-packing-list.js

@@ -0,0 +1,278 @@
+import '@things-factory/grist-ui'
+import '@things-factory/barcode-ui'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+
+import { MultiColumnFormStyles } from '@things-factory/form-ui'
+import { i18next, localize } from '@things-factory/i18n-base'
+import { client, PageView } from '@things-factory/shell'
+import { CommonButtonStyles } from '@things-factory/styles'
+import { isMobileDevice } from '@things-factory/utils'
+
+class BulkPrintPackingList extends localize(i18next)(PageView) {
+  static get properties() {
+    return {
+      pickingListConfig: Object,
+      orderNos: Array,
+      releaseOrders: Array
+    }
+  }
+
+  static get styles() {
+    return [
+      MultiColumnFormStyles,
+      css`
+        :host {
+          overflow-x: auto;
+        }
+        section {
+          display: flex;
+          flex-direction: column;
+        }
+        .form-container {
+          display: flex;
+        }
+        .form-container > form {
+          flex: 1;
+        }
+        barcode-tag {
+          width: 100px;
+          height: 100px;
+          margin: 10px;
+        }
+        .grist {
+          background-color: var(--main-section-background-color);
+          display: flex;
+          flex-direction: row;
+          flex: 1;
+          overflow-y: auto;
+        }
+        .grist-column {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          overflow: auto;
+        }
+        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 {
+          margin: var(--grist-title-margin);
+          border: var(--grist-title-border);
+          font: var(--grist-title-font);
+          color: var(--secondary-color);
+        }
+
+        .grist h2 mwc-icon {
+          vertical-align: middle;
+          margin: var(--grist-title-icon-margin);
+          font-size: var(--grist-title-icon-size);
+          color: var(--grist-title-icon-color);
+        }
+
+        h2 + data-grist {
+          padding-top: var(--grist-title-with-grid-padding);
+        }
+
+        @media print {
+          section {
+            break-before: page;
+            break-after: page;
+
+            margin: 0;
+            padding: 0;
+          }
+        }
+      `
+    ]
+  }
+
+  get context() {
+    var actions = [
+      {
+        title: i18next.t('button.back_to_list'),
+        action: () => history.back(),
+        ...CommonButtonStyles.back
+      }
+    ]
+
+    return {
+      title: i18next.t('title.bulk_print_packing_list'),
+      actions,
+      printable: {
+        accept: ['preview'],
+        content: this
+      }
+    }
+  }
+
+  render() {
+    const releaseOrders = this.releaseOrders
+
+    return html` ${releaseOrders.map(releaseOrder => {
+      const orderInventories = {
+        records: (releaseOrder.orderInventories || []).map(orderInventory => {
+          return {
+            ...orderInventory,
+            productName: orderInventory.product.name,
+            sku: orderInventory.product.sku,
+            uom: orderInventory.inventory.uom
+          }
+        })
+      }
+      return html`
+        <section>
+          <div class="form-container">
+            <form name="releaseOrder" class="multi-column-form">
+              <fieldset>
+                <legend>${releaseOrder.name}</legend>
+                <label>${i18next.t('label.company')}</label>
+                <input name="bizplaceName" value="${releaseOrder?.bizplace.name}" readonly />
+
+                <label>${i18next.t('label.ref_no')}</label>
+                <input name="refNo" value="${releaseOrder?.refNo || ''}" readonly />
+
+                <label>${i18next.t('label.ref_no_2')}</label>
+                <input name="refNo2" value="${releaseOrder?.refNo2 || ''}" readonly />
+
+                <label>${i18next.t('label.ref_no_3')}</label>
+                <input name="refNo3" value="${releaseOrder?.refNo3 || ''}" readonly />
+
+                <label>${i18next.t('label.release_date')}</label>
+                <input name="releaseDate" type="date" value="${releaseOrder.releaseDate}" readonly />
+              </fieldset>
+            </form>
+
+            <barcode-tag bcid="qrcode" .value=${releaseOrder.name}></barcode-tag>
+          </div>
+
+          <div class="grist">
+            <data-grist
+              .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
+              .config=${this.pickingListConfig}
+              .data=${orderInventories}
+            ></data-grist>
+          </div>
+        </section>
+      `
+    })}`
+  }
+
+  async pageUpdated(changes, lifecycle) {
+    if (this.active) {
+      this.orderNos = lifecycle.params.orderNo.split(',') || []
+      await this.fetchReleaseOrders()
+    }
+  }
+
+  get pickingListGrist() {
+    return this.shadowRoot.querySelector('data-grist')
+  }
+
+  pageInitialized() {
+    this.pickingListConfig = {
+      pagination: { infinite: true },
+      rows: { appendable: false },
+      columns: [
+        { type: 'gutter', gutterName: 'sequence' },
+        {
+          type: 'string',
+          name: 'sku',
+          header: i18next.t('field.sku'),
+          width: 120
+        },
+        {
+          type: 'string',
+          name: 'productName',
+          header: i18next.t('field.name'),
+          width: 180
+        },
+        {
+          type: 'string',
+          name: 'packingType',
+          header: i18next.t('field.packing_type'),
+          width: 180
+        },
+        {
+          type: 'float',
+          name: 'packingSize',
+          header: i18next.t('field.packing_size'),
+          width: 100
+        },
+        {
+          type: 'number',
+          name: 'releaseQty',
+          header: i18next.t('field.qty'),
+          width: 100
+        },
+        {
+          type: 'number',
+          name: 'releaseUomValue',
+          header: i18next.t('field.uom_value'),
+          width: 120
+        },
+        {
+          type: 'string',
+          name: 'uom',
+          header: i18next.t('field.uom'),
+          width: 120
+        }
+      ]
+    }
+  }
+
+  async fetchReleaseOrders() {
+    if (!this.orderNos?.length) return
+    const response = await client.query({
+      query: gql`
+        query releaseGoods($filters: [Filter], $sortings: [Sorting]) {
+          releaseGoods(filters: $filters, sortings: $sortings) {
+            items {
+              id
+              name
+              refNo
+              refNo2
+              refNo3
+              releaseDate
+              bizplace {
+                id
+                name
+              }
+              orderInventories {
+                id
+                releaseQty
+                packingType
+                packingSize
+                releaseUomValue
+                inventory {
+                  uom
+                }
+                product {
+                  sku
+                  name
+                }
+              }
+            }
+          }
+        }
+      `,
+      variables: {
+        filters: [{ name: 'name', operator: 'in', value: this.orderNos }],
+        sortings: [{ name: 'updatedAt', desc: true }]
+      }
+    })
+
+    if (!response.errors) {
+      this.releaseOrders = response.data.releaseGoods.items || []
+    }
+  }
+}
+window.customElements.define('bulk-print-packing-list', BulkPrintPackingList)

package/client/pages/order/return-order/create-return-order.js

@@ -754,8 +754,7 @@ class CreateReturnOrder extends localize(i18next)(PageView) {
       let returnOrder = this._serializeForm(this.returnOrderForm)
       delete returnOrder.warehouseTransport
       returnOrder.orderInventories = this._getOrderInventories()
-      returnOrder.ownTransport = this._ownTransport
-
+      returnOrder.ownTransport = this._ownTransport  
       const attachments = this._document?.files ? this._document.files : undefined
       const response = await client.mutate({
         mutation: gql`
@@ -787,11 +786,10 @@ class CreateReturnOrder extends localize(i18next)(PageView) {
         remark: record?.remark ? '[RETURN]' + record.remark : '[RETURN]',
         batchId: record?.batchId,
         packingType: record?.packingType,
-        packingSize: record.inventory.packingSize,
+        packingSize: record?.packingSize,
         type: ORDER_TYPES.RETURN_ORDER.value,
         status: ORDER_INVENTORY_STATUS.PENDING.value
       }
-
       newRecord.product = { id: record?.productId, name: record?.productName }
       newRecord.inventory = { id: record.id }
       return newRecord

package/client/pages/outbound/inventory-assign-popup.js

@@ -20,6 +20,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
       productSku: String,
       bizplaceId: String,
       packingType: String,
+      packingSize: Number,
       worksheetType: String,
       releaseQty: Number,
       releaseUomValue: Number,
@@ -248,6 +249,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
           $productName: String!
           $productSku: String!
           $packingType: String!
+          
           $pickingStrategy: String!
           $locationSortingRules: [Sorting]
         ) {
@@ -258,6 +260,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
             productName: $productName
             productSku: $productSku
             packingType: $packingType
+
             pickingStrategy: $pickingStrategy
             locationSortingRules: $locationSortingRules
           ) {
@@ -292,6 +295,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
         productName: this.productName,
         productSku: this.productSku,
         packingType: this.packingType,
+        packingSize: this.packingSize,
         pickingStrategy: this.selectedStrategy,
         locationSortingRules: this.locationSortingRules
       }
@@ -429,6 +433,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
                 $batchId: String!
                 $productId: String!
                 $packingType: String!
+                
                 $worksheetDetails: [NewWorksheetDetail]
               ) {
                 generateBatchPickingWorksheetDetails(
@@ -436,6 +441,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
                   batchId: $batchId
                   productId: $productId
                   packingType: $packingType
+                  
                   worksheetDetails: $worksheetDetails
                 )
               }
@@ -458,6 +464,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
                 $batchId: String!
                 $productId: String!
                 $packingType: String!
+                $packingSize: Float!
                 $worksheetDetails: [NewWorksheetDetail]
               ) {
                 generateReleaseGoodWorksheetDetails(
@@ -465,6 +472,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
                   batchId: $batchId
                   productId: $productId
                   packingType: $packingType
+                  packingSize: $packingSize
                   worksheetDetails: $worksheetDetails
                 )
               }
@@ -474,6 +482,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
               batchId: this.batchId,
               productId: this.productId,
               packingType: this.packingType,
+              packingSize: this.packingSize,
               worksheetDetails: this._composeWorksheetDetails()
             }
           })

package/client/pages/outbound/inventory-auto-assign-popup.js

@@ -125,7 +125,7 @@ class InventoryAutoAssignPopup extends localize(i18next)(LitElement) {
         },
         {
           type: 'string',
-          name: 'sku',
+          name: 'productSku',
           header: i18next.t('field.sku'),
           width: 100
         },
@@ -195,7 +195,6 @@ class InventoryAutoAssignPopup extends localize(i18next)(LitElement) {
         allowOutsideClick: true,
         allowEscapeKey: true
       })
-
       //// Note: Batch picking has been moved to server side processing.
       switch (this.worksheetType) {
         case WORKSHEET_TYPE.PICKING.value:
@@ -229,7 +228,7 @@ class InventoryAutoAssignPopup extends localize(i18next)(LitElement) {
     }
   }
 
-  async fetchInventoriesByStrategy({ batchId, product, packingType }, pickingStrategy, bizplaceId) {
+  async fetchInventoriesByStrategy({ batchId, product, packingType, packingSize }, pickingStrategy, bizplaceId) { 
     const productName = product.name
     const productSku = product.sku
     const response = await client.query({
@@ -241,6 +240,7 @@ class InventoryAutoAssignPopup extends localize(i18next)(LitElement) {
           $productName: String!
           $productSku: String!
           $packingType: String!
+
           $pickingStrategy: String!
         ) {
           inventoriesByStrategy(
@@ -250,6 +250,7 @@ class InventoryAutoAssignPopup extends localize(i18next)(LitElement) {
             productName: $productName
             productSku: $productSku
             packingType: $packingType
+
             pickingStrategy: $pickingStrategy
           ) {
             items {
@@ -274,6 +275,7 @@ class InventoryAutoAssignPopup extends localize(i18next)(LitElement) {
         productName,
         productSku,
         packingType,
+        packingSize,
         pickingStrategy
       }
     })
@@ -337,7 +339,7 @@ class InventoryAutoAssignPopup extends localize(i18next)(LitElement) {
     return worksheetDetails
   }
 
-  async submitPickedItems(worksheetNo, { batchId, product, packingType }, worksheetDetails) {
+  async submitPickedItems(worksheetNo, { batchId, product, packingType, packingSize }, worksheetDetails) {
     try {
       await client.mutate({
         mutation: gql`
@@ -346,6 +348,7 @@ class InventoryAutoAssignPopup extends localize(i18next)(LitElement) {
             $batchId: String!
             $productId: String!
             $packingType: String!
+            $packingSize: Float!
             $worksheetDetails: [NewWorksheetDetail]
           ) {
             generateReleaseGoodWorksheetDetails(
@@ -353,11 +356,12 @@ class InventoryAutoAssignPopup extends localize(i18next)(LitElement) {
               batchId: $batchId
               productId: $productId
               packingType: $packingType
+              packingSize: $packingSize
               worksheetDetails: $worksheetDetails
             )
           }
         `,
-        variables: { worksheetNo, batchId, productId: product.id, packingType, worksheetDetails }
+        variables: { worksheetNo, batchId, productId: product.id, packingType, packingSize, worksheetDetails }
       })
     } catch (e) {
       this._showToast(e)

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

@@ -6,6 +6,7 @@ import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin.js'
 
+import { GhostPrint } from '@operato/ghost-print'
 import { MultiColumnFormStyles, SingleColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
@@ -701,37 +702,26 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  _callPrintDialog(contentSource) {
-    const iframe = document.createElement('iframe')
-    iframe.style.display = 'none'
-    document.body.appendChild(iframe)
-
+  async _callPrintDialog(contentSource) {
     switch (this.platform) {
-      case 'shopee':
-        iframe.src = contentSource
-        iframe.onload = () => {
-          iframe.focus()
-          iframe.contentWindow.print()
-          this._showToast({ message: i18next.t('text.document_has_been_generated') })
-        }
-        break
-
       case 'lazada':
-        iframe.contentDocument.body.innerHTML = contentSource
-        setTimeout(() => {
-          iframe.focus()
-          iframe.contentWindow.print()
-          this._showToast({ message: i18next.t('text.document_has_been_generated') })
-        }, 1000)
+        GhostPrint.print({
+          srcdoc: contentSource,
+          pending: 1000,
+          onfinish: () => {
+            this._showToast({ message: i18next.t('text.document_has_been_generated') })
+          }
+        })
         break
 
+      case 'shopee':
       default:
-        iframe.src = contentSource
-        iframe.onload = () => {
-          iframe.focus()
-          iframe.contentWindow.print()
-          this._showToast({ message: i18next.t('text.document_has_been_generated') })
-        }
+        GhostPrint.print({
+          src: contentSource,
+          onfinish: () => {
+            this._showToast({ message: i18next.t('text.document_has_been_generated') })
+          }
+        })
         break
     }
   }