@things-factory/operato-wms 5.0.0-alpha.2 → 5.0.0-alpha.22

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

@@ -7,6 +7,7 @@ import '../components/worksheet-information-popup'
 import './unloaded-inventories-popup'
 import './undo-unload-popup'
 import './select-product-batch'
+import './serial-number-list-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
@@ -38,7 +39,9 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       _isLooseItem: Boolean,
       _isQtyChecked: Boolean,
       _isRequiredCheckExpiry: Boolean,
+      _isRequireSerialNumberScanningInbound: Boolean,
       _orderNo: String,
+      _orderId: String,
       _palletId: String,
       _reusablePallet: Object,
       _scanning: Boolean,
@@ -95,6 +98,10 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     return this.shadowRoot.querySelector('barcode-scanable-input[name=cartonId]').shadowRoot.querySelector('input')
   }
 
+  get serialNumberInput() {
+    return this.shadowRoot.querySelector('barcode-scanable-input[name=serialNumber]').shadowRoot.querySelector('input')
+  }
+
   get completable() {
     let completable = false
     const orderProductWithIssues = this.orderProductData.records.filter(orderProduct => !orderProduct.validity)
@@ -124,6 +131,14 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       })
     }
 
+    if (this._selectedOrderProduct && this._isRequireSerialNumberScanningInbound) {
+      actions.push({
+        title: i18next.t('button.serial_number'),
+        action: this._openSerialNumberList.bind(this),
+        ...CommonButtonStyles.activate
+      })
+    }
+
     if (this._selectedOrderProduct && !this._selectedOrderProduct.validity) {
       actions.push({
         title: i18next.t('button.issue'),
@@ -259,7 +274,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
                 <barcode-scanable-input name="productBarcode" without-enter custom-input></barcode-scanable-input>
               `
             : ''}
-          ${this._enableInputQty
+          ${this._enableInputQty && !this._isRequireSerialNumberScanningInbound
             ? html`
                 <label>${i18next.t('label.actual_qty')}</label>
                 <input name="qty" type="number" min="1" />
@@ -272,6 +287,12 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
               `
             : ''}
         </fieldset>
+        ${this._isRequireSerialNumberScanningInbound
+          ? html`<fieldset>
+              <label>${i18next.t('label.serial_number')}</label>
+              <barcode-scanable-input name="serialNumber" without-enter custom-input></barcode-scanable-input>
+            </fieldset>`
+          : ''}
       </form>
 
       <data-grist
@@ -307,6 +328,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     this._isLooseItem = false
     this._isQtyChecked = false
     this._isRequiredCheckExpiry = false
+    this._isRequireSerialNumberScanningInbound = false
     this._orderNo = ''
     this._scanning = false
     this.refOrderType = AVAIL_ORDER_TYPES.ARRIVAL_NOTICE.value
@@ -341,6 +363,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
             if (record && record.batchId) {
               this._selectedOrderProduct = record
               this._isRequiredCheckExpiry = record.product?.isRequiredCheckExpiry
+              this._isRequireSerialNumberScanningInbound = record.product?.isRequireSerialNumberScanningInbound
               this._isQtyChecked = false
 
               this.inputForm.reset()
@@ -349,6 +372,9 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
                   this.productBarcodeInput.readOnly = false
                   this.productBarcodeInput.value = ''
                 }
+                if (this.serialNumberInput) {
+                  this.serialNumberInput.value = ''
+                }
                 this.cartonInput.value = ''
                 this._focusOnCartonInput()
               } else {
@@ -373,6 +399,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           'actualPalletQty',
           'packQty',
           'actualPackQty',
+          'manufactureDate',
           'issue'
         ]
       },
@@ -484,6 +511,13 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.actual_pack_qty'),
           width: 100
         },
+        {
+          type: 'date',
+          name: 'manufactureDate',
+          label: true,
+          header: i18next.t('field.manufacture_date'),
+          width: 100
+        },
         {
           type: 'string',
           name: 'issue',
@@ -502,6 +536,10 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           query unloadingWorksheet($arrivalNoticeNo: String!) {
             unloadingWorksheet(arrivalNoticeNo: $arrivalNoticeNo) {
               worksheetInfo {
+                arrivalNotice {
+                  id
+                  name
+                }
                 bizplaceName
                 partnerDomainId
                 customerCompanyDomainId
@@ -537,6 +575,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
                   name
                   description
                   isRequiredCheckExpiry
+                  isRequireSerialNumberScanningInbound
                 }
                 name
                 targetName
@@ -548,6 +587,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
                 packQty
                 actualPackQty
                 issue
+                manufactureDate
                 remark
               }
             }
@@ -562,6 +602,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
         const orderVasInfo = worksheetInfo.orderVas
 
         this._orderNo = orderNo
+        this._orderId = worksheetInfo.arrivalNotice.id
         this._bizplaceName = worksheetInfo.bizplaceName
         this._isLooseItem = worksheetInfo.looseItem
         this._worksheetInfo = worksheetInfo
@@ -585,20 +626,29 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
             }
           : { records: [] }
 
+        const worksheetDetailInfo = orderBy(
+          response.data.unloadingWorksheet.worksheetDetailInfos.map(worksheetDetailInfo => {
+            return {
+              ...worksheetDetailInfo,
+              validity:
+                worksheetDetailInfo.actualPackQty === worksheetDetailInfo.packQty &&
+                worksheetDetailInfo.actualPalletQty === worksheetDetailInfo.palletQty,
+              sku: worksheetDetailInfo.product.sku
+            }
+          }),
+          ['validity'],
+          ['asc']
+        )
+
         this.orderProductData = {
-          records: orderBy(
-            response.data.unloadingWorksheet.worksheetDetailInfos.map(worksheetDetailInfo => {
-              return {
-                ...worksheetDetailInfo,
-                validity:
-                  worksheetDetailInfo.actualPackQty === worksheetDetailInfo.packQty &&
-                  worksheetDetailInfo.actualPalletQty === worksheetDetailInfo.palletQty,
-                sku: worksheetDetailInfo.product.sku
-              }
-            }),
-            ['validity'],
-            ['asc']
-          )
+          records: worksheetDetailInfo
+        }
+
+        if (!this._selectedOrderProduct) {
+          this._selectedOrderProduct = worksheetDetailInfo[0]
+          this._isRequiredCheckExpiry = worksheetDetailInfo[0].product?.isRequiredCheckExpiry
+          this._isRequireSerialNumberScanningInbound =
+            worksheetDetailInfo[0].product?.isRequireSerialNumberScanningInbound
         }
 
         const partnerDomainId = worksheetInfo.partnerDomainId
@@ -635,6 +685,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
                   description
                   sku
                   isRequiredCheckExpiry
+                  isRequireSerialNumberScanningInbound
                 }
                 inventory {
                   id
@@ -707,12 +758,14 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
             cartonId
             qty
             expirationDate
+            manufactureDate
             status
             product {
               id
               name
               sku
               isRequiredCheckExpiry
+              isRequireSerialNumberScanningInbound
             }
             reusablePallet {
               id
@@ -749,21 +802,33 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     if (this._selectedOrderProduct?.isRequiredCheckExpiry) this.expDateInput.value = null
 
     if (this._enableCartonLabel) {
-      if (this._enableInputQty) {
-        this.actualQtyInput.value = ''
-        this.cartonInput.value = ''
-        this._focusOnCartonInput()
+      if (this._isRequireSerialNumberScanningInbound) {
+        this.serialNumberInput.value = ''
+        this._focusOnSerialNumberInput()
+      } else {
+        if (this._enableInputQty) {
+          this.actualQtyInput.value = ''
+          this.cartonInput.value = ''
+          this._focusOnCartonInput()
+        }
       }
     } else {
-      this.lotInput.value = ''
-      if (this._enableInputQty) this.actualQtyInput.value = ''
-      this._focusOnLotInput()
+      if (this._isRequireSerialNumberScanningInbound) {
+        this.serialNumberInput.value = ''
+        this._focusOnSerialNumberInput()
+      } else {
+        this.lotInput.value = ''
+        if (this._enableInputQty) this.actualQtyInput.value = ''
+        this._focusOnLotInput()
+      }
     }
 
     if (this._enableProductScanning) {
-      this.productBarcodeInput.value = ''
-      if (this.cartonInput?.value) {
-        this._focusOnProductBarcodeInput()
+      if (!this._isRequireSerialNumberScanningInbound) {
+        this.productBarcodeInput.value = ''
+        if (this.cartonInput?.value) {
+          this._focusOnProductBarcodeInput()
+        }
       }
     }
   }
@@ -783,13 +848,17 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     try {
       if (!this._enableCartonLabel) return this._unloadSelected()
       await this._validateUnloading()
-      if (!(this._enableProductScanning && !this._enableInputQty)) return this._qtyUnload()
+
+      if (this._isRequireSerialNumberScanningInbound) {
+        return this._scanSerialNumberUnload()
+      } else {
+        if (!(this._enableProductScanning && !this._enableInputQty)) return this._qtyUnload()
+      }
       this._scanProductUnload()
     } catch (e) {
       this._showToast(e)
     }
   }
-
   async _scanProductUnload() {
     if (this._scanning) return this._showToast({ message: i18next.t('text.previous_scan_is_executing') })
     this._scanning = true
@@ -839,6 +908,62 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
+  async _scanSerialNumberUnload() {
+    if (this._scanning) {
+      return this._showToast({ message: i18next.t('text.previous_scan_is_executing') })
+    }
+    this._scanning = true
+
+    if (this.serialNumberInput.value == '') {
+      this._scanning = false
+      return this._showToast({ message: i18next.t('text.enter_serial_number') })
+    }
+
+    if (this._isRequiredCheckExpiry && this._expirationPeriod > 0) {
+      const answer = await this._checkExpiry()
+      if (answer && !answer.value) return (this._scanning = false)
+    }
+
+    try {
+      const response = await client.mutate({
+        mutation: gql`
+          mutation scanSerialNumberUnload(
+            $worksheetDetailName: String!
+            $serialNumber: String!
+            $inventory: InventoryPatch!
+          ) {
+            scanSerialNumberUnload(
+              worksheetDetailName: $worksheetDetailName
+              serialNumber: $serialNumber
+              inventory: $inventory
+            )
+          }
+        `,
+        variables: {
+          worksheetDetailName: this._selectedOrderProduct.name,
+          serialNumber: this.serialNumberInput.value.trim(),
+          inventory: {
+            palletId: this._enableCartonLabel ? null : this.lotInput.value.trim(),
+            cartonId: this._enableCartonLabel ? this.cartonInput.value.trim() : null,
+            expirationDate: this.expDateInput?.value ? this.expDateInput.value : null
+          }
+        }
+      })
+
+      if (!response.errors) {
+        await this._fetchProducts(this._orderNo)
+      }
+    } catch (e) {
+      // for cartonId + product scanning
+      // show custom toast for incorrect product barcodes
+      // full errors for everything else
+      if (!(e instanceof TypeError)) return this._showToast(e)
+      this._showToast({ message: i18next.t('text.incorrect_serial_number') })
+    } finally {
+      this._scanning = false
+    }
+  }
+
   async _checkExpiry() {
     let date = new Date()
     const acceptBefore = new Date(date.setDate(date.getDate() + this._expirationPeriod))
@@ -885,8 +1010,9 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       }
     } catch (e) {
       this._showToast(e)
+    } finally {
+      this._scanning = false
     }
-    this._scanning = false
   }
 
   async fetchProductDetail(gtin, productId) {
@@ -904,6 +1030,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
               name
               sku
               isRequiredCheckExpiry
+              isRequireSerialNumberScanningInbound
               expirationPeriod
             }
           }
@@ -943,9 +1070,14 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
 
         if (!foundOrderProducts?.length) {
           if (!foundParentProducts?.length) {
-            if (this._enableInputQty) {
+            if (this._enableInputQty && !this._isRequireSerialNumberScanningInbound) {
               if (this.actualQtyInput?.value) this.actualQtyInput.value = ''
             }
+
+            if (this._isRequireSerialNumberScanningInbound) {
+              if (this.serialNumberInput?.value) this.serialNumberInput.value = ''
+            }
+
             this.productBarcodeInput.value = ''
             this._focusOnProductBarcodeInput()
             throw new Error(i18next.t('text.no_matching_product_found'))
@@ -953,6 +1085,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
         }
         this._expirationPeriod = product.expirationPeriod
         this._isRequiredCheckExpiry = product.isRequiredCheckExpiry
+        this._isRequireSerialNumberScanningInbound = product.isRequireSerialNumberScanningInbound
 
         if (this._selectedOrderProduct && this._selectedOrderProduct.product.sku !== product.sku)
           this._selectedOrderProduct = null
@@ -975,10 +1108,15 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           .orderProducts="${orderProducts}"
           @selected-batch="${async e => {
             this._selectedOrderProduct = e.detail
-            if (this._enableProductScanning && !this._enableInputQty) {
-              await this._scanProductUnload()
+
+            if (e.detail.product.isRequireSerialNumberScanningInbound) {
+              await this._scanSerialNumberUnload()
             } else {
-              this._focusOnActualQtyInput()
+              if (this._enableProductScanning && !this._enableInputQty) {
+                await this._scanProductUnload()
+              } else {
+                this._focusOnActualQtyInput()
+              }
             }
           }}"
         ></select-product-batch>
@@ -1007,16 +1145,23 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     if (!this._enableProductScanning) {
       if (!this._selectedOrderProduct) throw new Error(i18next.t('text.target_does_not_selected'))
 
-      // 4. qty value existing
-      if (!parseInt(this.actualQtyInput.value)) {
-        this._focusOnActualQtyInput()
-        throw new Error(i18next.t('text.qty_is_empty'))
-      }
+      if (this._isRequireSerialNumberScanningInbound) {
+        if (!this.serialNumberInput.value) {
+          this._focusOnSerialNumberInput()
+          throw new Error(i18next.t('text.serial_number_is_empty'))
+        }
+      } else {
+        // 4. qty value existing
+        if (!parseInt(this.actualQtyInput.value)) {
+          this._focusOnActualQtyInput()
+          throw new Error(i18next.t('text.qty_is_empty'))
+        }
 
-      // 5. qty value has to be positive
-      if (!(parseInt(this.actualQtyInput.value) > 0)) {
-        setTimeout(() => this.actualQtyInput.select(), 100)
-        throw new Error(i18next.t('text.qty_should_be_positive'))
+        // 5. qty value has to be positive
+        if (!(parseInt(this.actualQtyInput.value) > 0)) {
+          setTimeout(() => this.actualQtyInput.select(), 100)
+          throw new Error(i18next.t('text.qty_should_be_positive'))
+        }
       }
 
       if (this._isRequiredCheckExpiry) {
@@ -1035,7 +1180,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
 
       await this._checkedScannedProduct()
 
-      if (this._enableInputQty) {
+      if (this._enableInputQty && !this._isRequireSerialNumberScanningInbound) {
         if (!parseInt(this.actualQtyInput.value)) {
           this._focusOnActualQtyInput()
           throw new Error(i18next.t('text.enter_qty'))
@@ -1045,6 +1190,11 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           setTimeout(() => this.actualQtyInput.select(), 100)
           throw new Error(i18next.t('text.qty_should_be_positive'))
         }
+      } else if (this._isRequireSerialNumberScanningInbound) {
+        if (!this.serialNumberInput.value) {
+          this._focusOnSerialNumberInput()
+          throw new Error(i18next.t('text.enter_serial_number'))
+        }
       }
 
       if (this._isRequiredCheckExpiry) {
@@ -1249,6 +1399,8 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       if (!this.lotInput.value) return
       await this._validateUnloading()
       await this._checkedLotScannedProduct()
+
+      if (this._isRequireSerialNumberScanningInbound) this._scanSerialNumberUnload()
       this._qtyUnload()
     } catch (e) {
       this._showToast(e)
@@ -1314,6 +1466,29 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     )
   }
 
+  _openSerialNumberList() {
+    openPopup(
+      html`
+        <serial-number-list-popup
+          .title="${i18next.t('title.serial_number_list')}"
+          .orderType="${i18next.t('text.inbound')}"
+          .orderId="${this._orderId}"
+          .data="${this._selectedOrderProduct}"
+          @close-serial-number-list="${async e => {
+            await this._fetchProducts(this._orderNo)
+          }}"
+        ></serial-number-list-popup>
+      `,
+      {
+        closable: false,
+        backdrop: false,
+        escapable: false,
+        size: 'large',
+        title: i18next.t('title.serial_number_list')
+      }
+    )
+  }
+
   async _normalPalletMode() {
     const result = await CustomAlert({
       title: i18next.t('title.are_you_sure'),
@@ -1404,6 +1579,10 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     setTimeout(() => this.productBarcodeInput.focus(), 100)
   }
 
+  _focusOnSerialNumberInput() {
+    setTimeout(() => this.serialNumberInput.focus(), 100)
+  }
+
   orderTypeChangeHandler(e) {
     this.refOrderType = e.currentTarget.value
     this._clearView()

package/client/pages/inbound/unloaded-inventories-popup.js

@@ -103,6 +103,13 @@ class UnloadedInventoriesPopup extends connect(store)(localize(i18next)(LitEleme
           label: true,
           width: 120
         },
+        {
+          type: 'date',
+          name: 'manufactureDate',
+          header: i18next.t('field.manufacture_date'),
+          label: true,
+          width: 120
+        },
         {
           type: 'object',
           name: 'reusablePallet',