@things-factory/sales-base 3.7.8 → 3.7.12
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/graphql/resolvers/goods-receival-note/goods-receival-notes.js +3 -0
- package/dist-server/graphql/resolvers/goods-receival-note/goods-receival-notes.js.map +1 -1
- package/dist-server/graphql/resolvers/manifest/manifests.js +7 -0
- package/dist-server/graphql/resolvers/manifest/manifests.js.map +1 -1
- package/dist-server/graphql/resolvers/release-good/delete-release-good.js +2 -1
- package/dist-server/graphql/resolvers/release-good/delete-release-good.js.map +1 -1
- package/dist-server/graphql/resolvers/reverse-kitting-order/execute-reverse-kitting.js +1 -2
- package/dist-server/graphql/resolvers/reverse-kitting-order/execute-reverse-kitting.js.map +1 -1
- package/package.json +4 -4
- package/server/graphql/resolvers/goods-receival-note/goods-receival-notes.ts +18 -12
- package/server/graphql/resolvers/manifest/manifests.ts +9 -0
- package/server/graphql/resolvers/release-good/delete-release-good.ts +8 -4
- package/server/graphql/resolvers/reverse-kitting-order/execute-reverse-kitting.ts +2 -2
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.goodsReceivalNotesResolver = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
+
const biz_base_1 = require("@things-factory/biz-base");
|
|
5
6
|
const shell_1 = require("@things-factory/shell");
|
|
6
7
|
const entities_1 = require("../../../entities");
|
|
7
8
|
exports.goodsReceivalNotesResolver = {
|
|
@@ -61,6 +62,8 @@ exports.goodsReceivalNotesResolver = {
|
|
|
61
62
|
.andWhere(`cc.name = 'GRN_STATUS'`)
|
|
62
63
|
.andWhere(`cc.name = 'GAN_REQUESTS_STATUS'`);
|
|
63
64
|
}, 'cc', 'cc.status = arrivalNotice.status');
|
|
65
|
+
let permittedBizplaceIds = await (0, biz_base_1.getPermittedBizplaceIds)(domain, user);
|
|
66
|
+
qb.andWhere('grn.bizplace_id IN (:...bizplaceIds)', { bizplaceIds: permittedBizplaceIds });
|
|
64
67
|
if (refNoFilter === null || refNoFilter === void 0 ? void 0 : refNoFilter.value) {
|
|
65
68
|
qb.andWhere('arrivalNotice.ref_no ilike :refNo', { refNo: refNoFilter.value });
|
|
66
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"goods-receival-notes.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/goods-receival-note/goods-receival-notes.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAG3D,iDAAqE;AAErE,gDAAqD;AAExC,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC9D,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;QAEtE,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QACrF,IAAI,gBAAgB,IAAI,CAAC,EAAE;YACzB,IAAI,WAAW,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAA;YAClE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAA;YAE1C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;gBAClB,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE,WAAW,CAAC,WAAW,EAAE;gBAChC,QAAQ,EAAE,KAAK;aAChB,CAAC,CAAA;SACH;
|
|
1
|
+
{"version":3,"file":"goods-receival-notes.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/goods-receival-note/goods-receival-notes.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ const shell_1 = require("@things-factory/shell");
|
|
|
6
6
|
const entities_1 = require("../../../entities");
|
|
7
7
|
exports.manifestsResolver = {
|
|
8
8
|
async manifests(_, params, context) {
|
|
9
|
+
const { domain, user } = context.state;
|
|
9
10
|
const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
|
|
10
11
|
if (fromDateParamIdx >= 0) {
|
|
11
12
|
let fromDateVal = new Date(params.filters[fromDateParamIdx].value);
|
|
@@ -28,6 +29,12 @@ exports.manifestsResolver = {
|
|
|
28
29
|
relation: false
|
|
29
30
|
});
|
|
30
31
|
}
|
|
32
|
+
params.filters.push({
|
|
33
|
+
name: 'domain',
|
|
34
|
+
operator: 'eq',
|
|
35
|
+
value: domain.id,
|
|
36
|
+
relation: true
|
|
37
|
+
});
|
|
31
38
|
const convertedParams = (0, shell_1.convertListParams)(params);
|
|
32
39
|
const [items, total] = await (0, typeorm_1.getRepository)(entities_1.Manifest).findAndCount(Object.assign(Object.assign({}, convertedParams), { relations: ['domain', 'creator', 'updater'] }));
|
|
33
40
|
return { items, total };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/manifest/manifests.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,iDAAoE;AAEpE,gDAA8D;AAEjD,QAAA,iBAAiB,GAAG;IAC/B,KAAK,CAAC,SAAS,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACrD,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QACrF,IAAI,gBAAgB,IAAI,CAAC,EAAE;YACzB,IAAI,WAAW,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAA;YAClE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAA;YAE1C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;gBAClB,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE,WAAW,CAAC,WAAW,EAAE;gBAChC,QAAQ,EAAE,KAAK;aAChB,CAAC,CAAA;SACH;QAED,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;QACjF,IAAI,cAAc,IAAI,CAAC,EAAE;YACvB,IAAI,SAAS,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,CAAA;YAC9D,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,CAAA;YAExC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;gBAClB,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;gBACzE,QAAQ,EAAE,KAAK;aAChB,CAAC,CAAA;SACH;QAED,MAAM,eAAe,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,CAAA;QACjD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,uBAAa,EAAC,mBAAc,CAAC,CAAC,YAAY,iCAClE,eAAe,KAClB,SAAS,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,IAC3C,CAAA;QAEF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
|
|
1
|
+
{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/manifest/manifests.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,iDAAoE;AAEpE,gDAA8D;AAEjD,QAAA,iBAAiB,GAAG;IAC/B,KAAK,CAAC,SAAS,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACrD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEtC,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QACrF,IAAI,gBAAgB,IAAI,CAAC,EAAE;YACzB,IAAI,WAAW,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAA;YAClE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAA;YAE1C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;gBAClB,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE,WAAW,CAAC,WAAW,EAAE;gBAChC,QAAQ,EAAE,KAAK;aAChB,CAAC,CAAA;SACH;QAED,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;QACjF,IAAI,cAAc,IAAI,CAAC,EAAE;YACvB,IAAI,SAAS,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,CAAA;YAC9D,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,CAAA;YAExC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;gBAClB,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;gBACzE,QAAQ,EAAE,KAAK;aAChB,CAAC,CAAA;SACH;QAED,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;YAClB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,KAAK,EAAE,MAAM,CAAC,EAAE;YAChB,QAAQ,EAAE,IAAI;SACf,CAAC,CAAA;QAEF,MAAM,eAAe,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,CAAA;QACjD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,uBAAa,EAAC,mBAAc,CAAC,CAAC,YAAY,iCAClE,eAAe,KAClB,SAAS,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,IAC3C,CAAA;QAEF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.deleteReleaseGood = exports.deleteReleaseGoodResolver = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
4
5
|
const attachment_base_1 = require("@things-factory/attachment-base");
|
|
5
6
|
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
6
|
-
const typeorm_1 = require("typeorm");
|
|
7
7
|
const attachment_type_1 = require("../../../constants/attachment-type");
|
|
8
8
|
const entities_1 = require("../../../entities");
|
|
9
9
|
const delete_arrival_notice_1 = require("../arrival-notice/delete-arrival-notice");
|
|
@@ -63,6 +63,7 @@ async function deleteReleaseGood(tx, name, user, domain) {
|
|
|
63
63
|
}
|
|
64
64
|
// 4. if there is SO, delete SO
|
|
65
65
|
if (foundSO) {
|
|
66
|
+
await tx.getRepository(entities_1.ReleaseGood).save(Object.assign(Object.assign({}, foundReleaseOrder), { shippingOrder: null }));
|
|
66
67
|
await tx.getRepository(entities_1.ShippingOrder).delete({ domain, id: foundSO.id });
|
|
67
68
|
}
|
|
68
69
|
if (foundAttachment) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete-release-good.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/delete-release-good.ts"],"names":[],"mappings":";;;AAAA,qEAA4D;AAG5D,mEAA0D;
|
|
1
|
+
{"version":3,"file":"delete-release-good.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/delete-release-good.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.executeReverseKittingFunction = exports.executeReverseKittingResolver = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
-
const biz_base_1 = require("@things-factory/biz-base");
|
|
6
5
|
const product_base_1 = require("@things-factory/product-base");
|
|
7
6
|
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
8
7
|
const constants_1 = require("../../../constants");
|
|
@@ -28,7 +27,6 @@ async function executeReverseKittingFunction(name, inventory, context, tx) {
|
|
|
28
27
|
if (!foundReverseKittingOrder)
|
|
29
28
|
throw new Error(`Reverse kitting order doesn't exists.`);
|
|
30
29
|
const customerBizplace = foundReverseKittingOrder.bizplace;
|
|
31
|
-
const customerCompanyBizplace = await (0, biz_base_1.getCompanyBizplace)(null, null, customerBizplace.id);
|
|
32
30
|
const productDetail = await tx.getRepository(product_base_1.ProductDetail).findOne({
|
|
33
31
|
where: {
|
|
34
32
|
id: inventory.productDetailId
|
|
@@ -73,6 +71,7 @@ async function executeReverseKittingFunction(name, inventory, context, tx) {
|
|
|
73
71
|
newInventory.warehouse = warehouse;
|
|
74
72
|
newInventory.location = location;
|
|
75
73
|
newInventory.zone = zone;
|
|
74
|
+
newInventory.refInventory = orderReverseKitting.inventory;
|
|
76
75
|
newInventory.status = warehouse_base_1.INVENTORY_STATUS.STORED;
|
|
77
76
|
newInventory.domain = domain;
|
|
78
77
|
newInventory.creator = user;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-reverse-kitting.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reverse-kitting-order/execute-reverse-kitting.ts"],"names":[],"mappings":";;;AAAA,qCAAuD;
|
|
1
|
+
{"version":3,"file":"execute-reverse-kitting.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reverse-kitting-order/execute-reverse-kitting.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/sales-base",
|
|
3
|
-
"version": "3.7.
|
|
3
|
+
"version": "3.7.12",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -29,11 +29,11 @@
|
|
|
29
29
|
"@things-factory/biz-base": "^3.7.5",
|
|
30
30
|
"@things-factory/code-base": "^3.7.5",
|
|
31
31
|
"@things-factory/notification": "^3.7.5",
|
|
32
|
-
"@things-factory/product-base": "^3.7.
|
|
32
|
+
"@things-factory/product-base": "^3.7.12",
|
|
33
33
|
"@things-factory/setting-base": "^3.7.5",
|
|
34
34
|
"@things-factory/shell": "^3.7.5",
|
|
35
35
|
"@things-factory/transport-base": "^3.7.5",
|
|
36
|
-
"@things-factory/warehouse-base": "^3.7.
|
|
36
|
+
"@things-factory/warehouse-base": "^3.7.12"
|
|
37
37
|
},
|
|
38
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "a0cea72a9cb1b90d8b7eaf96f3c8ec0c77a540cf"
|
|
39
39
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { getRepository, SelectQueryBuilder } from 'typeorm'
|
|
2
2
|
|
|
3
3
|
import { User } from '@things-factory/auth-base'
|
|
4
|
+
import { Bizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
|
|
4
5
|
import { buildQuery, Domain, ListParam } from '@things-factory/shell'
|
|
5
6
|
|
|
6
7
|
import { GoodsReceivalNote } from '../../../entities'
|
|
@@ -22,6 +23,7 @@ export const goodsReceivalNotesResolver = {
|
|
|
22
23
|
})
|
|
23
24
|
}
|
|
24
25
|
|
|
26
|
+
|
|
25
27
|
const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate')
|
|
26
28
|
if (toDateParamIdx >= 0) {
|
|
27
29
|
let toDateVal = new Date(params.filters[toDateParamIdx].value)
|
|
@@ -35,13 +37,13 @@ export const goodsReceivalNotesResolver = {
|
|
|
35
37
|
})
|
|
36
38
|
}
|
|
37
39
|
|
|
38
|
-
let refNoFilter = params.filters.find(x=> x.name =='refNo')
|
|
39
|
-
let refNo2Filter = params.filters.find(x=> x.name =='refNo2')
|
|
40
|
-
let refNo3Filter = params.filters.find(x=> x.name =='refNo3')
|
|
41
|
-
let ganNameFilter = params.filters.find(x=> x.name =='arrivalNoticeNo')
|
|
42
|
-
let bizplaceFilter = params.filters.find(x=> x.name =='bizplaceName')
|
|
43
|
-
let ganStatusFilter = params.filters.find(x=> x.name =='ganStatus')
|
|
44
|
-
let grnStatusFilter = params.filters.find(x=> x.name =='grnStatus')
|
|
40
|
+
let refNoFilter = params.filters.find(x => x.name == 'refNo')
|
|
41
|
+
let refNo2Filter = params.filters.find(x => x.name == 'refNo2')
|
|
42
|
+
let refNo3Filter = params.filters.find(x => x.name == 'refNo3')
|
|
43
|
+
let ganNameFilter = params.filters.find(x => x.name == 'arrivalNoticeNo')
|
|
44
|
+
let bizplaceFilter = params.filters.find(x => x.name == 'bizplaceName')
|
|
45
|
+
let ganStatusFilter = params.filters.find(x => x.name == 'ganStatus')
|
|
46
|
+
let grnStatusFilter = params.filters.find(x => x.name == 'grnStatus')
|
|
45
47
|
|
|
46
48
|
|
|
47
49
|
params.filters = params.filters.filter(
|
|
@@ -78,6 +80,9 @@ export const goodsReceivalNotesResolver = {
|
|
|
78
80
|
'cc.status = arrivalNotice.status'
|
|
79
81
|
)
|
|
80
82
|
|
|
83
|
+
let permittedBizplaceIds = await getPermittedBizplaceIds(domain, user)
|
|
84
|
+
qb.andWhere('grn.bizplace_id IN (:...bizplaceIds)', { bizplaceIds: permittedBizplaceIds })
|
|
85
|
+
|
|
81
86
|
if (refNoFilter?.value) {
|
|
82
87
|
qb.andWhere('arrivalNotice.ref_no ilike :refNo', { refNo: refNoFilter.value })
|
|
83
88
|
}
|
|
@@ -93,6 +98,7 @@ export const goodsReceivalNotesResolver = {
|
|
|
93
98
|
if (bizplaceFilter?.value) {
|
|
94
99
|
qb.andWhere('bizplace.name ilike :bizName', { bizName: bizplaceFilter.value })
|
|
95
100
|
}
|
|
101
|
+
|
|
96
102
|
if (ganStatusFilter?.value) {
|
|
97
103
|
qb.andWhere('arrivalNotice.status ilike :ganStatus', { ganStatus: ganStatusFilter.value })
|
|
98
104
|
}
|
|
@@ -107,15 +113,15 @@ export const goodsReceivalNotesResolver = {
|
|
|
107
113
|
const sort = (params.sortings || []).reduce(
|
|
108
114
|
(acc, sort) => ({
|
|
109
115
|
...acc,
|
|
110
|
-
[arrChildSortData.indexOf(sort.name) >= 0 ? 'arrivalNotice.' + sort.name : arrNameSortData.indexOf(sort.name) >= 0 ? sort.name + '.name'
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
116
|
+
[arrChildSortData.indexOf(sort.name) >= 0 ? 'arrivalNotice.' + sort.name : arrNameSortData.indexOf(sort.name) >= 0 ? sort.name + '.name'
|
|
117
|
+
: arrGanStatusSortData.indexOf(sort.name) >= 0 ? 'arrivalNotice.status' : arrGrnStatuSortData.indexOf(sort.name) >= 0 ? 'grn.status' : 'grn.' + sort.name]: sort.desc
|
|
118
|
+
? 'DESC'
|
|
119
|
+
: 'ASC'
|
|
114
120
|
}),
|
|
115
121
|
!params.sortings.some(e => e.name === 'status') ? { rank: 'ASC' } : {}
|
|
116
122
|
)
|
|
117
123
|
|
|
118
|
-
|
|
124
|
+
qb.orderBy(sort)
|
|
119
125
|
|
|
120
126
|
const [items, total] = await qb.getManyAndCount()
|
|
121
127
|
|
|
@@ -6,6 +6,8 @@ import { Manifest as ManifestEntity } from '../../../entities'
|
|
|
6
6
|
|
|
7
7
|
export const manifestsResolver = {
|
|
8
8
|
async manifests(_: any, params: ListParam, context: any) {
|
|
9
|
+
const { domain, user } = context.state
|
|
10
|
+
|
|
9
11
|
const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
|
|
10
12
|
if (fromDateParamIdx >= 0) {
|
|
11
13
|
let fromDateVal = new Date(params.filters[fromDateParamIdx].value)
|
|
@@ -32,6 +34,13 @@ export const manifestsResolver = {
|
|
|
32
34
|
})
|
|
33
35
|
}
|
|
34
36
|
|
|
37
|
+
params.filters.push({
|
|
38
|
+
name: 'domain',
|
|
39
|
+
operator: 'eq',
|
|
40
|
+
value: domain.id,
|
|
41
|
+
relation: true
|
|
42
|
+
})
|
|
43
|
+
|
|
35
44
|
const convertedParams = convertListParams(params)
|
|
36
45
|
const [items, total] = await getRepository(ManifestEntity).findAndCount({
|
|
37
46
|
...convertedParams,
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
+
import { EntityManager, In } from 'typeorm'
|
|
2
|
+
|
|
1
3
|
import { Attachment } from '@things-factory/attachment-base'
|
|
2
4
|
import { User } from '@things-factory/auth-base'
|
|
3
5
|
import { Domain } from '@things-factory/shell'
|
|
4
6
|
import { Inventory } from '@things-factory/warehouse-base'
|
|
5
|
-
|
|
7
|
+
|
|
6
8
|
import { ATTACHMENT_TYPE } from '../../../constants/attachment-type'
|
|
7
|
-
import { ArrivalNotice,
|
|
9
|
+
import { ArrivalNotice, OrderInventory, OrderProduct, OrderVas, ReleaseGood, ShippingOrder } from '../../../entities'
|
|
8
10
|
import { deleteArrivalNotice } from '../arrival-notice/delete-arrival-notice'
|
|
9
11
|
|
|
10
12
|
export const deleteReleaseGoodResolver = {
|
|
@@ -45,7 +47,8 @@ export async function deleteReleaseGood(tx: EntityManager, name: string, user: U
|
|
|
45
47
|
}
|
|
46
48
|
|
|
47
49
|
// Delete order inventories by ids
|
|
48
|
-
await Promise.all(
|
|
50
|
+
await Promise.all(
|
|
51
|
+
foundOIs.map(async (oi: OrderInventory) => {
|
|
49
52
|
if (oi?.inventory?.id) {
|
|
50
53
|
oi.inventory = await tx.getRepository(Inventory).findOne(oi.inventory.id)
|
|
51
54
|
|
|
@@ -59,7 +62,7 @@ export async function deleteReleaseGood(tx: EntityManager, name: string, user: U
|
|
|
59
62
|
|
|
60
63
|
await tx.getRepository(OrderInventory).delete({ id: oi.id })
|
|
61
64
|
|
|
62
|
-
if(oi?.orderProduct?.id){
|
|
65
|
+
if (oi?.orderProduct?.id) {
|
|
63
66
|
await tx.getRepository(OrderProduct).delete({ id: oi.orderProduct.id })
|
|
64
67
|
}
|
|
65
68
|
|
|
@@ -75,6 +78,7 @@ export async function deleteReleaseGood(tx: EntityManager, name: string, user: U
|
|
|
75
78
|
|
|
76
79
|
// 4. if there is SO, delete SO
|
|
77
80
|
if (foundSO) {
|
|
81
|
+
await tx.getRepository(ReleaseGood).save({ ...foundReleaseOrder, shippingOrder: null })
|
|
78
82
|
await tx.getRepository(ShippingOrder).delete({ domain, id: foundSO.id })
|
|
79
83
|
}
|
|
80
84
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EntityManager, Equal, In, Not } from 'typeorm'
|
|
2
2
|
|
|
3
3
|
import { User } from '@things-factory/auth-base'
|
|
4
|
-
import { Bizplace
|
|
4
|
+
import { Bizplace } from '@things-factory/biz-base'
|
|
5
5
|
import { Product, ProductDetail } from '@things-factory/product-base'
|
|
6
6
|
import { Domain } from '@things-factory/shell'
|
|
7
7
|
import {
|
|
@@ -46,7 +46,6 @@ export async function executeReverseKittingFunction(
|
|
|
46
46
|
if (!foundReverseKittingOrder) throw new Error(`Reverse kitting order doesn't exists.`)
|
|
47
47
|
|
|
48
48
|
const customerBizplace: Bizplace = foundReverseKittingOrder.bizplace
|
|
49
|
-
const customerCompanyBizplace: Bizplace = await getCompanyBizplace(null, null, customerBizplace.id)
|
|
50
49
|
|
|
51
50
|
const productDetail: ProductDetail = await tx.getRepository(ProductDetail).findOne({
|
|
52
51
|
where: {
|
|
@@ -95,6 +94,7 @@ export async function executeReverseKittingFunction(
|
|
|
95
94
|
newInventory.warehouse = warehouse
|
|
96
95
|
newInventory.location = location
|
|
97
96
|
newInventory.zone = zone
|
|
97
|
+
newInventory.refInventory = orderReverseKitting.inventory
|
|
98
98
|
newInventory.status = INVENTORY_STATUS.STORED
|
|
99
99
|
newInventory.domain = domain
|
|
100
100
|
newInventory.creator = user
|