@things-factory/operato-wms 3.6.37 → 3.6.41

package/client/pages/outbound/worksheet-batch-picking.js

@@ -242,12 +242,14 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
                 record.batchId,
                 record.product.name,
                 record.product.sku,
-                record.packingType
+                record.packingType,
+                record.packingSize
               )
               this._selectedProduct = {
                 batchId: record.batchId,
                 product: record.product,
                 packingType: record.packingType,
+                packingSize: record.packingSize,
                 releaseQty: record.releaseQty,
                 releaseUomValue: record.releaseUomValue,
                 completed: record.completed
@@ -279,6 +281,7 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
                 product: record.product,
                 bizplaceId: record.bizplace.id,
                 packingType: record.packingType,
+                packingSize: record.packingSize,
                 releaseQty: record.releaseQty,
                 releaseUomValue: record.releaseUomValue
               }
@@ -519,6 +522,7 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
                     id
                   }
                   packingType
+                  packingSize
                   releaseQty
                   releaseUomValue
                   status
@@ -555,8 +559,10 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
               ordInv.status === ORDER_INVENTORY_STATUS.PENDING_SPLIT.value ||
               ordInv.status === ORDER_INVENTORY_STATUS.COMPLETE_SPLIT.value
             ) {
+              ordInv.productSku = ordInv.product.sku
               result.tempOrderInvs.push(ordInv)
             } else {
+              ordInv.productSku = ordInv.product.sku
               ordInv.releaseUomValueWithUom = Math.round(ordInv.releaseUomValue).toFixed(2) + ' ' + ordInv.inventory.uom
               let existingCompOrderInvsIndex = result.completedOrderInvs.findIndex(
                 oinv => oinv.inventory.palletId == ordInv.inventory.palletId
@@ -638,11 +644,13 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
         this.productGristData = {
           records: orderBy(
             groupedOI.map(ordInv => {
-              const { compQty, compUomValue } = completedOrderInvs.reduce(
+              const { compQty, compUomValue, unassignedQty, unassignedUomValue } = completedOrderInvs.reduce(
                 (result, compOrdInv) => {
                   if (this._checkSameOrderInv(ordInv, compOrdInv)) {
-                    result.compQty += compOrdInv.releaseQty
-                    result.compUomValue += compOrdInv.releaseUomValue
+                    result.unassignedQty = compOrdInv.releaseQty - ordInv.releaseQty
+                    result.unassignedUomValue = compOrdInv.releaseUomValue - ordInv.releaseUomValue
+                    result.compQty = compOrdInv.releaseQty - result.unassignedQty
+                    result.compUomValue = compOrdInv.releaseUomValue - result.unassignedUomValue
                   }
 
                   // need to round off the completed uomValue to bypass the validation
@@ -650,7 +658,7 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
 
                   return result
                 },
-                { compQty: 0, compUomValue: 0 }
+                { compQty: 0, compUomValue: 0, unassignedQty: 0, unassignedUomValue: 0 }
               )
 
               return {
@@ -697,15 +705,15 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
     )
   }
 
-  async fetchWorksheetDetails(worksheetNo, batchId, productName, productSku, packingType) {
+  async fetchWorksheetDetails(worksheetNo, batchId, productName, productSku, packingType, packingSize) {
     if (worksheetNo && batchId && productName && productSku && packingType) {
-      await this.fetchWorksheetDetailsByProductGroup(worksheetNo, batchId, productName, productSku, packingType)
+      await this.fetchWorksheetDetailsByProductGroup(worksheetNo, batchId, productName, productSku, packingType, packingSize)
     } else {
       await this.fetchWholeWorksheetDetails()
     }
   }
 
-  async fetchWorksheetDetailsByProductGroup(worksheetNo, batchId, productName, productSku, packingType) {
+  async fetchWorksheetDetailsByProductGroup(worksheetNo, batchId, productName, productSku, packingType, packingSize) {
     const response = await client.query({
       query: gql`
         query worksheetDetailsByProductGroup(
@@ -714,6 +722,7 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
           $productName: String!
           $productSku: String!
           $packingType: String!
+          $packingSize: Float!
         ) {
           worksheetDetailsByProductGroup(
             worksheetNo: $worksheetNo
@@ -721,6 +730,7 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
             productName: $productName
             productSku: $productSku
             packingType: $packingType
+            packingSize: $packingSize
           ) {
             items {
               id
@@ -758,7 +768,7 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
           }
         }
       `,
-      variables: { worksheetNo, batchId, productName, productSku, packingType }
+      variables: { worksheetNo, batchId, productName, productSku, packingType, packingSize }
     })
 
     if (!response.errors) {
@@ -953,6 +963,7 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
               .bizplaceId="${this._selectedProduct.bizplaceId}"
               .worksheetType="${this._worksheetType}"
               .packingType="${this._selectedProduct.packingType}"
+              .packingSize="${this._selectedProduct.packingSize}"
               .releaseQty="${this._selectedProduct.releaseQty}"
               .releaseUomValue="${this._selectedProduct.releaseUomValue}"
               @completed="${async () => {
@@ -1005,7 +1016,8 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
               //   this._selectedProduct?.batchId,
               //   this._selectedProduct?.product?.name,
               //   this._selectedProduct?.product?.sku,
-              //   this._selectedProduct?.packingType
+              //   this._selectedProduct?.packingType,
+              //   this._selectedProduct.packingSize
               // )
 
               this._spinner(false)
@@ -1062,12 +1074,14 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
               $batchId: String!
               $productId: String!
               $packingType: String!
+              $packingSize: Float!
             ) {
               undoPickingAssigment(
                 worksheetNo: $worksheetNo
                 batchId: $batchId
                 productId: $productId
                 packingType: $packingType
+                packingSize: $packingSize
               )
             }
           `,
@@ -1075,7 +1089,8 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
             worksheetNo: this._worksheetNo,
             batchId: this._selectedProduct.batchId,
             productId: this._selectedProduct.product.id,
-            packingType: this._selectedProduct.packingType
+            packingType: this._selectedProduct.packingType,
+            packingSize: this._selectedProduct.packingSize
           }
         })
 

package/client/pages/outbound/worksheet-picking.js

@@ -319,19 +319,21 @@ class WorksheetPicking extends localize(i18next)(PageView) {
         },
         handlers: {
           click: async (columns, data, column, record, rowIndex) => {
-            if (record.batchId && record.product?.name && record.packingType) {
+            if (record.batchId && record.product?.name && record.packingType && record.packingSize != undefined) {
               await this.fetchWorksheetDetails(
                 this._worksheetNo,
                 record.batchId,
                 record.product.name,
                 record.product.sku,
-                record.packingType
+                record.packingType,
+                record.packingSize
               )
               this._selectedProduct = {
                 batchId: record.batchId,
                 batchIdRef: record.batchIdRef,
                 product: record.product,
                 packingType: record.packingType,
+                packingSize: record.packingSize,
                 releaseQty: record.releaseQty,
                 releaseUomValue: record.releaseUomValue,
                 completed: record.completed
@@ -362,6 +364,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
                 product: record.product,
                 bizplaceId: record.bizplaceId,
                 packingType: record.packingType,
+                packingSize: record.packingSize,
                 releaseQty: record.releaseQty,
                 releaseUomValue: record.releaseUomValue
               }
@@ -635,6 +638,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
                 sku
               }
               packingType
+              packingSize
               releaseQty
               releaseUomValue
               inventory {
@@ -666,6 +670,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
                   sku
                 }
                 packingType
+                packingSize
                 releaseQty
                 releaseUomValue
                 status
@@ -802,15 +807,22 @@ class WorksheetPicking extends localize(i18next)(PageView) {
     return a.batchId === b.batchId && a.product?.sku === b.product?.sku && a.packingType === b.packingType
   }
 
-  async fetchWorksheetDetails(worksheetNo, batchId, productName, productSku, packingType) {
+  async fetchWorksheetDetails(worksheetNo, batchId, productName, productSku, packingType, packingSize) {
     if (worksheetNo && batchId && productName && productSku && packingType) {
-      await this.fetchWorksheetDetailsByProductGroup(worksheetNo, batchId, productName, productSku, packingType)
+      await this.fetchWorksheetDetailsByProductGroup(
+        worksheetNo,
+        batchId,
+        productName,
+        productSku,
+        packingType,
+        packingSize
+      )
     } else {
       await this.fetchWholeWorksheetDetails()
     }
   }
 
-  async fetchWorksheetDetailsByProductGroup(worksheetNo, batchId, productName, productSku, packingType) {
+  async fetchWorksheetDetailsByProductGroup(worksheetNo, batchId, productName, productSku, packingType, packingSize) {
     const response = await client.query({
       query: gql`
         query worksheetDetailsByProductGroup(
@@ -819,6 +831,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
           $productName: String!
           $productSku: String!
           $packingType: String!
+          $packingSize: Float!
         ) {
           worksheetDetailsByProductGroup(
             worksheetNo: $worksheetNo
@@ -826,6 +839,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
             productName: $productName
             productSku: $productSku
             packingType: $packingType
+            packingSize: $packingSize
           ) {
             items {
               id
@@ -842,6 +856,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
                   palletId
                   cartonId
                   packingType
+                  packingSize
                   uom
                   product {
                     sku
@@ -861,7 +876,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
           }
         }
       `,
-      variables: { worksheetNo, batchId, productName, productSku, packingType }
+      variables: { worksheetNo, batchId, productName, productSku, packingType, packingSize }
     })
 
     if (!response.errors) {
@@ -908,6 +923,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
                   description
                 }
                 packingType
+
                 inventory {
                   qty
                   lockedQty
@@ -916,6 +932,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
                   batchId
                   batchIdRef
                   packingType
+
                   warehouse {
                     name
                     description
@@ -950,6 +967,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
                 description
               }
               packingType
+
               qty
               uomValue
               otherTarget
@@ -1127,6 +1145,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
             .worksheetType="${this.worksheetType}"
             .bizplaceId="${this._selectedProduct.bizplaceId}"
             .packingType="${this._selectedProduct.packingType}"
+            .packingSize="${this._selectedProduct.packingSize}"
             .releaseQty="${this._selectedProduct.releaseQty}"
             .releaseUomValue="${this._selectedProduct.releaseUomValue}"
             @completed="${async () => {
@@ -1136,7 +1155,8 @@ class WorksheetPicking extends localize(i18next)(PageView) {
                 this._selectedProduct.batchId,
                 this._selectedProduct.product.name,
                 this._selectedProduct.product.sku,
-                this._selectedProduct.packingType
+                this._selectedProduct.packingType,
+                this._selectedProduct.packingSize
               )
 
               this._selectedProduct.completed = true
@@ -1170,7 +1190,8 @@ class WorksheetPicking extends localize(i18next)(PageView) {
               this._selectedProduct?.batchId,
               this._selectedProduct?.product?.name,
               this._selectedProduct?.product?.sku,
-              this._selectedProduct?.packingType
+              this._selectedProduct?.packingType,
+              this._selectedProduct?.packingSize
             )
 
             this.updateContext()
@@ -1205,12 +1226,14 @@ class WorksheetPicking extends localize(i18next)(PageView) {
             $batchId: String!
             $productId: String!
             $packingType: String!
+            $packingSize: Float!
           ) {
             undoPickingAssigment(
               worksheetNo: $worksheetNo
               batchId: $batchId
               productId: $productId
               packingType: $packingType
+              packingSize: $packingSize
             )
           }
         `,
@@ -1218,7 +1241,8 @@ class WorksheetPicking extends localize(i18next)(PageView) {
           worksheetNo: this._worksheetNo,
           batchId: this._selectedProduct.batchId,
           productId: this._selectedProduct.product.id,
-          packingType: this._selectedProduct.packingType
+          packingType: this._selectedProduct.packingType,
+          packingSize: this._selectedProduct.packingSize
         }
       })
 
@@ -1228,7 +1252,8 @@ class WorksheetPicking extends localize(i18next)(PageView) {
         this._selectedProduct.batchId,
         this._selectedProduct.product.name,
         this._selectedProduct.product.sku,
-        this._selectedProduct.packingType
+        this._selectedProduct.packingType,
+        this._selectedProduct.packingSize
       )
 
       this._selectedProduct.completed = false

package/client/pages/vas/print-product-label.js

@@ -59,7 +59,13 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
         <fieldset>
           <legend>${i18next.t('title.search_area')}</legend>
           <label>${i18next.t('label.search_type')}</label>
-          <select name="orderType" @change="${e => (this._searchingType = e.currentTarget.value)}">
+          <select
+            name="orderType"
+            @change="${e => {
+              this._searchingType = e.currentTarget.value
+              this.dataGrist.data.records = []
+            }}"
+          >
             ${Object.keys(SEARCH_TYPES).map(
               key => html`
                 <option value="${SEARCH_TYPES[key].value}">${i18next.t(`label.${SEARCH_TYPES[key].name}`)}</option>
@@ -71,6 +77,12 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
             ? html`
                 <label>${i18next.t('label.product_info')}</label>
                 <input name="productInfo" value="" type="text" @keypress="${this.orderNoKeypressHandler.bind(this)}" />
+
+                <label>${i18next.t('label.batch_id')}</label>
+                <input name="batchId" value="" type="text" @keypress="${this.orderNoKeypressHandler.bind(this)}" />
+
+                <label>${i18next.t('label.lot_id')}</label>
+                <input name="lotId" value="" type="text" @keypress="${this.orderNoKeypressHandler.bind(this)}" />
               `
             : html`
                 <label>${i18next.t('label.order_no')}</label>
@@ -124,8 +136,17 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
   }
 
   get searchInfo() {
-    if (this._searchingType == 'INVENTORY') return this.shadowRoot.querySelector('input[name=productInfo]')
-    else return this.shadowRoot.querySelector('barcode-scanable-input[name=orderNo]').shadowRoot.querySelector('input')
+    if (this._searchingType == 'INVENTORY') {
+      return {
+        productInfo: this.shadowRoot.querySelector('input[name=productInfo]').value,
+        batchId: this.shadowRoot.querySelector('input[name=batchId]').value,
+        lotId: this.shadowRoot.querySelector('input[name=lotId]').value
+      }
+    } else
+      return {
+        orderNo: this.shadowRoot.querySelector('barcode-scanable-input[name=orderNo]').shadowRoot.querySelector('input')
+          .value
+      }
   }
 
   get targetData() {
@@ -225,11 +246,19 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
           sortable: true,
           width: 100
         },
+        {
+          type: 'string',
+          name: 'location',
+          header: i18next.t('field.location'),
+          sortable: true,
+          width: 100
+        },
         {
           type: 'string',
           name: 'expirationDate',
           header: i18next.t('field.exp_date'),
           sortable: true,
+          record: { editable: true },
           width: 100
         },
         {
@@ -245,39 +274,144 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
 
   async fetchHandler({ page, limit, sorters = [] }) {
     const fetcherDetail = { page, limit, sorters }
-    const searchInfo = this.searchInfo.value
     const searchType = this._searchingType
+    const searchInfo = this.searchInfo
 
-    if (searchInfo == '') return
+    if (!searchInfo || Object.values(searchInfo).every(search => search === '')) return
 
     switch (searchType) {
       case 'GAN':
-        return await this._fetchOrderInventories([
-          {
-            name: 'arrivalNoticeNo',
-            operator: 'eq',
-            value: searchInfo
-          }
-        ])
+        return await this._fetchArrivalNotice(searchInfo.orderNo)
 
       case 'RO':
         return await this._fetchOrderInventories([
           {
             name: 'releaseGoodNo',
             operator: 'eq',
-            value: searchInfo
+            value: searchInfo.orderNo
           }
         ])
 
       case 'INVENTORY':
-        const filters = [
-          { name: 'product_info', operator: 'eq', value: searchInfo },
-          { name: 'status', operator: 'notin', value: ['INTRANSIT', 'TERMINATED', 'DELETED'] }
-        ]
+        const filters = [{ name: 'status', operator: 'notin', value: ['INTRANSIT', 'TERMINATED', 'DELETED'] }]
+
+        if (searchInfo.productInfo !== '')
+          filters.push({ name: 'product_info', operator: 'eq', value: searchInfo.productInfo })
+
+        if (searchInfo.batchId !== '')
+          filters.push({ name: 'batch_id', operator: 'i_like', value: `%${searchInfo.batchId}%` })
+
+        if (searchInfo.lotId !== '')
+          filters.push({ name: 'pallet_id', operator: 'i_like', value: `%${searchInfo.lotId}%` })
+
         return await this._fetchInventories(fetcherDetail, filters)
     }
   }
 
+  async _fetchArrivalNotice(name) {
+    try {
+      const response = await client.query({
+        query: gql`
+          query {
+            arrivalNotice(${gqlBuilder.buildArgs({
+              name
+            })}) {
+              orderInventories {
+                inventory {
+                  batchId
+                  palletId
+                  expirationDate
+                  location {
+                    name
+                  }
+                  product {
+                    name
+                    sku
+                    description
+                    type
+                    auxUnit1
+                    auxValue1
+                    auxUnit2
+                    auxValue2
+                  }
+                }
+              }
+              orderProducts {
+                batchId
+                product {
+                  name
+                  sku
+                  description
+                  type
+                  auxUnit1
+                  auxValue1
+                  auxUnit2
+                  auxValue2
+                }
+              }
+            }
+          }
+        `
+      })
+
+      if (!response.errors) {
+        const orderInventories = response.data.arrivalNotice.orderInventories
+        const orderProducts = response.data.arrivalNotice.orderProducts
+
+        if (orderInventories && orderInventories.length) {
+          return {
+            records: orderInventories.map(oi => {
+              const inventory = oi.inventory
+              const product = inventory.product
+              return {
+                batchId: inventory.batchId,
+                palletId: inventory.palletId,
+                location: inventory.location?.name || '',
+                expirationDate: inventory.expirationDate || '',
+                productName: product.name,
+                sku: product.sku,
+                description: product.description,
+                type: product.type,
+                auxUnit1: product.auxUnit1 || '',
+                auxValue1: product.auxValue1 || '',
+                auxUnit2: product.auxUnit2 || '',
+                auxValue2: product.auxValue2 || '',
+                productInfo: product.description ? `${product.name} (${product.description})` : `${product.name}`
+              }
+            })
+          }
+        } else {
+          return {
+            records: orderProducts.map(op => {
+              const product = op.product
+              return {
+                batchId: op.batchId,
+                palletId: '',
+                location: '',
+                expirationDate: '',
+                productName: product.name,
+                sku: product.sku,
+                description: product.description,
+                type: product.type,
+                auxUnit1: product.auxUnit1 || '',
+                auxValue1: product.auxValue1 || '',
+                auxUnit2: product.auxUnit2 || '',
+                auxValue2: product.auxValue2 || '',
+                productInfo: product.description ? `${product.name} (${product.description})` : `${product.name}`
+              }
+            })
+          }
+        }
+      } else
+        return {
+          records: [],
+          total: 0
+        }
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
   async _fetchOrderInventories(filters) {
     try {
       const response = await client.query({
@@ -290,6 +424,9 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
                 inventory {
                   batchId
                   palletId
+                  location {
+                    name
+                  }
                   expirationDate
                   product {
                     name
@@ -320,6 +457,7 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
             return {
               batchId: inventory.batchId,
               palletId: inventory.palletId,
+              location: inventory.location?.name || '',
               expirationDate: inventory.expirationDate || '',
               productName: inventory.product.name,
               sku: inventory.product.sku,
@@ -353,6 +491,9 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
             items {
               palletId
               batchId
+              location {
+                name
+              }
               product {
                 name
                 sku
@@ -385,6 +526,7 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
           return {
             batchId: item.batchId,
             palletId: item.palletId,
+            location: item.location?.name || '',
             expirationDate: item.expirationDate || '',
             productName: item.product.name,
             sku: item.product.sku,

package/client/route.js

@@ -208,6 +208,10 @@ export default function route(page) {
       import('./pages/order/return-order/return-order-assign-buffer-location')
       return page
 
+    case 'bulk_print_packing_list':
+      import('./pages/order/release-order/bulk-print-packing-list')
+      return page
+
     /**
      * GRN Menus Section
      */