@things-factory/operato-wms 3.7.12 → 3.8.0

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

@@ -225,6 +225,12 @@ class CycleCountReport extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 350
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          width: 100
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -419,6 +425,7 @@ class CycleCountReport extends localize(i18next)(PageView) {
                   uom
                   product {
                     name
+                    brand
                     description
                   }
                 }
@@ -451,6 +458,7 @@ class CycleCountReport extends localize(i18next)(PageView) {
           return {
             ...worksheetDetail.targetInventory.inventory,
             name: worksheetDetail.name,
+            brand: worksheetDetail.targetInventory.inventory.product.brand,
             description: worksheetDetail.description,
             productName:
               worksheetDetail.targetInventory.inventory.product.name +

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

@@ -207,6 +207,18 @@ class WorksheetCycleCount extends localize(i18next)(PageView) {
           },
           width: 350
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          imex: {
+            header: i18next.t('field.brand'),
+            key: 'brand',
+            width: 15,
+            type: 'string'
+          },
+          width: 80
+        },
         {
           type: 'object',
           name: 'location',
@@ -323,6 +335,7 @@ class WorksheetCycleCount extends localize(i18next)(PageView) {
                   }
                   product {
                     name
+                    brand
                     description
                   }
                 },
@@ -356,6 +369,7 @@ class WorksheetCycleCount extends localize(i18next)(PageView) {
         return {
           ...worksheetDetail.targetInventory.inventory,
           name: worksheetDetail.name,
+          brand: worksheetDetail.targetInventory.inventory.product.brand,
           description: worksheetDetail.description,
           status: worksheetDetail.status,
           inspectedLocation: worksheetDetail.targetInventory.inspectedLocation,

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

@@ -1,18 +1,21 @@
-import { DirectPrinter } from '@things-factory/barcode-base'
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
-import { i18next, localize } from '@things-factory/i18n-base'
 import '@things-factory/import-ui'
-import { openPopup } from '@things-factory/layout-base'
-import { client, CustomAlert, PageView, store } from '@things-factory/shell'
-import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
-import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
+import './generate-location-list'
+import './print-location-label'
+
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin'
-import { LOCATION_LABEL_SETTING_KEY } from '../constants'
-import './generate-location-list'
-import './print-location-label'
+
+import { DirectPrinter } from '@things-factory/barcode-base'
+import { i18next, localize } from '@things-factory/i18n-base'
+import { openPopup } from '@things-factory/layout-base'
+import { client, CustomAlert, PageView, store } from '@things-factory/shell'
+import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
+import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
+
+import { LOCATION_LABEL_SETTING_KEY, LOCATION_STATUS, LOCATION_TYPE } from '../constants'
 
 class LocationList extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
@@ -130,8 +133,19 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
       {
         label: i18next.t('field.type'),
         name: 'type',
-        type: 'text',
-        props: { searchOper: 'i_like' }
+        type: 'select',
+        options: [
+          { value: '' },
+          ...Object.values(LOCATION_TYPE)
+            .map(type => {
+              return {
+                name: type.name,
+                value: type.value
+              }
+            })
+            .sort((a, b) => (a.name > b.name ? 1 : -1))
+        ],
+        props: { searchOper: 'eq' }
       },
       {
         label: i18next.t('field.zone'),
@@ -160,8 +174,19 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
       {
         label: i18next.t('field.status'),
         name: 'status',
-        type: 'text',
-        props: { searchOper: 'i_like' }
+        type: 'select',
+        options: [
+          { value: '' },
+          ...Object.values(LOCATION_STATUS)
+            .map(status => {
+              return {
+                name: status.name,
+                value: status.value
+              }
+            })
+            .sort((a, b) => (a.name > b.name ? 1 : -1))
+        ],
+        props: { searchOper: 'eq' }
       }
     ]
 
@@ -185,10 +210,18 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
           width: 150
         },
         {
-          type: 'string',
+          type: 'select',
           name: 'type',
           header: i18next.t('field.type'),
-          record: { editable: true },
+          record: {
+            editable: true,
+            options: [
+              '',
+              ...Object.values(LOCATION_TYPE)
+                .map(type => type.value)
+                .sort()
+            ]
+          },
           imex: { header: i18next.t('field.type'), key: 'type', width: 50, type: 'string' },
           sortable: true,
           width: 150
@@ -231,10 +264,18 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
           width: 80
         },
         {
-          type: 'string',
+          type: 'select',
           name: 'status',
           header: i18next.t('field.status'),
-          record: { editable: true },
+          record: {
+            editable: true,
+            options: [
+              '',
+              ...Object.values(LOCATION_STATUS)
+                .map(status => status.value)
+                .sort()
+            ]
+          },
           imex: { header: i18next.t('field.status'), key: 'status', width: 50, type: 'string' },
           sortable: true,
           width: 80

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

@@ -1,15 +1,21 @@
-import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import '@things-factory/grist-ui'
+import '../../components/attachment-viewer'
+import '../../components/vas-templates'
+import './edit-product-popup'
+import './proceed-edit-product-popup'
+import './view-product-changes-popup'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+
+import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { getRenderer } from '@things-factory/grist-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
 import { client, CustomAlert, navigate, PageView } from '@things-factory/shell'
 import { CommonButtonStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
-import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
-import '../../components/attachment-viewer'
-import '../../components/vas-templates'
+
 import {
   ORDER_PRODUCT_STATUS,
   ORDER_STATUS,
@@ -18,9 +24,6 @@ import {
   VAS_ETC_TYPE,
   VAS_PRODUCT_TYPE
 } from '../../constants'
-import './edit-product-popup'
-import './proceed-edit-product-popup'
-import './view-product-changes-popup'
 
 class ArrivalNoticeDetail extends localize(i18next)(PageView) {
   static get properties() {
@@ -136,11 +139,11 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
           height: 100px;
           margin: 10px;
         }
-        .form-container { 
-          display: flex
+        .form-container {
+          display: flex;
         }
-        .form-container > form { 
-          flex: 1
+        .form-container > form {
+          flex: 1;
         }
       `
     ]
@@ -238,111 +241,111 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
 
   render() {
     return html`
-    <div class="form-container">
-      <form name="arrivalNotice" class="multi-column-form">
-        <fieldset>
-          <legend>${i18next.t('title.gan_no')}: ${this._ganNo}</legend>
-
-          <label>${i18next.t('label.options')}</label>
-          <div options-wrap>
-            <input
-              id="ownTransport"
-              type="checkbox"
-              name="ownTransport"
-              ?checked="${this._ownTransport}"
-              @change="${e => (this._ownTransport = e.currentTarget.checked)}"
-              disabled
-            />
-            <label>${i18next.t('label.own_transport')}</label>
-
-            <input
-              id="warehouseTransport"
-              type="checkbox"
-              name="warehouseTransport"
-              ?checked="${!this._ownTransport}"
-              disabled
-            />
-            <label>${i18next.t('label.warehouse_transport')}</label>
-
-            <input id="container" type="checkbox" name="container" ?checked="${this._hasContainer}" disabled />
-            <label for="container">${i18next.t('label.container')}</label>
-
-            <input id="looseItem" type="checkbox" name="looseItem" ?checked="${this._looseItem}" disabled />
-            <label for="looseItem">${i18next.t('label.loose_item')}</label>
-
-            <input id="importedOrder" type="checkbox" name="importCargo" ?checked="${this._importedOrder}" disabled />
-            <label for="importedOrder">${i18next.t('label.import_cargo')}</label>
-
-            ${this._crossDocking
+      <div class="form-container">
+        <form name="arrivalNotice" class="multi-column-form">
+          <fieldset>
+            <legend>${i18next.t('title.gan_no')}: ${this._ganNo}</legend>
+
+            <label>${i18next.t('label.options')}</label>
+            <div options-wrap>
+              <input
+                id="ownTransport"
+                type="checkbox"
+                name="ownTransport"
+                ?checked="${this._ownTransport}"
+                @change="${e => (this._ownTransport = e.currentTarget.checked)}"
+                disabled
+              />
+              <label>${i18next.t('label.own_transport')}</label>
+
+              <input
+                id="warehouseTransport"
+                type="checkbox"
+                name="warehouseTransport"
+                ?checked="${!this._ownTransport}"
+                disabled
+              />
+              <label>${i18next.t('label.warehouse_transport')}</label>
+
+              <input id="container" type="checkbox" name="container" ?checked="${this._hasContainer}" disabled />
+              <label for="container">${i18next.t('label.container')}</label>
+
+              <input id="looseItem" type="checkbox" name="looseItem" ?checked="${this._looseItem}" disabled />
+              <label for="looseItem">${i18next.t('label.loose_item')}</label>
+
+              <input id="importedOrder" type="checkbox" name="importCargo" ?checked="${this._importedOrder}" disabled />
+              <label for="importedOrder">${i18next.t('label.import_cargo')}</label>
+
+              ${this._crossDocking
+                ? html`
+                    <input
+                      id="crossDocking"
+                      type="checkbox"
+                      name="crossDocking"
+                      ?checked="${this._crossDocking}"
+                      disabled
+                    />
+                    <label for="crossDocking">${i18next.t('label.cross_docking')}</label>
+                  `
+                : ''}
+            </div>
+
+            <label>${i18next.t('label.company')}</label>
+            <input name="bizplaceName" value="${this._bizplaceName}" readonly />
+
+            <label>${i18next.t('label.ref_no')}${`1`}</label>
+            <input name="refNo" readonly />
+
+            <label>${i18next.t('label.ref_no')}${`2`}</label>
+            <input name="refNo2" readonly />
+
+            <label>${i18next.t('label.ref_no')}${`3`}</label>
+            <input name="refNo3" readonly />
+
+            <label>${i18next.t('label.eta_date')}</label>
+            <input name="etaDate" type="date" readonly />
+
+            <label ?hidden="${!this._ownTransport}">${i18next.t('label.do_no')}</label>
+            <input name="deliveryOrderNo" ?hidden="${!this._ownTransport}" readonly />
+
+            <label ?hidden="${this._importedOrder || !this._ownTransport}">${i18next.t('label.truck_no')}</label>
+            <input ?hidden="${this._importedOrder || !this._ownTransport}" name="truckNo" readonly />
+
+            <label ?hidden="${!this._hasContainer}">${i18next.t('label.container_no')}</label>
+            <input ?hidden="${!this._hasContainer}" type="text" name="containerNo" readonly />
+
+            <label>${i18next.t('label.container_size')}</label>
+            <input type="text" name="containerSize" readonly />
+
+            <label>${i18next.t('label.status')}</label>
+            <select name="status" disabled>
+              ${Object.keys(ORDER_STATUS).map(key => {
+                const status = ORDER_STATUS[key]
+                return html` <option value="${status.value}">${i18next.t(`label.${status.name}`)}</option> `
+              })}
+            </select>
+
+            ${this._attachments?.length > 0
               ? html`
-                  <input
-                    id="crossDocking"
-                    type="checkbox"
-                    name="crossDocking"
-                    ?checked="${this._crossDocking}"
-                    disabled
-                  />
-                  <label for="crossDocking">${i18next.t('label.cross_docking')}</label>
+                  <label>${i18next.t('label.attachment')}</label>
+                  <ul attachment-wrap>
+                    ${(this._attachments || []).map(
+                      attachment =>
+                        html`
+                          <li>
+                            <a href="${location.origin}/attachment/${attachment.path}" download
+                              ><mwc-icon>attach_file</mwc-icon> ${attachment.name}</a
+                            >
+                          </li>
+                        `
+                    )}
+                  </ul>
                 `
               : ''}
-          </div>
-
-          <label>${i18next.t('label.company')}</label>
-          <input name="bizplaceName" value="${this._bizplaceName}" readonly />
-
-          <label>${i18next.t('label.ref_no')}${`1`}</label>
-          <input name="refNo" readonly />
-
-          <label>${i18next.t('label.ref_no')}${`2`}</label>
-          <input name="refNo2" readonly />
-
-          <label>${i18next.t('label.ref_no')}${`3`}</label>
-          <input name="refNo3" readonly />
-
-          <label>${i18next.t('label.eta_date')}</label>
-          <input name="etaDate" type="date" readonly />
-
-          <label ?hidden="${!this._ownTransport}">${i18next.t('label.do_no')}</label>
-          <input name="deliveryOrderNo" ?hidden="${!this._ownTransport}" readonly />
-
-          <label ?hidden="${this._importedOrder || !this._ownTransport}">${i18next.t('label.truck_no')}</label>
-          <input ?hidden="${this._importedOrder || !this._ownTransport}" name="truckNo" readonly />
-
-          <label ?hidden="${!this._hasContainer}">${i18next.t('label.container_no')}</label>
-          <input ?hidden="${!this._hasContainer}" type="text" name="containerNo" readonly />
-
-          <label>${i18next.t('label.container_size')}</label>
-          <input type="text" name="containerSize" readonly />
-
-          <label>${i18next.t('label.status')}</label>
-          <select name="status" disabled>
-            ${Object.keys(ORDER_STATUS).map(key => {
-              const status = ORDER_STATUS[key]
-              return html` <option value="${status.value}">${i18next.t(`label.${status.name}`)}</option> `
-            })}
-          </select>
-
-          ${this._attachments?.length > 0
-            ? html`
-                <label>${i18next.t('label.attachment')}</label>
-                <ul attachment-wrap>
-                  ${(this._attachments || []).map(
-                    attachment =>
-                      html`
-                        <li>
-                          <a href="${location.origin}/attachment/${attachment.path}" download
-                            ><mwc-icon>attach_file</mwc-icon> ${attachment.name}</a
-                          >
-                        </li>
-                      `
-                  )}
-                </ul>
-              `
-            : ''}
-        </fieldset>
-      </form>
-      <barcode-tag bcid="qrcode" .value=${this._ganNo}></barcode-tag>
-    </div>
+          </fieldset>
+        </form>
+        <barcode-tag bcid="qrcode" .value=${this._ganNo}></barcode-tag>
+      </div>
 
       <div class="container">
         <div class="grist">
@@ -541,6 +544,12 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
         record: { options: { queryName: 'products' } },
         width: 350
       },
+      {
+        type: 'string',
+        name: 'productBrand',
+        header: i18next.t('field.brand'),
+        width: 150
+      },
       {
         type: 'string',
         name: 'packingType',
@@ -618,6 +627,7 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
           'packingType',
           'uomValue',
           'uom',
+          'brand',
           'packQty',
           'totalUomValue',
           'palletQty',
@@ -687,6 +697,7 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
                 name
                 description
                 sku
+                brand
               }
               remark
               unitPrice
@@ -761,7 +772,11 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
       this.setProductGristConfig()
       this.productData = {
         records: orderProducts.map(record => {
-          return { ...record, productSku: record.product.sku }
+          return {
+            ...record,
+            productSku: record.product.sku,
+            productBrand: record.product.brand
+          }
         })
       }
       this.vasData = {
@@ -915,6 +930,10 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
   }
 
   openEditProductPopup() {
+    this.productData.records = this.productData.records.filter(
+      orderProduct => orderProduct.status !== ORDER_PRODUCT_STATUS.UNLOADED.value
+    )
+
     openPopup(
       html`
         <edit-product-popup