@things-factory/warehouse-base 4.3.617 → 4.3.626

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist-server/service/location/location-query.js +18 -2
  2. package/dist-server/service/location/location-query.js.map +1 -1
  3. package/package.json +3 -3
  4. package/server/service/location/location-query.ts +36 -5
package/dist-server/service/location/location-query.js CHANGED
@@ -184,9 +184,21 @@ let LocationQuery = class LocationQuery {
184
184
  .innerJoin('inventories', 'Inventory', 'Location.id = Inventory.location_id AND Inventory.status = :InvStatus', {
185
185
  InvStatus: inventory_1.INVENTORY_STATUS.STORED
186
186
  })
187
- .innerJoin('Inventory.bizplace', 'Bizplace')
188
187
  .where('Location.domain_id = :domainId', { domainId: domain.id })
189
- .andWhere('Inventory.bizplace_id = :bizplaceId', { bizplaceId: bizplaceId });
188
+ .andWhere('Inventory.bizplace_id = :bizplaceId', { bizplaceId: bizplaceId })
189
+ .andWhere(query => {
190
+ const subQuery = query.subQuery()
191
+ .select('DISTINCT ici.inventory_id', 'inventory_id')
192
+ .from('worksheets', 'w')
193
+ .innerJoin('worksheet_details', 'wd', 'wd.worksheet_id = w.id')
194
+ .innerJoin('inventory_check_items', 'ici', 'wd.target_inventory_check_item_id = ici.id')
195
+ .where('w.type IN (:...types)', { types: ['CYCLE_COUNT', 'CYCLE_COUNT_RECHECK'] })
196
+ .andWhere('w.status != :status', { status: 'DONE' })
197
+ .andWhere('w.bizplace_id = :bizplaceId', { bizplaceId: bizplaceId }) // assuming array
198
+ .andWhere('w.domain_id = :domainId', { domainId: domain.id })
199
+ .getQuery();
200
+ return `Inventory.id NOT IN ${subQuery}`;
201
+ });
190
202
  if (params.filters) {
191
203
  params.filters.forEach(filter => {
192
204
  const value = filter.value;
@@ -198,6 +210,10 @@ let LocationQuery = class LocationQuery {
198
210
  else if (filter.name === 'type' && filter.operator.toLowerCase() === 'eq') {
199
211
  queryBuilder.andWhere('Location.type = :type', { type: value });
200
212
  }
213
+ else if (filter.name === 'locationId' && filter.operator.toLowerCase() === 'notin') {
214
+ const locationIds = Array.isArray(value) ? value : [value];
215
+ queryBuilder.andWhere('Location.id NOT IN (:...locationIds)', { locationIds });
216
+ }
201
217
  });
202
218
  }
203
219
  queryBuilder.select('DISTINCT "Location"."id","Location"."name", "Location"."type"');
package/dist-server/service/location/location-query.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"location-query.js","sourceRoot":"","sources":["../../../server/service/location/location-query.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"location-query.js","sourceRoot":"","sources":["../../../server/service/location/location-query.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/warehouse-base",
3
- "version": "4.3.617",
3
+ "version": "4.3.626",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -26,11 +26,11 @@
26
26
  "@things-factory/biz-base": "^4.3.595",
27
27
  "@things-factory/id-rule-base": "^4.3.609",
28
28
  "@things-factory/integration-accounting": "^4.3.616",
29
- "@things-factory/integration-powrup": "^4.3.617",
29
+ "@things-factory/integration-powrup": "^4.3.626",
30
30
  "@things-factory/integration-sellercraft": "^4.3.617",
31
31
  "@things-factory/marketplace-base": "^4.3.617",
32
32
  "@things-factory/product-base": "^4.3.595",
33
33
  "@things-factory/setting-base": "^4.3.609"
34
34
  },
35
- "gitHead": "12739fffd56d5e153c6b6d0241c1e61d3c53a834"
35
+ "gitHead": "cd622d40b2d81b81598ef8df87766f5fa3ef7696"
36
36
  }
package/server/service/location/location-query.ts CHANGED
@@ -1,14 +1,29 @@
1
- import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
2
- import { getRepository, EntityManager } from 'typeorm'
1
+ import {
2
+ Arg,
3
+ Args,
4
+ Ctx,
5
+ Directive,
6
+ Query,
7
+ Resolver
8
+ } from 'type-graphql'
9
+ import { getRepository } from 'typeorm'
3
10
 
4
11
  import { User } from '@things-factory/auth-base'
5
12
  import { getPermittedBizplaceIds } from '@things-factory/biz-base'
6
- import { buildQuery, Domain, ListParam } from '@things-factory/shell'
13
+ import {
14
+ buildQuery,
15
+ Domain,
16
+ ListParam
17
+ } from '@things-factory/shell'
7
18
 
8
19
  import { INVENTORY_STATUS } from '../../constants/inventory'
9
20
  import { Warehouse } from '../warehouse/warehouse'
10
21
  import { Location } from './location'
11
- import { LocationInventories, LocationList, LocationOccupancy, LocationInfo } from './location-types'
22
+ import {
23
+ LocationInventories,
24
+ LocationList,
25
+ LocationOccupancy
26
+ } from './location-types'
12
27
 
13
28
  @Resolver(Location)
14
29
  export class LocationQuery {
@@ -237,9 +252,22 @@ export class LocationQuery {
237
252
  .innerJoin('inventories', 'Inventory', 'Location.id = Inventory.location_id AND Inventory.status = :InvStatus', {
238
253
  InvStatus: INVENTORY_STATUS.STORED
239
254
  })
240
- .innerJoin('Inventory.bizplace', 'Bizplace')
241
255
  .where('Location.domain_id = :domainId', { domainId: domain.id })
242
256
  .andWhere('Inventory.bizplace_id = :bizplaceId', { bizplaceId: bizplaceId })
257
+ .andWhere( query => {
258
+ const subQuery = query.subQuery()
259
+ .select('DISTINCT ici.inventory_id', 'inventory_id')
260
+ .from('worksheets', 'w')
261
+ .innerJoin('worksheet_details', 'wd', 'wd.worksheet_id = w.id')
262
+ .innerJoin('inventory_check_items', 'ici', 'wd.target_inventory_check_item_id = ici.id')
263
+ .where('w.type IN (:...types)', { types: ['CYCLE_COUNT', 'CYCLE_COUNT_RECHECK'] })
264
+ .andWhere('w.status != :status', { status: 'DONE' })
265
+ .andWhere('w.bizplace_id = :bizplaceId', { bizplaceId: bizplaceId }) // assuming array
266
+ .andWhere('w.domain_id = :domainId', { domainId: domain.id })
267
+ .getQuery()
268
+ return `Inventory.id NOT IN ${subQuery}`
269
+ }
270
+ )
243
271
 
244
272
  if (params.filters) {
245
273
  params.filters.forEach(filter => {
@@ -250,6 +278,9 @@ export class LocationQuery {
250
278
  queryBuilder.andWhere('Location.name ILIKE :name', { name: `%${value}%` })
251
279
  } else if (filter.name === 'type' && filter.operator.toLowerCase() === 'eq') {
252
280
  queryBuilder.andWhere('Location.type = :type', { type: value })
281
+ } else if(filter.name === 'locationId' && filter.operator.toLowerCase() === 'notin') {
282
+ const locationIds = Array.isArray(value) ? value : [value]
283
+ queryBuilder.andWhere('Location.id NOT IN (:...locationIds)', { locationIds })
253
284
  }
254
285
  })
255
286
  }