@things-factory/operato-wms 4.3.658 → 4.3.660

package/client/pages/components/select-product-popup.js

@@ -224,6 +224,7 @@ class SelectProductPopup extends localize(i18next)(LitElement) {
                 type
                 costPrice
                 isInventoryDecimal
+                isRequiredCheckExpiry
               }
             }
             total
@@ -247,7 +248,8 @@ class SelectProductPopup extends localize(i18next)(LitElement) {
               name: item.name,
               description: item.product.description,
               costPrice: (item.costPrice = (item?.costPrice || 0).toFixed(2)),
-              isInventoryDecimal: item.product.isInventoryDecimal
+              isInventoryDecimal: item.product.isInventoryDecimal,
+              isRequiredCheckExpiry: item.product.isRequiredCheckExpiry
             }
           }) || []
       }
@@ -276,7 +278,8 @@ class SelectProductPopup extends localize(i18next)(LitElement) {
             primaryUnit: record.uom,
             primaryValue: record.uomValue,
             costPrice: parseFloat(record.costPrice).toFixed(2),
-            isInventoryDecimal: record.isInventoryDecimal
+            isInventoryDecimal: record.isInventoryDecimal,
+            isRequiredCheckExpiry: record.isRequiredCheckExpiry
           }
         }
       })
@@ -308,7 +311,8 @@ class SelectProductPopup extends localize(i18next)(LitElement) {
                 primaryUnit: selectedProduct.uom,
                 primaryValue: selectedProduct.uomValue,
                 costPrice: parseFloat(selectedProduct.costPrice).toFixed(2),
-                isInventoryDecimal: selectedProduct.isInventoryDecimal
+                isInventoryDecimal: selectedProduct.isInventoryDecimal,
+                isRequiredCheckExpiry: selectedProduct.isRequiredCheckExpiry
               }
             }
           })
@@ -341,7 +345,8 @@ class SelectProductPopup extends localize(i18next)(LitElement) {
               primaryUnit: itm.uom,
               primaryValue: itm.uomValue,
               costPrice: parseFloat(itm.costPrice).costPrice,
-              isInventoryDecimal: itm.isInventoryDecimal
+              isInventoryDecimal: itm.isInventoryDecimal,
+              isRequiredCheckExpiry: itm.isRequiredCheckExpiry
             }
           }
         })

package/client/pages/inbound/carton-label-popup.js

@@ -1,7 +1,7 @@
 import '@things-factory/grist-ui'
 
 import { DirectPrinter } from '@things-factory/barcode-base'
-import { SingleColumnFormStyles } from '@things-factory/form-ui'
+import { MultiColumnFormStyles, SingleColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, store } from '@things-factory/shell'
 import { css, html, LitElement } from 'lit-element'
@@ -10,7 +10,6 @@ import { sendToPrinter } from '../../util'
 import { CARTON_LABEL_BY_SKU_SETTING_KEY, CARTON_LABEL_SETTING_KEY } from '../constants'
 
 import gql from 'graphql-tag'
-
 class CartonLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
   static get properties() {
     return {
@@ -20,12 +19,17 @@ class CartonLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
       bizplaceName: String,
       _printer: Object,
       _filters: Array,
-      _config: Object
+      _config: Object,
+      enableDirectInbound: Boolean,
+      productGristConfig: Object,
+      productData: Object,
+      arrivalNoticeId: String
     }
   }
 
   static get styles() {
     return [
+      MultiColumnFormStyles,
       SingleColumnFormStyles,
       css`
         :host {
@@ -55,6 +59,37 @@ class CartonLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
           flex: 1 1 0%;
           overflow-y: auto;
         }
+        .form-container {
+          display: flex;
+        }
+        .form-container > form {
+          flex: 1;
+        }
+        h2 + data-grist {
+          padding=top: var(--grist-title-with-grid-padding);
+        }
+        .grist h2 mwc-icon {
+          vertical-align: middle;
+          margin: var(--grist-title-icon-margin);
+          font-size: var(--grist-title-icon-size);
+          color: var(--grist-title-icon-color);
+        }
+        .grist h2 {
+          margin: var(--grist-title-margin);
+          border: var(--grist-title-border);
+          font: var(--grist-title-font);
+          color: var(--secondary-color);
+        }
+        h2 {
+          padding: var(--subtitle-padding);
+          font: var(--subtitle-font);
+          color: var(--subtitle-text-color);
+          border-bottom: var(--subtitle-border-bottom);
+        }
+        data-grist {
+          overflow-y: hidden;
+          flex: 1;
+        }
       `
     ]
   }
@@ -76,9 +111,13 @@ class CartonLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
     this.fixedType = null
     this.type = null
     this.bizplaceName = null
+    this.productData = { records: [] }
+    this.setProductGristConfig()
   }
 
   firstUpdated() {
+    this.setProductGristConfig()
+    this.fetchInventories()
     this._config = {
       rows: {
         appendable: false,
@@ -129,15 +168,19 @@ class CartonLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
   }
 
   render() {
-    return html`
-      <div id="input-form" class="single-column-form">
-        <label>${i18next.t('label.printing_mode')}</label>
-        ${this.filterContent()}
-      </div>
-      ${this.printControl()}
-      <div class="button-container">
-        <mwc-button raised @click="${this._printLabel.bind(this)}" label="${i18next.t('button.print')}"></mwc-button>
-      </div>
+    return html `
+      ${this.enableDirectInbound
+        ? this.renderDirectInboundPrintLayout()
+        : html`
+            <div id="input-form" class="single-column-form">
+              <label>${i18next.t('label.printing_mode')}</label>
+              ${this.filterContent()}
+            </div>
+            ${this.printControl()}
+            <div class="button-container">
+              <mwc-button raised @click="${this._printLabel.bind(this)}" label="${i18next.t('button.print')}"></mwc-button>
+            </div>
+          `}
     `
   }
 
@@ -198,11 +241,169 @@ class CartonLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
     }
   }
 
+  renderDirectInboundPrintLayout() {
+    return html`
+      <div class = "form-container">
+        <form name="printPopup" class="multi-column-form">
+          <fieldset>
+            <legend>${i18next.t('Print Settings')}</legend>
+          </fieldset>
+          
+          <div class="form-container">
+            <label>${i18next.t('label.print_qty')}</label>
+            <input name="printQty" type="number" min="1" />
+          </div>
+        </form>
+      </div>
+
+      <div class="container">
+        <div class="grist">
+          <h2><mwc-icon>list_alt</mwc-icon>Select Product</h2>
+          <data-grist
+            id="product-grist"
+            .mode=${'GRID'}
+            .config=${this.productGristConfig}
+            .data="${this.productData}"
+          ></data-grist>
+        </div>
+      </div>
+
+      <div class="button-container">
+        <mwc-button raised @click="${this._printLabel.bind(this)}" label="${i18next.t('button.print')}"></mwc-button>
+      </div>
+    `
+  }
+
+  setProductGristConfig() {
+    let productGristColumns = [
+      { type: 'gutter', gutterName: 'sequence' },
+      { type: 'gutter', gutterName: 'row-selector', multiple: true},
+      {
+        type: 'string',
+        name: 'cartonId',
+        header: i18next.t('field.carton_id'),
+        width: 150
+      },
+      {
+        type: 'string',
+        name: 'batchId',
+        header: i18next.t('field.batch_id'),
+        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: 'uom',
+        header: i18next.t('field.uom'),
+        width: 80
+      },
+      {
+        type: 'float',
+        name: 'uomValue',
+        header: i18next.t('field.uom_value'),
+        width: 100
+      },
+      {
+        type: 'float',
+        name: 'packQty',
+        header: i18next.t('field.pack_qty'),
+        width: 80
+      }
+    ]
+
+    this.productGristConfig = {
+      list: {
+        fields: [
+          'cartonId',
+          'batchId',
+          'product',
+          'packingType',
+          'uom',
+          'uomValue',
+          'packQty'
+        ]
+      },
+      pagination: { infinite: true },
+      rows: {
+        appendable: false
+      },
+      columns: productGristColumns
+    }
+  }
+
+  async fetchInventories() {
+  if (!this.arrivalNoticeId) return
+
+  const response = await client.query({
+    query: gql`
+      query ($filters: [Filter!]) {
+        inventories(filters: $filters) {
+          items {
+            cartonId
+            batchId
+            packingType
+            uom
+            uomValue
+            qty
+            product {
+              id
+              name
+              sku
+            }
+          }
+        }
+      }
+    `,
+    variables: {
+      filters: [
+        {
+          name: 'refOrderId',
+          operator: 'eq',
+          value: this.arrivalNoticeId
+        }
+      ]
+    },
+    fetchPolicy: 'no-cache'
+  })
+
+  const inventories = response?.data?.inventories?.items || []
+
+  // Optional: transform into productData format expected by the Grist
+  this.productData = {
+    records: inventories.map(item => ({
+      cartonId: item.cartonId,
+      batchId: item.batchId,
+      packingType: item.packingType,
+      uom: item.uom,
+      uomValue: item.uomValue,
+      packQty: item.qty,
+      product: item.product
+    }))
+  }
+}
+
+
   async _printLabel() {
     if (!this._printer) {
       this._printer = new DirectPrinter()
     }
 
+    if (this.enableDirectInbound) {
+      this.type = 'directInboundBySku'
+    }
+
     try {
       const filters = this._filters
       let labelId = filters.find(itm => itm.value == (this?.type ? this.type : 'default')).board.id
@@ -210,6 +411,38 @@ class CartonLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
       let printData = []
 
       switch (this.type) {
+        case 'directInboundBySku':
+          let selectedRows = this.shadowRoot.querySelector('data-grist')?.selected || []
+          const printQtyVal = parseInt(this.printQtyInput?.value) || 1
+
+          if (selectedRows.length > 0) {
+            selectedRows.forEach(obj => {
+              for (let index = 0; index < printQtyVal; index++) {
+                const manufactureDate = new Date(obj.manufactureDate)
+                const manufactureYear = manufactureDate.getFullYear()
+
+                let data = {
+                  batchId: obj.batchId,
+                  productSku: obj.product?.sku || obj.productSku,
+                  packingType: obj.packingType,
+                  packQty: obj.packQty,
+                  printQty: printQtyVal,
+                  manufactureDate: manufactureDate.toLocaleDateString(),
+                  manufactureYear: manufactureYear.toString(),
+                  cartonId: obj.cartonId,
+                  customer: bizplaceName,
+                  printCount: index + 1,
+                  carton: obj.cartonId
+                }
+
+                printData.push(data)
+              }
+            })
+
+            await sendToPrinter(labelId, printData, this._printer)
+          }
+          break
+
         case 'bySku':
           let selected = this.dataGrist.selected
 
@@ -289,7 +522,8 @@ class CartonLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
   stateChanged(state) {
     let filters = [
       { name: i18next.t(`label.normal`), value: 'default', labelId: CARTON_LABEL_SETTING_KEY },
-      { name: i18next.t(`label.print_by_sku`), value: 'bySku', labelId: CARTON_LABEL_BY_SKU_SETTING_KEY }
+      { name: i18next.t(`label.print_by_sku`), value: 'bySku', labelId: CARTON_LABEL_BY_SKU_SETTING_KEY },
+      { name: 'Direct Inbound by SKU', value: 'directInboundBySku', labelId: CARTON_LABEL_BY_SKU_SETTING_KEY}
     ]
 
     this._filters = filters

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

@@ -68,7 +68,9 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
       vasData: Object,
       arrivalNoticeId: String,
       _disableTransport: Boolean,
-      userRole: Array
+      userRole: Array,
+      enableDirectInbound: Boolean,
+      _enableLotIdInput: Boolean
     }
   }
 
@@ -184,6 +186,8 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
     var titleName = i18next.t('title.arrival_notice_detail')
     this._vasExpanded = false
     this._showAssignWarehouse = false
+    const isNotAdmin = !this.userRoles?.some(itm => itm.name.toLowerCase().includes('admin'))
+
     var actions = [
       {
         title: i18next.t('button.back'),
@@ -203,6 +207,14 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
       })
     }
 
+    if(this.enableDirectInbound && this._status === ORDER_STATUS.PENDING.value && isNotAdmin) {
+      actions.push({
+        title: i18next.t('button.edit_product'),
+        action: this.openEditProductPopup.bind(this),
+        ...CommonButtonStyles.add
+      })
+    }
+
     if (this._status === ORDER_STATUS.PENDING.value) {
       actions.push({
         title: i18next.t('button.update_order_details'),
@@ -406,6 +418,13 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
       titleName = i18next.t('title.rejected_arrival_notice_detail')
     }
 
+    if(this.enableDirectInbound && this._status === ORDER_STATUS.DONE.value) {
+      actions.push({
+        title: i18next.t('button.carton_label_print'),
+        action: this._openCartonLabelPrintPopup.bind(this),
+        ...CommonButtonStyles.label
+      })
+    }
     return {
       title: titleName,
       actions,
@@ -643,6 +662,8 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
     this._disableTransport = false
     this._importedOrder = false
     this._enableTransportationServiceSetting = false
+    this.enableDirectInbound = false
+    this._enableLotIdInput = false
   }
 
   get arrivalNoticeForm() {
@@ -674,6 +695,8 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
     this._enableTransportationServiceSetting = await fetchSettingRule('enable-transportation-service')
     this.isUserBelongsDomain = await this._checkUserBelongsDomain()
     this.userRoles = await this.fetchUserRoleHandler()
+    this._enableLotIdInput = await fetchSettingRule('enable-lot-id-input')
+    this.enableDirectInbound = await fetchSettingRule('enable-direct-gan-order')
     this.vasGristConfig = {
       list: { fields: ['set', 'targetType', 'target', 'packingType', 'qty', 'vas', 'status', 'remark'] },
       pagination: { infinite: true },
@@ -866,12 +889,18 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
         header: i18next.t('field.pallet_qty'),
         width: 80
       },
-      {
-        type: 'string',
-        name: 'palletId',
-        header: i18next.t('field.lot_id'),
-        width: 150
-      },
+      ...(this._enableLotIdInput
+        ? [
+            {
+              type: 'string',
+              name: 'palletId',
+              header: i18next.t('field.lot_id'),
+              imex: { header: i18next.t('field.lot_id'), key: 'palletId', width: 25, type: 'string' },
+              record: { editable: editable },
+              width: 150
+            }
+          ]
+        : []),
       {
         type: 'date',
         name: 'manufactureDate',
@@ -904,6 +933,47 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
       productGristColumns.splice(packQtyColumnIdx + 1, 0, ...crossDockingColumns)
     }
 
+    const expDateColumn = {
+      type: 'date',
+      name: 'expDate',
+      header: i18next.t('field.exp_date'),
+      width: 120
+    }
+
+    const locationColumn = {
+      type: 'object',
+      name: 'location',
+      header: i18next.t('field.location'),
+      width: 150
+    }
+
+    const warehouseColumn = {
+      type: 'object',
+      name: 'warehouse',
+      header: i18next.t('field.warehouse'),
+      width: 150
+    }
+
+    function insertAfter (cols, anchorName, newCols) {
+      const idx = cols.findIndex(c => c.name === anchorName)
+      if (idx >= 0) cols.splice(idx + 1, 0, ...newCols)
+    } 
+
+    if (this.enableDirectInbound) {
+      const anchor = this._enableLotIdInput ? 'palletId' : 'palletQty'
+      insertAfter(
+        productGristColumns,
+        anchor,
+        [expDateColumn]
+      )
+
+      insertAfter(
+        productGristColumns,
+        'batchIdRef',
+        [warehouseColumn, locationColumn]
+      )
+    }
+
     this.productGristConfig = {
       list: {
         fields: [
@@ -918,8 +988,11 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
           'totalUomValue',
           'palletQty',
           'palletId',
+          'expDate',
           'manufactureDate',
           'batchIdRef',
+          'warehouse',
+          'location',
           'unitPrice',
           'remark'
         ]
@@ -991,6 +1064,7 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
                 sku
                 brand
                 isInventoryDecimal
+                isRequiredCheckExpiry
               }
               productDetail {
                 id
@@ -1013,9 +1087,27 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
               palletQty
               palletId
               adjustedPalletQty
+              expDate
+              adjustedExpDate
               manufactureDate
               releaseQty
               releaseUomValue
+              warehouse{
+                name
+                id
+              }
+              location {
+                name
+                id
+              }
+              adjustedLocation {
+                name
+                id
+              }
+              adjustedWarehouse {
+                name
+                id
+              }
             }
             orderVass {
               vas {
@@ -1084,7 +1176,7 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
             return {
               ...record,
               productSku: record.product.sku,
-              productBrand: record.product.brand
+              productBrand: record.product.brand,
             }
           })
           .sort((a, b) => a.product.sku.localeCompare(b.product.sku))
@@ -1523,14 +1615,23 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
     }
 
     try {
-      const response = await client.mutate({
-        mutation: gql`
-          mutation confirmArrivalNotice($name: String!) {
-            confirmArrivalNotice(name: $name) {
-              name
+      const mutation = this.enableDirectInbound
+        ? gql`
+            mutation confirmDirectInboundArrivalNotice($name: String!) {
+              confirmDirectInboundArrivalNotice(name: $name) {
+                name
+              }
             }
-          }
-        `,
+        `
+        : gql `
+            mutation confirmArrivalNotice($name: String!) {
+              confirmArrivalNotice(name: $name) {
+                name
+              }
+            }
+        `
+      const response = await client.mutate({
+        mutation,
         variables: { name: this._ganNo }
       })
 
@@ -1684,10 +1785,17 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
 
   _openCartonLabelPrintPopup() {
     openPopup(
-      html` <carton-label-popup .fixedType="${'default'}" .bizplaceName="${this._bizplaceName}"></carton-label-popup> `,
+      html` 
+      <carton-label-popup 
+        .fixedType="${'default'}" 
+        .bizplaceName="${this._bizplaceName}"
+        .enableDirectInbound="${this.enableDirectInbound}"
+        .productData="${this.productData}"
+        .arrivalNoticeId="${this.arrivalNoticeId}"
+      ></carton-label-popup> 
+      `,
       {
         backdrop: true,
-        size: 'small',
         title: i18next.t('title.carton_label')
       }
     )
@@ -1706,6 +1814,7 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
           .productData="${this.productData}"
           .bizplace="${this.orderBizplace}"
           .strictEditable="${this._strictProductSelection}"
+          .enableDirectInbound="${this.enableDirectInbound}"
           @completed="${this._fetchGAN.bind(this)}"
         ></edit-product-popup>
       `,
@@ -1724,6 +1833,7 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
           .ganNo="${this._ganNo}"
           .bizplace="${this.orderBizplace}"
           .data="${this.productData}"
+          .enableDirectInbound="${this.enableDirectInbound}"
           @completed="${() => {
             this._fetchGAN()
             this.updateContext()
@@ -1756,11 +1866,19 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
   }
 
   openProductChangesPopup() {
-    openPopup(html` <view-product-changes-popup .data="${this.productData}"></view-product-changes-popup> `, {
-      backdrop: true,
-      size: 'large',
-      title: i18next.t('title.view_product_changes')
-    })
+    openPopup(
+      html` 
+        <view-product-changes-popup 
+          .data="${this.productData}"
+          .enableDirectInbound="${this.enableDirectInbound}"
+        ></view-product-changes-popup> 
+      `, 
+      {
+        backdrop: true,
+        size: 'large',
+        title: i18next.t('title.view_product_changes')
+      }
+    )
   }
 
   async fetchUserRoleHandler() {