@things-factory/warehouse-base 4.3.22 → 4.3.25
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/pallet-count/pallet-count-mutation.js +2 -5
- package/dist-server/service/pallet-count/pallet-count-mutation.js.map +1 -1
- package/dist-server/utils/inventory-no-generator.js +4 -7
- package/dist-server/utils/inventory-no-generator.js.map +1 -1
- package/package.json +8 -8
- package/server/service/inventory/inventory-query.ts +2 -3
- package/server/service/inventory-history/inventory-history-query.ts +2 -2
- package/server/service/pallet-count/pallet-count-mutation.ts +2 -2
- package/server/utils/inventory-no-generator.ts +4 -4
- package/server/utils/inventory-util.ts +1 -1
|
@@ -11,14 +11,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
15
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
16
|
-
};
|
|
17
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
15
|
exports.PalletCountMutation = void 0;
|
|
19
16
|
const type_graphql_1 = require("type-graphql");
|
|
20
17
|
const typeorm_1 = require("typeorm");
|
|
21
|
-
const
|
|
18
|
+
const uuid_1 = require("uuid");
|
|
22
19
|
const pallet_count_1 = require("./pallet-count");
|
|
23
20
|
const pallet_count_types_1 = require("./pallet-count-types");
|
|
24
21
|
let PalletCountMutation = class PalletCountMutation {
|
|
@@ -80,7 +77,7 @@ let PalletCountMutation = class PalletCountMutation {
|
|
|
80
77
|
});
|
|
81
78
|
if (!palletCount) {
|
|
82
79
|
let newPallet = {
|
|
83
|
-
name: (0,
|
|
80
|
+
name: (0, uuid_1.v4)(),
|
|
84
81
|
seq: 0,
|
|
85
82
|
domain: domain,
|
|
86
83
|
creator: user,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pallet-count-mutation.js","sourceRoot":"","sources":["../../../server/service/pallet-count/pallet-count-mutation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pallet-count-mutation.js","sourceRoot":"","sources":["../../../server/service/pallet-count/pallet-count-mutation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.InventoryNoGenerator = void 0;
|
|
7
|
-
const
|
|
4
|
+
const uuid_1 = require("uuid");
|
|
8
5
|
class InventoryNoGenerator {
|
|
9
6
|
static inventoryName() {
|
|
10
|
-
return (0,
|
|
7
|
+
return (0, uuid_1.v4)();
|
|
11
8
|
}
|
|
12
9
|
static inventoryHistoryName() {
|
|
13
|
-
return (0,
|
|
10
|
+
return (0, uuid_1.v4)();
|
|
14
11
|
}
|
|
15
12
|
static inventoryItemName() {
|
|
16
|
-
return (0,
|
|
13
|
+
return (0, uuid_1.v4)();
|
|
17
14
|
}
|
|
18
15
|
}
|
|
19
16
|
exports.InventoryNoGenerator = InventoryNoGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inventory-no-generator.js","sourceRoot":"","sources":["../../server/utils/inventory-no-generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"inventory-no-generator.js","sourceRoot":"","sources":["../../server/utils/inventory-no-generator.ts"],"names":[],"mappings":";;;AAAA,+BAAmC;AAEnC,MAAa,oBAAoB;IAC/B,MAAM,CAAC,aAAa;QAClB,OAAO,IAAA,SAAM,GAAE,CAAA;IACjB,CAAC;IAED,MAAM,CAAC,oBAAoB;QACzB,OAAO,IAAA,SAAM,GAAE,CAAA;IACjB,CAAC;IAED,MAAM,CAAC,iBAAiB;QACtB,OAAO,IAAA,SAAM,GAAE,CAAA;IACjB,CAAC;CACF;AAZD,oDAYC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/warehouse-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.25",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,12 +24,12 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/biz-base": "^4.3.
|
|
28
|
-
"@things-factory/id-rule-base": "^4.3.
|
|
29
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
30
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
31
|
-
"@things-factory/product-base": "^4.3.
|
|
32
|
-
"@things-factory/setting-base": "^4.3.
|
|
27
|
+
"@things-factory/biz-base": "^4.3.24",
|
|
28
|
+
"@things-factory/id-rule-base": "^4.3.24",
|
|
29
|
+
"@things-factory/integration-sellercraft": "^4.3.25",
|
|
30
|
+
"@things-factory/marketplace-base": "^4.3.25",
|
|
31
|
+
"@things-factory/product-base": "^4.3.24",
|
|
32
|
+
"@things-factory/setting-base": "^4.3.24"
|
|
33
33
|
},
|
|
34
|
-
"gitHead": "
|
|
34
|
+
"gitHead": "bdcecd8454d7a76df3c5676a39440d57bc21d5cb"
|
|
35
35
|
}
|
|
@@ -9,7 +9,6 @@ import { buildQuery, Domain, Filter, ListParam, Pagination, Sorting } from '@thi
|
|
|
9
9
|
|
|
10
10
|
import { INVENTORY_STATUS, LOCATION_TYPE } from '../../constants'
|
|
11
11
|
import { InventoryChange } from '../inventory-change/inventory-change'
|
|
12
|
-
import { InventoryItem } from '../inventory-item/inventory-item'
|
|
13
12
|
import { Inventory } from './inventory'
|
|
14
13
|
import { InventoryBundleGroupDetail, InventoryList } from './inventory-types'
|
|
15
14
|
|
|
@@ -155,8 +154,8 @@ export class InventoryQuery {
|
|
|
155
154
|
item.product['productDetails'] = productDetails
|
|
156
155
|
return {
|
|
157
156
|
...item,
|
|
158
|
-
remainQty: item.qty - item.lockedQty ? item.lockedQty : 0,
|
|
159
|
-
remainUomValue: item.uomValue - item.lockedUomValue ? item.lockedUomValue : 0,
|
|
157
|
+
remainQty: item.qty - (item.lockedQty ? item.lockedQty : 0),
|
|
158
|
+
remainUomValue: item.uomValue - (item.lockedUomValue ? item.lockedUomValue : 0),
|
|
160
159
|
serialNumbers: inventoryItems[0]?.serialNumbers
|
|
161
160
|
}
|
|
162
161
|
})
|
|
@@ -1166,7 +1166,7 @@ export class InventoryHistoryQuery {
|
|
|
1166
1166
|
inner join bizplaces bz on bz.id = rih.bizplace_id
|
|
1167
1167
|
inner join locations loc on loc.id = rih.location_id
|
|
1168
1168
|
inner join warehouses wh on wh.id = loc.warehouse_id
|
|
1169
|
-
|
|
1169
|
+
left join order_inventories oi on oi.inventory_id = rih.inventory_id
|
|
1170
1170
|
group by rih.inventory_id,rih.domain_id,rih.pallet_id,rih.carton_id,rih.qty,rih.uom_value,rih.uom,rih.last_seq,rih.created_at, rih.initial_inbound_at,rih.unit_cost,rih.reusable_pallet_id,
|
|
1171
1171
|
rih.batch_id,plt.name,rih.batch_id_ref,rih.product_id,rih.packing_type,rih.bizplace_id,rih.location_id,prd.id,bz.id,loc.id,wh.name,rih.remark,rih.expiration_date,rih.manufacture_date,rih.status
|
|
1172
1172
|
having 1=1 and (case when rih.status = 'TERMINATED' and SUM(CASE WHEN oi.status = 'LOADING' or (oi.status = 'SORTING' AND oi.type = 'RELEASE_OF_GOODS') THEN oi.release_qty ELSE 0 END) > 0 then rih.status = 'TERMINATED' else rih.status <> 'TERMINATED' end)
|
|
@@ -1199,7 +1199,7 @@ export class InventoryHistoryQuery {
|
|
|
1199
1199
|
inner join bizplaces bz on bz.id = rih.bizplace_id
|
|
1200
1200
|
inner join locations loc on loc.id = rih.location_id
|
|
1201
1201
|
inner join warehouses wh on wh.id = loc.warehouse_id
|
|
1202
|
-
|
|
1202
|
+
left join order_inventories oi on oi.inventory_id = rih.inventory_id
|
|
1203
1203
|
group by rih.inventory_id,rih.domain_id,rih.pallet_id,rih.carton_id,rih.qty,rih.uom_value,rih.uom,rih.last_seq,rih.created_at, rih.initial_inbound_at,rih.unit_cost,rih.reusable_pallet_id,
|
|
1204
1204
|
rih.batch_id,plt.name,rih.batch_id_ref,rih.product_id,rih.packing_type,rih.bizplace_id,rih.location_id,prd.id,bz.id,loc.id,wh.name,rih.remark,rih.expiration_date,rih.manufacture_date,rih.status
|
|
1205
1205
|
having 1=1 and (case when rih.status = 'TERMINATED' and SUM(CASE WHEN oi.status = 'LOADING' or (oi.status = 'SORTING' AND oi.type = 'RELEASE_OF_GOODS') THEN oi.release_qty ELSE 0 END) > 0 then rih.status = 'TERMINATED' else rih.status <> 'TERMINATED' end)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
|
|
2
2
|
import { EntityManager, In, MoreThan } from 'typeorm'
|
|
3
|
-
import
|
|
3
|
+
import { v4 as uuidv4 } from 'uuid'
|
|
4
4
|
|
|
5
5
|
import { User } from '@things-factory/auth-base'
|
|
6
6
|
import { Domain } from '@things-factory/shell'
|
|
@@ -125,7 +125,7 @@ export class PalletCountMutation {
|
|
|
125
125
|
|
|
126
126
|
if (!palletCount) {
|
|
127
127
|
let newPallet = {
|
|
128
|
-
name:
|
|
128
|
+
name: uuidv4(),
|
|
129
129
|
seq: 0,
|
|
130
130
|
domain: domain,
|
|
131
131
|
creator: user,
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { v4 as uuidv4 } from 'uuid'
|
|
2
2
|
|
|
3
3
|
export class InventoryNoGenerator {
|
|
4
4
|
static inventoryName() {
|
|
5
|
-
return
|
|
5
|
+
return uuidv4()
|
|
6
6
|
}
|
|
7
7
|
|
|
8
8
|
static inventoryHistoryName() {
|
|
9
|
-
return
|
|
9
|
+
return uuidv4()
|
|
10
10
|
}
|
|
11
11
|
|
|
12
12
|
static inventoryItemName() {
|
|
13
|
-
return
|
|
13
|
+
return uuidv4()
|
|
14
14
|
}
|
|
15
15
|
}
|
|
@@ -349,7 +349,7 @@ export async function getProductBundleInventory(
|
|
|
349
349
|
from json_populate_recordset(NULL::order_products,'${orderProductsJson}') src
|
|
350
350
|
inner join product_details pd ON src.product_id = pd.product_id and src.packing_type = pd.packing_type and src.packing_size = pd.packing_size and src.uom = pd.uom
|
|
351
351
|
inner join product_bundle_settings pbs on pbs.product_detail_id = pd.id
|
|
352
|
-
inner join product_bundles pb on pb.id = pbs.product_bundle_id
|
|
352
|
+
inner join product_bundles pb on pb.id = pbs.product_bundle_id and pb.status = 'ACTIVATED'
|
|
353
353
|
where pb.domain_id = $1
|
|
354
354
|
group by pb.id, pb.sku, pb.name
|
|
355
355
|
) pb
|