@things-factory/sales-base 3.8.29 → 3.8.34
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/delivery-order/delivery-order-report.js +117 -0
- package/dist-server/graphql/resolvers/delivery-order/delivery-order-report.js.map +1 -0
- package/dist-server/graphql/resolvers/delivery-order/delivery-orders.js +6 -9
- package/dist-server/graphql/resolvers/delivery-order/delivery-orders.js.map +1 -1
- package/dist-server/graphql/resolvers/delivery-order/index.js +6 -5
- package/dist-server/graphql/resolvers/delivery-order/index.js.map +1 -1
- package/dist-server/graphql/resolvers/release-good/confirm-release-good.js +14 -20
- package/dist-server/graphql/resolvers/release-good/confirm-release-good.js.map +1 -1
- package/dist-server/graphql/types/delivery-order/index.js +2 -1
- package/dist-server/graphql/types/delivery-order/index.js.map +1 -1
- package/package.json +4 -4
- package/server/graphql/resolvers/delivery-order/delivery-order-report.ts +147 -0
- package/server/graphql/resolvers/delivery-order/delivery-orders.ts +6 -12
- package/server/graphql/resolvers/delivery-order/index.ts +6 -4
- package/server/graphql/resolvers/release-good/confirm-release-good.ts +17 -20
- package/server/graphql/types/delivery-order/index.ts +2 -1
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.deliveryOrderReportResolver = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
5
|
+
const biz_base_1 = require("@things-factory/biz-base");
|
|
6
|
+
const shell_1 = require("@things-factory/shell");
|
|
7
|
+
const entities_1 = require("../../../entities");
|
|
8
|
+
const debug = require('debug')('things-factory:sales-base:delivery-orders');
|
|
9
|
+
exports.deliveryOrderReportResolver = {
|
|
10
|
+
async deliveryOrderReport(_, params, context) {
|
|
11
|
+
try {
|
|
12
|
+
const { domain, user } = context.state;
|
|
13
|
+
const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId');
|
|
14
|
+
if (!bizplaceFilter) {
|
|
15
|
+
params.filters.push({
|
|
16
|
+
name: 'bizplaceId',
|
|
17
|
+
operator: 'in',
|
|
18
|
+
value: await (0, biz_base_1.getPermittedBizplaceIds)(domain, user),
|
|
19
|
+
relation: false
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
const releaseGoodParam = params.filters.find(param => param.name === 'releaseGoodNo');
|
|
23
|
+
if (releaseGoodParam) {
|
|
24
|
+
let arrFilters = [];
|
|
25
|
+
params.filters.splice(params.filters.findIndex(item => item.name == 'releaseGoodNo'), 1);
|
|
26
|
+
arrFilters.push(Object.assign(Object.assign({}, releaseGoodParam), { name: 'name' }));
|
|
27
|
+
const foundReleaseGoods = await (0, typeorm_1.getRepository)(entities_1.ReleaseGood).find(Object.assign({}, (0, shell_1.convertListParams)({ filters: arrFilters })));
|
|
28
|
+
if (foundReleaseGoods && foundReleaseGoods.length) {
|
|
29
|
+
params.filters.push({
|
|
30
|
+
name: 'releaseGoodId',
|
|
31
|
+
operator: 'in',
|
|
32
|
+
value: foundReleaseGoods.map((releaseGood) => releaseGood.id),
|
|
33
|
+
relation: false
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
const tzOffsetIdx = params.filters.findIndex(param => param.name === 'tzoffset');
|
|
38
|
+
let tzOffset = 0;
|
|
39
|
+
if (tzOffsetIdx >= 0) {
|
|
40
|
+
tzOffset = params.filters[tzOffsetIdx].value;
|
|
41
|
+
params.filters.splice(tzOffsetIdx, 1);
|
|
42
|
+
}
|
|
43
|
+
const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
|
|
44
|
+
if (fromDateParamIdx >= 0) {
|
|
45
|
+
let fromDateVal = new Date(params.filters[fromDateParamIdx].value);
|
|
46
|
+
params.filters.splice(fromDateParamIdx, 1);
|
|
47
|
+
params.filters.push({
|
|
48
|
+
name: 'createdAt',
|
|
49
|
+
operator: 'gte',
|
|
50
|
+
value: fromDateVal.toISOString(),
|
|
51
|
+
relation: false
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate');
|
|
55
|
+
if (toDateParamIdx >= 0) {
|
|
56
|
+
let toDateVal = new Date(params.filters[toDateParamIdx].value);
|
|
57
|
+
params.filters.splice(toDateParamIdx, 1);
|
|
58
|
+
params.filters.push({
|
|
59
|
+
name: 'createdAt',
|
|
60
|
+
operator: 'lt',
|
|
61
|
+
value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
|
|
62
|
+
relation: false
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
let refNoFilter = params.filters.find(x => x.name == 'refNo');
|
|
66
|
+
let refNo2Filter = params.filters.find(x => x.name == 'refNo2');
|
|
67
|
+
let refNo3Filter = params.filters.find(x => x.name == 'refNo3');
|
|
68
|
+
params.filters = params.filters.filter(x => x.name != 'refNo' && x.name != 'refNo2' && x.name != 'refNo3');
|
|
69
|
+
const qb = (0, typeorm_1.getRepository)(entities_1.DeliveryOrder).createQueryBuilder('do');
|
|
70
|
+
(0, shell_1.buildQuery)(qb, params, context);
|
|
71
|
+
qb.addSelect('COALESCE("cc".rank, 99999)', 'rank');
|
|
72
|
+
qb.leftJoinAndSelect('do.domain', 'domain');
|
|
73
|
+
qb.leftJoinAndSelect('do.bizplace', 'bizplace');
|
|
74
|
+
qb.leftJoinAndSelect('do.releaseGood', 'releaseGood');
|
|
75
|
+
qb.leftJoinAndSelect('do.transportDriver', 'td');
|
|
76
|
+
qb.leftJoinAndSelect('do.transportVehicle', 'th');
|
|
77
|
+
qb.leftJoinAndSelect('do.orderInventories', 'oi');
|
|
78
|
+
qb.leftJoinAndSelect('oi.inventory', 'inv');
|
|
79
|
+
qb.leftJoinAndSelect('inv.product', 'prd');
|
|
80
|
+
qb.leftJoinAndSelect('do.creator', 'creator');
|
|
81
|
+
qb.leftJoinAndSelect('do.updater', 'updater');
|
|
82
|
+
qb.leftJoin(subQuery => {
|
|
83
|
+
return subQuery
|
|
84
|
+
.select(`ccd.rank`, 'rank')
|
|
85
|
+
.addSelect(`ccd.name`, 'status')
|
|
86
|
+
.from(`common_code_details`, 'ccd')
|
|
87
|
+
.innerJoin(`ccd.commonCode`, 'cc')
|
|
88
|
+
.where(`ccd.domain_id = :domainId`, { domainId: domain.id })
|
|
89
|
+
.andWhere(`cc.name = 'DELIVERY_STATUS'`);
|
|
90
|
+
}, 'cc', 'cc.status = do.status');
|
|
91
|
+
if (refNoFilter === null || refNoFilter === void 0 ? void 0 : refNoFilter.value) {
|
|
92
|
+
qb.andWhere('releaseGood.ref_no ilike :refNo', { refNo: refNoFilter.value });
|
|
93
|
+
}
|
|
94
|
+
if (refNo2Filter === null || refNo2Filter === void 0 ? void 0 : refNo2Filter.value) {
|
|
95
|
+
qb.andWhere('releaseGood.ref_no_2 ilike :refNo2', { refNo2: refNo2Filter.value });
|
|
96
|
+
}
|
|
97
|
+
if (refNo3Filter === null || refNo3Filter === void 0 ? void 0 : refNo3Filter.value) {
|
|
98
|
+
qb.andWhere('releaseGood.ref_no_3 ilike :refNo3', { refNo3: refNo3Filter.value });
|
|
99
|
+
}
|
|
100
|
+
const arrChildSortData = ['refNo', 'refNo2', 'refNo3'];
|
|
101
|
+
const arrNameSortData = ['bizplace', 'releaseGood', 'updater'];
|
|
102
|
+
const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0
|
|
103
|
+
? 'releaseGood.' + sort.name
|
|
104
|
+
: arrNameSortData.indexOf(sort.name) >= 0
|
|
105
|
+
? sort.name + '.name'
|
|
106
|
+
: 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC' })), params.sortings.length < 1 ? { rank: 'ASC', 'do.createdAt': 'DESC' } : {});
|
|
107
|
+
qb.orderBy(sort);
|
|
108
|
+
const [items, total] = await qb.getManyAndCount();
|
|
109
|
+
return { items, total };
|
|
110
|
+
}
|
|
111
|
+
catch (error) {
|
|
112
|
+
debug('deliveryOrders', error.toString());
|
|
113
|
+
throw error;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
};
|
|
117
|
+
//# sourceMappingURL=delivery-order-report.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"delivery-order-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/delivery-order/delivery-order-report.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAGvC,uDAAkE;AAClE,iDAAwF;AAExF,gDAA8D;AAE9D,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,2CAA2C,CAAC,CAAA;AAE9D,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC/D,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;YAEtE,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,CAAA;YAChF,IAAI,CAAC,cAAc,EAAE;gBACnB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,YAAY;oBAClB,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC;oBAClD,QAAQ,EAAE,KAAK;iBAChB,CAAC,CAAA;aACH;YAED,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe,CAAC,CAAA;YACrF,IAAI,gBAAgB,EAAE;gBACpB,IAAI,UAAU,GAAG,EAAE,CAAA;gBACnB,MAAM,CAAC,OAAO,CAAC,MAAM,CACnB,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,eAAe,CAAC,EAC9D,CAAC,CACF,CAAA;gBACD,UAAU,CAAC,IAAI,iCAAM,gBAAgB,KAAE,IAAI,EAAE,MAAM,IAAG,CAAA;gBAEtD,MAAM,iBAAiB,GAAkB,MAAM,IAAA,uBAAa,EAAC,sBAAW,CAAC,CAAC,IAAI,mBACzE,IAAA,yBAAiB,EAAC,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,EAC7C,CAAA;gBAEF,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,MAAM,EAAE;oBACjD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;wBAClB,IAAI,EAAE,eAAe;wBACrB,QAAQ,EAAE,IAAI;wBACd,KAAK,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,WAAwB,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC;wBAC1E,QAAQ,EAAE,KAAK;qBAChB,CAAC,CAAA;iBACH;aACF;YAED,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;YAChF,IAAI,QAAQ,GAAG,CAAC,CAAA;YAChB,IAAI,WAAW,IAAI,CAAC,EAAE;gBACpB,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,KAAK,CAAA;gBAC5C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;aACtC;YAED,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;YACrF,IAAI,gBAAgB,IAAI,CAAC,EAAE;gBACzB,IAAI,WAAW,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAA;gBAClE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAA;gBAE1C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,WAAW;oBACjB,QAAQ,EAAE,KAAK;oBACf,KAAK,EAAE,WAAW,CAAC,WAAW,EAAE;oBAChC,QAAQ,EAAE,KAAK;iBAChB,CAAC,CAAA;aACH;YACD,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;YACjF,IAAI,cAAc,IAAI,CAAC,EAAE;gBACvB,IAAI,SAAS,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,CAAA;gBAC9D,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,CAAA;gBAExC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,WAAW;oBACjB,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;oBACzE,QAAQ,EAAE,KAAK;iBAChB,CAAC,CAAA;aACH;YAED,IAAI,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAA;YAC7D,IAAI,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAA;YAC/D,IAAI,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAA;YAE/D,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,CAAC,IAAI,IAAI,QAAQ,IAAI,CAAC,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAA;YAE1G,MAAM,EAAE,GAAQ,IAAA,uBAAa,EAAC,wBAAa,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;YACrE,IAAA,kBAAU,EAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YAC/B,EAAE,CAAC,SAAS,CAAC,4BAA4B,EAAE,MAAM,CAAC,CAAA;YAClD,EAAE,CAAC,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;YAC3C,EAAE,CAAC,iBAAiB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;YAC/C,EAAE,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAA;YACrD,EAAE,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAA;YAChD,EAAE,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAA;YACjD,EAAE,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAA;YACjD,EAAE,CAAC,iBAAiB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;YAC3C,EAAE,CAAC,iBAAiB,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;YAC1C,EAAE,CAAC,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;YAC7C,EAAE,CAAC,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;YAC7C,EAAE,CAAC,QAAQ,CACT,QAAQ,CAAC,EAAE;gBACT,OAAO,QAAQ;qBACZ,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC;qBAC1B,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC;qBAC/B,IAAI,CAAC,qBAAqB,EAAE,KAAK,CAAC;qBAClC,SAAS,CAAC,gBAAgB,EAAE,IAAI,CAAC;qBACjC,KAAK,CAAC,2BAA2B,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;qBAC3D,QAAQ,CAAC,6BAA6B,CAAC,CAAA;YAC5C,CAAC,EACD,IAAI,EACJ,uBAAuB,CACxB,CAAA;YAED,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,EAAE;gBACtB,EAAE,CAAC,QAAQ,CAAC,iCAAiC,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,CAAC,CAAA;aAC7E;YACD,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,EAAE;gBACvB,EAAE,CAAC,QAAQ,CAAC,oCAAoC,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,KAAK,EAAE,CAAC,CAAA;aAClF;YACD,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,EAAE;gBACvB,EAAE,CAAC,QAAQ,CAAC,oCAAoC,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,KAAK,EAAE,CAAC,CAAA;aAClF;YAED,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;YACtD,MAAM,eAAe,GAAG,CAAC,UAAU,EAAE,aAAa,EAAE,SAAS,CAAC,CAAA;YAC9D,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CACzC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,iCACV,GAAG,KACN,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;oBACvC,CAAC,CAAC,cAAc,GAAG,IAAI,CAAC,IAAI;oBAC5B,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;wBACzC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,OAAO;wBACrB,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,IAClD,EACF,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAC1E,CAAA;YAED,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAEhB,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,CAAA;YACjD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;SACxB;QAAC,OAAO,KAAK,EAAE;YACd,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;YACzC,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}
|
|
@@ -65,9 +65,7 @@ exports.deliveryOrdersResolver = {
|
|
|
65
65
|
let refNoFilter = params.filters.find(x => x.name == 'refNo');
|
|
66
66
|
let refNo2Filter = params.filters.find(x => x.name == 'refNo2');
|
|
67
67
|
let refNo3Filter = params.filters.find(x => x.name == 'refNo3');
|
|
68
|
-
params.filters = params.filters.filter(x => x.name != 'refNo' &&
|
|
69
|
-
x.name != 'refNo2' &&
|
|
70
|
-
x.name != 'refNo3');
|
|
68
|
+
params.filters = params.filters.filter(x => x.name != 'refNo' && x.name != 'refNo2' && x.name != 'refNo3');
|
|
71
69
|
const qb = (0, typeorm_1.getRepository)(entities_1.DeliveryOrder).createQueryBuilder('do');
|
|
72
70
|
(0, shell_1.buildQuery)(qb, params, context);
|
|
73
71
|
qb.addSelect('COALESCE("cc".rank, 99999)', 'rank');
|
|
@@ -76,9 +74,6 @@ exports.deliveryOrdersResolver = {
|
|
|
76
74
|
qb.leftJoinAndSelect('do.releaseGood', 'releaseGood');
|
|
77
75
|
qb.leftJoinAndSelect('do.transportDriver', 'td');
|
|
78
76
|
qb.leftJoinAndSelect('do.transportVehicle', 'th');
|
|
79
|
-
qb.leftJoinAndSelect('do.orderInventories', 'oi');
|
|
80
|
-
qb.leftJoinAndSelect('oi.inventory', 'inv');
|
|
81
|
-
qb.leftJoinAndSelect('inv.product', 'prd');
|
|
82
77
|
qb.leftJoinAndSelect('do.creator', 'creator');
|
|
83
78
|
qb.leftJoinAndSelect('do.updater', 'updater');
|
|
84
79
|
qb.leftJoin(subQuery => {
|
|
@@ -101,9 +96,11 @@ exports.deliveryOrdersResolver = {
|
|
|
101
96
|
}
|
|
102
97
|
const arrChildSortData = ['refNo', 'refNo2', 'refNo3'];
|
|
103
98
|
const arrNameSortData = ['bizplace', 'releaseGood', 'updater'];
|
|
104
|
-
const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0
|
|
105
|
-
? '
|
|
106
|
-
:
|
|
99
|
+
const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0
|
|
100
|
+
? 'releaseGood.' + sort.name
|
|
101
|
+
: arrNameSortData.indexOf(sort.name) >= 0
|
|
102
|
+
? sort.name + '.name'
|
|
103
|
+
: 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC' })), params.sortings.length < 1 ? { rank: 'ASC', 'do.createdAt': 'DESC' } : {});
|
|
107
104
|
qb.orderBy(sort);
|
|
108
105
|
const [items, total] = await qb.getManyAndCount();
|
|
109
106
|
return { items, total };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/delivery-order/delivery-orders.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"delivery-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/delivery-order/delivery-orders.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,21 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Mutation = exports.Query = void 0;
|
|
4
4
|
const check_delivered_order_1 = require("./check-delivered-order");
|
|
5
5
|
const confirm_delivery_order_1 = require("./confirm-delivery-order");
|
|
6
|
+
const create_delivery_order_1 = require("./create-delivery-order");
|
|
6
7
|
const delete_delivery_order_1 = require("./delete-delivery-order");
|
|
7
8
|
const delivery_order_1 = require("./delivery-order");
|
|
8
9
|
const delivery_order_by_release_good_1 = require("./delivery-order-by-release-good");
|
|
9
10
|
const delivery_order_items_1 = require("./delivery-order-items");
|
|
11
|
+
const delivery_order_report_1 = require("./delivery-order-report");
|
|
10
12
|
const delivery_order_requests_1 = require("./delivery-order-requests");
|
|
11
13
|
const delivery_orders_1 = require("./delivery-orders");
|
|
12
14
|
const dispatch_delivery_order_1 = require("./dispatch-delivery-order");
|
|
15
|
+
const dispatch_manual_delivery_order_1 = require("./dispatch-manual-delivery-order");
|
|
13
16
|
const generate_delivery_order_1 = require("./generate-delivery-order");
|
|
17
|
+
const manual_delivery_order_items_1 = require("./manual-delivery-order-items");
|
|
14
18
|
const receive_delivery_order_1 = require("./receive-delivery-order");
|
|
15
19
|
const reject_delivery_order_1 = require("./reject-delivery-order");
|
|
16
|
-
const update_delivery_order_1 = require("./update-delivery-order");
|
|
17
20
|
const submit_goods_delivery_note_1 = require("./submit-goods-delivery-note");
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
const dispatch_manual_delivery_order_1 = require("./dispatch-manual-delivery-order");
|
|
21
|
-
exports.Query = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, delivery_orders_1.deliveryOrdersResolver), delivery_order_1.deliveryOrderResolver), delivery_order_requests_1.deliveryOrderRequestsResolver), delivery_order_by_release_good_1.deliveryOrderByReleaseGoodResolver), delivery_order_items_1.deliveryOrderItemsResolver), manual_delivery_order_items_1.manualDeliveryOrderItemsResolver);
|
|
21
|
+
const update_delivery_order_1 = require("./update-delivery-order");
|
|
22
|
+
exports.Query = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, delivery_orders_1.deliveryOrdersResolver), delivery_order_1.deliveryOrderResolver), delivery_order_report_1.deliveryOrderReportResolver), delivery_order_requests_1.deliveryOrderRequestsResolver), delivery_order_by_release_good_1.deliveryOrderByReleaseGoodResolver), delivery_order_items_1.deliveryOrderItemsResolver), manual_delivery_order_items_1.manualDeliveryOrderItemsResolver);
|
|
22
23
|
exports.Mutation = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, update_delivery_order_1.updateDeliveryOrder), generate_delivery_order_1.generateDeliveryOrderResolver), delete_delivery_order_1.deleteDeliveryOrder), generate_delivery_order_1.generateDeliveryOrder), confirm_delivery_order_1.confirmDeliveryOrder), receive_delivery_order_1.receiveDeliveryOrder), dispatch_delivery_order_1.dispatchDeliveryOrder), check_delivered_order_1.checkDeliveredOrder), reject_delivery_order_1.rejectDeliveryOrder), submit_goods_delivery_note_1.submitGoodsDeliveryNote), create_delivery_order_1.createDeliveryOrderResolver), dispatch_manual_delivery_order_1.dispatchManualDeliveryOrder);
|
|
23
24
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/delivery-order/index.ts"],"names":[],"mappings":";;;AAAA,mEAA6D;AAC7D,qEAA+D;AAC/D,mEAA6D;AAC7D,qDAAwD;AACxD,qFAAqF;AACrF,iEAAmE;AACnE,uEAAyE;AACzE,uDAA0D;AAC1D,uEAAiE;AACjE,uEAAgG;AAChG,qEAA+D;AAC/D,mEAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/delivery-order/index.ts"],"names":[],"mappings":";;;AAAA,mEAA6D;AAC7D,qEAA+D;AAC/D,mEAAqE;AACrE,mEAA6D;AAC7D,qDAAwD;AACxD,qFAAqF;AACrF,iEAAmE;AACnE,mEAAqE;AACrE,uEAAyE;AACzE,uDAA0D;AAC1D,uEAAiE;AACjE,qFAA8E;AAC9E,uEAAgG;AAChG,+EAAgF;AAChF,qEAA+D;AAC/D,mEAA6D;AAC7D,6EAAsE;AACtE,mEAA6D;AAEhD,QAAA,KAAK,yGACb,wCAAsB,GACtB,sCAAqB,GACrB,mDAA2B,GAC3B,uDAA6B,GAC7B,mEAAkC,GAClC,iDAA0B,GAC1B,8DAAgC,EACpC;AAEY,QAAA,QAAQ,+KAChB,2CAAmB,GACnB,uDAA6B,GAC7B,2CAAmB,GACnB,+CAAqB,GACrB,6CAAoB,GACpB,6CAAoB,GACpB,+CAAqB,GACrB,2CAAmB,GACnB,2CAAmB,GACnB,oDAAuB,GACvB,mDAA2B,GAC3B,4DAA2B,EAC/B"}
|
|
@@ -32,26 +32,22 @@ async function confirmReleaseGood(name, context, tx) {
|
|
|
32
32
|
const { user, domain } = context.state;
|
|
33
33
|
let foundReleaseGood = await tx.getRepository(entities_1.ReleaseGood).findOne({
|
|
34
34
|
where: { name, status: constants_1.ORDER_STATUS.PENDING },
|
|
35
|
-
relations: [
|
|
36
|
-
'domain',
|
|
37
|
-
'bizplace',
|
|
38
|
-
'bizplace.domain',
|
|
39
|
-
'bizplace.company',
|
|
40
|
-
'bizplace.company.domain',
|
|
41
|
-
'orderProducts',
|
|
42
|
-
'orderProducts.product',
|
|
43
|
-
'orderProducts.product.productDetails',
|
|
44
|
-
'orderInventories',
|
|
45
|
-
'orderInventories.product',
|
|
46
|
-
'orderVass'
|
|
47
|
-
]
|
|
35
|
+
relations: ['domain', 'bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain', 'orderVass']
|
|
48
36
|
});
|
|
49
37
|
if (!foundReleaseGood)
|
|
50
38
|
throw new Error(`Release good order doesn't exists.`);
|
|
51
|
-
|
|
39
|
+
// query orderInventories separately from releaseGood to reduce resource usage
|
|
40
|
+
let foundOIs = await tx.getRepository(entities_1.OrderInventory).find({
|
|
41
|
+
where: { domain, releaseGood: foundReleaseGood },
|
|
42
|
+
relations: ['product']
|
|
43
|
+
});
|
|
44
|
+
// query orderProducts separately from releaseGood to reduce resource usage
|
|
45
|
+
let foundOPs = await tx.getRepository(entities_1.OrderProduct).find({
|
|
46
|
+
where: { domain, releaseGood: foundReleaseGood },
|
|
47
|
+
relations: ['product', 'product.productDetails']
|
|
48
|
+
});
|
|
52
49
|
let foundBundleInfo = JSON.parse(foundReleaseGood.bundleInfo);
|
|
53
50
|
let foundOVs = foundReleaseGood.orderVass;
|
|
54
|
-
let foundOPs = foundReleaseGood.orderProducts;
|
|
55
51
|
let customerBizplace = foundReleaseGood.bizplace;
|
|
56
52
|
const companyDomain = customerBizplace === null || customerBizplace === void 0 ? void 0 : customerBizplace.company.domain;
|
|
57
53
|
const sellercraft = await tx
|
|
@@ -60,7 +56,7 @@ async function confirmReleaseGood(name, context, tx) {
|
|
|
60
56
|
if (foundReleaseGood.type == 'b2c') {
|
|
61
57
|
if (sellercraft) {
|
|
62
58
|
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
63
|
-
foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood);
|
|
59
|
+
foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, Object.assign(Object.assign({}, foundReleaseGood), { orderProducts: foundOPs }));
|
|
64
60
|
}
|
|
65
61
|
else {
|
|
66
62
|
// find for any existing marketplace store connections
|
|
@@ -99,10 +95,8 @@ async function confirmReleaseGood(name, context, tx) {
|
|
|
99
95
|
});
|
|
100
96
|
if (foundMarketplaceProductVariations) {
|
|
101
97
|
await Promise.all(foundMarketplaceProductVariations.map(async (variation) => {
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
await tx.getRepository(marketplace_base_1.MarketplaceProductVariation).save(variation);
|
|
105
|
-
}
|
|
98
|
+
variation.reserveQty -= oi.releaseQty;
|
|
99
|
+
await tx.getRepository(marketplace_base_1.MarketplaceProductVariation).save(variation);
|
|
106
100
|
}));
|
|
107
101
|
}
|
|
108
102
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confirm-release-good.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/confirm-release-good.ts"],"names":[],"mappings":";;;AAEA,yDAAsD;AAEtD,qFAA0E;AAC1E,qFAAwF;AACxF,uEAAgG;AAChG,+DAA+D;AAG/D,kDAA2F;AAC3F,sDAAiF;AACjF,gDAAuF;AACvF,qFAAuF;AAE1E,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QACrD,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;QACnD,MAAM,WAAW,GAAgB,MAAM,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;QAE5E,kCAAkC;QAClC,IAAI,WAAW,CAAC,YAAY,EAAE;YAC5B,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,sBAAW,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE;gBACpF,SAAS,EAAE,CAAC,eAAe,CAAC;aAC7B,CAAC,CAAA;YAEF,wFAAwF;YACxF,IAAI,aAAa,CAAC,MAAM,KAAK,wBAAY,CAAC,eAAe,EAAE;gBACzD,MAAM,IAAA,qDAA4B,EAAC,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;aACpE;SACF;QAED,OAAO,WAAW,CAAA;IACpB,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CAAC,IAAY,EAAE,OAAY,EAAE,EAAkB;;IACrF,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;IAEtE,IAAI,gBAAgB,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,sBAAW,CAAC,CAAC,OAAO,CAAC;QAC9E,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,wBAAY,CAAC,OAAO,EAAE;QAC7C,SAAS,EAAE
|
|
1
|
+
{"version":3,"file":"confirm-release-good.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/confirm-release-good.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,8 @@ exports.Types = exports.Query = exports.Mutation = void 0;
|
|
|
4
4
|
const delivery_order_1 = require("./delivery-order");
|
|
5
5
|
const delivery_order_list_1 = require("./delivery-order-list");
|
|
6
6
|
const delivery_order_patch_1 = require("./delivery-order-patch");
|
|
7
|
-
const new_delivery_order_1 = require("./new-delivery-order");
|
|
8
7
|
const generate_delivery_order_1 = require("./generate-delivery-order");
|
|
8
|
+
const new_delivery_order_1 = require("./new-delivery-order");
|
|
9
9
|
exports.Mutation = `
|
|
10
10
|
createDeliveryOrder (
|
|
11
11
|
orderInfo: NewDeliveryOrder
|
|
@@ -67,6 +67,7 @@ exports.Query = `
|
|
|
67
67
|
deliveryOrders(filters: [Filter], pagination: Pagination, sortings: [Sorting]): DeliveryOrderList
|
|
68
68
|
deliveryOrder(name: String!): DeliveryOrder
|
|
69
69
|
deliveryOrderRequests(filters: [Filter], pagination: Pagination, sortings: [Sorting]): DeliveryOrderList
|
|
70
|
+
deliveryOrderReport(filters: [Filter], pagination: Pagination, sortings: [Sorting]): DeliveryOrderList
|
|
70
71
|
deliveryOrderByReleaseGood(releaseGoodNo: String!): DeliveryOrderList
|
|
71
72
|
deliveryOrderItems(name: String!): OrderInventoryList
|
|
72
73
|
manualDeliveryOrderItems(name: String!): OrderInventoryList
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/delivery-order/index.ts"],"names":[],"mappings":";;;AAAA,qDAAgD;AAChD,+DAAyD;AACzD,iEAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/delivery-order/index.ts"],"names":[],"mappings":";;;AAAA,qDAAgD;AAChD,+DAAyD;AACzD,iEAA2D;AAC3D,uEAAiE;AACjE,6DAAuD;AAE1C,QAAA,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwDvB,CAAA;AAEY,QAAA,KAAK,GAAG;;;;;;;;CAQpB,CAAA;AAEY,QAAA,KAAK,GAAG,CAAC,8BAAa,EAAE,qCAAgB,EAAE,yCAAkB,EAAE,uCAAiB,EAAE,+CAAqB,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/sales-base",
|
|
3
|
-
"version": "3.8.
|
|
3
|
+
"version": "3.8.34",
|
|
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.8.29",
|
|
30
30
|
"@things-factory/code-base": "^3.8.0",
|
|
31
31
|
"@things-factory/notification": "^3.8.0",
|
|
32
|
-
"@things-factory/product-base": "^3.8.
|
|
32
|
+
"@things-factory/product-base": "^3.8.31",
|
|
33
33
|
"@things-factory/setting-base": "^3.8.0",
|
|
34
34
|
"@things-factory/shell": "^3.8.0",
|
|
35
35
|
"@things-factory/transport-base": "^3.8.29",
|
|
36
|
-
"@things-factory/warehouse-base": "^3.8.
|
|
36
|
+
"@things-factory/warehouse-base": "^3.8.32"
|
|
37
37
|
},
|
|
38
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "773aed8d04b1e1db9d196833a98efa92ec82c58b"
|
|
39
39
|
}
|
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
import { getRepository } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { User } from '@things-factory/auth-base'
|
|
4
|
+
import { getPermittedBizplaceIds } from '@things-factory/biz-base'
|
|
5
|
+
import { buildQuery, convertListParams, Domain, ListParam } from '@things-factory/shell'
|
|
6
|
+
|
|
7
|
+
import { DeliveryOrder, ReleaseGood } from '../../../entities'
|
|
8
|
+
|
|
9
|
+
const debug = require('debug')('things-factory:sales-base:delivery-orders')
|
|
10
|
+
|
|
11
|
+
export const deliveryOrderReportResolver = {
|
|
12
|
+
async deliveryOrderReport(_: any, params: ListParam, context: any) {
|
|
13
|
+
try {
|
|
14
|
+
const { domain, user }: { domain: Domain; user: User } = context.state
|
|
15
|
+
|
|
16
|
+
const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId')
|
|
17
|
+
if (!bizplaceFilter) {
|
|
18
|
+
params.filters.push({
|
|
19
|
+
name: 'bizplaceId',
|
|
20
|
+
operator: 'in',
|
|
21
|
+
value: await getPermittedBizplaceIds(domain, user),
|
|
22
|
+
relation: false
|
|
23
|
+
})
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
const releaseGoodParam = params.filters.find(param => param.name === 'releaseGoodNo')
|
|
27
|
+
if (releaseGoodParam) {
|
|
28
|
+
let arrFilters = []
|
|
29
|
+
params.filters.splice(
|
|
30
|
+
params.filters.findIndex(item => item.name == 'releaseGoodNo'),
|
|
31
|
+
1
|
|
32
|
+
)
|
|
33
|
+
arrFilters.push({ ...releaseGoodParam, name: 'name' })
|
|
34
|
+
|
|
35
|
+
const foundReleaseGoods: ReleaseGood[] = await getRepository(ReleaseGood).find({
|
|
36
|
+
...convertListParams({ filters: arrFilters })
|
|
37
|
+
})
|
|
38
|
+
|
|
39
|
+
if (foundReleaseGoods && foundReleaseGoods.length) {
|
|
40
|
+
params.filters.push({
|
|
41
|
+
name: 'releaseGoodId',
|
|
42
|
+
operator: 'in',
|
|
43
|
+
value: foundReleaseGoods.map((releaseGood: ReleaseGood) => releaseGood.id),
|
|
44
|
+
relation: false
|
|
45
|
+
})
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
const tzOffsetIdx = params.filters.findIndex(param => param.name === 'tzoffset')
|
|
50
|
+
let tzOffset = 0
|
|
51
|
+
if (tzOffsetIdx >= 0) {
|
|
52
|
+
tzOffset = params.filters[tzOffsetIdx].value
|
|
53
|
+
params.filters.splice(tzOffsetIdx, 1)
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
|
|
57
|
+
if (fromDateParamIdx >= 0) {
|
|
58
|
+
let fromDateVal = new Date(params.filters[fromDateParamIdx].value)
|
|
59
|
+
params.filters.splice(fromDateParamIdx, 1)
|
|
60
|
+
|
|
61
|
+
params.filters.push({
|
|
62
|
+
name: 'createdAt',
|
|
63
|
+
operator: 'gte',
|
|
64
|
+
value: fromDateVal.toISOString(),
|
|
65
|
+
relation: false
|
|
66
|
+
})
|
|
67
|
+
}
|
|
68
|
+
const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate')
|
|
69
|
+
if (toDateParamIdx >= 0) {
|
|
70
|
+
let toDateVal = new Date(params.filters[toDateParamIdx].value)
|
|
71
|
+
params.filters.splice(toDateParamIdx, 1)
|
|
72
|
+
|
|
73
|
+
params.filters.push({
|
|
74
|
+
name: 'createdAt',
|
|
75
|
+
operator: 'lt',
|
|
76
|
+
value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
|
|
77
|
+
relation: false
|
|
78
|
+
})
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
let refNoFilter = params.filters.find(x => x.name == 'refNo')
|
|
82
|
+
let refNo2Filter = params.filters.find(x => x.name == 'refNo2')
|
|
83
|
+
let refNo3Filter = params.filters.find(x => x.name == 'refNo3')
|
|
84
|
+
|
|
85
|
+
params.filters = params.filters.filter(x => x.name != 'refNo' && x.name != 'refNo2' && x.name != 'refNo3')
|
|
86
|
+
|
|
87
|
+
const qb: any = getRepository(DeliveryOrder).createQueryBuilder('do')
|
|
88
|
+
buildQuery(qb, params, context)
|
|
89
|
+
qb.addSelect('COALESCE("cc".rank, 99999)', 'rank')
|
|
90
|
+
qb.leftJoinAndSelect('do.domain', 'domain')
|
|
91
|
+
qb.leftJoinAndSelect('do.bizplace', 'bizplace')
|
|
92
|
+
qb.leftJoinAndSelect('do.releaseGood', 'releaseGood')
|
|
93
|
+
qb.leftJoinAndSelect('do.transportDriver', 'td')
|
|
94
|
+
qb.leftJoinAndSelect('do.transportVehicle', 'th')
|
|
95
|
+
qb.leftJoinAndSelect('do.orderInventories', 'oi')
|
|
96
|
+
qb.leftJoinAndSelect('oi.inventory', 'inv')
|
|
97
|
+
qb.leftJoinAndSelect('inv.product', 'prd')
|
|
98
|
+
qb.leftJoinAndSelect('do.creator', 'creator')
|
|
99
|
+
qb.leftJoinAndSelect('do.updater', 'updater')
|
|
100
|
+
qb.leftJoin(
|
|
101
|
+
subQuery => {
|
|
102
|
+
return subQuery
|
|
103
|
+
.select(`ccd.rank`, 'rank')
|
|
104
|
+
.addSelect(`ccd.name`, 'status')
|
|
105
|
+
.from(`common_code_details`, 'ccd')
|
|
106
|
+
.innerJoin(`ccd.commonCode`, 'cc')
|
|
107
|
+
.where(`ccd.domain_id = :domainId`, { domainId: domain.id })
|
|
108
|
+
.andWhere(`cc.name = 'DELIVERY_STATUS'`)
|
|
109
|
+
},
|
|
110
|
+
'cc',
|
|
111
|
+
'cc.status = do.status'
|
|
112
|
+
)
|
|
113
|
+
|
|
114
|
+
if (refNoFilter?.value) {
|
|
115
|
+
qb.andWhere('releaseGood.ref_no ilike :refNo', { refNo: refNoFilter.value })
|
|
116
|
+
}
|
|
117
|
+
if (refNo2Filter?.value) {
|
|
118
|
+
qb.andWhere('releaseGood.ref_no_2 ilike :refNo2', { refNo2: refNo2Filter.value })
|
|
119
|
+
}
|
|
120
|
+
if (refNo3Filter?.value) {
|
|
121
|
+
qb.andWhere('releaseGood.ref_no_3 ilike :refNo3', { refNo3: refNo3Filter.value })
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
const arrChildSortData = ['refNo', 'refNo2', 'refNo3']
|
|
125
|
+
const arrNameSortData = ['bizplace', 'releaseGood', 'updater']
|
|
126
|
+
const sort = (params.sortings || []).reduce(
|
|
127
|
+
(acc, sort) => ({
|
|
128
|
+
...acc,
|
|
129
|
+
[arrChildSortData.indexOf(sort.name) >= 0
|
|
130
|
+
? 'releaseGood.' + sort.name
|
|
131
|
+
: arrNameSortData.indexOf(sort.name) >= 0
|
|
132
|
+
? sort.name + '.name'
|
|
133
|
+
: 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
|
|
134
|
+
}),
|
|
135
|
+
params.sortings.length < 1 ? { rank: 'ASC', 'do.createdAt': 'DESC' } : {}
|
|
136
|
+
)
|
|
137
|
+
|
|
138
|
+
qb.orderBy(sort)
|
|
139
|
+
|
|
140
|
+
const [items, total] = await qb.getManyAndCount()
|
|
141
|
+
return { items, total }
|
|
142
|
+
} catch (error) {
|
|
143
|
+
debug('deliveryOrders', error.toString())
|
|
144
|
+
throw error
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
}
|
|
@@ -82,12 +82,7 @@ export const deliveryOrdersResolver = {
|
|
|
82
82
|
let refNo2Filter = params.filters.find(x => x.name == 'refNo2')
|
|
83
83
|
let refNo3Filter = params.filters.find(x => x.name == 'refNo3')
|
|
84
84
|
|
|
85
|
-
params.filters = params.filters.filter(
|
|
86
|
-
x =>
|
|
87
|
-
x.name != 'refNo' &&
|
|
88
|
-
x.name != 'refNo2' &&
|
|
89
|
-
x.name != 'refNo3'
|
|
90
|
-
)
|
|
85
|
+
params.filters = params.filters.filter(x => x.name != 'refNo' && x.name != 'refNo2' && x.name != 'refNo3')
|
|
91
86
|
|
|
92
87
|
const qb: any = getRepository(DeliveryOrder).createQueryBuilder('do')
|
|
93
88
|
buildQuery(qb, params, context)
|
|
@@ -97,9 +92,6 @@ export const deliveryOrdersResolver = {
|
|
|
97
92
|
qb.leftJoinAndSelect('do.releaseGood', 'releaseGood')
|
|
98
93
|
qb.leftJoinAndSelect('do.transportDriver', 'td')
|
|
99
94
|
qb.leftJoinAndSelect('do.transportVehicle', 'th')
|
|
100
|
-
qb.leftJoinAndSelect('do.orderInventories', 'oi')
|
|
101
|
-
qb.leftJoinAndSelect('oi.inventory', 'inv')
|
|
102
|
-
qb.leftJoinAndSelect('inv.product', 'prd')
|
|
103
95
|
qb.leftJoinAndSelect('do.creator', 'creator')
|
|
104
96
|
qb.leftJoinAndSelect('do.updater', 'updater')
|
|
105
97
|
qb.leftJoin(
|
|
@@ -131,9 +123,11 @@ export const deliveryOrdersResolver = {
|
|
|
131
123
|
const sort = (params.sortings || []).reduce(
|
|
132
124
|
(acc, sort) => ({
|
|
133
125
|
...acc,
|
|
134
|
-
[arrChildSortData.indexOf(sort.name) >= 0
|
|
135
|
-
? '
|
|
136
|
-
:
|
|
126
|
+
[arrChildSortData.indexOf(sort.name) >= 0
|
|
127
|
+
? 'releaseGood.' + sort.name
|
|
128
|
+
: arrNameSortData.indexOf(sort.name) >= 0
|
|
129
|
+
? sort.name + '.name'
|
|
130
|
+
: 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
|
|
137
131
|
}),
|
|
138
132
|
params.sortings.length < 1 ? { rank: 'ASC', 'do.createdAt': 'DESC' } : {}
|
|
139
133
|
)
|
|
@@ -1,24 +1,26 @@
|
|
|
1
1
|
import { checkDeliveredOrder } from './check-delivered-order'
|
|
2
2
|
import { confirmDeliveryOrder } from './confirm-delivery-order'
|
|
3
|
+
import { createDeliveryOrderResolver } from './create-delivery-order'
|
|
3
4
|
import { deleteDeliveryOrder } from './delete-delivery-order'
|
|
4
5
|
import { deliveryOrderResolver } from './delivery-order'
|
|
5
6
|
import { deliveryOrderByReleaseGoodResolver } from './delivery-order-by-release-good'
|
|
6
7
|
import { deliveryOrderItemsResolver } from './delivery-order-items'
|
|
8
|
+
import { deliveryOrderReportResolver } from './delivery-order-report'
|
|
7
9
|
import { deliveryOrderRequestsResolver } from './delivery-order-requests'
|
|
8
10
|
import { deliveryOrdersResolver } from './delivery-orders'
|
|
9
11
|
import { dispatchDeliveryOrder } from './dispatch-delivery-order'
|
|
12
|
+
import { dispatchManualDeliveryOrder } from './dispatch-manual-delivery-order'
|
|
10
13
|
import { generateDeliveryOrder, generateDeliveryOrderResolver } from './generate-delivery-order'
|
|
14
|
+
import { manualDeliveryOrderItemsResolver } from './manual-delivery-order-items'
|
|
11
15
|
import { receiveDeliveryOrder } from './receive-delivery-order'
|
|
12
16
|
import { rejectDeliveryOrder } from './reject-delivery-order'
|
|
13
|
-
import { updateDeliveryOrder } from './update-delivery-order'
|
|
14
17
|
import { submitGoodsDeliveryNote } from './submit-goods-delivery-note'
|
|
15
|
-
import {
|
|
16
|
-
import { manualDeliveryOrderItemsResolver } from './manual-delivery-order-items'
|
|
17
|
-
import { dispatchManualDeliveryOrder } from './dispatch-manual-delivery-order'
|
|
18
|
+
import { updateDeliveryOrder } from './update-delivery-order'
|
|
18
19
|
|
|
19
20
|
export const Query = {
|
|
20
21
|
...deliveryOrdersResolver,
|
|
21
22
|
...deliveryOrderResolver,
|
|
23
|
+
...deliveryOrderReportResolver,
|
|
22
24
|
...deliveryOrderRequestsResolver,
|
|
23
25
|
...deliveryOrderByReleaseGoodResolver,
|
|
24
26
|
...deliveryOrderItemsResolver,
|
|
@@ -39,26 +39,25 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
|
|
|
39
39
|
|
|
40
40
|
let foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
|
|
41
41
|
where: { name, status: ORDER_STATUS.PENDING },
|
|
42
|
-
relations: [
|
|
43
|
-
'domain',
|
|
44
|
-
'bizplace',
|
|
45
|
-
'bizplace.domain',
|
|
46
|
-
'bizplace.company',
|
|
47
|
-
'bizplace.company.domain',
|
|
48
|
-
'orderProducts',
|
|
49
|
-
'orderProducts.product',
|
|
50
|
-
'orderProducts.product.productDetails',
|
|
51
|
-
'orderInventories',
|
|
52
|
-
'orderInventories.product',
|
|
53
|
-
'orderVass'
|
|
54
|
-
]
|
|
42
|
+
relations: ['domain', 'bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain', 'orderVass']
|
|
55
43
|
})
|
|
56
44
|
|
|
57
45
|
if (!foundReleaseGood) throw new Error(`Release good order doesn't exists.`)
|
|
58
|
-
|
|
46
|
+
|
|
47
|
+
// query orderInventories separately from releaseGood to reduce resource usage
|
|
48
|
+
let foundOIs: OrderInventory[] = await tx.getRepository(OrderInventory).find({
|
|
49
|
+
where: { domain, releaseGood: foundReleaseGood },
|
|
50
|
+
relations: ['product']
|
|
51
|
+
})
|
|
52
|
+
|
|
53
|
+
// query orderProducts separately from releaseGood to reduce resource usage
|
|
54
|
+
let foundOPs: OrderProduct[] = await tx.getRepository(OrderProduct).find({
|
|
55
|
+
where: { domain, releaseGood: foundReleaseGood },
|
|
56
|
+
relations: ['product', 'product.productDetails']
|
|
57
|
+
})
|
|
58
|
+
|
|
59
59
|
let foundBundleInfo: any[] = JSON.parse(foundReleaseGood.bundleInfo)
|
|
60
60
|
let foundOVs: OrderVas[] = foundReleaseGood.orderVass
|
|
61
|
-
let foundOPs: OrderProduct[] = foundReleaseGood.orderProducts
|
|
62
61
|
let customerBizplace: Bizplace = foundReleaseGood.bizplace
|
|
63
62
|
const companyDomain: Domain = customerBizplace?.company.domain
|
|
64
63
|
const sellercraft: Sellercraft = await tx
|
|
@@ -68,7 +67,7 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
|
|
|
68
67
|
if (foundReleaseGood.type == 'b2c') {
|
|
69
68
|
if (sellercraft) {
|
|
70
69
|
const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
71
|
-
foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood)
|
|
70
|
+
foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...foundReleaseGood, orderProducts: foundOPs })
|
|
72
71
|
} else {
|
|
73
72
|
// find for any existing marketplace store connections
|
|
74
73
|
let marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
|
|
@@ -115,11 +114,9 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
|
|
|
115
114
|
if (foundMarketplaceProductVariations) {
|
|
116
115
|
await Promise.all(
|
|
117
116
|
foundMarketplaceProductVariations.map(async variation => {
|
|
118
|
-
|
|
119
|
-
variation.reserveQty -= oi.releaseQty
|
|
117
|
+
variation.reserveQty -= oi.releaseQty
|
|
120
118
|
|
|
121
|
-
|
|
122
|
-
}
|
|
119
|
+
await tx.getRepository(MarketplaceProductVariation).save(variation)
|
|
123
120
|
})
|
|
124
121
|
)
|
|
125
122
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { DeliveryOrder } from './delivery-order'
|
|
2
2
|
import { DeliveryOrderList } from './delivery-order-list'
|
|
3
3
|
import { DeliveryOrderPatch } from './delivery-order-patch'
|
|
4
|
-
import { NewDeliveryOrder } from './new-delivery-order'
|
|
5
4
|
import { GenerateDeliveryOrder } from './generate-delivery-order'
|
|
5
|
+
import { NewDeliveryOrder } from './new-delivery-order'
|
|
6
6
|
|
|
7
7
|
export const Mutation = `
|
|
8
8
|
createDeliveryOrder (
|
|
@@ -66,6 +66,7 @@ export const Query = `
|
|
|
66
66
|
deliveryOrders(filters: [Filter], pagination: Pagination, sortings: [Sorting]): DeliveryOrderList
|
|
67
67
|
deliveryOrder(name: String!): DeliveryOrder
|
|
68
68
|
deliveryOrderRequests(filters: [Filter], pagination: Pagination, sortings: [Sorting]): DeliveryOrderList
|
|
69
|
+
deliveryOrderReport(filters: [Filter], pagination: Pagination, sortings: [Sorting]): DeliveryOrderList
|
|
69
70
|
deliveryOrderByReleaseGood(releaseGoodNo: String!): DeliveryOrderList
|
|
70
71
|
deliveryOrderItems(name: String!): OrderInventoryList
|
|
71
72
|
manualDeliveryOrderItems(name: String!): OrderInventoryList
|