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

package/client/pages/order/transport-order/print-delivery-note.js

@@ -10,6 +10,26 @@ import { ORDER_STATUS } from '../../constants'
 import './delivery-note-popup'
 
 class PrintDeliveryOrder extends localize(i18next)(PageView) {
+  static get styles() {
+    return [
+      ScrollbarStyles,
+      css`
+        :host {
+          display: flex;
+          flex-direction: column;
+          padding: 0;
+        }
+
+        #container {
+          flex: 1;
+          padding: 0;
+          margin: 0;
+          border: 0;
+        }
+      `
+    ]
+  }
+
   static get properties() {
     return {
       _doNo: String,
@@ -20,10 +40,13 @@ class PrintDeliveryOrder extends localize(i18next)(PageView) {
       _date: Date,
       _recipient: String,
       _proceedFlag: Boolean,
-      _customerContactPoints: Array,
+      // _customerContactPoints: Array,
       _bizplace: Object,
       _orderInfo: Object,
-      _isManualDo: Boolean
+      _isManualDo: Boolean,
+      _data: Object,
+      _roNo: String,
+      _refNo: String
     }
   }
 
@@ -33,26 +56,6 @@ class PrintDeliveryOrder extends localize(i18next)(PageView) {
     this._status = ''
   }
 
-  static get styles() {
-    return [
-      ScrollbarStyles,
-      css`
-        :host {
-          display: flex;
-          flex-direction: column;
-          padding: 0;
-        }
-
-        #container {
-          flex: 1;
-          padding: 0;
-          margin: 0;
-          border: 0;
-        }
-      `
-    ]
-  }
-
   get context() {
     var actions = [
       {
@@ -87,7 +90,11 @@ class PrintDeliveryOrder extends localize(i18next)(PageView) {
     return {
       title: i18next.t('title.goods_delivery_note_details'),
       help: 'operato-wms/transport-order/print-delivery-note',
-      actions
+      actions,
+      exportable: {
+        name: i18next.t('title.goods_delivery_note_details'),
+        data: this._exportableData.bind(this)
+      }
     }
   }
 
@@ -107,6 +114,8 @@ class PrintDeliveryOrder extends localize(i18next)(PageView) {
 
       if (this._doNo) {
         await this._fetchDeliveryOrder(this._doNo)
+
+        this._fetchDOTemplate()
       }
 
       this.updateContext()
@@ -119,6 +128,7 @@ class PrintDeliveryOrder extends localize(i18next)(PageView) {
         query deliveryOrderByWorksheet($name: String!) {
           deliveryOrderByWorksheet(name: $name) {
             deliveryOrderInfo {
+              name
               contactName
               createdDate
               deliverTo
@@ -136,14 +146,22 @@ class PrintDeliveryOrder extends localize(i18next)(PageView) {
                 id
                 name
               }
-            }
-            contactPointInfo {
-              id
-              contactName
-              address
-              phone
-              fax
-              email
+              releaseGood {
+                name
+                refNo
+                refNo2
+                refNo3
+                attentionTo
+              }
+              productList {
+                batchNo
+                sku
+                name
+                type
+                uom
+                loadedQty
+                uomValue
+              }
             }
           }
         }
@@ -158,9 +176,10 @@ class PrintDeliveryOrder extends localize(i18next)(PageView) {
 
       let orderInfo = deliveryOrderData.deliveryOrderInfo
       let contactPoints = deliveryOrderData.contactPointInfo
+      this._roNo = orderInfo.releaseGood.name
       this._status = orderInfo.doStatus
       this._ownCollection = orderInfo.ownCollection
-      this._customerContactPoints = deliveryOrderData.contactPointInfo
+      // this._customerContactPoints = deliveryOrderData.contactPointInfo
       this._truckNo = orderInfo.truckNo
       this._bizplace = orderInfo.bizplace
       this._isManualDo = orderInfo.isManualDo
@@ -175,7 +194,49 @@ class PrintDeliveryOrder extends localize(i18next)(PageView) {
       }
 
       this._orderInfo = orderInfo
-      this._fetchDOTemplate()
+    }
+  }
+
+  /**
+   * @oscarchuaweiwen-fsd
+   * Kindly clean up anything regarding this function.
+   * Check and confirm to be remove and remove.
+   * This function causes the whole page to render 2 times. Thus causing the document template to run 2 time and consuming alot of resources.
+   */
+  async _fetchDeliveryOrderRO(name) {
+    const response = await client.query({
+      query: gql`
+        query fetchDeliveryOrderRO($name: String!) {
+          fetchDeliveryOrderRO(name: $name) {
+            roNo
+            doNo
+            roRef
+            roRef2
+            roRef3
+            companyDomain
+            recipientBiz
+            doDate
+            productList {
+              batchNo
+              sku
+              name
+              type
+              uom
+              loadedQty
+              uomValue
+            }
+          }
+        }
+      `,
+      variables: {
+        name
+      }
+    })
+
+    if (!response.error) {
+      this._data = response.data.fetchDeliveryOrderRO
+      this._roNo = this._data.roNo
+      this._refNo = this._data.roRef
     }
   }
 
@@ -234,6 +295,8 @@ class PrintDeliveryOrder extends localize(i18next)(PageView) {
       html`
         <delivery-note-popup
           .doNo="${this._doNo}"
+          .roNo="${this._roNo}"
+          .refNo="${this._refNo}"
           .bizplace="${this._bizplace}"
           .orderInfo="${this._orderInfo}"
           .status="${this._status}"
@@ -261,6 +324,124 @@ class PrintDeliveryOrder extends localize(i18next)(PageView) {
     }
   }
 
+  _exportableData() {
+    const { name, doNo, refNo, refNo2, refNo3, companyDomain, attentionTo, doDate } = {
+      ...this._orderInfo.releaseGood,
+      bizplaceName: this._orderInfo.bizplace.name,
+      doNo: this._orderInfo.name,
+      doDate: this._orderInfo.createdDate
+    }
+
+    const exportData = this._orderInfo.productList.map(res => {
+      return {
+        roNo: name,
+        doNo,
+        roRef: refNo,
+        roRef2: refNo2,
+        roRef3: refNo3,
+        companyDomain,
+        recipientBiz: attentionTo,
+        doDate,
+        ...res
+      }
+    })
+
+    const headerSetting = [
+      {
+        header: i18next.t('field.ro'),
+        key: 'roNo',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.do'),
+        key: 'doNo',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.ref_no'),
+        key: 'roRef',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.ref_no_2'),
+        key: 'roRef2',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.ref_no_3'),
+        key: 'roRef3',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.company'),
+        key: 'companyDomain',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.recipient_bizplace'),
+        key: 'recipientBiz',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.do_generated_date'),
+        key: 'doDate',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.batch_no'),
+        key: 'batchNo',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.sku'),
+        key: 'sku',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.product_name'),
+        key: 'name',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.packing_type'),
+        key: 'type',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.loaded_qty'),
+        key: 'loadedQty',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.load_uom_value'),
+        key: 'uomValue',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.uom'),
+        key: 'uom',
+        width: 25,
+        type: 'string'
+      }
+    ]
+
+    return { header: headerSetting, data: exportData }
+  }
+
   _showToast({ type, message }) {
     document.dispatchEvent(
       new CustomEvent('notify', {

package/client/pages/order/transport-order/upload-delivery-note.js

@@ -1,11 +1,13 @@
 import '@things-factory/form-ui'
-import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import '@things-factory/grist-ui'
+
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit-element'
+
+import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client } from '@things-factory/shell'
 import { isMobileDevice } from '@things-factory/utils'
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit-element'
 
 class UploadDeliveryNote extends localize(i18next)(LitElement) {
   static get styles() {
@@ -202,7 +204,7 @@ class UploadDeliveryNote extends localize(i18next)(LitElement) {
     if (this._loadedFlag) {
       const filters = [
         {
-          name: 'releaseGood',
+          name: 'releaseGoodId',
           operator: 'eq',
           value: this._releaseGoodId
         }

package/client/pages/order/transport-order/view-delivery-note.js

@@ -226,7 +226,6 @@ class ViewDeliveryOrder extends localize(i18next)(PageView) {
         title: i18next.t('title.completed_delivery_order')
       }
     )
-
   }
 
   _editDeliveryNote() {