@things-factory/sales-base 4.3.25 → 4.3.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-base",
-  "version": "4.3.25",
+  "version": "4.3.26",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -34,7 +34,7 @@
     "@things-factory/setting-base": "^4.3.24",
     "@things-factory/shell": "^4.3.23",
     "@things-factory/transport-base": "^4.3.24",
-    "@things-factory/warehouse-base": "^4.3.25"
+    "@things-factory/warehouse-base": "^4.3.26"
   },
-  "gitHead": "bdcecd8454d7a76df3c5676a39440d57bc21d5cb"
+  "gitHead": "dbb4dc519a8a7bd8fd295ec91f2f80ba6b1b3250"
 }

package/server/service/release-good/release-good-query.ts

@@ -60,45 +60,54 @@ export class ReleaseGoodQuery {
 
       const qb: SelectQueryBuilder<ReleaseGood> = getRepository(ReleaseGood).createQueryBuilder('rg')
       buildQuery(qb, params, context)
-      qb.addSelect('COALESCE("cc".rank, 99999)', 'rank')
-      qb.leftJoinAndSelect('rg.domain', 'domain')
-      qb.leftJoinAndSelect('rg.bizplace', 'bizplace')
-      qb.leftJoinAndSelect('rg.orderInventories', 'oi')
-      qb.leftJoinAndSelect('rg.orderProducts', 'op')
-      qb.leftJoinAndSelect('oi.inventory', 'inv')
-      qb.leftJoinAndSelect('oi.product', 'prod')
-      qb.leftJoinAndSelect('rg.arrivalNotice', 'an')
-      qb.leftJoinAndSelect('rg.creator', 'creator')
-      qb.leftJoinAndSelect('rg.updater', 'updater')
-      qb.leftJoin(
-        subQuery => {
-          return subQuery
-            .select(`ccd.rank`, 'rank')
-            .addSelect(`ccd.name`, 'status')
-            .from(`common_code_details`, 'ccd')
-            .innerJoin(`ccd.commonCode`, 'cc')
-            .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
-            .andWhere(`cc.name = 'RO_LIST_STATUS'`)
-        },
-        'cc',
-        'cc.status = rg.status'
-      )
-
-      const arrChildSortData = ['bizplace']
-      const sort = (params.sortings || []).reduce(
-        (acc, sort) => ({
-          ...acc,
-          [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'rg.' + sort.name]: sort.desc
-            ? 'DESC'
-            : 'ASC'
-        }),
-        !params.sortings.some(e => e.name === 'status') ? { rank: 'ASC' } : {}
-      )
+      let items: any
+      let total: number
+      if (!params.filters.find((filter: any) => filter.name === 'releaseGoodOnly')) {
+        qb.addSelect('COALESCE("cc".rank, 99999)', 'rank')
+        qb.leftJoinAndSelect('rg.domain', 'domain')
+        qb.leftJoinAndSelect('rg.bizplace', 'bizplace')
+        qb.leftJoinAndSelect('rg.orderInventories', 'oi')
+        qb.leftJoinAndSelect('rg.orderProducts', 'op')
+        qb.leftJoinAndSelect('oi.inventory', 'inv')
+        qb.leftJoinAndSelect('oi.product', 'prod')
+        qb.leftJoinAndSelect('rg.arrivalNotice', 'an')
+        qb.leftJoinAndSelect('rg.creator', 'creator')
+        qb.leftJoinAndSelect('rg.updater', 'updater')
+        qb.leftJoin(
+          subQuery => {
+            return subQuery
+              .select(`ccd.rank`, 'rank')
+              .addSelect(`ccd.name`, 'status')
+              .from(`common_code_details`, 'ccd')
+              .innerJoin(`ccd.commonCode`, 'cc')
+              .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+              .andWhere(`cc.name = 'RO_LIST_STATUS'`)
+          },
+          'cc',
+          'cc.status = rg.status'
+        )
 
-      qb.orderBy(sort)
+        const arrChildSortData = ['bizplace']
+        const sort = (params.sortings || []).reduce(
+          (acc, sort) => ({
+            ...acc,
+            [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'rg.' + sort.name]: sort.desc
+              ? 'DESC'
+              : 'ASC'
+          }),
+          !params.sortings.some(e => e.name === 'status') ? { rank: 'ASC' } : {}
+        )
 
-      const [items, total] = await qb.getManyAndCount()
+        qb.orderBy(sort)
 
+        let [itemsRes, totalRes] = await qb.getManyAndCount()
+        items = itemsRes
+        total = totalRes
+      } else {
+        let itemsRes = await qb.getOne()
+        items = itemsRes ? [itemsRes] : []
+        total = items.length
+      }
       return { items, total }
     } catch (error) {
       throw error
@@ -468,24 +477,27 @@ export class ReleaseGoodQuery {
         ${batchId ? `AND LOWER(${INV_ALIAS}.batch_id) LIKE '%${batchId.toLowerCase()}%'` : ''}
         ${packingType ? `AND LOWER(${INV_ALIAS}.packing_type) LIKE '%${packingType.toLowerCase()}%'` : ''}
         ${containerNo ? `AND LOWER(${GAN_ALIAS}.container_no) LIKE '%${containerNo.toLowerCase()}%'` : ''}
-        ${product?.length > 0 && product[0]
-        ? `AND ${PROD_ALIAS}.id IN (${product.map((id: string) => `'${id}'`).join(', ')})`
-        : product[0] === null
-          ? `AND ${PROD_ALIAS}.id isnull`
-          : ''
-      }
-        ${inventory?.length > 0
-        ? `
-              AND (${INV_ALIAS}.batch_id, ${PROD_ALIAS}.id) ${filters.find((filter: { name: string; operator: string; value: any }) => filter.name === 'inventory')
-          .operator
-        } (
+        ${
+          product?.length > 0 && product[0]
+            ? `AND ${PROD_ALIAS}.id IN (${product.map((id: string) => `'${id}'`).join(', ')})`
+            : product[0] === null
+            ? `AND ${PROD_ALIAS}.id isnull`
+            : ''
+        }
+        ${
+          inventory?.length > 0
+            ? `
+              AND (${INV_ALIAS}.batch_id, ${PROD_ALIAS}.id) ${
+                filters.find((filter: { name: string; operator: string; value: any }) => filter.name === 'inventory')
+                  .operator
+              } (
                 ${inventory
-          .map((inv: { batchId: string; productId: string }) => `('${inv.batchId}', '${inv.productId}')`)
-          .join(', ')}
+                  .map((inv: { batchId: string; productId: string }) => `('${inv.batchId}', '${inv.productId}')`)
+                  .join(', ')}
               )
             `
-        : ''
-      }
+            : ''
+        }
     `
 
     // ${product?.length > 0 ? `AND ${PROD_ALIAS}.id IN (${product.map((id: string) => id ? `'${id}'` : null).join(', ')})` : ''}
@@ -660,7 +672,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
         packing_size: raw.packingSize,
         uom: raw.uom,
         releaseQty: raw.releaseQty,
-        release_qty: raw.releaseQty,
+        release_qty: raw.releaseQty
       }
     })
   )
@@ -840,16 +852,16 @@ function _extractData(rawData, validatedData) {
         !raw.productId || !raw.productDetailId
           ? 'inventory or product not found'
           : raw.releaseQty <= 0
-            ? 'invalid release qty'
-            : raw.assignedQty < raw.releaseQty
-              ? 'insufficient stock'
-              : raw.releaseDate == ''
-                ? 'release date is empty'
-                : releaseDate < _getStdDateStr(new Date())
-                  ? 'backdate is not allowed'
-                  : !raw.refNo
-                    ? 'ref no is empty'
-                    : ''
+          ? 'invalid release qty'
+          : raw.assignedQty < raw.releaseQty
+          ? 'insufficient stock'
+          : raw.releaseDate == ''
+          ? 'release date is empty'
+          : releaseDate < _getStdDateStr(new Date())
+          ? 'backdate is not allowed'
+          : !raw.refNo
+          ? 'ref no is empty'
+          : ''
     }
   })
 }