@things-factory/operato-wms 4.1.26 → 5.0.0-alpha.1

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

@@ -365,7 +365,7 @@ class TransferInventory extends connect(store)(localize(i18next)(PageView)) {
                       ></barcode-scanable-input>`
                   : ``
                 : html`
-                    <label class="content-title">${i18next.t('label.carton_id')}</label>
+                    <label class="content-title">${i18next.t('label.new_carton_id')}</label>
                     <barcode-scanable-input
                       name="newCartonId"
                       custom-input
@@ -580,9 +580,13 @@ class TransferInventory extends connect(store)(localize(i18next)(PageView)) {
 
       if (!response.errors) {
         if (response.data.inventories.total == 0) {
-          if (this.refInventoryType === INVENTORY_TYPES.LOT.value) this.focusOnPalletInput()
-          else this.focusOnCartonInput()
-          throw new Error(i18next.t('text.wrong_lot_id'))
+          if (this.refInventoryType === INVENTORY_TYPES.LOT.value) {
+            this.focusOnPalletInput()
+            throw new Error(i18next.t('text.lot_id_not_found'))
+          } else {
+            this.focusOnCartonInput()
+            throw new Error(i18next.t('text.carton_id_not_found'))
+          }
         }
 
         this._data = {

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

@@ -167,7 +167,7 @@ class BulkOperation extends localize(i18next)(PageView) {
         refNo: '',
         refNo2: '',
         refNo3: '',
-        etaDate: '',
+        etaDate: new Date(),
         truckNo: '',
         containerNo: '',
         containerSize: '',
@@ -181,7 +181,7 @@ class BulkOperation extends localize(i18next)(PageView) {
         uom: '',
         packQty: 0,
         palletQty: 0,
-        manufactureYear: 0,
+        manufactureDate: new Date(),
         unitPrice: ''
       }
     ]
@@ -348,7 +348,8 @@ class BulkOperation extends localize(i18next)(PageView) {
       html`
         <validate-gan-popup
           .records=${records.map(raw => {
-            let etaDate = new Date(String(raw.etaDate || ''))
+            let etaDate = new Date((raw.etaDate - (25567 + 1)) * 86400 * 1000 || NULL)
+            let mfgDate = new Date((raw.manufactureDate - (25567 + 1)) * 86400 * 1000 || NULL)
 
             return {
               refNo: String(raw.refNo || ''),
@@ -369,8 +370,14 @@ class BulkOperation extends localize(i18next)(PageView) {
               packQty: parseInt(raw.packQty || 0),
               palletQty: parseInt(raw.palletQty || 0),
               unitPrice: Number(raw.unitPrice || 0),
-              manufactureYear: Math.round(Number(raw.manufactureYear || 0)),
-              etaDate: this._getStdDateStr(etaDate)
+              manufactureDate: `${mfgDate.getFullYear()}-${(mfgDate.getMonth() + 1).toString().padStart(2, 0)}-${mfgDate
+                .getDate()
+                .toString()
+                .padStart(2, 0)}`,
+              etaDate: `${etaDate.getFullYear()}-${(etaDate.getMonth() + 1).toString().padStart(2, 0)}-${etaDate
+                .getDate()
+                .toString()
+                .padStart(2, 0)}`
             }
           })}
           .bizplaceId=${this._ganBizplaceId}

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

@@ -109,7 +109,7 @@ class ValidateGanPopup extends localize(i18next)(LitElement) {
           width: 150
         },
         {
-          type: 'string',
+          type: 'date',
           name: 'etaDate',
           header: i18next.t('field.eta_date'),
           width: 150
@@ -205,9 +205,9 @@ class ValidateGanPopup extends localize(i18next)(LitElement) {
           width: 100
         },
         {
-          type: 'integer',
-          name: 'manufactureYear',
-          header: i18next.t('field.manufacture_year'),
+          type: 'date',
+          name: 'manufactureDate',
+          header: i18next.t('field.manufacture_date'),
           width: 100
         },
         {
@@ -291,7 +291,7 @@ class ValidateGanPopup extends localize(i18next)(LitElement) {
               totalUomValue
               palletQty
               unitPrice
-              manufactureYear
+              manufactureDate
               errorMsg
             }
           }
@@ -346,7 +346,7 @@ class ValidateGanPopup extends localize(i18next)(LitElement) {
               packQty: raw.packQty,
               palletQty: raw.palletQty,
               unitPrice: raw.unitPrice,
-              manufactureYear: raw.manufactureYear
+              manufactureDate: new Date(parseInt(raw.manufactureDate))
             }
           }),
           bizplaceId

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

@@ -10,7 +10,7 @@ import './select-product-batch'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
-import orderBy from 'lodash/orderBy'
+import orderBy from 'lodash-es/orderBy'
 import { connect } from 'pwa-helpers/connect-mixin.js'
 
 import { MultiColumnFormStyles } from '@things-factory/form-ui'

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

@@ -135,7 +135,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
       { column: 'uom', name: 'Uom' },
       { column: 'uomValue', name: 'UomValue' },
       { column: 'expirationDate', name: 'Exp. Date' },
-      { column: 'manufactureYear', name: 'Mfg. Date' },
+      { column: 'manufactureDate', name: 'Mfg. Date' },
       { column: 'unitCost', name: 'Unit Cost' }
     ]
 
@@ -368,7 +368,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
               status
               transactionType
               expirationDate
-              manufactureYear
+              manufactureDate
               unitCost
               bizplace {
                 id
@@ -412,7 +412,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
                 uom
                 uomValue
                 expirationDate
-                manufactureYear
+                manufactureDate
                 unitCost
               }
               lastInventoryHistory {
@@ -442,7 +442,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
                 uom
                 uomValue
                 expirationDate
-                manufactureYear
+                manufactureDate
                 unitCost
               }
               createdAt
@@ -474,19 +474,33 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
             ? this._convertUnixTimestampToDate(item?.inventory?.expirationDate)
             : null
 
+          let inventoryChangesMfgDate = item?.manufactureDate
+            ? this._convertUnixTimestampToDate(item?.manufactureDate)
+            : null
+          let lastInventoryChangesMfgDate = item?.lastInventoryHistory?.manufactureDate
+            ? this._convertUnixTimestampToDate(item?.lastInventoryHistory?.manufactureDate)
+            : null
+
+          let inventoryMfgDate = item?.inventory?.manufactureDate
+            ? this._convertUnixTimestampToDate(item?.inventory?.manufactureDate)
+            : null
+
           return {
             ...item,
             cartonId: item.inventory?.cartonId,
             inventory: {
               ...item.inventory,
-              expirationDate: inventoryExpDate ? inventoryExpDate : null
+              expirationDate: inventoryExpDate ? inventoryExpDate : null,
+              manufactureDate: inventoryMfgDate ? inventoryMfgDate : null
             },
             lastInventoryHistory: {
               ...item.lastInventoryHistory,
-              expirationDate: lastInventoryChangesExpDate ? lastInventoryChangesExpDate : null
+              expirationDate: lastInventoryChangesExpDate ? lastInventoryChangesExpDate : null,
+              manufactureDate: lastInventoryChangesMfgDate ? lastInventoryChangesMfgDate : null
             },
             customerName: item?.inventory?.bizplace?.name || item.bizplace.name,
-            expirationDate: inventoryChangesExpDate ? inventoryChangesExpDate : null
+            expirationDate: inventoryChangesExpDate ? inventoryChangesExpDate : null,
+            manufactureDate: inventoryChangesMfgDate ? inventoryChangesMfgDate : null
           }
         }) || []
     }

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

@@ -425,11 +425,11 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           width: 150
         },
         {
-          type: 'number',
-          name: 'manufactureYear',
-          header: i18next.t('field.manufacture_year'),
-          imex: { header: i18next.t('field.manufacture_year'), key: 'manufactureYear', width: 40, type: 'number' },
-          record: { editable: true, options: { min: 1500, max: 2200 } },
+          type: 'date',
+          name: 'manufactureDate',
+          header: i18next.t('field.manufacture_date'),
+          imex: { header: i18next.t('field.manufacture_date'), key: 'manufactureDate', width: 40, type: 'date' },
+          record: { editable: true },
           sortable: true,
           width: 120
         },
@@ -437,7 +437,6 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           type: 'string',
           name: 'remark',
           header: i18next.t('field.remark'),
-          imex: { header: i18next.t('field.remark'), key: 'remark', width: 40, type: 'string' },
           sortable: true,
           width: 200,
           handlers: {
@@ -501,7 +500,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
               packingSize
               uom
               uomValue
-              manufactureYear
+              manufactureDate
               bizplace {
                 id
                 name
@@ -586,7 +585,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
               uomValue
               remark
               expirationDate
-              manufactureYear
+              manufactureDate
               unitCost
               bizplace {
                 id
@@ -679,46 +678,34 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
   }
 
   fieldChange(e) {
+    let popUpDataGrist = e.target?.shadowRoot.querySelector('data-grist')
+
+    let item = e.target.localName == 'import-pop-up' ? popUpDataGrist : this.dataGrist
+
     switch (e.detail.column.name) {
       case 'uomValue':
-        if (e.detail.after < 0) this.dataGrist._data.records[e.detail.row].uomValue = 0
+        if (e.detail.after < 0) item._data.records[e.detail.row].uomValue = 0
         break
       case 'qty':
         if (e.detail.after < 0 || !Number.isInteger(e.detail.after))
-          this.dataGrist._data.records[e.detail.row].qty = e.detail.before
+          item._data.records[e.detail.row].qty = e.detail.before
         break
       case 'unitCost':
-        if (e.detail.after < 0) this.dataGrist._data.records[e.detail.row].unitCost = e.detail.before
+        if (e.detail.after < 0) item._data.records[e.detail.row].unitCost = e.detail.before
         break
-      case 'manufactureYear':
-        if (
-          e.detail.after != 0 &&
-          (e.detail.after < 0 ||
-            !Number.isInteger(e.detail.after) ||
-            e.detail.after.toString().length < 4 ||
-            e.detail.after.toString().length > 4)
-        ) {
-          this.dataGrist._data.records[e.detail.row].manufactureYear = e.detail.before == 0 ? null : e.detail.before
-          this._showToast({ type: 'error', message: 'Invalid Manufacture Year.' })
-        } else if (e.detail.after == 0) {
-          this.dataGrist._data.records[e.detail.row].manufactureYear = null
-        }
-
+      case 'manufactureDate':
+        if (new Date(e.detail.after) > new Date()) item._data.records[e.detail.row].manufactureDate = e.detail.before
         break
       case 'product':
-        this.dataGrist._data.records[e.detail.row].uom = e.detail.after?.uom ? e.detail.after.uom : ''
+        item._data.records[e.detail.row].uom = e.detail.after?.uom ? e.detail.after.uom : ''
 
-        this.dataGrist._data.records[e.detail.row].packingType = e.detail.after?.packingType
-          ? e.detail.after.packingType
-          : ''
+        item._data.records[e.detail.row].packingType = e.detail.after?.packingType ? e.detail.after.packingType : ''
 
-        this.dataGrist._data.records[e.detail.row].packingSize = e.detail.after?.packingSize
-          ? e.detail.after.packingSize
-          : 1
+        item._data.records[e.detail.row].packingSize = e.detail.after?.packingSize ? e.detail.after.packingSize : 1
 
-        this.dataGrist._data.records[e.detail.row].brand = e.detail.after?.brand ? e.detail.after.brand : ''
+        item._data.records[e.detail.row].brand = e.detail.after?.brand ? e.detail.after.brand : ''
 
-        this.dataGrist._data.records[e.detail.row].sku = e.detail.after?.sku ? e.detail.after.sku : ''
+        item._data.records[e.detail.row].sku = e.detail.after?.sku ? e.detail.after.sku : ''
         break
       default:
         break
@@ -775,28 +762,81 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
   }
 
   async importHandler(patches) {
-    patches.map(itm => {
-      itm.qty = parseFloat(itm.qty)
-      itm.packingSize = parseFloat(itm.packingSize)
-      itm.uomValue = parseFloat(itm.uomValue)
-      itm.manufactureYear = parseFloat(itm.manufactureYear)
-      let dt = new Date(itm.expirationDate)
-      itm.expirationDate = `${dt.getFullYear()}-${dt.getMonth() + 1}-${dt.getDate()}`
-    })
+    try {
+      patches.map(itm => {
+        if (itm.cuFlag == '+') {
+          if (
+            !itm.bizplace?.id ||
+            !itm.location?.id ||
+            !itm.product?.id ||
+            !itm.batchId ||
+            !itm.qty ||
+            !itm.uomValue ||
+            !itm.uom ||
+            !itm.packingType
+          ) {
+            throw new Error(i18next.t('text.empty_value_in_list'))
+          }
 
-    const response = await client.mutate({
-      mutation: gql`
-        mutation submitInventoryChanges($patches: [InventoryPatch!]!) {
-          submitInventoryChanges(patches: $patches)
+          if (itm.qty < 1 || itm.unitCost < 0 || itm.packingSize < 1 || itm.uomValue < 1) {
+            throw new Error(i18next.t('text.invalid_value_in_list'))
+          }
+
+          if (itm.manufactureYear && itm.manufactureYear < 1000) {
+            throw new Error(i18next.t('text.invalid_value_in_list'))
+          }
+        }
+        itm.qty = parseInt(itm.qty)
+        itm.packingSize = parseFloat(itm.packingSize)
+        itm.uomValue = parseFloat(itm.uomValue)
+        itm.unitCost = parseFloat(itm.unitCost)
+
+        //if user repic location after import
+        if (itm.location.zone || itm.location.row || itm.location.column) {
+          delete itm.location.zone
+          delete itm.location.row
+          delete itm.location.column
         }
-      `,
-      variables: { patches }
-    })
 
-    if (!response.errors) {
-      history.back()
-      this.dataGrist.fetch()
-      this._showToast({ message: i18next.t('text.data_submitted_for_approval') })
+        //if user repick product after import
+        if (itm.product.productId) {
+          itm.product.id = itm.product.productId
+          delete itm.product.productId
+          delete itm.product.brand
+          delete itm.product.packingType
+          delete itm.product.packingSize
+          delete itm.product.sku
+          delete itm.product.type
+          delete itm.product.uom
+        }
+
+        if (itm.expirationDate) {
+          let dt = new Date(itm.expirationDate)
+          itm.expirationDate = `${dt.getFullYear()}-${dt.getMonth() + 1}-${dt.getDate()}`
+        }
+
+        if (itm.manufactureDate) {
+          let mdt = new Date(itm.manufactureDate)
+          itm.manufactureDate = `${mdt.getFullYear()}-${mdt.getMonth() + 1}-${mdt.getDate()}`
+        }
+      })
+
+      const response = await client.mutate({
+        mutation: gql`
+          mutation submitInventoryChanges($patches: [InventoryPatch!]!) {
+            submitInventoryChanges(patches: $patches)
+          }
+        `,
+        variables: { patches }
+      })
+
+      if (!response.errors) {
+        history.back()
+        this.dataGrist.fetch()
+        this._showToast({ message: i18next.t('text.data_submitted_for_approval') })
+      }
+    } catch (e) {
+      this._showToast(e)
     }
   }
 
@@ -811,6 +851,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
               columns: [...this.config.columns.filter(column => column.imex !== undefined)]
             }}
             .importHandler="${this.importHandler.bind(this)}"
+            @field-change="${this.fieldChange.bind(this)}"
           ></import-pop-up>
         `,
         {
@@ -870,10 +911,14 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
       })
 
       data = data.map(item => {
-        if (item?.expirationDate != '') {
+        if (item?.expirationDate !== null && item?.expirationDate !== '') {
           item.expirationDate = new Date(item.expirationDate).getTime()
         }
 
+        if (item?.manufactureDate !== null && item?.manufactureDate !== '') {
+          item.manufactureDate = new Date(item.manufactureDate).getTime()
+        }
+
         item.product.name = item.product.productInformation
         return {
           id: item.id,

package/client/pages/inventory-check/create-cycle-count.js

@@ -16,8 +16,6 @@ import { isMobileDevice } from '@things-factory/utils'
 import { fetchLocationSortingRule } from '../../fetch-location-sorting-rule'
 import { LOCATION_SORTING_RULE } from '../constants'
 
-const _ = require('lodash')
-
 class CreateCycleCount extends localize(i18next)(PageView) {
   static get properties() {
     return {

package/client/pages/master/product/product-detail-bizplace-setting-popup.js

@@ -9,8 +9,6 @@ import { client, CustomAlert, gqlContext } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
 import { flattenObject, isMobileDevice } from '@things-factory/utils'
 
-const _ = require('lodash')
-
 export class ProductDetailBizplaceSettingPopup extends localize(i18next)(LitElement) {
   static get styles() {
     return [

package/client/pages/master/product/product-details-popup.js

@@ -3,6 +3,9 @@ import '@things-factory/grist-ui'
 
 import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit-element'
+import isEmpty from 'lodash-es/isEmpty'
+import isNaN from 'lodash-es/isNaN'
+import isNumber from 'lodash-es/isNumber'
 
 import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
@@ -10,8 +13,6 @@ import { client, CustomAlert, gqlContext } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
 
-const _ = require('lodash')
-
 export class ProductDetailsPopup extends localize(i18next)(LitElement) {
   static get styles() {
     return [
@@ -555,20 +556,20 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
     let data = this.dataGrist._data.records.map(itm => {
       itm.error = false
 
-      if (_.isEmpty(itm.gtin) || '') {
+      if (isEmpty(itm.gtin) || '') {
         itm.error = true
         if (!errors.find(err => err.type == 'gtin')) errors.push({ type: 'gtin', value: 'GTIN is required' })
       }
-      if (_.isEmpty(itm.packingType) || '') {
+      if (isEmpty(itm.packingType) || '') {
         itm.error = true
         if (!errors.find(err => err.type == 'packingType'))
           errors.push({ type: 'packingType', value: 'Packing type is required' })
       }
-      if (_.isEmpty(itm.uom) || '') {
+      if (isEmpty(itm.uom) || '') {
         itm.error = true
         if (!errors.find(err => err.type == 'uom')) errors.push({ type: 'uom', value: 'UOM is required' })
       }
-      if (!_.isNumber(itm.uomValue) || _.isNaN(itm.uomValue) || '') {
+      if (!isNumber(itm.uomValue) || isNaN(itm.uomValue) || '') {
         itm.error = true
         if (!errors.find(err => err.type == 'uomValue'))
           errors.push({ type: 'uomValue', value: 'UOM Value is required' })
@@ -626,7 +627,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
           ...this.dataGrist._data,
           records: this._updateRowOption(
             this.dataGrist._data.records.map((record, idx) => {
-              if (!_.isEmpty(record.childProductDetail) && record.childProductDetail == before) {
+              if (!isEmpty(record.childProductDetail) && record.childProductDetail == before) {
                 record.childProductDetail = after
               }
               return record
@@ -636,7 +637,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
 
         break
       case 'uomValue':
-        if (_.isNaN(after)) {
+        if (isNaN(after)) {
           updatedRecords.records[row].uomValue = 1
         }
         break
@@ -691,7 +692,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
                 value: ''
               },
               ...data
-                .filter(child => child.gtin != itm.gtin && !_.isEmpty(child.gtin))
+                .filter(child => child.gtin != itm.gtin && !isEmpty(child.gtin))
                 .map(x => {
                   const rowOption = {
                     display: x.gtin,

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

@@ -5,6 +5,9 @@ import './product-detail-bizplace-setting-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
+import isEmpty from 'lodash-es/isEmpty'
+import isNaN from 'lodash-es/isNaN'
+import isNumber from 'lodash-es/isNumber'
 
 import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
@@ -14,8 +17,6 @@ import { client, CustomAlert, gqlContext, PageView } from '@things-factory/shell
 import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
 
-const _ = require('lodash')
-
 class ProductList extends localize(i18next)(PageView) {
   static get properties() {
     return {
@@ -821,7 +822,7 @@ class ProductList extends localize(i18next)(PageView) {
 
   async _saveProducts(patches) {
     try {
-      if (_.isEmpty(this._bizplaceInput.value) || this._bizplaceInput?.value == undefined) {
+      if (isEmpty(this._bizplaceInput.value) || this._bizplaceInput?.value == undefined) {
         return this.showToast(i18next.t('text.no_company_selected'))
       }
 
@@ -944,23 +945,23 @@ class ProductList extends localize(i18next)(PageView) {
   _validate(data) {
     let errors = []
     data = data.map(itm => {
-      if (_.isEmpty(itm.sku) || '') {
+      if (isEmpty(itm.sku) || '') {
         if (!errors.find(err => err.type == 'sku')) errors.push({ type: 'sku', value: 'Product SKU is required' })
       }
-      if (_.isEmpty(itm.name) || '') {
+      if (isEmpty(itm.name) || '') {
         if (!errors.find(err => err.type == 'name')) errors.push({ type: 'name', value: 'Product name is required' })
       }
-      if (_.isEmpty(itm.type) || '') {
+      if (isEmpty(itm.type) || '') {
         if (!errors.find(err => err.type == 'type')) errors.push({ type: 'name', value: 'Product type is required' })
       }
-      if (_.isEmpty(itm.packingType) || '') {
+      if (isEmpty(itm.packingType) || '') {
         if (!errors.find(err => err.type == 'packingType'))
           errors.push({ type: 'packingType', value: 'Packing type is required' })
       }
-      if (_.isEmpty(itm.uom) || '') {
+      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 <= 0) {
+      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/arrival-notice/arrival-notice-detail.js

@@ -678,10 +678,10 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
         width: 80
       },
       {
-        type: 'string',
-        name: 'manufactureYear',
-        header: i18next.t('field.manufacture_year'),
-        width: 100
+        type: 'date',
+        name: 'manufactureDate',
+        header: i18next.t('field.manufacture_date'),
+        width: 120
       },
       {
         type: 'string',
@@ -722,7 +722,7 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
           'packQty',
           'totalUomValue',
           'palletQty',
-          'manufactureYear',
+          'manufactureDate',
           'batchIdRef',
           'unitPrice',
           'remark'
@@ -811,7 +811,7 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
               adjustedTotalUomValue
               palletQty
               adjustedPalletQty
-              manufactureYear
+              manufactureDate
               releaseQty
               releaseUomValue
             }