@things-factory/operato-wms 3.7.7 → 3.7.11

package/client/pages/order/release-order/release-extra-product-popup.js

@@ -519,71 +519,75 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
     let columnName = e.detail.column.name
     let packageUomValue = 0
 
-    if (!e.detail.after) {
-      throw new Error(i18next.t('text.invalid_form_value'))
-    }
-
-    const result = this._calculateQtyAndUom(
-      packageUomValue,
-      columnName,
-      e.detail.record.uomValue,
-      e.detail.record.qty,
-      e.detail.record.__origin__.releaseUomValue,
-      e.detail.record.__origin__.releaseQty,
-      e.detail.record.__origin__.addableUomValue,
-      e.detail.record.__origin__.addableQty,
-      e.detail.record.__origin__.remainUomValue,
-      e.detail.record.__origin__.remainQty,
-      e.detail.after
-    )
+    try {
+      if (e.details?.after && e.details?.after !== 0) {
+        throw new Error(i18next.t('text.invalid_form_value'))
+      }
 
-    this.existingInventoryData = {
-      ...this.existingInventoryGrist.dirtyData,
-      records: this.existingInventoryGrist.dirtyData.records.map((record, idx) => {
-        if (result.releaseQty >= 0 && result.roundedUom >= 0) {
-          if ((columnName == 'releaseUomValue' || columnName == 'releaseQty') && idx === e.detail.row) {
-            if (columnName == 'releaseUomValue') {
-              record.releaseQty = result.releaseQty
-            }
-            record.releaseUomValue = result.roundedUom
-            record.addableQty = record.__origin__.releaseQty + record.__origin__.addableQty - result.releaseQty
-            if (record.addableQty <= 0) {
-              record.addableQty = 0
-            }
-            if (record.addableUomValue == 0) {
-              record.addableUomValue =
-                record.addableQty * (record.__origin__.releaseUomValue / record.__origin__.releaseQty)
-            } else {
-              if (record.addableQty == 0) {
-                record.addableUomValue = 0
+      const result = this._calculateQtyAndUom(
+        packageUomValue,
+        columnName,
+        e.detail.record.uomValue,
+        e.detail.record.qty,
+        e.detail.record.__origin__.releaseUomValue,
+        e.detail.record.__origin__.releaseQty,
+        e.detail.record.__origin__.addableUomValue,
+        e.detail.record.__origin__.addableQty,
+        e.detail.record.__origin__.remainUomValue,
+        e.detail.record.__origin__.remainQty,
+        e.detail.after
+      )
+
+      this.existingInventoryData = {
+        ...this.existingInventoryGrist.dirtyData,
+        records: this.existingInventoryGrist.dirtyData.records.map((record, idx) => {
+          if (result.releaseQty >= 0 && result.roundedUom >= 0) {
+            if ((columnName == 'releaseUomValue' || columnName == 'releaseQty') && idx === e.detail.row) {
+              if (columnName == 'releaseUomValue') {
+                record.releaseQty = result.releaseQty
+              }
+              record.releaseUomValue = result.roundedUom
+              record.addableQty = record.__origin__.releaseQty + record.__origin__.addableQty - result.releaseQty
+              if (record.addableQty <= 0) {
+                record.addableQty = 0
+              }
+              if (record.addableUomValue == 0) {
+                record.addableUomValue =
+                  record.addableQty * (record.__origin__.releaseUomValue / record.__origin__.releaseQty)
               } else {
-                if (e.detail.record.__origin__.releaseQty == 0 || e.detail.record.__origin__.releaseUomValue == 0) {
-                  record.addableUomValue =
-                    record.addableQty *
-                    (e.detail.record.__origin__.addableUomValue / e.detail.record.__origin__.addableQty)
+                if (record.addableQty == 0) {
+                  record.addableUomValue = 0
                 } else {
-                  record.addableUomValue =
-                    record.addableQty *
-                    (e.detail.record.__origin__.releaseUomValue / e.detail.record.__origin__.releaseQty)
+                  if (e.detail.record.__origin__.releaseQty == 0 || e.detail.record.__origin__.releaseUomValue == 0) {
+                    record.addableUomValue =
+                      record.addableQty *
+                      (e.detail.record.__origin__.addableUomValue / e.detail.record.__origin__.addableQty)
+                  } else {
+                    record.addableUomValue =
+                      record.addableQty *
+                      (e.detail.record.__origin__.releaseUomValue / e.detail.record.__origin__.releaseQty)
+                  }
                 }
               }
             }
           }
-        }
 
-        let returnObj = {
-          ...record
-        }
+          let returnObj = {
+            ...record
+          }
 
-        if (this._pickingStd === PICKING_STANDARD.SELECT_BY_PRODUCT.value) {
-          returnObj.product = {
-            id: record.inventory.productId,
-            name: record.inventory.productName
+          if (this._pickingStd === PICKING_STANDARD.SELECT_BY_PRODUCT.value) {
+            returnObj.product = {
+              id: record.inventory.productId,
+              name: record.inventory.productName
+            }
           }
-        }
 
-        return returnObj
-      })
+          return returnObj
+        })
+      }
+    } catch (e) {
+      this._showToast(e)
     }
   }
 
@@ -605,18 +609,14 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
 
     if (afterValue >= 0) {
       if (columnName == 'releaseUomValue' || columnName == 'releaseQty') {
-        if (detailUom && detailQty) {
-          packageUom = detailUom / detailQty
-        } else {
-          if (originQty) {
-            if (originQty == 0 || originUom == 0) {
-              packageUom = originAddableUom / originAddableQty
-            } else {
-              packageUom = originUom / originQty
-            }
+        if (originQty) {
+          if (originQty == 0 || originUom == 0) {
+            packageUom = originAddableUom / originAddableQty
           } else {
-            packageUom = originRemainUom / originRemainQty
+            packageUom = originUom / originQty
           }
+        } else {
+          packageUom = originRemainUom / originRemainQty
         }
 
         if (columnName === 'releaseQty') {

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

@@ -785,9 +785,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
 
       this.roType = releaseOrder.type
       const orderInventories = releaseOrder.inventoryInfos.map(inventoryInfo => {
-        let roundedUomValue =
-          inventoryInfo.releaseQty *
-          ((inventoryInfo.uomValue + inventoryInfo.releaseUomValue) / (inventoryInfo.qty + inventoryInfo.releaseQty))
+        let roundedUomValue = parseFloat(inventoryInfo.releaseUomValue.toFixed(2))
         return {
           ...inventoryInfo,
           productSKU: inventoryInfo?.product?.sku || '',

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.7",
+  "version": "3.7.11",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -69,9 +69,9 @@
     "@things-factory/print-proxy-service": "^3.7.5",
     "@things-factory/print-service": "^3.7.5",
     "@things-factory/print-ui": "^3.7.5",
-    "@things-factory/product-base": "^3.7.7",
+    "@things-factory/product-base": "^3.7.8",
     "@things-factory/resource-ui": "^3.7.7",
-    "@things-factory/sales-ui": "^3.7.7",
+    "@things-factory/sales-ui": "^3.7.11",
     "@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.7",
-    "@things-factory/worksheet-base": "^3.7.7"
+    "@things-factory/warehouse-base": "^3.7.11",
+    "@things-factory/worksheet-base": "^3.7.11"
   },
   "devDependencies": {
     "@things-factory/builder": "^3.7.5"
   },
-  "gitHead": "7e1cfc771ca9e8970d90493d3049d4d589e96f08"
+  "gitHead": "fea83ab8a7f82df4d78e69a504a4877c3b93248e"
 }