@things-factory/operato-wms 3.7.2 → 3.7.7

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

@@ -833,7 +833,6 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
                 select: [
                   { name: 'productId', hidden: true },
                   { name: 'remainUomValue', hidden: true },
-                  { name: 'uom', hidden: true },
                   { name: 'batchId', header: i18next.t('field.batch_id') },
                   { name: 'batchIdRef', header: i18next.t('field.batch_no_ref') },
                   {
@@ -848,6 +847,7 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
                   },
                   { name: 'packingType', header: i18next.t('field.packing_type') },
                   { name: 'packingSize', header: i18next.t('field.packing_size') },
+                  { name: 'uom', header: i18next.t('field.uom') },
                   {
                     name: 'remainQty',
                     header: i18next.t('field.remain_qty'),
@@ -906,6 +906,12 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
             header: i18next.t('field.packing_size'),
             width: 140
           },
+          {
+            type: 'string',
+            name: 'uom',
+            header: i18next.t('field.uom'),
+            width: 100
+          },
           {
             type: 'integer',
             name: 'remainQty',
@@ -984,7 +990,6 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
                 select: [
                   { name: 'id', hidden: true },
                   { name: 'name', hidden: true },
-                  { name: 'uom', hidden: true },
                   { name: 'remainUomValue', hidden: true },
                   { name: 'product', type: 'object', hidden: true },
                   { name: 'palletId', header: i18next.t('field.lot_id') },
@@ -999,6 +1004,7 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
                   },
                   { name: 'packingType', header: i18next.t('field.packing_type') },
                   { name: 'packingSize', header: i18next.t('field.packing_size') },
+                  { name: 'uom', header: i18next.t('field.uom') },
                   { name: 'remainQty', type: 'float', header: i18next.t('field.remain_qty') },
                   {
                     name: 'remainUomValueWithUom',
@@ -1052,6 +1058,12 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
             header: i18next.t('field.packing_size'),
             width: 140
           },
+          {
+            type: 'string',
+            name: 'uom',
+            header: i18next.t('field.uom'),
+            width: 100
+          },
           {
             type: 'integer',
             name: 'remainQty',
@@ -1141,6 +1153,8 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
 
           roundedUomValue = releaseQty * packageUomValue
           roundedUomValue = parseFloat(roundedUomValue.toFixed(2))
+          this.releaseQty = releaseQty
+          this.releaseUomValue = roundedUomValue
         }
       }
     }
@@ -1155,8 +1169,13 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
           (columnName == 'releaseUomValue' || columnName == 'releaseQty' || columnName == 'inventory') &&
           idx === e.detail.row
         ) {
-          if (columnName == 'releaseUomValue') record.releaseQty = releaseQty
-          record.releaseUomValue = roundedUomValue
+          if (this.releaseQty > e.detail.record.remainQty && this.releaseUomValue > e.detail.record.releaseUomValue) {
+            record.releaseQty = e.detail.record.releaseQty
+            record.releaseUomValue = e.detail.record.releaseUomValue
+          } else {
+            record.releaseQty = releaseQty
+            record.releaseUomValue = roundedUomValue
+          }
         }
 
         let returnObj = {
@@ -2131,6 +2150,7 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
             remainUomValueWithUom
             packingType
             packingSize
+            uom
             releaseQty
             releaseUomValue
             isError
@@ -2146,6 +2166,7 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
               remainUomValueWithUom
               packingType
               packingSize
+              uom
             }
             product {
               id

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

@@ -41,8 +41,7 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
       _template: Object,
       _mimetype: String,
       _doPath: String,
-      _bizplaceName: String,
-      _type: String
+      _roType: String
     }
   }
 
@@ -247,7 +246,7 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
           </div>
 
           <label>${i18next.t('label.company')}</label>
-          <input name="bizplaceName" value="${this._bizplaceName}" readonly />
+          <input name="bizplaceName" readonly />
 
           <label>${i18next.t('label.ref_no')}</label>
           <input name="refNo" readonly />
@@ -264,6 +263,15 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
           <label ?hidden="${!this._ownTransport}">${i18next.t('label.co_no')}</label>
           <input name="collectionOrderNo" ?hidden="${!this._ownTransport}" readonly />
 
+          <label ?hidden="${this._roType === 'b2b'}">${i18next.t('label.attention_to')}</label>
+          <input name="attentionTo" ?hidden="${this._roType === 'b2b'}" readonly />
+
+          <label ?hidden="${this._roType === 'b2b'}">${i18next.t('label.phone_no')}</label>
+          <input name="phone1" ?hidden="${this._roType === 'b2b'}" readonly />
+
+          <label ?hidden="${this._roType === 'b2b'}">${i18next.t('label.delivery_address')}</label>
+          <textarea name="deliveryAddress1" ?hidden="${this._roType === 'b2b'}" rows="5" readonly></textarea>
+
           ${this._crossDocking
             ? html`
                 <label for="ganNo">${i18next.t('label.arrival_notice')}</label>
@@ -341,7 +349,6 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
     this._exportOption = false
     this._downloadable = true
     this._ownTransport = true
-    this._bizplaceName = ''
   }
 
   get releaseOrderForm() {
@@ -399,12 +406,6 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
           header: i18next.t('field.packing_type'),
           width: 150
         },
-        // {
-        //   type: 'integer',
-        //   name: 'qty',
-        //   header: i18next.t('field.available_qty'),
-        //   width: 100
-        // },
         {
           type: 'integer',
           name: 'releaseQty',
@@ -412,12 +413,6 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
           record: { options: { min: 0 } },
           width: 100
         },
-        // {
-        //   type: 'string',
-        //   name: 'remainUomValue',
-        //   header: i18next.t('field.available_uom_value'),
-        //   width: 100
-        // },
         {
           type: 'string',
           name: 'releaseUomValue',
@@ -575,6 +570,9 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
             type
             ownTransport
             crossDocking
+            attentionTo
+            deliveryAddress1
+            phone1
             arrivalNotice {
               name
             }
@@ -664,7 +662,6 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
       const orderVass = releaseOrder.orderVass
 
       this._exportOption = releaseOrder.exportOption
-      this._bizplaceName = releaseOrder.bizplace.name
       if (this._exportOption) {
         this._ownTransport = true
       } else if (!this._exportOption) {
@@ -677,16 +674,22 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
 
       this._courierOption = releaseOrder.courierOption
       this._packingOption = releaseOrder.packingOption
+
+      await this.updateComplete
       this._status = releaseOrder.status
-      this._type = releaseOrder?.type
+      this._roType = releaseOrder?.type
+
+      this._fillupRGForm({ ...releaseOrder, bizplaceName: releaseOrder.bizplace?.name })
+
+      if (shippingOrder) {
+        this._shippingOrder = shippingOrder
+        this._fillupSOForm(shippingOrder)
+      }
 
       if (releaseOrder && releaseOrder?.attachment) {
         this._attachments = releaseOrder && releaseOrder.attachment
       }
 
-      this._fillupRGForm(releaseOrder)
-      if (this._exportOption) this._fillupSOForm(shippingOrder)
-
       this.inventoryData = { records: orderInventories }
       this.vasData = {
         records: orderVass
@@ -798,7 +801,7 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
               })
 
               if (!response.errors) {
-                if (this._type === 'b2b') {
+                if (this._roType === 'b2b') {
                   navigate(`b2b_order_requests`)
                 } else {
                   navigate(`b2c_order_requests`)
@@ -867,7 +870,7 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
 
       if (!response.errors) {
         this._showToast({ message: i18next.t('text.release_order_has_been_cancelled') })
-        if (this._type === 'b2b') {
+        if (this._roType === 'b2b') {
           navigate(`b2b_order_requests`)
         } else {
           navigate(`b2c_order_requests`)
@@ -900,7 +903,7 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
 
       if (!response.errors) {
         this._showToast({ message: i18next.t('text.cancellation_request_has_been_rejected') })
-        if (this._type === 'b2b') {
+        if (this._roType === 'b2b') {
           navigate(`b2b_order_requests`)
         } else {
           navigate(`b2c_order_requests`)

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

@@ -1,11 +1,14 @@
-import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import '@things-factory/grist-ui'
+
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit-element'
+
+import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, CustomAlert } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit-element'
+
 import { fetchLocationSortingRule } from '../../../fetch-location-sorting-rule'
 import {
   INVENTORY_STATUS,
@@ -118,7 +121,7 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
             .config="${this.existingInventoryGristConfig}"
             .data="${this.existingInventoryData}"
             @record-change="${this._onProductChangeHandler.bind(this)}"
-            @field-change="${this._onInventoryFieldChanged.bind(this)}"
+            @field-change="${this._onExistingInventoryFieldChanged.bind(this)}"
           ></data-grist>
         </div>
 
@@ -271,8 +274,8 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
         },
         {
           type: 'integer',
-          name: 'remainQty',
-          header: i18next.t('field.available_qty'),
+          name: 'addableQty',
+          header: i18next.t('field.addable_qty'),
           width: 100
         },
         {
@@ -284,8 +287,8 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
         },
         {
           type: 'float',
-          name: 'remainUomValue',
-          header: i18next.t('field.available_uom_value'),
+          name: 'addableUomValue',
+          header: i18next.t('field.addable_uom_value'),
           width: 100
         },
         {
@@ -354,7 +357,7 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
                   field: 'name'
                 },
                 { name: 'packingType', header: i18next.t('field.packing_type') },
-                { name: 'remainQty', type: 'float' },
+                { name: 'remainQty', header: i18next.t('field.remain_qty'), type: 'float' },
                 {
                   name: 'remainUomValue',
                   type: 'float',
@@ -362,7 +365,7 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
                 },
                 { name: 'batchIdRef', header: i18next.t('field.batch_no_ref') }
               ],
-              list: { fields: ['palletId', 'product', 'batchId', 'location', 'remainUomValue', 'batchIdRef'] }
+              list: { fields: ['palletId', 'product', 'batchId', 'location', 'batchIdRef'] }
             }
           },
           width: 250
@@ -419,7 +422,6 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
   }
 
   resetPage() {
-    this.initProperties()
     this._clearGristConditions()
   }
 
@@ -513,41 +515,64 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
     return date.toISOString().split('T')[0]
   }
 
-  _onInventoryFieldChanged(e) {
+  _onExistingInventoryFieldChanged(e) {
     let columnName = e.detail.column.name
-    let roundedUomValue = e.detail.record.roundedUomValue || 0
-    let releaseQty = 0
+    let packageUomValue = 0
 
-    if (columnName == 'releaseUomValue' || columnName == 'releaseQty') {
-      let packageUomValue = e.detail.record.remainUomValue / e.detail.record.remainQty
-      if (
-        e.detail.record.remainUomValue &&
-        e.detail.record.remainQty &&
-        e.detail.record.remainUomValue > 0 &&
-        e.detail.record.remainQty > 0
-      ) {
-        if (columnName === 'releaseQty') {
-          releaseQty = e.detail.after || 0
-        } else {
-          releaseQty = Math.round(e.detail.after / packageUomValue)
-        }
-
-        roundedUomValue = releaseQty * packageUomValue
-        roundedUomValue = parseFloat(roundedUomValue.toFixed(2))
-      }
+    if (!e.detail.after) {
+      throw new Error(i18next.t('text.invalid_form_value'))
     }
 
-    this.inventoryData = {
-      ...this.inventoryGrist.dirtyData,
-      records: this.inventoryGrist.dirtyData.records.map((record, idx) => {
-        if ((columnName == 'releaseUomValue' || columnName == 'releaseQty') && idx === e.detail.row) {
-          if (columnName == 'releaseUomValue') record.releaseQty = releaseQty
-          record.releaseUomValue = roundedUomValue
+    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 (record.addableQty == 0) {
+                record.addableUomValue = 0
+              } 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)
+                } else {
+                  record.addableUomValue =
+                    record.addableQty *
+                    (e.detail.record.__origin__.releaseUomValue / e.detail.record.__origin__.releaseQty)
+                }
+              }
+            }
+          }
         }
 
         let returnObj = {
-          ...record,
-          ...record.inventory
+          ...record
         }
 
         if (this._pickingStd === PICKING_STANDARD.SELECT_BY_PRODUCT.value) {
@@ -560,13 +585,94 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
         return returnObj
       })
     }
+  }
 
-    this.existingInventoryData = {
-      ...this.existingInventoryGrist.dirtyData,
-      records: this.existingInventoryGrist.dirtyData.records.map((record, idx) => {
-        if ((columnName == 'releaseUomValue' || columnName == 'releaseQty') && idx === e.detail.row) {
-          if (columnName == 'releaseUomValue') record.releaseQty = releaseQty
-          record.releaseUomValue = roundedUomValue
+  _calculateQtyAndUom(
+    packageUom,
+    columnName,
+    detailUom,
+    detailQty,
+    originUom,
+    originQty,
+    originAddableUom,
+    originAddableQty,
+    originRemainUom,
+    originRemainQty,
+    afterValue
+  ) {
+    var releaseQty = 0
+    var roundedUom = 0
+
+    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
+            }
+          } else {
+            packageUom = originRemainUom / originRemainQty
+          }
+        }
+
+        if (columnName === 'releaseQty') {
+          releaseQty = afterValue || 0
+        } else {
+          releaseQty = Math.round(afterValue / packageUom)
+        }
+
+        roundedUom = releaseQty * packageUom
+        roundedUom = parseFloat(roundedUom.toFixed(2))
+      }
+    } else {
+      releaseQty = afterValue
+      roundedUom = afterValue
+    }
+
+    return { releaseQty, roundedUom }
+  }
+  _onInventoryFieldChanged(e) {
+    let columnName = e.detail.column.name
+    let roundedUomValue = e.detail.record.roundedUomValue || 0
+    let releaseQty = 0
+    let packageUomValue = 0
+
+    try {
+      if (e.detail.after == NaN) {
+        throw new Error(i18next.t('text.invalid_form_value'))
+      }
+    } catch (e) {
+      this._showToast(e)
+    }
+    if (e.detail.after >= 0) {
+      packageUomValue = e.detail.record.remainUomValue / e.detail.record.remainQty
+
+      if (columnName === 'releaseQty' && e.detail.after <= e.detail.record.remainQty) {
+        releaseQty = e.detail.after || 0
+      } else {
+        if (columnName === 'releaseUomValue' && e.detail.after <= e.detail.record.remainUomValue) {
+          releaseQty = Math.round(e.detail.after / packageUomValue)
+        }
+      }
+      roundedUomValue = releaseQty * packageUomValue
+      roundedUomValue = parseFloat(roundedUomValue.toFixed(2))
+    } else {
+      releaseQty = e.detail.after
+      roundedUomValue = e.detail.after
+    }
+
+    this.inventoryData = {
+      ...this.inventoryGrist.dirtyData,
+      records: this.inventoryGrist.dirtyData.records.map((record, idx) => {
+        if (releaseQty >= 0 && roundedUomValue >= 0) {
+          if ((columnName == 'releaseUomValue' || columnName == 'releaseQty') && idx === e.detail.row) {
+            record.releaseQty = releaseQty
+            record.releaseUomValue = roundedUomValue
+          }
         }
 
         let returnObj = {
@@ -589,12 +695,22 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
   _onProductChangeHandler(event) {
     const changeRecord = event.detail.after
     const changedColumn = event.detail.column.name
+    var totalAvailableQty = 0
+    var totalAvailableUomValue = 0
+
+    if (changeRecord.inventory.remainQty) {
+      totalAvailableQty = changeRecord.inventory.remainQty
+      totalAvailableUomValue = changeRecord.inventory.remainUomValue
+    } else if (event.detail.before) {
+      totalAvailableQty = event.detail.before.inventory.releaseQty + event.detail.before.addableQty
+      totalAvailableUomValue = event.detail.before.inventory.releaseUomValue + event.detail.before.addableUomValue
+    }
 
     try {
       if (changedColumn === 'releaseQty') {
-        this._validateReleaseQty(changeRecord.releaseQty, changeRecord.remainQty)
+        this._validateReleaseQty(changeRecord.releaseQty, changeRecord.remainQty, totalAvailableQty)
       } else if (changedColumn === 'releaseUomValue') {
-        this._validateReleaseUomValue(changeRecord.releaseUomValue, changeRecord.remainUomValue)
+        this._validateReleaseUomValue(changeRecord.releaseUomValue, changeRecord.remainUomValue, totalAvailableUomValue)
       }
       this._updateInventoryList()
     } catch (e) {
@@ -608,22 +724,39 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
     }
   }
 
-  _validateReleaseQty(releaseQty, remainQty) {
+  _validateReleaseQty(releaseQty, remainQty, totalAvailableQty) {
     if (remainQty === undefined) throw new Error(i18next.t('text.there_is_no_selected_items'))
-    if (releaseQty > remainQty) {
-      throw new Error(i18next.t('text.available_quantity_insufficient'))
+    if (totalAvailableQty) {
+      if (releaseQty < 0) {
+        throw new Error(i18next.t('text.invalid_quantity_input'))
+      } else if (releaseQty > totalAvailableQty) {
+        throw new Error(i18next.t('text.available_quantity_insufficient'))
+      }
+    } else {
+      if (releaseQty > remainQty) {
+        throw new Error(i18next.t('text.available_quantity_insufficient'))
+      }
     }
   }
 
-  _validateReleaseUomValue(releaseUomValue, remainUomValue) {
+  _validateReleaseUomValue(releaseUomValue, remainUomValue, totalAvailableUomValue) {
     if (remainUomValue === undefined) throw new Error(i18next.t('text.there_is_no_selected_items'))
-    if (releaseUomValue > remainUomValue) {
-      throw new Error(i18next.t('text.available_uom_value_insufficient'))
+    if (totalAvailableUomValue) {
+      if (releaseUomValue < 0) {
+        throw new Error(i18next.t('text.invalid_quantity_input'))
+      } else if (releaseUomValue > totalAvailableUomValue) {
+        throw new Error(i18next.t('text.available_uom_value_insufficient'))
+      }
+    } else {
+      if (releaseUomValue > remainUomValue) {
+        throw new Error(i18next.t('text.available_uom_value_insufficient'))
+      }
     }
   }
 
   async _addExtraProducts() {
     try {
+      this._validateProducts()
       const result = await CustomAlert({
         title: i18next.t('title.are_you_sure'),
         text: i18next.t('text.add_extra_product'),
@@ -728,9 +861,9 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
   }
 
   _validateProducts() {
-    // no records
-    if (!this.inventoryGrist.dirtyData.records || !this.inventoryGrist.dirtyData.records.length)
-      throw new Error(i18next.t('text.no_products'))
+    // // no records
+    // if (!this.inventoryGrist.dirtyData.records || !this.inventoryGrist.dirtyData.records.length)
+    //   throw new Error(i18next.t('text.no_products'))
     // required field (batchId, packingType, uomValue, unit, packQty, palletQty)
     if (
       this.inventoryGrist.dirtyData.records.filter(