@things-factory/operato-wms 3.7.2 → 3.7.7

package/client/pages/vas/reverse-kitting/execute-reverse-kitting.js

@@ -72,9 +72,6 @@ class ExecuteReverseKitting extends connect(store)(localize(i18next)(PageView))
         ? html`<form class="multi-column-form" id="info-form">
               <fieldset>
                 <legend>${`${i18next.t('title.order_no')}: ${this._orderNo}`}</legend>
-
-                <!-- <label>${i18next.t('label.company')}</label>
-            <input name="bizplaceName" readonly /> -->
               </fieldset>
             </form>
 
@@ -109,8 +106,11 @@ class ExecuteReverseKitting extends connect(store)(localize(i18next)(PageView))
 
   get completable() {
     let completable = false
-    if (this.orderData.records.length > 0) {
-      completable = this.orderData.records.every(item => item.completed)
+    const orderDataWithIssues = this.orderData.records.filter(orderReverseKitting => !orderReverseKitting.completed)
+    if (!orderDataWithIssues?.length) {
+      completable = this.orderData.records.every(record => record.completed)
+    } else {
+      completable = orderDataWithIssues.every(record => record.issue)
     }
 
     return completable
@@ -131,7 +131,7 @@ class ExecuteReverseKitting extends connect(store)(localize(i18next)(PageView))
   pageInitialized() {
     this.orderGristConfig = {
       pagination: { infinite: true },
-      list: { fields: ['completed', 'batchId', 'palletId', 'product', 'qty'] },
+      list: { fields: ['completed', 'batchId', 'palletId', 'product', 'qty', 'issue'] },
       rows: {
         appendable: false,
         handlers: {
@@ -179,6 +179,13 @@ class ExecuteReverseKitting extends connect(store)(localize(i18next)(PageView))
           header: i18next.t('field.uom_value'),
           label: true,
           width: 60
+        },
+        {
+          type: 'string',
+          name: 'issue',
+          header: i18next.t('field.issue'),
+          label: true,
+          width: 200
         }
       ]
     }
@@ -236,6 +243,7 @@ class ExecuteReverseKitting extends connect(store)(localize(i18next)(PageView))
               otherTarget
               operationGuide
               status
+              issue
               description
               remark
             }
@@ -336,7 +344,6 @@ class ExecuteReverseKitting extends connect(store)(localize(i18next)(PageView))
 
   _clearView() {
     this.orderData = { records: [] }
-    this.inputForm.reset()
     this._selectedParentInventory = null
     this.updateContext()
   }
@@ -346,11 +353,22 @@ class ExecuteReverseKitting extends connect(store)(localize(i18next)(PageView))
   }
 
   _openPopupCombinationSets(record) {
-    openPopup(html` <popup-combination-sets .orderNo="${this._orderNo}" .data="${record}"></popup-combination-sets> `, {
-      backdrop: true,
-      size: 'large',
-      title: record.palletId
-    })
+    openPopup(
+      html`
+        <popup-combination-sets
+          .orderNo="${this._orderNo}"
+          .data="${record}"
+          @order-reverse-kitting-data="${e => {
+            this.fetchReverseKittingOrder(this._orderNo)
+          }}"
+        ></popup-combination-sets>
+      `,
+      {
+        backdrop: true,
+        size: 'large',
+        title: record.palletId
+      }
+    )
   }
 
   _showToast({ type, message }) {

package/client/pages/vas/reverse-kitting/popup-combination-sets.js

@@ -1,10 +1,13 @@
 import '../../vas/reverse-kitting/popup-reverse-kitting-template'
+import '../../components/popup-note'
 
+import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit-element'
 
 import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
+import { client } from '@things-factory/shell'
 import { isMobileDevice } from '@things-factory/utils'
 
 class PopupCombinationSets extends localize(i18next)(LitElement) {
@@ -53,12 +56,15 @@ class PopupCombinationSets extends localize(i18next)(LitElement) {
           font-size: var(--grist-title-icon-size);
           color: var(--grist-title-icon-color);
         }
+        .grist {
+          display: flex;
+          flex-direction: column;
+          flex: 1;
+          overflow-y: auto;
+        }
         .button-container {
-          padding: var(--button-container-padding);
-          margin: var(--button-container-margin);
-          text-align: var(--button-container-align);
-          background-color: var(--button-container-background);
-          height: var(--button-container-height);
+          padding: 10px 0 12px 0;
+          text-align: center;
         }
       `
     ]
@@ -129,6 +135,15 @@ class PopupCombinationSets extends localize(i18next)(LitElement) {
             ></data-grist>
           </div>`
         : ''}
+      ${this.data
+        ? html`<div class="button-container">
+            <mwc-button
+              raised
+              @click=${this._openIssueNote.bind(this)}
+              label="${i18next.t('button.issue')}"
+            ></mwc-button>
+          </div>`
+        : ''}
     `
   }
 
@@ -214,6 +229,31 @@ class PopupCombinationSets extends localize(i18next)(LitElement) {
     }
   }
 
+  async updateReverseKittingIssue(orderReverseKitting, issue) {
+    try {
+      if (!issue) return
+      const response = await client.mutate({
+        mutation: gql`
+          mutation updateOrderReverseKitting($id: String!, $patch: OrderReverseKittingPatch!) {
+            updateOrderReverseKitting(id: $id, patch: $patch) {
+              id
+              name
+            }
+          }
+        `,
+        variables: { id: orderReverseKitting.id, patch: { issue } }
+      })
+
+      if (!response.errors) {
+        this._showToast({ message: i18next.t('text.issue_updated') })
+        this.dispatchEvent(new CustomEvent('order-reverse-kitting-data', { detail: this.data }))
+        history.back()
+      }
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
   getProductCombination() {
     let operationGuide = JSON.parse(this.data.operationGuide)
     this.productCombinationSets = {
@@ -229,6 +269,25 @@ class PopupCombinationSets extends localize(i18next)(LitElement) {
     }
   }
 
+  _openIssueNote() {
+    openPopup(
+      html`
+        <popup-note
+          .title="${i18next.t('title.issue')}"
+          .value="${this.data.issue}"
+          @submit="${async e => {
+            await this.updateReverseKittingIssue(this.data, e.detail.value)
+          }}"
+        ></popup-note>
+      `,
+      {
+        backdrop: true,
+        size: 'medium',
+        title: i18next.t('title.issue')
+      }
+    )
+  }
+
   _openPopupReverseKittingTemplate(record) {
     openPopup(
       html`
@@ -247,6 +306,17 @@ class PopupCombinationSets extends localize(i18next)(LitElement) {
       }
     )
   }
+
+  _showToast({ type, message }) {
+    document.dispatchEvent(
+      new CustomEvent('notify', {
+        detail: {
+          type,
+          message
+        }
+      })
+    )
+  }
 }
 
 window.customElements.define('popup-combination-sets', PopupCombinationSets)

package/client/pages/vas/reverse-kitting/popup-reverse-kitting-template.js

@@ -7,7 +7,7 @@ import { css, html, LitElement } from 'lit-element'
 import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
-import { client } from '@things-factory/shell'
+import { client, CustomAlert } from '@things-factory/shell'
 import { isMobileDevice } from '@things-factory/utils'
 
 class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
@@ -20,8 +20,11 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
       actualQty: Number,
       incompleteLocationName: Boolean,
       locations: Array,
+      _selectedInventory: Object,
       reverseKittingInventoriesConfig: Object,
-      _reverseKittingInventories: Array
+      _reverseKittingInventories: Array,
+      _palletId: String,
+      _locationCode: String
     }
   }
 
@@ -62,11 +65,8 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
           color: var(--grist-title-icon-color);
         }
         .button-container {
-          padding: var(--button-container-padding);
-          margin: var(--button-container-margin);
-          text-align: var(--button-container-align);
-          background-color: var(--button-container-background);
-          height: var(--button-container-height);
+          padding: 10px 0 12px 0;
+          text-align: center;
         }
       `
     ]
@@ -99,13 +99,23 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
           <legend>${this.productSku} [ ${this.actualQty} / ${this.qty} ]</legend>
 
           <label>${i18next.t('label.lot_id')}</label>
-          <barcode-scanable-input name="palletId" without-enter custom-input></barcode-scanable-input>
+          <barcode-scanable-input
+            name="palletId"
+            value="${this._palletId}"
+            without-enter
+            custom-input
+          ></barcode-scanable-input>
 
           <label>${i18next.t('label.qty')}</label>
-          <input name="qty" type="number" min="1" />
+          <input name="qty" type="number" value="" min="1" />
 
           <label>${i18next.t('label.location')}</label>
-          <barcode-scanable-input name="locationCode" without-enter custom-input></barcode-scanable-input>
+          <barcode-scanable-input
+            name="locationCode"
+            value="${this._locationCode}"
+            without-enter
+            custom-input
+          ></barcode-scanable-input>
         </fieldset>
       </form>
 
@@ -118,12 +128,21 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
                 .config=${this.reverseKittingInventoriesConfig}
                 .data=${this._reverseKittingInventories}
               ></data-grist>
-            </div>`
+            </div>
+            <div class="button-container">
+              <mwc-button
+                raised
+                @click=${this._undoInventory.bind(this)}
+                label="${i18next.t('button.undo')}"
+              ></mwc-button>
+            </div> `
         : ''}
     `
   }
 
   async firstUpdated() {
+    this._palletId = ''
+    this._locationCode = ''
     this.productSku = this.data.productSku
     this.qty = this.data.qty
     this.actualQty = this.data.actualQty
@@ -133,7 +152,10 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
         appendable: false,
         handlers: {
           click: (columns, data, column, record, rowIndex) => {
-            return
+            this._selectedInventory = record
+            this._palletId = record.palletId
+            this._locationCode = record.locationCode
+            this._fillUpForm(this.inputForm, record)
           }
         }
       },
@@ -202,8 +224,11 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
   async _fetchInventories() {
     const response = await client.query({
       query: gql`
-        query reverseKittingInventories($orderReverseKittingName: String!) {
-          reverseKittingInventories(orderReverseKittingName: $orderReverseKittingName) {
+        query reverseKittingInventories($orderReverseKittingName: String!, $productDetailId: String) {
+          reverseKittingInventories(
+            orderReverseKittingName: $orderReverseKittingName
+            productDetailId: $productDetailId
+          ) {
             batchId
             packingType
             bizplace {
@@ -218,6 +243,11 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
             qty
             expirationDate
             status
+            location {
+              id
+              name
+              description
+            }
             product {
               id
               name
@@ -227,7 +257,7 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
           }
         }
       `,
-      variables: { orderReverseKittingName: this.orderReverseKittingName }
+      variables: { orderReverseKittingName: this.orderReverseKittingName, productDetailId: this.data.productDetailId }
     })
 
     if (!response.errors) {
@@ -237,15 +267,24 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
             return {
               ...reverseKittingInventory,
               sku: reverseKittingInventory.product.sku,
-              packingTypeSize: `${reverseKittingInventory.packingType}(${reverseKittingInventory.packingSize})`
+              packingTypeSize: `${reverseKittingInventory.packingType}(${reverseKittingInventory.packingSize})`,
+              locationCode: reverseKittingInventory.location.name
             }
           }) || []
       }
+
+      let totalActualQty = 0
+      response.data.reverseKittingInventories.forEach(inventory => {
+        totalActualQty += inventory.qty
+      })
+
+      this.actualQty = totalActualQty
     }
   }
 
   async _executeReverseKitting(e) {
     if (e.keyCode === 13) {
+      e.preventDefault()
       try {
         await this._validateReverseKitting()
         if (!this.incompleteLocationName) {
@@ -266,8 +305,8 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
             }
           })
           if (!response.errors) {
-            this.dispatchEvent(new CustomEvent('updated'))
-            history.back()
+            this._clearView()
+            await this._fetchInventories()
           }
         } else {
           this._openSelectLocationPopup()
@@ -278,6 +317,41 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
     }
   }
 
+  async _undoInventory() {
+    try {
+      this._validateSelectedInventory()
+      const result = await CustomAlert({
+        title: i18next.t('title.are_you_sure'),
+        text: i18next.t('text.undo_x', { state: { x: this._palletId } }),
+        confirmButton: { text: i18next.t('button.confirm') },
+        cancelButton: { text: i18next.t('button.cancel') }
+      })
+
+      if (!result.value) {
+        return
+      }
+
+      let response = await client.mutate({
+        mutation: gql`
+          mutation undoReverseKittingInventory($orderReverseKittingName: String!, $palletId: String!) {
+            undoReverseKittingInventory(orderReverseKittingName: $orderReverseKittingName, palletId: $palletId)
+          }
+        `,
+        variables: {
+          orderReverseKittingName: this.orderReverseKittingName,
+          palletId: this._palletId.trim()
+        }
+      })
+
+      if (!response.errors) {
+        this._clearView()
+        await this._fetchInventories()
+      }
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
   _fillUpForm(form, data) {
     for (let key in data) {
       Array.from(form.querySelectorAll('input')).forEach(field => {
@@ -299,12 +373,25 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
     }
   }
 
+  _clearView() {
+    this.inputForm.reset()
+    this._palletId = ''
+    this._locationCode = ''
+  }
+
   async _validateReverseKitting() {
     if (!this.palletInput.value) {
       this._focusOnPalletInput()
       throw new Error(i18next.t('text.lot_id_is_empty'))
     }
 
+    if (!this.qtyInput.value) {
+      this._focusOnQtyInput()
+      throw new Error(i18next.t('text.qty_is_empty'))
+    } else {
+      if (!this.qtyInput.checkValidity()) throw new Error(i18next.t('text.qty_invalid'))
+    }
+
     // 4. location code existing
     if (!this.locationInput.value) {
       this._focusOnLocationInput()
@@ -327,6 +414,10 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
     }
   }
 
+  _validateSelectedInventory() {
+    if (!this._selectedInventory) throw new Error(i18next.t('text.target_does_not_selected'))
+  }
+
   async _fetchLocations(zone, row, column) {
     const filters = [
       {
@@ -420,6 +511,10 @@ class PopupReverseKittingTemplate extends localize(i18next)(LitElement) {
     setTimeout(() => this.palletInput.focus(), 100)
   }
 
+  _focusOnQtyInput() {
+    setTimeout(() => this.qtyInput.focus(), 100)
+  }
+
   _focusOnLocationInput() {
     setTimeout(() => this.locationInput.focus(), 100)
   }

package/client/route.js

@@ -212,6 +212,18 @@ export default function route(page) {
       import('./pages/order/release-order/bulk-print-packing-list')
       return page
 
+    case 'create_loading_manifest':
+      import('./pages/manifest/create-loading-manifest')
+      return page
+
+    case 'loading_manifest_list':
+      import('./pages/manifest/loading-manifest-list')
+      return page
+
+    case 'loading_manifest_detail':
+      import('./pages/manifest/loading-manifest-detail')
+      return page
+
     /**
      * GRN Menus Section
      */
@@ -452,6 +464,10 @@ export default function route(page) {
       import('./pages/report/outbound-order-details-report')
       return page
 
+    case 'product_label_report':
+      import('./pages/report/product-label-report')
+      return page
+
     /**
      * Custom ELCCL Menus Section
      */
@@ -479,6 +495,13 @@ export default function route(page) {
       import('./pages/report/custom-elccl/elccl-delivery-order-summary')
       return page
 
+    /**
+     * Support
+     */
+    case 'inventory_comparison':
+      import('./pages/support/inventory-comparison')
+      return page
+
     /** Custom VAS */
     case 'reverse_kitting_orders':
       import('./pages/order/reverse-kitting-order/reverse-kitting-order-list')

package/dist-server/graphql/resolvers/custom/elccl/elccl-inventory-history-summary-report.js

@@ -1,66 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.elcclInventoryHistorySummaryReport = void 0;
+exports.inventoryHistorySummaryReportQuery = exports.elcclInventoryHistorySummaryReport = void 0;
 const typeorm_1 = require("typeorm");
 const biz_base_1 = require("@things-factory/biz-base");
 exports.elcclInventoryHistorySummaryReport = {
     async elcclInventoryHistorySummaryReport(_, params, context) {
         try {
             const { tx } = context.state;
-            let balanceOnlyFilter = params.filters.find(data => data.name === 'balanceOnly');
-            let bizplaceFilter = params.filters.find(data => data.name === 'bizplace');
-            let fromDate = params.filters.find(data => data.name === 'fromDate');
-            let toDate = params.filters.find(data => data.name === 'toDate');
-            if (!bizplaceFilter || !fromDate || !toDate)
-                throw 'Invalid input';
-            const bizplace = await (0, typeorm_1.getRepository)(biz_base_1.Bizplace).findOne({
-                id: bizplaceFilter.value
-            });
-            let balanceOnlyQuery = '';
-            if (balanceOnlyFilter && balanceOnlyFilter.value) {
-                balanceOnlyQuery = 'and (opening_qty + adjustment_qty + total_in_qty + total_out_qty + total_return_qty) > 0 ';
-            }
-            await tx.query(`
-        create temp table temp_inv_history on commit drop as (
-          select i2.pallet_id, ih.product_id::uuid, ih.packing_type, ih.batch_id,
-          ih.id as inventory_history_id, ih.seq, ih.status, ih.transaction_type, ih.qty, ih.opening_qty, ih.weight, ih.opening_weight, ih.created_at,
-          ih.ref_order_id::uuid as ref_order_id
-          from inventories i2
-          inner join reduced_inventory_histories ih on ih.pallet_id = i2.pallet_id and ih.domain_id = i2.domain_id
-          where
-          i2.domain_id = $1
-          and i2.bizplace_id = $2
-          and ih.created_at <= $3
-        )
-      `, [context.state.domain.id, bizplace.id, toDate.value]);
-            await tx.query(`
-        create temp table temp_elccl_inventory_summary on commit drop as (
-          select src.*,
-          opening_qty + adjustment_qty + total_in_qty + total_out_qty + total_return_qty as closing_qty,
-          prd.name as product_name, prd.sku as product_sku, prd.description as product_description 
-          from (
-            select ih.batch_id, ih.packing_type,
-            min(ih.created_at) as initial_date,
-            sum(case when (ih.transaction_type = 'UNLOADING' or ih.transaction_type = 'NEW') and rtn.id is null then qty else 0 end) as initial_qty,
-            sum(case when ih.created_at > $1 and ih.transaction_type = 'ADJUSTMENT' then ih.qty else 0 end) as adjustment_qty,
-            sum(case when ih.created_at < $1 then ih.qty else 0 end) as opening_qty,
-            sum(case when ih.created_at > $1 then case when ih.qty > 0 and ih.transaction_type <> 'ADJUSTMENT' and ih.transaction_type <> 'RETURN' and rtn.id is null then ih.qty else 0 end else 0 end) as total_in_qty,
-            sum(case when ih.created_at > $1 then case when (ih.qty < 0 and ih.transaction_type <> 'ADJUSTMENT')  or ih.transaction_type = 'RETURN' then ih.qty else 0 end else 0 end) as total_out_qty,
-            ih.product_id,
-            sum(case when rtn.id is not null and ih.transaction_type <> 'ADJUSTMENT' and ih.created_at > $1 then qty else 0 end) as total_return_qty
-            from temp_inv_history ih
-            left join return_orders rtn on rtn.id = ih.ref_order_id
-            group by ih.batch_id, ih.product_id, ih.packing_type
-            order by batch_id
-          ) src
-          inner join products prd on prd.id = src.product_id
-          where (opening_qty > 0 or total_in_qty > 0 or adjustment_qty > 0)
-          ${balanceOnlyQuery}
-        )
-      `, [fromDate.value]);
-            const total = await tx.query(`select count(*) from temp_elccl_inventory_summary`);
+            await inventoryHistorySummaryReportQuery(_, params, context);
+            const total = await tx.query(`select count(*) from temp_inventory_summary`);
             const result = await tx.query(` 
-        select * from temp_elccl_inventory_summary ORDER BY initial_date OFFSET $1 LIMIT $2
+        select * from temp_inventory_summary ORDER BY initial_date OFFSET $1 LIMIT $2
       `, [(params.pagination.page - 1) * params.pagination.limit, params.pagination.limit]);
             let items = result.map(itm => {
                 return Object.assign(Object.assign({}, itm), { batchId: itm.batch_id, packingType: itm.packing_type, openingQty: itm.opening_qty, adjustmentQty: itm.adjustment_qty, closingQty: itm.closing_qty, totalInQty: itm.total_in_qty, totalOutQty: itm.total_out_qty, totalReturnQty: itm.total_return_qty, initialQty: itm.initial_qty, initialDate: itm.initial_date, product: {
@@ -77,4 +27,64 @@ exports.elcclInventoryHistorySummaryReport = {
         }
     }
 };
+async function inventoryHistorySummaryReportQuery(_, params, context) {
+    try {
+        const { tx } = context.state;
+        let balanceOnlyFilter = params.filters.find(data => data.name === 'balanceOnly');
+        let bizplaceFilter = params.filters.find(data => data.name === 'bizplace');
+        let fromDate = params.filters.find(data => data.name === 'fromDate');
+        let toDate = params.filters.find(data => data.name === 'toDate');
+        if (!bizplaceFilter || !fromDate || !toDate)
+            throw 'Invalid input';
+        const bizplace = await (0, typeorm_1.getRepository)(biz_base_1.Bizplace).findOne({
+            id: bizplaceFilter.value
+        });
+        let balanceOnlyQuery = '';
+        if (balanceOnlyFilter && balanceOnlyFilter.value) {
+            balanceOnlyQuery = 'and (opening_qty + adjustment_qty + total_in_qty + total_out_qty + total_return_qty) > 0 ';
+        }
+        await tx.query(`
+      create temp table temp_inv_history on commit drop as (
+        select i2.pallet_id, ih.product_id::uuid, ih.packing_type, ih.batch_id,
+        ih.id as inventory_history_id, ih.seq, ih.status, ih.transaction_type, ih.qty, ih.opening_qty, ih.weight, ih.opening_weight, ih.created_at,
+        ih.ref_order_id::uuid as ref_order_id
+        from inventories i2
+        inner join reduced_inventory_histories ih on ih.pallet_id = i2.pallet_id and ih.domain_id = i2.domain_id
+        where
+        i2.domain_id = $1
+        and i2.bizplace_id = $2
+        and ih.created_at <= $3
+      )
+    `, [context.state.domain.id, bizplace.id, toDate.value]);
+        await tx.query(`
+      create temp table temp_inventory_summary on commit drop as (
+        select src.*,
+        opening_qty + adjustment_qty + total_in_qty + total_out_qty + total_return_qty as closing_qty,
+        prd.name as product_name, prd.sku as product_sku, prd.description as product_description 
+        from (
+          select ih.batch_id, ih.packing_type,
+          min(ih.created_at) as initial_date,
+          sum(case when (ih.transaction_type = 'UNLOADING' or ih.transaction_type = 'NEW') and rtn.id is null then qty else 0 end) as initial_qty,
+          sum(case when ih.created_at > $1 and ih.transaction_type = 'ADJUSTMENT' then ih.qty else 0 end) as adjustment_qty,
+          sum(case when ih.created_at < $1 then ih.qty else 0 end) as opening_qty,
+          sum(case when ih.created_at > $1 then case when ih.qty > 0 and ih.transaction_type <> 'ADJUSTMENT' and ih.transaction_type <> 'RETURN' and rtn.id is null then ih.qty else 0 end else 0 end) as total_in_qty,
+          sum(case when ih.created_at > $1 then case when (ih.qty < 0 and ih.transaction_type <> 'ADJUSTMENT')  or ih.transaction_type = 'RETURN' then ih.qty else 0 end else 0 end) as total_out_qty,
+          ih.product_id,
+          sum(case when rtn.id is not null and ih.transaction_type <> 'ADJUSTMENT' and ih.created_at > $1 then qty else 0 end) as total_return_qty
+          from temp_inv_history ih
+          left join return_orders rtn on rtn.id = ih.ref_order_id
+          group by ih.batch_id, ih.product_id, ih.packing_type
+          order by batch_id
+        ) src
+        inner join products prd on prd.id = src.product_id
+        where (opening_qty > 0 or total_in_qty > 0 or adjustment_qty > 0)
+        ${balanceOnlyQuery}
+      )
+    `, [fromDate.value]);
+    }
+    catch (error) {
+        throw error;
+    }
+}
+exports.inventoryHistorySummaryReportQuery = inventoryHistorySummaryReportQuery;
 //# sourceMappingURL=elccl-inventory-history-summary-report.js.map

package/dist-server/graphql/resolvers/custom/elccl/elccl-inventory-history-summary-report.js.map

@@ -1 +1 @@
-{"version":3,"file":"elccl-inventory-history-summary-report.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/custom/elccl/elccl-inventory-history-summary-report.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"elccl-inventory-history-summary-report.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/custom/elccl/elccl-inventory-history-summary-report.ts"],"names":[],"mappings":"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"}