@things-factory/operato-wms 4.3.2 → 4.4.0-alpha.0

package/client/pages/order/release-order/release-order-detail.js

@@ -55,7 +55,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
       _containerArrivalDate: Date,
       _containerLeavingDate: Date,
       _vasExpanded: Boolean,
-      _beforeRemark: String,
       isUserBelongsDomain: Boolean
     }
   }
@@ -310,10 +309,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
             <label ?hidden="${this.roType === 'b2b'}">${i18next.t('label.delivery_address')}</label>
             <textarea name="deliveryAddress1" ?hidden="${this.roType === 'b2b'}" rows="5" readonly></textarea>
 
-            <label ?hidden="${this.roType === 'b2b'}">${i18next.t('label.order_remark')}</label>
-            <textarea name="remark" ?hidden="${this.roType === 'b2b'}" rows="5" ?readonly="${!this
-      ?._editable}"></textarea>
-
             ${
               this._crossDocking
                 ? html`
@@ -562,10 +557,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     return this.shadowRoot.querySelector('input[name=warehouseTransport]')
   }
 
-  get _remarkInput() {
-    return this.shadowRoot.querySelector('textarea[name=remark]')
-  }
-
   get _exportInput() {
     return this.shadowRoot.querySelector('input[name=exportOption]')
   }
@@ -758,6 +749,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
           type: 'object',
           name: 'vas',
           header: i18next.t('field.vas'),
+          record: { options: { queryName: 'vass' } },
           width: 250
         },
         {
@@ -798,7 +790,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
             attentionTo
             phone1
             deliveryAddress1
-            remark
             bizplace {
               id
               name
@@ -943,7 +934,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
       this.partnerBizplaceId = releaseOrder.bizplace.id
       this._exportOption = releaseOrder.exportOption
 
-      this._beforeRemark = releaseOrder?.remark
       this._courierOption = releaseOrder.courierOption
       this._packingOption = releaseOrder.packingOption
       this._crossDocking = releaseOrder?.crossDocking
@@ -974,9 +964,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         this._attachments = releaseOrder && releaseOrder.attachment
       }
 
-      const nonEditableStatus = ['DONE', 'PACKING']
-
-      if (!nonEditableStatus.includes(releaseOrder.status) && this.isUserBelongsDomain) {
+      if (releaseOrder.status !== 'DONE' && this.isUserBelongsDomain) {
         this._editable = true
       } else {
         this._editable = false
@@ -1056,6 +1044,8 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         title: i18next.t('title.reject_release_order')
       }
     )
+
+    popup.onclosed
   }
 
   async _receiveReleaseOrder() {
@@ -1219,7 +1209,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     this._packingOption = false
     this._ownTransport = true
     this._downloadable = true
-    this._beforeRemark = null
     this._attachments = []
     this.inventoryData = { records: [] }
     this.vasData = { records: [] }
@@ -1227,6 +1216,10 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
 
   async _deleteReleaseOrder() {
     try {
+      let userIsOfficeAdmin = this._userRoles
+        ? this._userRoles.find(x => x.name?.toLowerCase() === 'office admin')
+        : false
+
       let result = await CustomAlert({
         title: i18next.t('title.are_you_sure'),
         text: i18next.t('text.you_wont_be_able_to_revert_this'),
@@ -1267,6 +1260,10 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
   }
 
   async _submitCancellationReleaseOrder() {
+    let userIsOfficeAdmin = this._userRoles
+      ? this._userRoles.find(x => x.name?.toLowerCase() === 'office admin')
+      : false
+
     try {
       const result = await CustomAlert({
         title: i18next.t('title.are_you_sure'),
@@ -1314,6 +1311,10 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
   }
 
   async _confirmReleaseOrder() {
+    let userIsOfficeAdmin = this._userRoles
+      ? this._userRoles.find(x => x.name?.toLowerCase() === 'office admin')
+      : false
+
     let result = await CustomAlert({
       title: i18next.t('title.are_you_sure'),
       text: i18next.t('text.confirm_release_good'),
@@ -1359,7 +1360,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     try {
       const response = await client.query({
         query: gql`
-          query checkUserBelongsDomain {
+          query {
             checkUserBelongsDomain
           }
         `
@@ -1430,31 +1431,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
       this._validateTransport()
       this._validateForm()
 
-      let releaseOrder = this._getFormInfo()
-      delete releaseOrder.warehouseTransport
-      delete releaseOrder.bizplaceId
-      delete releaseOrder.bizplaceName
-      delete releaseOrder.status
-      delete releaseOrder.ganNo
-
-      let afterRemarkValue
-      if (releaseOrder?.remark) {
-        afterRemarkValue = releaseOrder.remark = releaseOrder.remark.trimStart()
-      }
-
-      if (this._beforeRemark !== afterRemarkValue) {
-        if (!afterRemarkValue) {
-          const remarkResult = await CustomAlert({
-            title: i18next.t('title.removing_order_remark'),
-            text: i18next.t('text.do_you_want_to_proceed'),
-            confirmButton: { text: i18next.t('button.proceed') },
-            cancelButton: { text: i18next.t('button.cancel') }
-          })
-
-          if (!remarkResult.value) return
-        }
-      }
-
       const result = await CustomAlert({
         title: i18next.t('title.are_you_sure'),
         text: i18next.t('text.update_release_order_details'),
@@ -1464,6 +1440,13 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
 
       if (!result.value) return
 
+      let releaseOrder = this._getFormInfo()
+      delete releaseOrder.warehouseTransport
+      delete releaseOrder.bizplaceId
+      delete releaseOrder.bizplaceName
+      delete releaseOrder.status
+      delete releaseOrder.ganNo
+
       let shippingOrder = this._exportOption ? this._serializeForm(this.shippingOrderForm) : null
 
       const response = await client.mutate({
@@ -1496,15 +1479,14 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
   }
 
   _getFormInfo() {
-    let formData = this._serializeForm(this.releaseOrderForm)
+    const formData = this._serializeForm(this.releaseOrderForm)
     delete formData.importedOrder
-
     return formData
   }
 
   _serializeForm(form) {
     let obj = {}
-    Array.from(form.querySelectorAll('input, select, textarea')).forEach(field => {
+    Array.from(form.querySelectorAll('input, select')).forEach(field => {
       if (!field.hasAttribute('hidden')) {
         obj[field.name] = field.type === 'checkbox' ? field.checked : field.value
       }

package/client/pages/order/return-order/receive-return-order-requests.js

@@ -510,6 +510,8 @@ class ReceiveReturnOrderRequests extends connect(store)(localize(i18next)(PageVi
         title: i18next.t('title.reject_return_order')
       }
     )
+
+    popup.onclosed
   }
 
   _showToast({ type, message }) {

package/client/pages/order/transfer-order/receive-transfer-order-request.js

@@ -423,7 +423,7 @@ class ReceiveTransferOrderRequest extends localize(i18next)(PageView) {
   //     }
   //   )
 
-  //  
+  //   popup.onclosed
   // }
 
   get _columns() {

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

@@ -227,6 +227,7 @@ class PrintDeliveryOrder extends localize(i18next)(PageView) {
         title: i18next.t('title.completed_delivery_order')
       }
     )
+    popup.onclosed
   }
 
   _editDeliveryNote() {

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

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

package/client/pages/order/vas-order/receive-vas-order.js

@@ -355,6 +355,8 @@ class ReceiveVasOrder extends localize(i18next)(PageView) {
         title: i18next.t('title.reject_vas_order')
       }
     )
+
+    popup.onclosed
   }
 
   _showToast({ type, message }) {

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

@@ -34,8 +34,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
       _data: Object,
       data: Object,
       pickQty: Number,
-      pickUomValue: Number,
-      orderProductId: String
+      pickUomValue: Number
     }
   }
 
@@ -512,11 +511,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
             product: { id: record.product.id },
             releaseQty: record.pickQty,
             releaseUomValue: record.pickUomValue,
-            type: ORDER_TYPES.RELEASE_OF_GOODS.value,
-            uom: record.uom
-          },
-          targetProduct: {
-            id: this.orderProductId
+            type: ORDER_TYPES.RELEASE_OF_GOODS.value
           }
         }
       })

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

@@ -232,8 +232,7 @@ class InventoryAutoAssignPopup extends localize(i18next)(LitElement) {
             uom: item.uom,
             releaseQty: item.releaseQty,
             releaseUomValue: item.releaseUomValue,
-            pickingStrategy: item.product.pickingStrategy,
-            orderProductId: item.orderProduct.id
+            pickingStrategy: item.product.pickingStrategy
           }
         })
       }

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

@@ -1,21 +1,17 @@
 import '@things-factory/barcode-ui'
-import '@things-factory/grist-ui'
-import './return-pallet-check-popup'
-import './transport-vehicles-popup'
-
-import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
-import { connect } from 'pwa-helpers/connect-mixin.js'
-
-import { sleep } from '@operato/utils'
 import { MultiColumnFormStyles, SingleColumnFormStyles } from '@things-factory/form-ui'
+import '@things-factory/grist-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
 import { client, CustomAlert, PageView, store } from '@things-factory/shell'
 import { CommonButtonStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
-
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+import { connect } from 'pwa-helpers/connect-mixin.js'
 import { WORKSHEET_STATUS } from '../constants'
+import './return-pallet-check-popup'
+import './transport-vehicles-popup'
 
 class LoadingProduct extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
@@ -289,8 +285,7 @@ class LoadingProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async _openBufferSelector() {
-    await sleep(1010)
+  _openBufferSelector() {
     openPopup(
       html`
         <transport-vehicles-popup
@@ -342,12 +337,6 @@ class LoadingProduct extends connect(store)(localize(i18next)(PageView)) {
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         { type: 'gutter', gutterName: 'row-selector', multiple: true },
-        {
-          type: 'string',
-          name: 'toteName',
-          header: i18next.t('field.tote'),
-          width: 140
-        },
         {
           type: 'string',
           name: 'palletId',
@@ -531,7 +520,6 @@ class LoadingProduct extends connect(store)(localize(i18next)(PageView)) {
             }
             worksheetDetailInfos {
               name
-              toteName
               palletId
               batchId
               batchIdRef
@@ -600,34 +588,9 @@ class LoadingProduct extends connect(store)(localize(i18next)(PageView)) {
   async _loading() {
     try {
       this._validateLoading()
-      const toteList = this.pickedProductGrist.selected.filter(itm => itm.toteName)
-
-      let loadedWorksheetDetails = []
-
-      if (toteList[0]?.toteName) {
-        loadedWorksheetDetails = this.pickedProductGrist.selected
-          .map(record => {
-            return { name: record.name, loadedQty: record.loadedQty, toteName: record.toteName }
-          })
-          .filter(itm => !itm.toteName)
-
-        let toteRecords = this.pickedProductGrist.data.records
-          .filter(record => {
-            return toteList.some(list => {
-              return list.toteName == record.toteName
-            })
-          })
-          .map(itm => {
-            return { name: itm.name, loadedQty: itm.loadedQty, toteName: itm.toteName }
-          })
-
-        loadedWorksheetDetails = loadedWorksheetDetails.concat(toteRecords)
-      } else {
-        loadedWorksheetDetails = this.pickedProductGrist.selected.map(record => {
-          return { name: record.name, loadedQty: record.loadedQty, toteName: record.toteName }
-        })
-      }
-
+      const loadedWorksheetDetails = this.pickedProductGrist.selected.map(record => {
+        return { name: record.name, loadedQty: record.loadedQty }
+      })
       let truckNo = null
       if (!this._ownCollection) {
         truckNo = this.warehouseTruckInput.value
@@ -877,8 +840,7 @@ class LoadingProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async _validateRemainPallets(data) {
-    await sleep(1010)
+  _validateRemainPallets(data) {
     openPopup(
       html`
         <return-pallet-check-popup

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

@@ -2,14 +2,12 @@ import '@things-factory/barcode-ui'
 import '@things-factory/grist-ui'
 import '../components/worksheet-information-popup'
 import './serial-number-popup'
-import './order-remark-popup'
 
 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 { sleep } from '@operato/utils'
 import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
@@ -24,12 +22,10 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
     return {
       airwayBill: String,
-      checkedRemarkAt: String,
       config: Object,
       data: Object,
       invoice: String,
       orderInformation: String,
-      orderRemark: String,
       platform: String,
       releaseGoodNo: String,
       releaseGoodId: String,
@@ -78,11 +74,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
   }
 
   get completed() {
-    if (this.orderRemark) {
-      return this.data.records.every(record => record.completed) && Boolean(this.checkedRemarkAt)
-    } else {
-      return this.data.records.every(record => record.completed)
-    }
+    return this.data.records.every(record => record.completed)
   }
 
   get context() {
@@ -144,11 +136,11 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       })
     }
 
-    if (this.orderRemark) {
+    if (this._selectedTaskStatus === 'EXECUTING') {
       actions.push({
-        title: i18next.t('button.order_remark'),
-        action: this._openOrderRemarkPopup.bind(this),
-        ...CommonButtonStyles.inspect
+        title: i18next.t('button.pack'),
+        action: this.packing.bind(this),
+        ...CommonButtonStyles.submit
       })
     }
 
@@ -393,12 +385,9 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
               releaseGood {
                 id
                 name
-                remark
-                checkedRemarkAt
               }
               bizplaceName
               partnerDomainId
-              checkedRemarkBy
               refNo
               refNo2
               refNo3
@@ -490,8 +479,6 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       this.platform = worksheetInfo.platform
       this.shippingProvider = worksheetInfo.shippingProvider
       this.orderInformation = worksheetInfo.marketplaceOrder
-      this.orderRemark = worksheetInfo.releaseGood?.remark
-      this.checkedRemarkAt = worksheetInfo.releaseGood?.checkedRemarkAt
 
       this._isBatchPicking = worksheetDetailInfos[0].relatedOrderInv?.refWorksheetId ? true : false
 
@@ -844,28 +831,6 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async _openOrderRemarkPopup() {
-    await sleep(1010)
-    openPopup(
-      html`
-        <order-remark-popup
-          .orderRemark="${this.orderRemark}"
-          .releaseGoodNo="${this.releaseGoodNo}"
-          .checkedRemarkAt="${this.checkedRemarkAt}"
-          @remark-checked="${async () => {
-            await this._fetchInventories(this.releaseGoodNo)
-            this._showToast({ message: i18next.t('text.order_remark_has_been_checked') })
-          }}"
-        ></order-remark-popup>
-      `,
-      {
-        backdrop: true,
-        size: 'medium',
-        title: i18next.t('title.order_remark')
-      }
-    )
-  }
-
   _openWorksheetInformation() {
     openPopup(
       html`
@@ -879,8 +844,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     )
   }
 
-  async openSerialNumberPopup() {
-    await sleep(1010)
+  openSerialNumberPopup() {
     openPopup(
       html`
         <serial-number-popup

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

@@ -159,13 +159,6 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
           })()
         },
         value: new Date().toISOString().split('T')[0]
-      },
-      {
-        label: i18next.t('field.order_remark'),
-        name: 'orderRemark',
-        type: 'checkbox',
-        props: { searchOper: 'eq' },
-        attrs: ['indeterminate']
       }
     ]
 
@@ -194,13 +187,6 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
             }
           }
         },
-        {
-          type: 'boolean',
-          name: 'orderRemark',
-          header: i18next.t('field.order_remark'),
-          sortable: true,
-          width: 100
-        },
         {
           type: 'object',
           name: 'releaseGood',
@@ -310,7 +296,6 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
                 name
                 description
               }
-              orderRemark
               name
               type
               status