@things-factory/operato-wms 3.8.2 → 3.8.6

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

@@ -803,14 +803,18 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
           if (this._enableCartonLabel) {
             let worksheetDetail = this._getSelectedOrderProducts(this.cartonInput.value)
             worksheetDetailNames.push(worksheetDetail[0].name)
-            if (worksheetDetail[0].expirationPeriod > 0 && locationDetails.type !== 'QUARANTINE') {
-              await this._expiryAlert()
-            }
+            await this._checkExpiry(
+              worksheetDetail[0].expirationPeriod,
+              new Date(worksheetDetail[0].expirationDate),
+              locationDetails.type
+            )
           } else {
             worksheetDetailNames.push(this._selectedOrderProduct.name)
-            if (this._selectedOrderProduct.expirationPeriod > 0 && locationDetails.type !== 'QUARANTINE') {
-              await this._expiryAlert()
-            }
+            await this._checkExpiry(
+              this._selectedOrderProduct.expirationPeriod,
+              new Date(this._selectedOrderProduct.expirationDate),
+              locationDetails.type
+            )
           }
 
           const response = await client.mutate({
@@ -874,16 +878,20 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
           const locationDetails = await this._fetchLocation(this.locationInput.value.trim())
 
           if (this._enableCartonLabel) {
-            worksheetDetailNames.push(worksheetDetail[0].name)
             let worksheetDetail = this._getSelectedOrderProducts(this.cartonInput.value)
-            if (worksheetDetail[0].expirationPeriod > 0 && locationDetails.type !== 'QUARANTINE') {
-              await this._expiryAlert()
-            }
+            worksheetDetailNames.push(worksheetDetail[0].name)
+            await this._checkExpiry(
+              worksheetDetail[0].expirationPeriod,
+              new Date(worksheetDetail[0].expirationDate),
+              locationDetails.type
+            )
           } else {
             worksheetDetailNames.push(this._selectedOrderProduct.name)
-            if (this._selectedOrderProduct.expirationPeriod > 0 && locationDetails.type !== 'QUARANTINE') {
-              await this._expiryAlert()
-            }
+            await this._checkExpiry(
+              this._selectedOrderProduct.expirationPeriod,
+              new Date(this._selectedOrderProduct.expirationDate),
+              locationDetails.type
+            )
           }
 
           const response = await client.mutate({
@@ -945,8 +953,10 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
         await this._validatePutaway()
         if (!this.incompleteLocationName) {
           let worksheetDetailNames = []
-          if (this._enableCartonLabel) worksheetDetailNames = this._getSelectedOrderProducts(this.cartonInput.value)
-          else worksheetDetailNames.push(this._selectedOrderProduct.name)
+          if (this._enableCartonLabel) {
+            const selectedWorksheetDetailName = this._getSelectedOrderProducts(this.cartonInput.value)
+            worksheetDetailNames.push(selectedWorksheetDetailName[0].name)
+          } else worksheetDetailNames.push(this._selectedOrderProduct.name)
 
           const response = await client.mutate({
             mutation: gql`
@@ -1096,6 +1106,15 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
+  async _checkExpiry(expirationPeriod, expiryDate, locationType) {
+    let date = new Date()
+    let acceptBefore = new Date(date.setDate(date.getDate() + expirationPeriod))
+
+    if (expirationPeriod > 0) {
+      if (expiryDate < acceptBefore && locationType !== 'QUARANTINE') await this._expiryAlert()
+    }
+  }
+
   _validateTransfer() {
     // 1. validate for order selection
     if (!this._selectedOrderProduct) throw new Error(i18next.t('text.target_is_not_selected'))

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

@@ -328,7 +328,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
               <input name="batchIdRef" readonly />
 
               <label>${i18next.t('label.packing_type')}</label>
-              <input name="packingTypeSize" readonly />
+              <input name="packingType" readonly />
 
               <label>${i18next.t('label.total_pallet_qty')}</label>
               <input name="palletQty" type="number" readonly />

package/client/pages/inventory/inventory-adjustment.js

@@ -768,7 +768,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
 
     const response = await client.mutate({
       mutation: gql`
-        mutation submitInventoryChanges($patches: [InventoryPatch]!) {
+        mutation submitInventoryChanges($patches: [InventoryPatch!]!) {
           submitInventoryChanges(patches: $patches)
         }
       `,

package/client/pages/master/product/product-list.js

@@ -960,7 +960,7 @@ class ProductList extends localize(i18next)(PageView) {
       if (_.isEmpty(itm.uom) || '') {
         if (!errors.find(err => err.type == 'uom')) errors.push({ type: 'uom', value: 'UOM is required' })
       }
-      if (!_.isNumber(itm.uomValue) || _.isNaN(itm.uomValue) || '' || itm?.uomValue < 1) {
+      if (!_.isNumber(itm.uomValue) || _.isNaN(itm.uomValue) || '' || itm?.uomValue <= 0) {
         if (!errors.find(err => err.type == 'uomValue'))
           errors.push({ type: 'uomValue', value: 'UOM Value is required' })
       }

package/client/pages/order/release-order/b2b/b2b-order-requests.js

@@ -60,13 +60,13 @@ class B2bOrderRequests extends localize(i18next)(PageView) {
   get context() {
     return {
       title: i18next.t('title.release_order_requests'),
-      // actions: [
-      //   {
-      //     title: i18next.t('button.batch_picking'),
-      //     action: this._openBatchPickingPopup.bind(this),
-      //     ...CommonButtonStyles.activate
-      //   }
-      // ],
+      actions: [
+        {
+          title: i18next.t('button.batch_picking'),
+          action: this._openBatchPickingPopup.bind(this),
+          ...CommonButtonStyles.activate
+        }
+      ],
       exportable: {
         name: i18next.t('title.release_order_requests'),
         data: this._exportableData.bind(this)

package/client/pages/order/release-order/b2c/b2c-order-requests.js

@@ -65,12 +65,12 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
           title: i18next.t('button.generate_packing_list'),
           action: this._generatePackingList.bind(this),
           ...CommonButtonStyles.label
+        },
+        {
+          title: i18next.t('button.batch_picking'),
+          action: this._openBatchPickingPopup.bind(this),
+          ...CommonButtonStyles.activate
         }
-        // {
-        //   title: i18next.t('button.batch_picking'),
-        //   action: this._openBatchPickingPopup.bind(this),
-        //   ...CommonButtonStyles.activate
-        // }
       ],
       exportable: {
         name: i18next.t('title.release_order_requests'),
@@ -209,6 +209,7 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
     this.config = {
       rows: { selectable: { multiple: true }, appendable: false },
       list: { fields: ['name', 'bizplace', 'releaseDate', 'status', 'updatedAt'] },
+      pagination: { limit: 100, pages: [20, 50, 100, 200, 500] },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         { type: 'gutter', gutterName: 'row-selector', multiple: true },

package/client/pages/order/release-order/batch-picking-popup.js

@@ -7,7 +7,7 @@ import { isMobileDevice } from '@things-factory/utils'
 import { css, html, LitElement } from 'lit-element'
 import gql from 'graphql-tag'
 import { ScrollbarStyles } from '@things-factory/styles'
-import { ORDER_STATUS } from '../../constants'
+import { ORDER_STATUS, RO_TYPES } from '../../constants'
 import '@things-factory/biz-ui'
 
 class BatchPickingPopup extends localize(i18next)(LitElement) {
@@ -146,6 +146,16 @@ class BatchPickingPopup extends localize(i18next)(LitElement) {
         name: 'releaseDate',
         type: 'date',
         props: { searchOper: 'lte' }
+      },
+      {
+        label: i18next.t('field.type'),
+        name: 'type',
+        type: 'select',
+        options: Object.keys(RO_TYPES).map(map => {
+          debugger
+          return { name: RO_TYPES[map].name, value: RO_TYPES[map].value }
+        }),
+        props: { searchOper: 'eq' }
       }
     ]
 
@@ -165,6 +175,12 @@ class BatchPickingPopup extends localize(i18next)(LitElement) {
           header: i18next.t('field.release_good_no'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'type',
+          header: i18next.t('field.type'),
+          width: 100
+        },
         {
           type: 'string',
           name: 'refNo',
@@ -288,6 +304,7 @@ class BatchPickingPopup extends localize(i18next)(LitElement) {
               name
               refNo
               releaseDate
+              type
               bizplace {
                 id
                 name

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

@@ -1396,7 +1396,7 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
 
   async fetchInventoriesByBundle(productBundleId, bundleReleaseQty) {
     const page = 1
-    const limit = 200
+    const limit = 99999
     const pagination = { page, limit }
     const filters = [
       {
@@ -1419,7 +1419,7 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
 
     const response = await client.query({
       query: gql`
-        query inventoriesByBundle($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+        query inventoriesByBundle($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
           inventoriesByBundle(filters: $filters, pagination: $pagination, sortings: $sortings) {
             bundleGroup {
               batchId

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

@@ -352,10 +352,18 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
               if (e.keyCode === 13) {
                 e.preventDefault()
                 this._currentBinLocation = null
-                if (this.releaseGoodNoInput.value) {
-                  this.releaseGoodNo = this.releaseGoodNoInput.value
-                  await this.fetchAll(this.releaseGoodNo)
-                  this.completeHandler()
+                if (this.refPickingType === PICKING_TYPES.PICKING.value) {
+                  if (this.releaseGoodNoInput.value) {
+                    this.releaseGoodNo = this.releaseGoodNoInput.value
+                    await this.fetchAll(this.releaseGoodNo)
+                    this.completeHandler()
+                  }
+                } else {
+                  if (this.taskNoInput.value) {
+                    this.taskNo = this.taskNoInput.value
+                    await this.fetchAll(this.taskNo)
+                    this.completeHandler()
+                  }
                 }
               }
             }}"
@@ -571,7 +579,10 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
                 if (this.serialInput) this.serialInput.value = ''
 
                 this._selectedOrderInventory = record
-                await this.fetchInventories(this.releaseGoodNo)
+
+                await this.fetchInventories(
+                  this.refPickingType === PICKING_TYPES.PICKING.value ? this.releaseGoodNo : this.taskNo
+                )
                 let updatedRecords = this._selectedOrderInventory
                 if (updatedRecords.releaseQty === updatedRecords.pickedQty) {
                   updatedRecords.status = 'DONE'
@@ -846,12 +857,14 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
             if (record.pickedQty == record.releaseQty) {
               if (this._isCartonLabel) {
                 this.cartonInput.value = ''
-                this._focusOnCartonNoInput()
+                this.productBarcodeInput.value = ''
+                // this._focusOnCartonNoInput()
               }
               this.inputForm.reset()
             } else {
-              this._focusOnProductBarcodeInput()
+              // this._focusOnProductBarcodeInput()
               this.fillUpForm(this.inputForm, record)
+              this.focusOnInput()
             }
           }
         }
@@ -1048,21 +1061,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
   openSerialNumberPopup() {
     openPopup(
       html`
-        <serial-number-popup
-          .orderInventory="${this?._selectedOrderInventory?.relatedOrderInv}"
-          @completed="${() => {
-            // if (this.refPickingType === PICKING_TYPES.PICKING.value) {
-            //   this.fetchInventories(this.releaseGoodNoInput.value)
-            //   this.fetchPalletsHandler(this.releaseGoodNoInput.value)
-            // } else {
-            //   this.fetchInventories(this.taskNoInput.value)
-            //   this.fetchPalletsHandler(this.taskNoInput.value)
-            // }
-            // // this._selectedTaskStatus = null
-            // this._selectedOrderInventory = null
-            // this._isReplacement = false
-          }}"
-        ></serial-number-popup>
+        <serial-number-popup .orderInventory="${this?._selectedOrderInventory?.relatedOrderInv}"></serial-number-popup>
       `,
       {
         backdrop: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "3.8.2",
+  "version": "3.8.6",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -69,9 +69,9 @@
     "@things-factory/print-proxy-service": "^3.8.0",
     "@things-factory/print-service": "^3.8.0",
     "@things-factory/print-ui": "^3.8.0",
-    "@things-factory/product-base": "^3.8.1",
+    "@things-factory/product-base": "^3.8.3",
     "@things-factory/resource-ui": "^3.8.0",
-    "@things-factory/sales-ui": "^3.8.2",
+    "@things-factory/sales-ui": "^3.8.5",
     "@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.8.0",
     "@things-factory/transport-base": "^3.8.0",
     "@things-factory/tutorial-ui": "^3.8.0",
-    "@things-factory/warehouse-base": "^3.8.2",
-    "@things-factory/worksheet-base": "^3.8.2"
+    "@things-factory/warehouse-base": "^3.8.5",
+    "@things-factory/worksheet-base": "^3.8.6"
   },
   "devDependencies": {
     "@things-factory/builder": "^3.7.5"
   },
-  "gitHead": "d2f935bdad2321ef93780978e593157ef0c1eb52"
+  "gitHead": "e7722293298bd414b6ce78996a4e09df5f1e5ad8"
 }