@things-factory/warehouse-base 6.2.1 → 6.2.4
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.
- package/dist-server/service/inventory/inventory-query.js +4 -2
- package/dist-server/service/inventory/inventory-query.js.map +1 -1
- package/dist-server/service/inventory-history/inventory-history-query.js +1 -1
- package/dist-server/service/inventory-history/inventory-history-query.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
- package/server/service/inventory/inventory-query.ts +3 -1
- package/server/service/inventory-history/inventory-history-query.ts +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/warehouse-base",
|
|
3
|
-
"version": "6.2.
|
|
3
|
+
"version": "6.2.4",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -26,10 +26,10 @@
|
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"@things-factory/biz-base": "^6.2.0",
|
|
28
28
|
"@things-factory/id-rule-base": "^6.2.0",
|
|
29
|
-
"@things-factory/integration-sellercraft": "^6.2.
|
|
30
|
-
"@things-factory/marketplace-base": "^6.2.
|
|
29
|
+
"@things-factory/integration-sellercraft": "^6.2.4",
|
|
30
|
+
"@things-factory/marketplace-base": "^6.2.4",
|
|
31
31
|
"@things-factory/product-base": "^6.2.0",
|
|
32
32
|
"@things-factory/setting-base": "^6.2.0"
|
|
33
33
|
},
|
|
34
|
-
"gitHead": "
|
|
34
|
+
"gitHead": "246f9274d7e0e605d24c523d5ba526ecd23e71b4"
|
|
35
35
|
}
|
|
@@ -65,7 +65,7 @@ export class InventoryQuery {
|
|
|
65
65
|
params,
|
|
66
66
|
domain,
|
|
67
67
|
alias: 'inventory',
|
|
68
|
-
searchables: ['warehouse', 'product', 'batchId', 'location', 'palletId']
|
|
68
|
+
searchables: ['warehouse', 'product', 'batchId', 'location', 'palletId', 'lot']
|
|
69
69
|
})
|
|
70
70
|
|
|
71
71
|
qb.leftJoinAndSelect('inventory.bizplace', 'bizplace')
|
|
@@ -244,6 +244,7 @@ export class InventoryQuery {
|
|
|
244
244
|
.addSelect('product.auxUnit1', 'auxUnit1')
|
|
245
245
|
.addSelect('i.product_color', 'productColor')
|
|
246
246
|
.addSelect('i.product_quality', 'productQuality')
|
|
247
|
+
.addSelect('i.work_category', 'workCategory')
|
|
247
248
|
.addSelect('i.packing_type', 'packingType')
|
|
248
249
|
.addSelect('COALESCE(SUM(i.qty), 0)', 'qty')
|
|
249
250
|
.addSelect('COALESCE(SUM(i.locked_qty), 0)', 'lockedQty')
|
|
@@ -257,6 +258,7 @@ export class InventoryQuery {
|
|
|
257
258
|
.addGroupBy('i.product_color')
|
|
258
259
|
.addGroupBy('i.product_quality')
|
|
259
260
|
.addGroupBy('i.packing_type')
|
|
261
|
+
.addGroupBy('i.work_category')
|
|
260
262
|
|
|
261
263
|
queryBuilder.orderBy('product.sku', 'ASC')
|
|
262
264
|
|
|
@@ -105,7 +105,7 @@ export class InventoryHistoryQuery {
|
|
|
105
105
|
const convertedParams = convertListParams(params)
|
|
106
106
|
let [items, total] = await getRepository(InventoryHistory).findAndCount({
|
|
107
107
|
...convertedParams,
|
|
108
|
-
relations: ['domain', 'bizplace', 'product', 'location', 'warehouse', 'creator', 'updater'],
|
|
108
|
+
relations: ['domain', 'bizplace', 'product', 'location', 'inventory', 'warehouse', 'creator', 'updater'],
|
|
109
109
|
order: {
|
|
110
110
|
...convertedParams.order,
|
|
111
111
|
palletId: 'DESC',
|