@things-factory/operato-wms 4.3.820 → 4.3.823

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

@@ -240,10 +240,12 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
                     }
                   }
 
+                  const isTransfer = record.transactionType === 'TRANSFER'
                   recordDiff.push({
                     column: item.name,
                     current: currentVal || '[N/A]',
-                    update: updatedVal != null && currentVal != updatedVal ? updatedVal : '[N/A]'
+                    update:
+                      updatedVal != null && (isTransfer || currentVal != updatedVal) ? updatedVal : '[N/A]'
                   })
                 })
               }

package/client/pages/order/arrival-notice/create-arrival-notice.js

@@ -1878,6 +1878,13 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       },
       ...(this.enableDirectInbound
         ? [
+          {
+            type: 'date',
+            name: 'expDate',
+            header: i18next.t('field.exp_date'),
+            imex: { header: i18next.t('field.exp_date'), key: 'expDate', width: 25, type: 'string' },
+            width: 120
+          },
           {
             type: 'object',
             name: 'location',
@@ -1966,6 +1973,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
             palletQty
             palletId
             manufactureDate
+            expDate
             batchId
             batchIdRef
             unitPrice
@@ -1992,6 +2000,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
               primaryUnit
               primaryValue
               costPrice
+              isRequiredCheckExpiry
             }
             productDetail {
               id

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

@@ -508,10 +508,12 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
               <label ?hidden="${!this._ownTransport}">${i18next.t('label.co_no')}</label>
               <input name="collectionOrderNo" ?hidden="${!this._ownTransport}" ?readonly="${!this?._editable}" />
 
-              <label ?hidden="${this.roType === 'b2b'}">${i18next.t('label.order_remark')}</label>
+              <label ?hidden="${this.roType === 'b2b' && !this._beforeRemark}"
+                >${i18next.t('label.order_remark')}</label
+              >
               <textarea
                 name="remark"
-                ?hidden="${this.roType === 'b2b'}"
+                ?hidden="${this.roType === 'b2b' && !this._beforeRemark}"
                 rows="5"
                 ?readonly="${!this?._editable}"
               ></textarea>
@@ -1216,7 +1218,9 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     this.inventoryGristConfig = {
       pagination: { infinite: true },
       rows: { selectable: { multiple: true }, appendable: false },
-      list: { fields: ['sku', 'productName', 'batchId', 'invStatus', 'packingType', 'releaseQty', 'releaseUomValue'] },
+      list: {
+        fields: ['sku', 'productName', 'batchId', 'invStatus', 'packingType', 'releaseQty', 'releaseUomValue', 'remark']
+      },
       columns: [
         { name: 'releaseUomValue', hidden: true },
         { name: 'remainUomValue', hidden: true },
@@ -1288,6 +1292,12 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
           name: 'batchIdRef',
           header: i18next.t('field.batch_no_ref'),
           width: 100
+        },
+        {
+          type: 'string',
+          name: 'remark',
+          header: i18next.t('field.remark'),
+          width: 200
         }
       ]
     }
@@ -1617,6 +1627,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
               releaseQty
               releaseUomValue
               status
+              remark
             }
             inventoryInfos {
               id
@@ -1650,6 +1661,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
               }
               status
               refWorksheetId
+              remark
             }
             shippingOrderInfo {
               id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "4.3.820",
+  "version": "4.3.823",
   "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.819",
+    "@things-factory/biz-ui": "^4.3.823",
     "@things-factory/board-service": "^4.3.815",
     "@things-factory/board-ui": "^4.3.815",
     "@things-factory/code-ui": "^4.3.815",
@@ -81,17 +81,17 @@
     "@things-factory/help": "^4.3.815",
     "@things-factory/i18n-base": "^4.3.815",
     "@things-factory/id-rule-base": "^4.3.815",
-    "@things-factory/import-ui": "^4.3.815",
-    "@things-factory/import-ui-excel": "^4.3.815",
+    "@things-factory/import-ui": "^4.3.823",
+    "@things-factory/import-ui-excel": "^4.3.823",
     "@things-factory/menu-ui": "^4.3.815",
     "@things-factory/more-ui": "^4.3.815",
     "@things-factory/notification": "^4.3.815",
     "@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.819",
-    "@things-factory/resource-ui": "^4.3.815",
-    "@things-factory/sales-ui": "^4.3.820",
+    "@things-factory/product-base": "^4.3.822",
+    "@things-factory/resource-ui": "^4.3.823",
+    "@things-factory/sales-ui": "^4.3.823",
     "@things-factory/scene-data-transform": "^4.3.815",
     "@things-factory/scene-excel": "^4.3.815",
     "@things-factory/scene-firebase": "^4.3.815",
@@ -107,8 +107,8 @@
     "@things-factory/system-ui": "^4.3.815",
     "@things-factory/transport-base": "^4.3.819",
     "@things-factory/tutorial-ui": "^4.3.815",
-    "@things-factory/warehouse-base": "^4.3.819",
-    "@things-factory/worksheet-base": "^4.3.820"
+    "@things-factory/warehouse-base": "^4.3.823",
+    "@things-factory/worksheet-base": "^4.3.823"
   },
   "devDependencies": {
     "@things-factory/builder": "^4.3.815",
@@ -117,5 +117,5 @@
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "50ff67176b1c57306867ee735081facd63a14d3b"
+  "gitHead": "701b5d8d38c9df8d482dc6dac012950c151b83b2"
 }