@things-factory/operato-wms 3.7.9 → 3.7.10

package/client/pages/vas/reverse-kitting/execute-reverse-kitting.js

@@ -365,6 +365,8 @@ class ExecuteReverseKitting extends connect(store)(localize(i18next)(PageView))
       `,
       {
         backdrop: true,
+        escapable: false,
+        closable: false,
         size: 'large',
         title: record.palletId
       }

package/client/pages/vas/reverse-kitting/popup-combination-sets.js

@@ -142,13 +142,16 @@ class PopupCombinationSets extends localize(i18next)(LitElement) {
               @click=${this._openIssueNote.bind(this)}
               label="${i18next.t('button.issue')}"
             ></mwc-button>
+            <mwc-button raised @click=${this._closePopup.bind(this)} label="${i18next.t('button.back')}"></mwc-button>
           </div>`
-        : ''}
+        : html`<div class="button-container">
+            <mwc-button raised @click=${this._closePopup.bind(this)} label="${i18next.t('button.back')}"></mwc-button>
+          </div>`}
     `
   }
 
   async fetchReverseKittingOrder() {
-    if (!this._orderNo) return
+    if (!this.orderNo) return
     const response = await client.query({
       query: gql`
         query executingReverseKittingOrder($name: String!) {
@@ -205,15 +208,30 @@ class PopupCombinationSets extends localize(i18next)(LitElement) {
           }
         }
       `,
-      variables: { name: this._orderNo }
+      variables: { name: this.orderNo }
     })
 
     if (!response.errors) {
       const reverseKittingOrder = response.data.executingReverseKittingOrder
       const orderReverseKittings = reverseKittingOrder.orderReverseKittings
 
-      this.data = {
-        records: orderReverseKittings.map(orderReverseKitting => {
+      // this.data = {
+      //   records: orderReverseKittings.map(orderReverseKitting => {
+      //     const inventory = orderReverseKitting.inventory
+      //     return {
+      //       ...orderReverseKitting,
+      //       batchId: inventory.batchId,
+      //       palletId: inventory.palletId,
+      //       location: inventory.location,
+      //       product: inventory.product
+      //     }
+      //   })
+      // }
+
+      const previousOrderReverseKittingName = this.data.name
+      const matchedOrderReverseKitting = orderReverseKittings
+        .filter(item => item.name === previousOrderReverseKittingName)
+        .map(orderReverseKitting => {
           const inventory = orderReverseKitting.inventory
           return {
             ...orderReverseKitting,
@@ -223,7 +241,8 @@ class PopupCombinationSets extends localize(i18next)(LitElement) {
             product: inventory.product
           }
         })
-      }
+
+      this.data = { ...matchedOrderReverseKitting[0] }
 
       this.getProductCombination()
     }
@@ -301,12 +320,19 @@ class PopupCombinationSets extends localize(i18next)(LitElement) {
       `,
       {
         backdrop: true,
+        escapable: false,
+        closable: false,
         size: 'large',
         title: i18next.t('title.reverse_kitting')
       }
     )
   }
 
+  _closePopup() {
+    this.dispatchEvent(new CustomEvent('order-reverse-kitting-data', { detail: {} }))
+    history.back()
+  }
+
   _showToast({ type, message }) {
     document.dispatchEvent(
       new CustomEvent('notify', {

package/client/pages/vas/reverse-kitting/popup-reverse-kitting-template.js

@@ -130,13 +130,24 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
               ></data-grist>
             </div>
             <div class="button-container">
+              <mwc-button
+                raised
+                @click=${this._confirmInventory.bind(this)}
+                label="${i18next.t('button.confirm')}"
+              ></mwc-button>
               <mwc-button
                 raised
                 @click=${this._undoInventory.bind(this)}
                 label="${i18next.t('button.undo')}"
               ></mwc-button>
             </div> `
-        : ''}
+        : html`<div class="button-container">
+            <mwc-button
+              raised
+              @click=${this._confirmInventory.bind(this)}
+              label="${i18next.t('button.confirm')}"
+            ></mwc-button>
+          </div> `}
     `
   }
 
@@ -352,6 +363,11 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
     }
   }
 
+  _confirmInventory() {
+    this.dispatchEvent(new CustomEvent('updated', { detail: {} }))
+    history.back()
+  }
+
   _fillUpForm(form, data) {
     for (let key in data) {
       Array.from(form.querySelectorAll('input')).forEach(field => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "3.7.9",
+  "version": "3.7.10",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -71,7 +71,7 @@
     "@things-factory/print-ui": "^3.7.5",
     "@things-factory/product-base": "^3.7.8",
     "@things-factory/resource-ui": "^3.7.7",
-    "@things-factory/sales-ui": "^3.7.9",
+    "@things-factory/sales-ui": "^3.7.10",
     "@things-factory/scene-chartjs": "^3.7.5",
     "@things-factory/scene-clock": "^3.7.5",
     "@things-factory/scene-clone": "^3.7.5",
@@ -102,11 +102,11 @@
     "@things-factory/system-ui": "^3.7.5",
     "@things-factory/transport-base": "^3.7.5",
     "@things-factory/tutorial-ui": "^3.7.5",
-    "@things-factory/warehouse-base": "^3.7.9",
-    "@things-factory/worksheet-base": "^3.7.9"
+    "@things-factory/warehouse-base": "^3.7.10",
+    "@things-factory/worksheet-base": "^3.7.10"
   },
   "devDependencies": {
     "@things-factory/builder": "^3.7.5"
   },
-  "gitHead": "4d4b67315ce5f7a8a3e2cbc3206ff23b0f1d5f9d"
+  "gitHead": "dc4aa344ee524651b4e633c3647c85c8daad8eb6"
 }