@things-factory/operato-wms 4.3.818 → 4.3.820

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

@@ -1304,9 +1304,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     try {
       patches = patches.map(patch => normalizeInventoryPatch(patch))
 
-      const validAdjustmentCodes = new Set(
-        Object.values(ADJUSTMENT_CODE).map(ac => ac.value)
-      )
+      const validAdjustmentCodes = new Set(Object.values(ADJUSTMENT_CODE).map(ac => ac.value))
 
       // Fetch fresh locations for client-side validation (avoid stale cache)
       await this.fetchLocation()
@@ -1509,9 +1507,9 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           <import-pop-up
             .records=${records}
             .config=${{
-            rows: this.config.rows,
-            columns: columns
-          }}
+              rows: this.config.rows,
+              columns: columns
+            }}
             .enableRowErrors=${true}
             .importHandler="${this.importHandler.bind(this)}"
             @field-change="${this.fieldChange.bind(this)}"
@@ -1691,15 +1689,15 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           .title="${i18next.t('title.inventory_remark')}"
           .value="${record.remark}"
           @submit="${async e => {
-          await this.updateRemark(record.id, e.detail.value)
+            await this.updateRemark(record.id, e.detail.value)
 
-          this.dataGrist._data = {
-            records: this.dataGrist._data.records.map(updateRecord => {
-              if (updateRecord.id === record.id) updateRecord.remark = e.detail.value
-              return updateRecord
-            })
-          }
-        }}"
+            this.dataGrist._data = {
+              records: this.dataGrist._data.records.map(updateRecord => {
+                if (updateRecord.id === record.id) updateRecord.remark = e.detail.value
+                return updateRecord
+              })
+            }
+          }}"
         ></popup-note>
       `,
       {
@@ -1713,13 +1711,13 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
   openSerialNumberPopup(inventory, rowIndex, records) {
     const removable =
       inventory?.product?.isRequireSerialNumberScanningOutbound &&
-        inventory?.product?.isRequireSerialNumberScanningInbound
+      inventory?.product?.isRequireSerialNumberScanningInbound
         ? true
         : false
 
     const updatable =
       inventory?.product?.isRequireSerialNumberScanningOutbound &&
-        inventory?.product?.isRequireSerialNumberScanningInbound
+      inventory?.product?.isRequireSerialNumberScanningInbound
         ? true
         : false
 
@@ -1732,43 +1730,43 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           .enableRemove=${removable}
           .enableUpdateBtn=${updatable}
           @confirm-serial-number-list="${e => {
-          let totalSerialNumber = 0
-          let newRecords = []
-          for (let i = 0; i < e.detail.inventoryItemChanges.length; i++) {
-            let inventoryItemChange = e.detail.inventoryItemChanges[i]
-            newRecords.push(inventoryItemChange)
+            let totalSerialNumber = 0
+            let newRecords = []
+            for (let i = 0; i < e.detail.inventoryItemChanges.length; i++) {
+              let inventoryItemChange = e.detail.inventoryItemChanges[i]
+              newRecords.push(inventoryItemChange)
 
-            if (inventoryItemChange.type == INVENTORY_ITEM_CHANGE_TYPE.NEW.value) totalSerialNumber++
+              if (inventoryItemChange.type == INVENTORY_ITEM_CHANGE_TYPE.NEW.value) totalSerialNumber++
 
-            if (inventoryItemChange.type == INVENTORY_ITEM_CHANGE_TYPE.REMOVED.value) totalSerialNumber--
-          }
+              if (inventoryItemChange.type == INVENTORY_ITEM_CHANGE_TYPE.REMOVED.value) totalSerialNumber--
+            }
 
-          let inventoryItemChangesJson = JSON.stringify(newRecords)
-          let currentInventoryItemCount = records[rowIndex]?.inventoryItemCount || 0
+            let inventoryItemChangesJson = JSON.stringify(newRecords)
+            let currentInventoryItemCount = records[rowIndex]?.inventoryItemCount || 0
 
-          this.dataGrist.dirtyData.records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
-          this.dataGrist.dirtyData.records[rowIndex].inventoryItemCount =
-            currentInventoryItemCount + totalSerialNumber
-          if (!this.dataGrist?.dirtyData?.records[rowIndex]?.__dirtyfields__) {
-            this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__ = {
-              inventoryItemChanges: { before: '', after: inventoryItemChangesJson }
-            }
-          } else {
-            this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__ = {
-              ...this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__,
-              inventoryItemChanges: {
-                before: '',
-                after: inventoryItemChangesJson
+            this.dataGrist.dirtyData.records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
+            this.dataGrist.dirtyData.records[rowIndex].inventoryItemCount =
+              currentInventoryItemCount + totalSerialNumber
+            if (!this.dataGrist?.dirtyData?.records[rowIndex]?.__dirtyfields__) {
+              this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__ = {
+                inventoryItemChanges: { before: '', after: inventoryItemChangesJson }
+              }
+            } else {
+              this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__ = {
+                ...this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__,
+                inventoryItemChanges: {
+                  before: '',
+                  after: inventoryItemChangesJson
+                }
               }
             }
-          }
-          this.dataGrist.dirtyData.records[rowIndex].__dirty__ = 'M'
+            this.dataGrist.dirtyData.records[rowIndex].__dirty__ = 'M'
 
-          if (records[rowIndex]) {
-            records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
-            records[rowIndex].inventoryItemCount = currentInventoryItemCount + totalSerialNumber
-          }
-        }}"
+            if (records[rowIndex]) {
+              records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
+              records[rowIndex].inventoryItemCount = currentInventoryItemCount + totalSerialNumber
+            }
+          }}"
         ></serial-number-list-popup>
       `,
       {
@@ -1852,6 +1850,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
         searchParams.append('customer', record.bizplace.name)
         searchParams.append('packing', record.packingType)
         searchParams.append('packingSize', record.packingSize)
+        searchParams.append('packQty', record.qty)
         searchParams.append('uom', record.uom)
         searchParams.append('uomValue', record.uomValue)
         searchParams.append('date', dateIn)

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

@@ -400,6 +400,7 @@ class CreateReturnOrder extends localize(i18next)(PageView) {
                 { name: 'name', hidden: true },
                 { name: 'productId', hidden: true },
                 { name: 'releaseOrderId', hidden: true },
+                { name: 'refItemId', hidden: true },
                 {
                   name: 'releaseGoodName',
                   header: i18next.t('field.ro')
@@ -810,6 +811,7 @@ class CreateReturnOrder extends localize(i18next)(PageView) {
         status: ORDER_INVENTORY_STATUS.PENDING.value
       }
       newRecord.releaseOrderId = record?.releaseOrderId
+      newRecord.refItemId = record?.refItemId
       newRecord.product = { id: record?.productId, name: record?.productName }
       newRecord.productDetail = { id: record?.productDetailId }
       newRecord.inventory = { id: record.id }

package/client/pages/order/return-order/return-order-inventory-popup.js

@@ -293,6 +293,7 @@ class ReturnOrderInventoryPopup extends localize(i18next)(LitElement) {
               releaseGoodRefNo
               releaseGoodRefNo2
               releaseGoodRefNo3
+              refItemId
             }
             total
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "4.3.818",
+  "version": "4.3.820",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -66,7 +66,7 @@
     "@things-factory/attachment-ui": "^4.3.815",
     "@things-factory/auth-ui": "^4.3.815",
     "@things-factory/barcode-ui": "^4.3.815",
-    "@things-factory/biz-ui": "^4.3.815",
+    "@things-factory/biz-ui": "^4.3.819",
     "@things-factory/board-service": "^4.3.815",
     "@things-factory/board-ui": "^4.3.815",
     "@things-factory/code-ui": "^4.3.815",
@@ -89,9 +89,9 @@
     "@things-factory/pdf": "^4.3.815",
     "@things-factory/print-proxy-service": "^4.3.815",
     "@things-factory/print-ui": "^4.3.815",
-    "@things-factory/product-base": "^4.3.815",
+    "@things-factory/product-base": "^4.3.819",
     "@things-factory/resource-ui": "^4.3.815",
-    "@things-factory/sales-ui": "^4.3.818",
+    "@things-factory/sales-ui": "^4.3.820",
     "@things-factory/scene-data-transform": "^4.3.815",
     "@things-factory/scene-excel": "^4.3.815",
     "@things-factory/scene-firebase": "^4.3.815",
@@ -105,10 +105,10 @@
     "@things-factory/scene-visualizer": "^4.3.815",
     "@things-factory/setting-ui": "^4.3.815",
     "@things-factory/system-ui": "^4.3.815",
-    "@things-factory/transport-base": "^4.3.815",
+    "@things-factory/transport-base": "^4.3.819",
     "@things-factory/tutorial-ui": "^4.3.815",
-    "@things-factory/warehouse-base": "^4.3.818",
-    "@things-factory/worksheet-base": "^4.3.818"
+    "@things-factory/warehouse-base": "^4.3.819",
+    "@things-factory/worksheet-base": "^4.3.820"
   },
   "devDependencies": {
     "@things-factory/builder": "^4.3.815",
@@ -117,5 +117,5 @@
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "68f211abfcbc53a014e9ad11d536680b2b86c250"
+  "gitHead": "50ff67176b1c57306867ee735081facd63a14d3b"
 }