@things-factory/operato-wms 4.3.656 → 4.3.660

package/client/pages/order/arrival-notice/proceed-edit-product-popup.js

@@ -71,7 +71,8 @@ export class ProceedEditProductPopup extends localize(i18next)(LitElement) {
       config: Object,
       data: Object,
       bizplace: Object,
-      ganNo: String
+      ganNo: String,
+      enableDirectInbound: Boolean
     }
   }
 
@@ -146,6 +147,196 @@ export class ProceedEditProductPopup extends localize(i18next)(LitElement) {
   }
 
   firstUpdated() {
+    const columns = [
+      { type: 'gutter', gutterName: 'sequence' },
+      { type: 'gutter', gutterName: 'row-selector', multiple: true },
+      {
+        type: 'string',
+        name: 'batchId',
+        header: i18next.t('field.batch_id'),
+        width: 150
+      },
+      {
+        type: 'string',
+        name: 'adjustedBatchId',
+        header: i18next.t('field.adjusted_batch_id'),
+        width: 150
+      },
+      {
+        type: 'string',
+        name: 'productSku',
+        header: i18next.t('field.sku'),
+        width: 150
+      },
+      {
+        type: 'object',
+        name: 'product',
+        header: i18next.t('field.product'),
+        record: { options: { queryName: 'products' } },
+        width: 350
+      },
+      {
+        type: 'string',
+        name: 'packingType',
+        header: i18next.t('field.packing_type'),
+        width: 150
+      },
+      {
+        type: 'string',
+        name: 'adjustedPackingType',
+        header: i18next.t('field.adjusted_packing_type'),
+        width: 150
+      },
+      {
+        type: 'float',
+        name: 'uomValue',
+        header: i18next.t('field.uom_value'),
+        width: 80
+      },
+      {
+        type: 'float',
+        name: 'adjustedUomValue',
+        header: i18next.t('field.adjusted_uom_value'),
+        width: 80
+      },
+      {
+        type: 'string',
+        name: 'uom',
+        header: i18next.t('field.uom'),
+        width: 80
+      },
+      {
+        type: 'string',
+        name: 'adjustedUom',
+        header: i18next.t('field.adjusted_uom'),
+        width: 80
+      },
+      {
+        type: 'float',
+        name: 'packQty',
+        header: i18next.t('field.pack_qty'),
+        width: 80
+      },
+      {
+        type: 'float',
+        name: 'adjustedPackQty',
+        header: i18next.t('field.adjusted_pack_qty'),
+        width: 80
+      },
+      {
+        type: 'float',
+        name: 'totalUomValue',
+        header: i18next.t('field.total_uom_value'),
+        width: 120
+      },
+      {
+        type: 'integer',
+        name: 'adjustedTotalUomValue',
+        header: i18next.t('field.adjusted_total_uom_value'),
+        width: 120
+      },
+      {
+        type: 'integer',
+        name: 'palletQty',
+        header: i18next.t('field.pallet_qty'),
+        width: 80
+      },
+      {
+        type: 'integer',
+        name: 'adjustedPalletQty',
+        header: i18next.t('field.adjusted_pallet_qty'),
+        width: 80
+      },
+      {
+        type: 'date',
+        name: 'manufactureDate',
+        header: i18next.t('field.manufacture_date'),
+        width: 120
+      },
+      {
+        type: 'string',
+        name: 'batchIdRef',
+        header: i18next.t('field.batch_no_ref'),
+        width: 150
+      },
+      {
+        type: 'string',
+        name: 'adjustedBatchIdRef',
+        header: i18next.t('field.adjusted_batch_id_ref'),
+        width: 150
+      },
+      {
+        type: 'float',
+        name: 'unitPrice',
+        header: i18next.t('field.unit_price'),
+        width: 80
+      },
+      {
+        type: 'float',
+        name: 'adjustedUnitPrice',
+        header: i18next.t('field.adjusted_unit_price'),
+        width: 80
+      },
+      {
+        type: 'string',
+        name: 'remark',
+        header: i18next.t('field.remark'),
+        width: 200
+      }
+    ]
+
+    function insertAfter(cols, anchorName, newCols) {
+        const idx = cols.findIndex(c => c.name === anchorName)
+        if (idx >= 0) cols.splice(idx + 1, 0, ...newCols)
+      }
+
+      const expDateColumn = {
+        type: 'date',
+        name: 'expDate',
+        header: i18next.t('field.exp_date'),
+        width: 120
+      }
+
+      const adjustedExpDateColumn = {
+        type: 'date',
+        name: 'adjustedExpDate',
+        header: i18next.t('field.adjusted_exp_date'),
+        width: 120
+      }
+
+      const locationColumn = {
+        type: 'object',
+        name: 'location',
+        header: i18next.t('field.location'),
+        width: 150
+      }
+
+      const adjustedLocationColumn = {
+        type: 'object',
+        name: 'adjustedLocation',
+        header: i18next.t('field.adjusted_location'),
+        width: 150
+      }
+
+      const warehouseColumn = {
+        type: 'object',
+        name: 'warehouse',
+        header: i18next.t('field.warehouse'),
+        width: 150
+      }
+
+      const adjustedWarehouseColumn = {
+        type: 'object',
+        name: 'adjustedWarehouse',
+        header: i18next.t('field.adjusted_warehouse'),
+        width: 150
+      }
+
+      if (this.enableDirectInbound) {
+        insertAfter(columns, 'adjustedPalletQty', [expDateColumn, adjustedExpDateColumn] )
+        insertAfter(columns, 'adjustedBatchIdRef', [warehouseColumn, locationColumn, adjustedWarehouseColumn, adjustedLocationColumn])
+      }
+
     this.config = this.productGristConfig = {
       list: {
         fields: [
@@ -171,143 +362,7 @@ export class ProceedEditProductPopup extends localize(i18next)(LitElement) {
       },
       pagination: { infinite: true },
       rows: { selectable: { multiple: true }, appendable: false },
-      columns: [
-        { type: 'gutter', gutterName: 'sequence' },
-        { type: 'gutter', gutterName: 'row-selector', multiple: true },
-        {
-          type: 'string',
-          name: 'batchId',
-          header: i18next.t('field.batch_id'),
-          width: 150
-        },
-        {
-          type: 'string',
-          name: 'adjustedBatchId',
-          header: i18next.t('field.adjusted_batch_id'),
-          width: 150
-        },
-        {
-          type: 'string',
-          name: 'productSku',
-          header: i18next.t('field.sku'),
-          width: 150
-        },
-        {
-          type: 'object',
-          name: 'product',
-          header: i18next.t('field.product'),
-          record: { options: { queryName: 'products' } },
-          width: 350
-        },
-        {
-          type: 'string',
-          name: 'packingType',
-          header: i18next.t('field.packing_type'),
-          width: 150
-        },
-        {
-          type: 'string',
-          name: 'adjustedPackingType',
-          header: i18next.t('field.adjusted_packing_type'),
-          width: 150
-        },
-        {
-          type: 'float',
-          name: 'uomValue',
-          header: i18next.t('field.uom_value'),
-          width: 80
-        },
-        {
-          type: 'float',
-          name: 'adjustedUomValue',
-          header: i18next.t('field.adjusted_uom_value'),
-          width: 80
-        },
-        {
-          type: 'string',
-          name: 'uom',
-          header: i18next.t('field.uom'),
-          width: 80
-        },
-        {
-          type: 'string',
-          name: 'adjustedUom',
-          header: i18next.t('field.adjusted_uom'),
-          width: 80
-        },
-        {
-          type: 'float',
-          name: 'packQty',
-          header: i18next.t('field.pack_qty'),
-          width: 80
-        },
-        {
-          type: 'float',
-          name: 'adjustedPackQty',
-          header: i18next.t('field.adjusted_pack_qty'),
-          width: 80
-        },
-        {
-          type: 'float',
-          name: 'totalUomValue',
-          header: i18next.t('field.total_uom_value'),
-          width: 120
-        },
-        {
-          type: 'integer',
-          name: 'adjustedTotalUomValue',
-          header: i18next.t('field.adjusted_total_uom_value'),
-          width: 120
-        },
-        {
-          type: 'integer',
-          name: 'palletQty',
-          header: i18next.t('field.pallet_qty'),
-          width: 80
-        },
-        {
-          type: 'integer',
-          name: 'adjustedPalletQty',
-          header: i18next.t('field.adjusted_pallet_qty'),
-          width: 80
-        },
-        {
-          type: 'date',
-          name: 'manufactureDate',
-          header: i18next.t('field.manufacture_date'),
-          width: 120
-        },
-        {
-          type: 'string',
-          name: 'batchIdRef',
-          header: i18next.t('field.batch_no_ref'),
-          width: 150
-        },
-        {
-          type: 'string',
-          name: 'adjustedBatchIdRef',
-          header: i18next.t('field.adjusted_batch_id_ref'),
-          width: 150
-        },
-        {
-          type: 'float',
-          name: 'unitPrice',
-          header: i18next.t('field.unit_price'),
-          width: 80
-        },
-        {
-          type: 'float',
-          name: 'adjustedUnitPrice',
-          header: i18next.t('field.adjusted_unit_price'),
-          width: 80
-        },
-        {
-          type: 'string',
-          name: 'remark',
-          header: i18next.t('field.remark'),
-          width: 200
-        }
-      ]
+      columns
     }
   }
 

package/client/pages/order/arrival-notice/view-product-changes-popup.js

@@ -66,7 +66,8 @@ export class ViewProductChangesPopup extends localize(i18next)(LitElement) {
   static get properties() {
     return {
       config: Object,
-      data: Object
+      data: Object,
+      enableDirectInbound: Boolean
     }
   }
 
@@ -111,6 +112,202 @@ export class ViewProductChangesPopup extends localize(i18next)(LitElement) {
   }
 
   firstUpdated() {
+    const columns = [
+      { type: 'gutter', gutterName: 'sequence' },
+      {
+        type: 'string',
+        name: 'batchId',
+        header: i18next.t('field.batch_id'),
+        width: 150
+      },
+      {
+        type: 'string',
+        name: 'adjustedBatchId',
+        header: i18next.t('field.adjusted_batch_id'),
+        width: 150
+      },
+      {
+        type: 'string',
+        name: 'batchIdRef',
+        header: i18next.t('field.batch_no_ref'),
+        width: 150
+      },
+      {
+        type: 'string',
+        name: 'adjustedBatchIdRef',
+        header: i18next.t('field.adjusted_batch_id_ref'),
+        width: 150
+      },
+      {
+        type: 'string',
+        name: 'productSku',
+        header: i18next.t('field.sku'),
+        width: 150
+      },
+      {
+        type: 'object',
+        name: 'product',
+        header: i18next.t('field.product'),
+        record: { options: { queryName: 'products' } },
+        width: 350
+      },
+      {
+        type: 'string',
+        name: 'packingType',
+        header: i18next.t('field.packing_type'),
+        width: 150
+      },
+      {
+        type: 'string',
+        name: 'adjustedPackingType',
+        header: i18next.t('field.adjusted_packing_type'),
+        width: 150
+      },
+      {
+        type: 'float',
+        name: 'uomValue',
+        header: i18next.t('field.uom_value'),
+        width: 80
+      },
+      {
+        type: 'float',
+        name: 'adjustedUomValue',
+        header: i18next.t('field.adjusted_uom_value'),
+        width: 80
+      },
+      {
+        type: 'string',
+        name: 'uom',
+        header: i18next.t('field.uom'),
+        width: 80
+      },
+      {
+        type: 'string',
+        name: 'adjustedUom',
+        header: i18next.t('field.adjusted_uom'),
+        width: 80
+      },
+      {
+        type: 'float',
+        name: 'packQty',
+        header: i18next.t('field.pack_qty'),
+        width: 80
+      },
+      {
+        type: 'float',
+        name: 'adjustedPackQty',
+        header: i18next.t('field.adjusted_pack_qty'),
+        width: 80
+      },
+      {
+        type: 'float',
+        name: 'totalUomValue',
+        header: i18next.t('field.total_uom_value'),
+        width: 120
+      },
+      {
+        type: 'integer',
+        name: 'adjustedTotalUomValue',
+        header: i18next.t('field.adjusted_total_uom_value'),
+        width: 120
+      },
+      {
+        type: 'integer',
+        name: 'palletQty',
+        header: i18next.t('field.pallet_qty'),
+        width: 80
+      },
+      {
+        type: 'integer',
+        name: 'adjustedPalletQty',
+        header: i18next.t('field.adjusted_pallet_qty'),
+        width: 80
+      },
+      {
+        type: 'date',
+        name: 'manufactureDate',
+        header: i18next.t('field.manufacture_date'),
+        width: 120
+      },
+      {
+        type: 'float',
+        name: 'unitPrice',
+        header: i18next.t('field.unit_price'),
+        width: 80
+      },
+      {
+        type: 'float',
+        name: 'adjustedUnitPrice',
+        header: i18next.t('field.adjusted_unit_price'),
+        width: 80
+      },
+      {
+        type: 'string',
+        name: 'remark',
+        header: i18next.t('field.remark'),
+        width: 200
+      }
+    ]
+
+    function insertAfter(cols, anchorName, newCols) {
+      const idx = cols.findIndex(c => c.name === anchorName)
+      if (idx >= 0) cols.splice(idx + 1, 0, ...newCols)
+    }
+
+    const expDateColumn = {
+      type: 'date',
+      name: 'expDate',
+      header: i18next.t('field.exp_date'),
+      record: { editable: true },
+      width: 120
+    }
+
+    const adjustedExpDateColumn = {
+      type: 'date',
+      name: 'adjustedExpDate',
+      header: i18next.t('field.adjusted_exp_date'),
+      width: 120
+    }
+
+    const locationColumn = {
+      type: 'object',
+      name: 'location',
+      header: i18next.t('field.location'),
+      record: { editable: true },
+      handlers: {
+        click: (columns, data, column, record, rowIndex) => {
+          this._openLocationSelection(rowIndex)
+        }
+      },
+      width: 150
+    }
+
+    const adjustedLocationColumn = {
+      type: 'object',
+      name: 'adjustedLocation',
+      header: i18next.t('field.adjusted_location'),
+      width: 150
+    }
+
+    const warehouseColumn = {
+      type: 'object',
+      name: 'warehouse',
+      header: i18next.t('field.warehouse'),
+      width: 150
+    } 
+
+    const adjustedWarehouseColumn = {
+      type: 'object',
+      name: 'adjustedWarehouse',
+      header: i18next.t('field.adjusted_warehouse'),
+      width: 150
+    }
+
+    if (this.enableDirectInbound) {
+      insertAfter(columns, 'adjustedPalletQty', [expDateColumn, adjustedExpDateColumn] )
+      insertAfter(columns, 'manufactureDate', [warehouseColumn, locationColumn, adjustedWarehouseColumn, adjustedLocationColumn])
+    }
+
     this.config = {
       list: {
         fields: [
@@ -135,142 +332,7 @@ export class ViewProductChangesPopup extends localize(i18next)(LitElement) {
       },
       pagination: { infinite: true },
       rows: { appendable: false },
-      columns: [
-        { type: 'gutter', gutterName: 'sequence' },
-        {
-          type: 'string',
-          name: 'batchId',
-          header: i18next.t('field.batch_id'),
-          width: 150
-        },
-        {
-          type: 'string',
-          name: 'adjustedBatchId',
-          header: i18next.t('field.adjusted_batch_id'),
-          width: 150
-        },
-        {
-          type: 'string',
-          name: 'batchIdRef',
-          header: i18next.t('field.batch_no_ref'),
-          width: 150
-        },
-        {
-          type: 'string',
-          name: 'adjustedBatchIdRef',
-          header: i18next.t('field.adjusted_batch_id_ref'),
-          width: 150
-        },
-        {
-          type: 'string',
-          name: 'productSku',
-          header: i18next.t('field.sku'),
-          width: 150
-        },
-        {
-          type: 'object',
-          name: 'product',
-          header: i18next.t('field.product'),
-          record: { options: { queryName: 'products' } },
-          width: 350
-        },
-        {
-          type: 'string',
-          name: 'packingType',
-          header: i18next.t('field.packing_type'),
-          width: 150
-        },
-        {
-          type: 'string',
-          name: 'adjustedPackingType',
-          header: i18next.t('field.adjusted_packing_type'),
-          width: 150
-        },
-        {
-          type: 'float',
-          name: 'uomValue',
-          header: i18next.t('field.uom_value'),
-          width: 80
-        },
-        {
-          type: 'float',
-          name: 'adjustedUomValue',
-          header: i18next.t('field.adjusted_uom_value'),
-          width: 80
-        },
-        {
-          type: 'string',
-          name: 'uom',
-          header: i18next.t('field.uom'),
-          width: 80
-        },
-        {
-          type: 'string',
-          name: 'adjustedUom',
-          header: i18next.t('field.adjusted_uom'),
-          width: 80
-        },
-        {
-          type: 'float',
-          name: 'packQty',
-          header: i18next.t('field.pack_qty'),
-          width: 80
-        },
-        {
-          type: 'float',
-          name: 'adjustedPackQty',
-          header: i18next.t('field.adjusted_pack_qty'),
-          width: 80
-        },
-        {
-          type: 'float',
-          name: 'totalUomValue',
-          header: i18next.t('field.total_uom_value'),
-          width: 120
-        },
-        {
-          type: 'integer',
-          name: 'adjustedTotalUomValue',
-          header: i18next.t('field.adjusted_total_uom_value'),
-          width: 120
-        },
-        {
-          type: 'integer',
-          name: 'palletQty',
-          header: i18next.t('field.pallet_qty'),
-          width: 80
-        },
-        {
-          type: 'integer',
-          name: 'adjustedPalletQty',
-          header: i18next.t('field.adjusted_pallet_qty'),
-          width: 80
-        },
-        {
-          type: 'date',
-          name: 'manufactureDate',
-          header: i18next.t('field.manufacture_date'),
-          width: 120
-        },
-        {
-          type: 'float',
-          name: 'unitPrice',
-          header: i18next.t('field.unit_price'),
-          width: 80
-        },
-        {
-          type: 'float',
-          name: 'adjustedUnitPrice',
-          header: i18next.t('field.adjusted_unit_price'),
-          width: 80
-        },
-        {
-          type: 'string',
-          name: 'remark',
-          header: i18next.t('field.remark'),
-          width: 200
-        }
-      ]
+      columns
     }
   }
 

package/client/pages/report/inbound-order-details-report.js

@@ -468,10 +468,10 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
         width: 150
       },
       {
-        type: 'datetime',
+        type: 'date',
         name: 'expirationDate',
         header: i18next.t('field.exp_date'),
-        width: 170
+        width: 120
       },
       {
         type: 'date',