@things-factory/operato-wms 4.3.815 → 4.3.817

package/client/pages/bulk-operation/bulk-operation.js

@@ -166,11 +166,11 @@ class BulkOperation extends localize(i18next)(PageView) {
 
   get _ganData() {
     let date =
-      new Date().getDate().toString().padStart(2, '0') +
-      '/' +
+      new Date().getFullYear() +
+      '-' +
       (new Date().getMonth() + 1).toString().padStart(2, '0') +
-      '/' +
-      new Date().getFullYear()
+      '-' +
+      new Date().getDate().toString().padStart(2, '0')
     return [
       {
         refNo: '',
@@ -193,7 +193,8 @@ class BulkOperation extends localize(i18next)(PageView) {
         packQty: 0,
         palletQty: 0,
         manufactureDate: '',
-        unitPrice: ''
+        unitPrice: '',
+        itemRemark: ''
       }
     ]
   }
@@ -544,6 +545,7 @@ class BulkOperation extends localize(i18next)(PageView) {
               palletQty: parseInt(raw.palletQty || 0),
               palletId: String(raw.lotId || ''),
               unitPrice: raw.unitPrice,
+              itemRemark: raw.itemRemark ? String(raw.itemRemark) : null,
               manufactureDate: Number.isInteger(raw.manufactureDate)
                 ? raw.manufactureDate.toString()
                 : raw.manufactureDate,

package/client/pages/bulk-operation/validate-gan-popup.js

@@ -219,6 +219,12 @@ class ValidateGanPopup extends localize(i18next)(LitElement) {
           header: i18next.t('field.unit_price'),
           width: 100
         },
+        {
+          type: 'string',
+          name: 'itemRemark',
+          header: i18next.t('field.item_remark'),
+          width: 200
+        },
         {
           type: 'string',
           name: 'manufactureDate',
@@ -323,6 +329,7 @@ class ValidateGanPopup extends localize(i18next)(LitElement) {
               palletQty
               palletId
               unitPrice
+              itemRemark
               manufactureDate
               errorMsg
             }
@@ -377,6 +384,7 @@ class ValidateGanPopup extends localize(i18next)(LitElement) {
             palletQty: raw.palletQty,
             palletId: raw.palletId,
             unitPrice: parseFloat(raw.unitPrice),
+            itemRemark: raw.itemRemark,
             manufactureDate: raw.manufactureDate
           }
         })

package/client/pages/order/goods-received-note/received-note-detail.js

@@ -90,13 +90,6 @@ class ReceivedNoteDetail extends localize(i18next)(PageView) {
       case 'el-cold-chain-warehouse':
         this.shadowRoot.querySelector('#container').src = `/view_elccl_grn/${this._grnNo}`
         break
-      case 'orientage-warehouse':
-      case 'shah-alam-warehouse':
-        this.shadowRoot.querySelector('#container').src = `/view_orientage_grn/${this._grnNo}`
-        break
-      case 'seebuu-warehouse':
-        this.shadowRoot.querySelector('#container').src = `/view_seebuu_grn/${this._grnNo}`
-        break
       case 'fmn01s-default':
         this.shadowRoot.querySelector('#container').src = `/view_fm_grn/${this._grnNo}/${timezoneOffSet}`
         break
@@ -130,6 +123,7 @@ class ReceivedNoteDetail extends localize(i18next)(PageView) {
               po
               productSKU
               productName
+              productDescription
               productType
               productBatch
               expectedQty
@@ -288,6 +282,12 @@ class ReceivedNoteDetail extends localize(i18next)(PageView) {
         width: 25,
         type: 'string'
       },
+      {
+        header: i18next.t('field.product_description'),
+        key: 'productDescription',
+        width: 30,
+        type: 'string'
+      },
       {
         header: i18next.t('field.packing_type'),
         key: 'productType',

package/client/pages/order/release-order/packing-label-history-popup.js

@@ -101,7 +101,7 @@ class PackingLabelHistoryPopup extends localize(i18next)(LitElement) {
   _initConfig() {
     this.config = {
       rows: { selectable: { multiple: true }, appendable: false },
-      list: { fields: ['releaseGood', 'refNo', 'displayNumber', 'printedAt'] },
+      list: { fields: ['releaseGood', 'refNo', 'refNo2', 'refNo3', 'displayNumber', 'printedAt'] },
       pagination: { limit: 50, pages: [20, 50, 100, 200] },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
@@ -128,6 +128,20 @@ class PackingLabelHistoryPopup extends localize(i18next)(LitElement) {
           sortable: true,
           width: 150
         },
+        {
+          type: 'string',
+          name: 'refNo2',
+          header: i18next.t('field.ref_no_2') || 'Ref No.2',
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'refNo3',
+          header: i18next.t('field.ref_no_3') || 'Ref No.3',
+          sortable: true,
+          width: 150
+        },
         {
           type: 'number',
           name: 'displayNumber',
@@ -187,7 +201,7 @@ class PackingLabelHistoryPopup extends localize(i18next)(LitElement) {
 
   async fetchHandler({ page, limit, sorters = [] }) {
     const filters = this.searchForm.queryFilters
-    
+
     const response = await client.query({
       query: gql`
         query printedLoadingPackagesHistory($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
@@ -200,6 +214,8 @@ class PackingLabelHistoryPopup extends localize(i18next)(LitElement) {
                 id
                 name
                 refNo
+                refNo2
+                refNo3
               }
               printedAt
               printedBy {
@@ -225,7 +241,9 @@ class PackingLabelHistoryPopup extends localize(i18next)(LitElement) {
         records:
           response.data.printedLoadingPackagesHistory.items.map(item => ({
             ...item,
-            refNo: item.releaseGood?.refNo || ''
+            refNo: item.releaseGood?.refNo || '',
+            refNo2: item.releaseGood?.refNo2 || '',
+            refNo3: item.releaseGood?.refNo3 || ''
           })) || []
       }
     }
@@ -249,7 +267,7 @@ class PackingLabelHistoryPopup extends localize(i18next)(LitElement) {
           <print-quantity-popup
             @print="${e => {
               const printQuantity = e.detail.printQuantity
-              
+
               // Validate print quantity
               if (!printQuantity || printQuantity <= 0) {
                 showToast({
@@ -258,7 +276,7 @@ class PackingLabelHistoryPopup extends localize(i18next)(LitElement) {
                 })
                 return
               }
-              
+
               // Close popup and execute print
               history.back()
               this._executePrint(selected, printQuantity)
@@ -280,7 +298,10 @@ class PackingLabelHistoryPopup extends localize(i18next)(LitElement) {
     const loadingPackageIds = selected.map(item => item.id).filter(Boolean)
 
     if (loadingPackageIds.length === 0) {
-      showToast({ type: 'error', message: i18next.t('text.no_valid_packages_selected') || 'No valid packages selected' })
+      showToast({
+        type: 'error',
+        message: i18next.t('text.no_valid_packages_selected') || 'No valid packages selected'
+      })
       return
     }
 
@@ -302,7 +323,10 @@ class PackingLabelHistoryPopup extends localize(i18next)(LitElement) {
 
       const renderedHtml = await response.text()
       if (!renderedHtml) {
-        showToast({ type: 'error', message: i18next.t('text.failed_to_render_template') || 'Failed to render template' })
+        showToast({
+          type: 'error',
+          message: i18next.t('text.failed_to_render_template') || 'Failed to render template'
+        })
         return
       }
 
@@ -343,17 +367,9 @@ class PackingLabelHistoryPopup extends localize(i18next)(LitElement) {
     return this.shadowRoot?.querySelector('#print-iframe')
   }
 
-  _closePopup() {
-    history.back()
-  }
-
   render() {
     return html`
-      <search-form
-        id="search-form"
-        .fields=${this._searchFields}
-        @submit=${() => this.dataGrist.fetch()}
-      ></search-form>
+      <search-form id="search-form" .fields=${this._searchFields} @submit=${() => this.dataGrist.fetch()}></search-form>
 
       <div class="grist-container">
         <div class="grist">
@@ -366,7 +382,6 @@ class PackingLabelHistoryPopup extends localize(i18next)(LitElement) {
       </div>
 
       <div class="button-container">
-        <mwc-button @click=${this._closePopup}>${i18next.t('button.close')}</mwc-button>
         <mwc-button raised @click=${this._handlePrint}>${i18next.t('button.print')}</mwc-button>
       </div>
 

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

@@ -223,9 +223,15 @@ class InventorySummaryReport extends connect(store)(localize(i18next)(PageView))
       },
       {
         type: 'string',
-        name: 'productNameDescription',
-        header: i18next.t('field.product'),
-        width: 400
+        name: 'productName',
+        header: i18next.t('field.product_name'),
+        width: 250
+      },
+      {
+        type: 'string',
+        name: 'productDescription',
+        header: i18next.t('field.product_description'),
+        width: 200
       },
       {
         type: 'string',
@@ -289,7 +295,7 @@ class InventorySummaryReport extends connect(store)(localize(i18next)(PageView))
     ]
 
     if (this._byPallet) {
-      columns.splice(6, 1)
+      columns.splice(7, 1)
     }
 
     return {
@@ -297,6 +303,7 @@ class InventorySummaryReport extends connect(store)(localize(i18next)(PageView))
         fields: [
           'productSku',
           'productName',
+          'productDescription',
           'productType',
           'packingType',
           'packingSize',
@@ -393,9 +400,8 @@ class InventorySummaryReport extends connect(store)(localize(i18next)(PageView))
             flattenObject({
               ...item,
               productSku: item.product.sku,
-              productNameDescription: `${item.product.name} (${item.product.description})`,
               productName: item.product.name,
-              productDescription: item.product.description,
+              productDescription: item.product.description || '',
               productType: item.product.type
             })
           ) || []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "4.3.815",
+  "version": "4.3.817",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -91,7 +91,7 @@
     "@things-factory/print-ui": "^4.3.815",
     "@things-factory/product-base": "^4.3.815",
     "@things-factory/resource-ui": "^4.3.815",
-    "@things-factory/sales-ui": "^4.3.815",
+    "@things-factory/sales-ui": "^4.3.817",
     "@things-factory/scene-data-transform": "^4.3.815",
     "@things-factory/scene-excel": "^4.3.815",
     "@things-factory/scene-firebase": "^4.3.815",
@@ -108,7 +108,7 @@
     "@things-factory/transport-base": "^4.3.815",
     "@things-factory/tutorial-ui": "^4.3.815",
     "@things-factory/warehouse-base": "^4.3.815",
-    "@things-factory/worksheet-base": "^4.3.815"
+    "@things-factory/worksheet-base": "^4.3.817"
   },
   "devDependencies": {
     "@things-factory/builder": "^4.3.815",
@@ -117,5 +117,5 @@
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "e44c5a15e2b5495997bb929f5dfc80622a326c5e"
+  "gitHead": "1df87b891f86bf497c74d5228f9ced4d5714ddce"
 }

package/translations/en.json

@@ -782,6 +782,7 @@
   "field.unit_gross_weight": "unit gross weight",
   "field.unit_nett_weight": "unit nett weight",
   "field.unit_price": "unit price",
+  "field.item_remark": "item remark",
   "field.unit_uom_value": "unit uom value",
   "field.unit_value": "unit value",
   "field.unit_volume": "unit volume",

package/translations/ko.json

@@ -766,6 +766,7 @@
   "field.type": "유형",
   "field.unassigned_qty": "[ko] unassigned qty",
   "field.unit_price": "단위 가격",
+  "field.item_remark": "항목 비고",
   "field.unit_value": "단위 값",
   "field.unit_volume": "[ko]unit volume",
   "field.unit": "단위",

package/translations/ms.json

@@ -806,6 +806,7 @@
   "field.unit_gross_weight": "unit berat kasar",
   "field.unit_nett_weight": "unit berat nett",
   "field.unit_price": "unit harga",
+  "field.item_remark": "catatan item",
   "field.unit_uom_value": "nilai uom unit",
   "field.unit_value": "nilai unit",
   "field.unit_volume": "unit volume",

package/translations/zh.json

@@ -811,6 +811,7 @@
   "field.unit_gross_weight": "单位毛重",
   "field.unit_nett_weight": "单位净重",
   "field.unit_price": "单价",
+  "field.item_remark": "项目备注",
   "field.unit_uom_value": "单位单位值",
   "field.unit_value": "单位值",
   "field.unit_volume": "单位体积",