@things-factory/operato-wms 4.3.677 → 4.3.679

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

@@ -586,6 +586,12 @@ class DraftReleaseGoodDetail extends connect(store)(localize(i18next)(PageView))
             }
           }
         },
+        {
+          type: 'string',
+          name: 'batchId',
+          header: i18next.t('field.batch_id'),
+          width: 100
+        },
         {
           type: 'object',
           name: 'product',
@@ -825,6 +831,7 @@ class DraftReleaseGoodDetail extends connect(store)(localize(i18next)(PageView))
               orderProducts {
                 id
                 name
+                batchId
                 product {
                   id
                   name

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

@@ -130,7 +130,8 @@ class InventoryReport extends connect(store)(localize(i18next)(PageView)) {
           })(),
           max: new Date().toISOString().split('T')[0]
         },
-        value: new Date().toISOString().split('T')[0]
+        value: new Date().toISOString().split('T')[0],
+        handlers: { change: this._modifyDateRange.bind(this) }
       },
       {
         label: i18next.t('field.product_info'),
@@ -344,12 +345,7 @@ class InventoryReport extends connect(store)(localize(i18next)(PageView)) {
             let date = new Date(parseInt(item.createdAt))
             return flattenObject({
               ...item,
-              productName: 
-                item.product.name +
-                ' ( ' +
-                item.product.description +
-                ' ) ' +
-                item.product.auxValue1,
+              productName: item.product.name + ' ( ' + item.product.description + ' ) ' + item.product.auxValue1,
               createdAt:
                 date.getDate().toString() + '/' + (date.getMonth() + 1).toString() + '/' + date.getFullYear().toString()
             })
@@ -390,17 +386,31 @@ class InventoryReport extends connect(store)(localize(i18next)(PageView)) {
   }
 
   _modifyDateRange(e) {
-    const fromDate = e.currentTarget.value
+    if (e.currentTarget.name == 'fromDate') {
+      const fromDate = e.currentTarget.value
+
+      let maxToDate = new Date(fromDate)
+      maxToDate.setDate(maxToDate.getDate() + 31)
+      maxToDate = maxToDate.toISOString().split('T')[0]
+      if (this._toDateInput.value > maxToDate) this._toDateInput.value = maxToDate
+      if (this._toDateInput.value < fromDate) this._toDateInput.value = fromDate
 
-    if (this._toDateInput.value < fromDate) this._toDateInput.value = fromDate
+      let min = new Date(fromDate)
+      let today = new Date()
+      today.setHours(0, 0, 0, 0)
 
-    let min = new Date(fromDate)
-    let today = new Date()
-    today.setHours(0, 0, 0, 0)
+      min = min.toISOString().split('T')[0]
 
-    min = min.toISOString().split('T')[0]
+      this._toDateInput.min = min
+    }
+    if (e.currentTarget.name == 'toDate') {
+      const toDate = e.currentTarget.value
+      let maxFromDate = new Date(toDate)
+      maxFromDate.setDate(maxFromDate.getDate() - 31)
+      maxFromDate = maxFromDate.toISOString().split('T')[0]
 
-    this._toDateInput.min = min
+      if (this._fromDateInput.value < maxFromDate) this._fromDateInput.value = maxFromDate
+    }
   }
 
   _compareValues(key, order = 'asc') {
@@ -465,7 +475,7 @@ class InventoryReport extends connect(store)(localize(i18next)(PageView)) {
       var headerSetting = [
         { header: i18next.t('field.sku'), key: 'product|sku', width: 75, type: 'string' },
         { header: i18next.t('field.product'), key: 'product|name', width: 75, type: 'string' },
-        { header: i18next.t('field.product_description'), key: 'product|description', width: 75, type:'string' },
+        { header: i18next.t('field.product_description'), key: 'product|description', width: 75, type: 'string' },
         { header: i18next.t('field.product_type'), key: 'product|type', width: 25, type: 'string' },
         { header: i18next.t('field.packing_type'), key: 'packingType', width: 25, type: 'string' },
         { header: i18next.t('field.batch_id'), key: 'batchId', width: 25, type: 'string' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "4.3.677",
+  "version": "4.3.679",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -91,7 +91,7 @@
     "@things-factory/print-ui": "^4.3.675",
     "@things-factory/product-base": "^4.3.677",
     "@things-factory/resource-ui": "^4.3.677",
-    "@things-factory/sales-ui": "^4.3.677",
+    "@things-factory/sales-ui": "^4.3.679",
     "@things-factory/scene-data-transform": "^4.3.591",
     "@things-factory/scene-excel": "^4.3.591",
     "@things-factory/scene-firebase": "^4.3.591",
@@ -107,8 +107,8 @@
     "@things-factory/system-ui": "^4.3.675",
     "@things-factory/transport-base": "^4.3.677",
     "@things-factory/tutorial-ui": "^4.3.677",
-    "@things-factory/warehouse-base": "^4.3.677",
-    "@things-factory/worksheet-base": "^4.3.677"
+    "@things-factory/warehouse-base": "^4.3.679",
+    "@things-factory/worksheet-base": "^4.3.679"
   },
   "devDependencies": {
     "@things-factory/builder": "^4.3.591",
@@ -117,5 +117,5 @@
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "40d5f1f02846df24414d16d4971acea9cc4574b8"
+  "gitHead": "dbd3c422ea6f5239def218b70aac8302eac238f5"
 }