@things-factory/sales-base 5.0.13 → 5.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-base",
-  "version": "5.0.13",
+  "version": "5.0.15",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,17 +24,17 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/attachment-base": "^5.0.11",
-    "@things-factory/auth-base": "^5.0.11",
-    "@things-factory/biz-base": "^5.0.11",
-    "@things-factory/code-base": "^5.0.11",
-    "@things-factory/integration-sftp": "^5.0.11",
-    "@things-factory/notification": "^5.0.11",
-    "@things-factory/product-base": "^5.0.11",
-    "@things-factory/setting-base": "^5.0.11",
-    "@things-factory/shell": "^5.0.11",
-    "@things-factory/transport-base": "^5.0.11",
-    "@things-factory/warehouse-base": "^5.0.12"
+    "@things-factory/attachment-base": "^5.0.15",
+    "@things-factory/auth-base": "^5.0.15",
+    "@things-factory/biz-base": "^5.0.15",
+    "@things-factory/code-base": "^5.0.15",
+    "@things-factory/integration-sftp": "^5.0.15",
+    "@things-factory/notification": "^5.0.15",
+    "@things-factory/product-base": "^5.0.15",
+    "@things-factory/setting-base": "^5.0.15",
+    "@things-factory/shell": "^5.0.15",
+    "@things-factory/transport-base": "^5.0.15",
+    "@things-factory/warehouse-base": "^5.0.15"
   },
-  "gitHead": "72dfd33e398eab9872600e91d1b13fef0595c174"
+  "gitHead": "87b738da786f92983d009d72548918be93e4ae2c"
 }

package/server/service/order-inventory/order-inventory-query.ts

@@ -678,50 +678,35 @@ export class OrderInventoryQuery {
     @Args() params: ListParam,
     @Arg('productTypes', type => [String], { nullable: true }) productTypes?: string[]
   ): Promise<OrderInventoryList> {
-    const { domain }: { domain: Domain } = context.state
-    let filters = params.filters
-
-    const rgParam = filters.find(
-      (filter: filterInterface) => filter.name === 'releaseGoodNo' && filter.operator === 'eq'
-    )
-
-    if (rgParam && !filters.some(filter => filter.name === 'releaseGood')) {
-      if (!rgParam.value) filters = params.filters.filter(filter => filter.name !== 'releaseGoodNo')
-      else {
-        const foundReleaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({
-          where: {
-            name: rgParam.value,
-            domain
-          }
-        })
-
-        if (foundReleaseGood) {
-          filters = params.filters.filter(filter => filter.name !== 'releaseGoodNo')
-          params.filters = [...filters, { name: 'releaseGood', operator: 'eq', value: foundReleaseGood.id }]
-        } else throw new Error(`Cannot find result for order "${rgParam.value}"`)
-      }
-    }
+    const { domain } = context.state
 
     const qb = getQueryBuilderFromListParams({
       repository: getRepository(OrderInventory),
       params,
       domain,
       alias: 'oi',
-      searchables: ['bizplace', 'product']
+      searchables: ['bizplace', 'product', 'releaseGood', 'lot'],
+      filtersMap: {
+        lot: {
+          /* 조인 테이블의 필터대상 컬럼이름을 디폴트('name')에서 다른 컬럼('sku')로 변경 */
+          relationColumn: 'inventory',
+          columnName: 'palletId'
+        }
+      }
     })
 
-    const [items, total] = await qb
-      .leftJoinAndSelect('oi.releaseGood', 'rg')
+    qb.leftJoinAndSelect('oi.releaseGood', 'rg')
       .leftJoinAndSelect('rg.deliverTo', 'deliverTo')
       .leftJoinAndSelect('deliverTo.bizplace', 'deliverToBizplace')
-      .leftJoinAndSelect('oi.product', 'p')
       .leftJoinAndSelect('oi.inventory', 'i')
+      .leftJoinAndSelect('oi.product', 'p')
       .leftJoinAndSelect('oi.bizplace', 'b')
       .andWhere('oi.type = :oiType', { oiType: 'RELEASE_OF_GOODS' })
       .andWhere('p.type IN (:...productTypes)', {
         productTypes: productTypes
       })
-      .getManyAndCount()
+
+    const [items, total] = await qb.getManyAndCount()
 
     return { items, total }
   }