@things-factory/sales-base 3.7.8 → 3.7.9
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.
|
@@ -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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"}
|
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.9",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -33,7 +33,7 @@
|
|
|
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.9"
|
|
37
37
|
},
|
|
38
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "4d4b67315ce5f7a8a3e2cbc3206ff23b0f1d5f9d"
|
|
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
|
|