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

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

@@ -337,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',
@@ -526,7 +520,6 @@ class LoadingProduct extends connect(store)(localize(i18next)(PageView)) {
             }
             worksheetDetailInfos {
               name
-              toteName
               palletId
               batchId
               batchIdRef
@@ -595,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

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

@@ -2,7 +2,6 @@ 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'
@@ -23,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,
@@ -77,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() {
@@ -143,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
       })
     }
 
@@ -392,12 +385,9 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
               releaseGood {
                 id
                 name
-                remark
-                checkedRemarkAt
               }
               bizplaceName
               partnerDomainId
-              checkedRemarkBy
               refNo
               refNo2
               refNo3
@@ -489,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
 
@@ -843,27 +831,6 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  _openOrderRemarkPopup() {
-    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`

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

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

@@ -5,7 +5,6 @@ import './picking-replacement-popup'
 import './show-my-worksheet-list-popup'
 import '../components/worksheet-information-popup'
 import './serial-number-popup'
-import './tote-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
@@ -50,8 +49,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
       refPickingType: String,
       releaseGoodNo: String,
       releaseGoodId: String,
-      worksheetNo: String,
-      toteNo: String
+      worksheetNo: String
     }
   }
 
@@ -94,12 +92,12 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
   }
 
   get completed() {
-    return this.data.records.every(record => record?.completed)
+    return this.data.records.every(record => record.completed)
   }
 
   get context() {
     var actions = []
-    if (this._hasBinPicking) {
+    if (this._hasBinPicking && this.refPickingType === PICKING_TYPES.PICKING.value || PICKING_TYPES.BATCH_PICKING.value) {
       actions.push({
         title: i18next.t('button.get_task'),
         action: this.getTask.bind(this),
@@ -121,14 +119,6 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
       })
     }
 
-    if (this.refPickingType === PICKING_TYPES.PICKING.value && this.releaseGoodNo && this._enableToteScanning) {
-      actions.push({
-        title: i18next.t('button.tote'),
-        action: this.openTotePopup.bind(this),
-        ...CommonButtonStyles.activate
-      })
-    }
-
     if (this.releaseGoodNo) {
       actions.push({
         title: i18next.t('button.plastic_pallet'),
@@ -137,19 +127,6 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
       })
     }
 
-    if (
-      (this.releaseGoodId || this.taskNo) &&
-      this._selectedOrderInventory.status !== 'MISSING' &&
-      this._selectedOrderInventory.hasMissingInventoryChanges !== true &&
-      this._selectedOrderInventory.status !== 'DONE'
-    ) {
-      actions.push({
-        title: i18next.t('button.missing_stock'),
-        action: this.missingStock.bind(this),
-        ...CommonButtonStyles.submit
-      })
-    }
-
     if ((this.releaseGoodNo && this.completed) || (this.taskNo && this.completed)) {
       actions.push({
         title: i18next.t('button.complete'),
@@ -273,6 +250,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
     this.releaseGoodNo = ''
     this.releaseGoodId = ''
     this.taskNo = ''
+
     this._incompleteLocationName = false
     this._isCartonLabel = false
     /* A flag to indicate either PICKING process is executing */
@@ -348,7 +326,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
         ${this.scannable
           ? html`
               <fieldset>
-                ${this._hasBinPicking && (!this.toteNo || this.tote !== '')
+                ${this._hasBinPicking
                   ? html`
                       <label>${i18next.t('label.bin_location')}</label>
                       <barcode-scanable-input
@@ -610,7 +588,6 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
   async fetchInventories(pickingRefNo) {
     if (!pickingRefNo) return
 
-    const data = this._selectedOrderInventory
     let response
     switch (this.refPickingType) {
       case PICKING_TYPES.PICKING.value:
@@ -636,7 +613,6 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
                   trackingNo
                 }
                 worksheetDetailInfos {
-                  hasMissingInventoryChanges
                   name
                   palletId
                   cartonId
@@ -708,31 +684,13 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
 
           if (
             this._selectedOrderInventory &&
-            this._selectedOrderInventory.pickedQty != this._selectedOrderInventory.releaseQty &&
-            !this._selectedOrderInventory.hasMissingInventoryChanges &&
-            this._selectedOrderInventory.status !== 'MISSING'
+            this._selectedOrderInventory.pickedQty != this._selectedOrderInventory.releaseQty
           ) {
             this.scannable = true
           } else {
             this.scannable = false
           }
 
-          if (!this._isCartonLabel && data) {
-            const findPalletId = worksheetDetailInfos.find(res => res.palletId == data.palletId)
-
-            if (data && findPalletId.hasMissingInventoryChanges) {
-              this.scannable = false
-            }
-          }
-
-          if (this._isCartonLabel && data) {
-            const findCartonId = worksheetDetailInfos.find(res => res.cartonId == data.cartonId)
-
-            if (data && findCartonId.hasMissingInventoryChanges) {
-              this.scannable = false
-            }
-          }
-
           if (this._selectedOrderInventory) {
             const record = this.data.records.find(record => record.name === this._selectedOrderInventory.name)
             this._selectedOrderInventory = record
@@ -761,7 +719,6 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
           }
 
           this._enableProductScanning = await fetchSettingRule('enable-product-scanning', worksheetInfo.partnerDomainId)
-          this._enableToteScanning = await fetchSettingRule('enable-tote-scanning', worksheetInfo.partnerDomainId)
         }
         break
 
@@ -776,7 +733,6 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
                   startedAt
                 }
                 worksheetDetailInfos {
-                  hasMissingInventoryChanges
                   palletId
                   cartonId
                   batchId
@@ -835,31 +791,13 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
 
           if (
             this._selectedOrderInventory &&
-            this._selectedOrderInventory.pickedQty != this._selectedOrderInventory.releaseQty &&
-            !this._selectedOrderInventory.hasMissingInventoryChanges &&
-            this._selectedOrderInventory.status !== 'MISSING'
+            this._selectedOrderInventory.pickedQty != this._selectedOrderInventory.releaseQty
           ) {
             this.scannable = true
           } else {
             this.scannable = false
           }
 
-          if (!this._isCartonLabel && data) {
-            const findPalletId = worksheetDetailInfos.find(res => res.palletId == data.palletId)
-
-            if (data && findPalletId.hasMissingInventoryChanges) {
-              this.scannable = false
-            }
-          }
-
-          if (this._isCartonLabel && data) {
-            const findCartonId = worksheetDetailInfos.find(res => res.cartonId == data.cartonId)
-
-            if (data && findCartonId.hasMissingInventoryChanges) {
-              this.scannable = false
-            }
-          }
-
           this._enableProductScanning = await fetchSettingRule('enable-product-scanning', worksheetInfo.partnerDomainId)
 
           if (this._selectedOrderInventory) {
@@ -894,7 +832,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
   formatWorksheetDetailInfos(wsdInfos) {
     return wsdInfos
       .map(record => {
-        if (record.pickedQty == record.releaseQty || record.status == 'MISSING') {
+        if (record.pickedQty == record.releaseQty) {
           record.completed = true
         } else {
           record.completed = false
@@ -920,7 +858,6 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
 
         return record
       })
-      .sort((a, b) => a.hasMissingInventoryChanges - b.hasMissingInventoryChanges)
       .sort((a, b) => a.completed - b.completed)
   }
 
@@ -971,7 +908,6 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
     this._incompleteLocationName = false
     this._isExecuting = false
     this._locationName = null
-    this.toteNo = ''
   }
 
   fillUpForm(form, data) {
@@ -1121,28 +1057,6 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
     )
   }
 
-  openTotePopup() {
-    openPopup(
-      html`
-        <tote-popup
-          .orderNo="${this.releaseGoodNo}"
-          .toteNo="${this.toteNo}"
-          .bizplace="${this._bizplaceName}"
-          @completed="${async e => {
-            this.toteNo = e.detail
-          }}"
-        ></tote-popup>
-      `,
-      {
-        closable: false,
-        backdrop: false,
-        escapable: false,
-        size: 'large',
-        title: i18next.t('title.tote_scanning')
-      }
-    )
-  }
-
   _openWorksheetInformation() {
     openPopup(
       html`
@@ -1199,7 +1113,6 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
                 $releaseQty: Int!
                 $binLocation: String
                 $serialNumber: String
-                $toteNo: String
               ) {
                 picking(
                   worksheetDetailName: $worksheetDetailName
@@ -1209,7 +1122,6 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
                   releaseQty: $releaseQty
                   binLocation: $binLocation
                   serialNumber: $serialNumber
-                  toteNo: $toteNo
                 )
               }
             `,
@@ -1220,8 +1132,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
               locationName: this._locationName ? this._locationName : this._selectedOrderInventory?.location.name,
               releaseQty: this._isRequireSerialNumberScanningOutbound ? 1 : parseInt(this.releaseQtyInput.value),
               binLocation: this._hasBinPicking ? this.binLocationInput.value : null,
-              serialNumber: this._isRequireSerialNumberScanningOutbound ? this.serialInput.value : null,
-              toteNo: this._enableToteScanning && this.toteNo !== '' ? this.toteNo : null
+              serialNumber: this._isRequireSerialNumberScanningOutbound ? this.serialInput.value : null
             }
           })
 
@@ -1280,7 +1191,6 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
                 $cartonId: String!
                 $binLocation: String
                 $serialNumber: String
-                $toteNo: String
               ) {
                 scanProductPicking(
                   worksheetDetailName: $worksheetDetailName
@@ -1289,7 +1199,6 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
                   cartonId: $cartonId
                   binLocation: $binLocation
                   serialNumber: $serialNumber
-                  toteNo: $toteNo
                 )
               }
             `,
@@ -1299,8 +1208,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
               productBarcode: this.productBarcodeInput.value.trim(),
               cartonId: this.cartonInput.value.trim(),
               serialNumber: this._isRequireSerialNumberScanningOutbound ? this.serialInput.value : null,
-              binLocation: this._hasBinPicking ? this.binLocationInput.value : null,
-              toteNo: this._enableToteScanning && this.toteNo !== '' ? this.toteNo : null
+              binLocation: this._hasBinPicking ? this.binLocationInput.value : null
             }
           })
 
@@ -1637,45 +1545,6 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async missingStock() {
-    const selectOrderInventory = this._selectedOrderInventory
-
-    const patchesArr = [selectOrderInventory]
-
-    const patches = patchesArr.map(p => {
-      return {
-        palletId: p.palletId,
-        transactionType: 'MISSING'
-      }
-    })
-
-    const result = await CustomAlert({
-      title: i18next.t('title.are_you_sure'),
-      text: i18next.t('text.do_you_want_to_mark_it_as_missing'),
-      confirmButton: { text: i18next.t('button.confirm') },
-      cancelButton: { text: i18next.t('button.cancel') }
-    })
-
-    if (result.isConfirmed) {
-      try {
-        const response = await client.mutate({
-          mutation: gql`
-            mutation submitInventoryChanges($patches: [InventoryPatch!]!) {
-              submitInventoryChanges(patches: $patches)
-            }
-          `,
-          variables: { patches }
-        })
-
-        if (!response.error) {
-          await this.fetchInventories(this.releaseGoodNo)
-        }
-      } catch (error) {
-        throw new Error(error)
-      }
-    }
-  }
-
   openPalletOutbound() {
     openPopup(
       html`
@@ -1781,7 +1650,6 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
         this.data = { records: this.formatWorksheetDetailInfos(worksheetDetailInfos) }
 
         this._enableProductScanning = await fetchSettingRule('enable-product-scanning', worksheetInfo.partnerDomainId)
-        this._enableToteScanning = await fetchSettingRule('enable-tote-scanning', worksheetInfo.partnerDomainId)
 
         if (this._selectedOrderInventory) {
           const record = this.data.records.find(record => record.name === this._selectedOrderInventory.name)

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

@@ -66,7 +66,13 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
   }
 
   get context() {
-    var actions = []
+    var actions = [
+        {
+          title: i18next.t('button.assign_picker'),
+          action: this._assignPicker.bind(this),
+          ...CommonButtonStyles.activate
+        }
+      ]
 
     if (this._routeLabelSetting) {
       actions.push({
@@ -76,12 +82,6 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
       })
     }
 
-    actions.push({
-      title: i18next.t('button.assign_picker'),
-      action: this._assignPicker.bind(this),
-      ...CommonButtonStyles.activate
-    })
-
     return {
       title: i18next.t('title.outbound_worksheet'),
       actions,
@@ -192,7 +192,7 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
       },
       {
         label: i18next.t('field.cross_docking'),
-        name: 'crossDocking',
+        name: 'crossDocking', 
         type: 'checkbox',
         props: { searchOper: 'eq' },
         attrs: ['indeterminate']
@@ -438,8 +438,9 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
     if (!response.errors) {
       let domain = response.data.worksheets.items[0]?.domain
 
-      if (domain) this._routeLabelSetting = await fetchSettingRule('enable-print-route-label', domain.id)
-
+      if (domain)
+        this._routeLabelSetting = await fetchSettingRule('enable-print-route-label', domain.id)
+        
       this.updateContext()
       return {
         total: response.data.worksheets.total || 0,
@@ -630,6 +631,17 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
     return { header: headerSetting, data: data }
   }
 
+  _showToast({ type, message }) {
+    document.dispatchEvent(
+      new CustomEvent('notify', {
+        detail: {
+          type,
+          message
+        }
+      })
+    )
+  }
+
   navigatePickingRelatedPages(record) {
     if (this.assigneeId) {
       const searchParams = new URLSearchParams()