@things-factory/operato-wms 3.7.11 → 3.7.15

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

@@ -136,11 +136,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 +238,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 +541,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 +624,7 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
           'packingType',
           'uomValue',
           'uom',
+          'brand',
           'packQty',
           'totalUomValue',
           'palletQty',
@@ -687,6 +694,7 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
                 name
                 description
                 sku
+                brand
               }
               remark
               unitPrice
@@ -761,7 +769,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 = {

package/client/pages/order/arrival-notice/assign-buffer-location.js

@@ -450,6 +450,7 @@ class AssignBufferLocation extends localize(i18next)(PageView) {
                 name
                 description
                 sku
+                brand
               }
               remark
               unitPrice
@@ -523,7 +524,7 @@ class AssignBufferLocation 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 = {
@@ -577,6 +578,12 @@ class AssignBufferLocation extends localize(i18next)(PageView) {
         header: i18next.t('field.product'),
         width: 350
       },
+      {
+        type: 'string',
+        name: 'productBrand',
+        header: i18next.t('field.brand'),
+        width: 150
+      },
       {
         type: 'string',
         name: 'packingType',

package/client/pages/order/arrival-notice/check-arrived-notice.js

@@ -300,6 +300,7 @@ class CheckArrivedNotice extends localize(i18next)(PageView) {
         fields: [
           'batchId',
           'productSku',
+          'productBrand',
           'product',
           'packingType',
           'uomValue',
@@ -333,6 +334,12 @@ class CheckArrivedNotice extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 350
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -552,6 +559,7 @@ class CheckArrivedNotice extends localize(i18next)(PageView) {
                 name
                 description
                 sku
+                brand
               }
               remark
               unitPrice
@@ -622,7 +630,7 @@ class CheckArrivedNotice extends localize(i18next)(PageView) {
 
       this.productData = {
         records: orderProducts.map(record => {
-          return { ...record, productSku: record.product.sku }
+          return { ...record, productSku: record.product.sku, productBrand: record.product.brand }
         })
       }
       this.vasData = {

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

@@ -563,6 +563,13 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
         },
         width: 350
       },
+      {
+        type: 'string',
+        name: 'productBrand',
+        header: i18next.t('field.brand'),
+        imex: { header: i18next.t('field.brand'), key: 'productBrand', width: 25, type: 'string' },
+        width: 150
+      },
       {
         type: 'object',
         name: 'product',

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

@@ -454,6 +454,7 @@ class ReceiveArrivalNotice extends localize(i18next)(PageView) {
                 name
                 description
                 sku
+                brand
               }
               remark
               unitPrice
@@ -527,7 +528,7 @@ class ReceiveArrivalNotice 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 = {
@@ -582,6 +583,12 @@ class ReceiveArrivalNotice 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',

package/client/pages/order/release-order/create-release-order.js

@@ -845,6 +845,7 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
                     header: i18next.t('field.product_info'),
                     width: 280
                   },
+                  { name: 'productBrand', header: i18next.t('field.brand') },
                   { name: 'packingType', header: i18next.t('field.packing_type') },
                   { name: 'packingSize', header: i18next.t('field.packing_size') },
                   { name: 'uom', header: i18next.t('field.uom') },
@@ -869,6 +870,7 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
                     'batchId',
                     'batchIdRef',
                     'productName',
+                    'productBrand',
                     'packingType',
                     'remainQty',
                     'remainUomValue',
@@ -891,6 +893,12 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
             header: i18next.t('field.product'),
             width: 150
           },
+          {
+            type: 'string',
+            name: 'productBrand',
+            header: i18next.t('field.brand'),
+            width: 100
+          },
           {
             type: 'code',
             name: 'packingType',
@@ -995,6 +1003,7 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
                   { name: 'palletId', header: i18next.t('field.lot_id') },
                   { name: 'productSKU', header: i18next.t('field.sku') },
                   { name: 'productName', header: i18next.t('field.product_info') },
+                  { name: 'productBrand', header: i18next.t('field.brand') },
                   { name: 'batchId', header: i18next.t('field.batch_id') },
                   {
                     name: 'location',
@@ -1019,7 +1028,15 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
                   }
                 ],
                 list: {
-                  fields: ['palletId', 'productName', 'batchId', 'location', 'remainUomValue', 'batchIdRef']
+                  fields: [
+                    'palletId',
+                    'productName',
+                    'productBrand',
+                    'batchId',
+                    'location',
+                    'remainUomValue',
+                    'batchIdRef'
+                  ]
                 }
               }
             },
@@ -1037,6 +1054,12 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
             header: i18next.t('field.product'),
             width: 150
           },
+          {
+            type: 'string',
+            name: 'productBrand',
+            header: i18next.t('field.brand'),
+            width: 100
+          },
           {
             type: 'object',
             name: 'location',

package/client/pages/order/release-order/receive-release-order-request.js

@@ -400,6 +400,12 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
           header: i18next.t('field.product'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 100
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -595,6 +601,7 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
               product {
                 id
                 sku
+                brand
                 name
                 description
               }
@@ -652,6 +659,7 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
         return {
           ...inventoryInfo,
           productSKU: inventoryInfo?.product?.sku || '',
+          productBrand: inventoryInfo?.product?.brand || '',
           qty: inventoryInfo.qty + inventoryInfo.releaseQty,
           remainUomValue: `${inventoryInfo.uomValue + inventoryInfo.releaseUomValue} ${inventoryInfo.uom}`,
           releaseUomValue: inventoryInfo.releaseUomValue + ' ' + inventoryInfo.uom,

package/client/pages/order/release-order/release-order-detail.js

@@ -527,6 +527,12 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.product'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 100
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -724,6 +730,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
               product {
                 id
                 sku
+                brand
                 name
                 description
               }
@@ -789,6 +796,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         return {
           ...inventoryInfo,
           productSKU: inventoryInfo?.product?.sku || '',
+          productBrand: inventoryInfo?.product?.brand || '',
           inventory: {
             id: inventoryInfo.id,
             name: inventoryInfo.name,

package/client/pages/order/return-order/check-return-order.js

@@ -271,6 +271,12 @@ class CheckReturnOrder extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.product'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -343,6 +349,7 @@ class CheckReturnOrder extends connect(store)(localize(i18next)(PageView)) {
                 name
                 description
                 sku
+                brand
               }
               productName
               packingType
@@ -376,7 +383,8 @@ class CheckReturnOrder extends connect(store)(localize(i18next)(PageView)) {
         records: orderInventories.map(orderInventory => {
           return {
             ...orderInventory,
-            sku: orderInventory.product.sku
+            sku: orderInventory.product.sku,
+            brand: orderInventory.product.brand
           }
         })
       }

package/client/pages/order/return-order/create-return-order.js

@@ -411,6 +411,11 @@ class CreateReturnOrder extends localize(i18next)(PageView) {
                   width: 280,
                   ignoreCondition: true
                 },
+                {
+                  name: 'productBrand',
+                  header: i18next.t('field.brand'),
+                  ignoreCondition: true
+                },
                 {
                   name: 'packingType',
                   header: i18next.t('field.packing_type'),
@@ -437,6 +442,7 @@ class CreateReturnOrder extends localize(i18next)(PageView) {
                   'releaseGoodName',
                   'batchId',
                   'productName',
+                  'productBrand',
                   'packingType',
                   'packingSize',
                   'releaseQty',
@@ -459,6 +465,12 @@ class CreateReturnOrder extends localize(i18next)(PageView) {
           header: i18next.t('field.product_name'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'batchId',
@@ -754,7 +766,7 @@ class CreateReturnOrder extends localize(i18next)(PageView) {
       let returnOrder = this._serializeForm(this.returnOrderForm)
       delete returnOrder.warehouseTransport
       returnOrder.orderInventories = this._getOrderInventories()
-      returnOrder.ownTransport = this._ownTransport  
+      returnOrder.ownTransport = this._ownTransport
       const attachments = this._document?.files ? this._document.files : undefined
       const response = await client.mutate({
         mutation: gql`

package/client/pages/order/return-order/receive-return-order-requests.js

@@ -277,6 +277,12 @@ class ReceiveReturnOrderRequests extends connect(store)(localize(i18next)(PageVi
           header: i18next.t('field.product'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -349,6 +355,7 @@ class ReceiveReturnOrderRequests extends connect(store)(localize(i18next)(PageVi
                 name
                 description
                 sku
+                brand
               }
               productName
               packingType
@@ -381,7 +388,8 @@ class ReceiveReturnOrderRequests extends connect(store)(localize(i18next)(PageVi
         records: orderInventories.map(orderInventory => {
           return {
             ...orderInventory,
-            sku: orderInventory.product.sku
+            sku: orderInventory.product.sku,
+            brand: orderInventory.product.brand
           }
         })
       }

package/client/pages/order/return-order/return-order-detail.js

@@ -312,6 +312,12 @@ class ReturnOrderDetail extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.product'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -384,6 +390,7 @@ class ReturnOrderDetail extends connect(store)(localize(i18next)(PageView)) {
                 name
                 description
                 sku
+                brand
               }
               productName
               packingType
@@ -417,7 +424,8 @@ class ReturnOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         records: orderInventories.map(orderInventory => {
           return {
             ...orderInventory,
-            sku: orderInventory.product.sku
+            sku: orderInventory.product.sku,
+            brand: orderInventory.product.brand
           }
         })
       }

package/client/pages/order/return-order/return-order-inventory-popup.js

@@ -154,6 +154,12 @@ class ReturnOrderInventoryPopup extends localize(i18next)(LitElement) {
           header: i18next.t('field.product_name'),
           width: 220
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 120
+        },
         {
           type: 'code',
           name: 'packingType',
@@ -233,6 +239,7 @@ class ReturnOrderInventoryPopup extends localize(i18next)(LitElement) {
                 id
               }
               productName
+              productBrand
               packingType
               packingSize
               releaseUomValueWithUom