@things-factory/sales-base 4.3.414 → 4.3.416
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/manifest/manifest-mutation.js +64 -50
- package/dist-server/service/manifest/manifest-mutation.js.map +1 -1
- package/dist-server/service/manifest/manifest-query.js +83 -16
- package/dist-server/service/manifest/manifest-query.js.map +1 -1
- package/dist-server/service/manifest/manifest-type.js +53 -11
- package/dist-server/service/manifest/manifest-type.js.map +1 -1
- package/dist-server/service/order-package/order-package-query.js +19 -0
- package/dist-server/service/order-package/order-package-query.js.map +1 -1
- package/package.json +4 -4
- package/server/service/manifest/manifest-mutation.ts +68 -64
- package/server/service/manifest/manifest-query.ts +123 -21
- package/server/service/manifest/manifest-type.ts +48 -9
- package/server/service/order-package/order-package-query.ts +36 -3
|
@@ -27,7 +27,7 @@ const release_good_1 = require("../release-good/release-good");
|
|
|
27
27
|
const manifest_1 = require("./manifest");
|
|
28
28
|
const manifest_type_1 = require("./manifest-type");
|
|
29
29
|
let ManifestMutation = class ManifestMutation {
|
|
30
|
-
async updateManifest(manifestId, status, shippingProvider, removePackages, context) {
|
|
30
|
+
async updateManifest(manifestId, status, shippingProvider, removePackages, context, isPreventDeleteManifest) {
|
|
31
31
|
const { domain, tx } = context.state;
|
|
32
32
|
const ManifestRepo = tx.getRepository(manifest_1.Manifest);
|
|
33
33
|
//update status
|
|
@@ -65,9 +65,12 @@ let ManifestMutation = class ManifestMutation {
|
|
|
65
65
|
return Object.assign(Object.assign({}, rg), { manifest: totalOPK <= 0 ? null : rg.manifest, manifestedBy: totalOPK <= 0 ? null : rg.manifestedBy, manifestedAt: totalOPK <= 0 ? null : rg.manifestedAt });
|
|
66
66
|
}));
|
|
67
67
|
await tx.getRepository(release_good_1.ReleaseGood).save(releaseGoods);
|
|
68
|
-
if
|
|
69
|
-
|
|
70
|
-
|
|
68
|
+
//validation preventation for deleting manifest if delete trackingNo on scanning page
|
|
69
|
+
if (isPreventDeleteManifest !== true) {
|
|
70
|
+
if (removePackages.length == totalTrackingNo) {
|
|
71
|
+
await tx.getRepository(manifest_1.Manifest).delete(manifestId);
|
|
72
|
+
return false;
|
|
73
|
+
}
|
|
71
74
|
}
|
|
72
75
|
}
|
|
73
76
|
return true;
|
|
@@ -79,50 +82,21 @@ let ManifestMutation = class ManifestMutation {
|
|
|
79
82
|
}
|
|
80
83
|
async generateManifest(manifest, context) {
|
|
81
84
|
const { domain, user, tx } = context.state;
|
|
82
|
-
const
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
if (openManifest) {
|
|
95
|
-
manifest = openManifest;
|
|
96
|
-
}
|
|
97
|
-
else {
|
|
98
|
-
manifest = new manifest_1.Manifest();
|
|
99
|
-
manifest.domain = domain;
|
|
100
|
-
manifest.shippingProvider = transporter;
|
|
101
|
-
manifest.name = utils_1.OrderNoGenerator.manifest();
|
|
102
|
-
manifest.creator = user;
|
|
103
|
-
manifest = await tx.getRepository(manifest_1.Manifest).save(manifest);
|
|
104
|
-
}
|
|
105
|
-
const curDate = new Date();
|
|
106
|
-
await Promise.all(items.map(async (item) => {
|
|
107
|
-
let orderPackage = await tx
|
|
108
|
-
.getRepository(order_package_1.OrderPackage)
|
|
109
|
-
.createQueryBuilder('op')
|
|
110
|
-
.innerJoinAndSelect('op.releaseGood', 'rg')
|
|
111
|
-
.where('rg.ref_no = :refNo', { refNo: item.refNo })
|
|
112
|
-
.andWhere('op.domain_id = :domainId', { domainId: domain.id })
|
|
113
|
-
.andWhere('op.tracking_no = :trackingNo', { trackingNo: item.trackingNo })
|
|
114
|
-
.getOne();
|
|
115
|
-
await tx
|
|
116
|
-
.getRepository(order_package_1.OrderPackage)
|
|
117
|
-
.update({ id: orderPackage.id }, { manifest: manifest, updater: user, manifestedBy: user.id, manifestedAt: curDate });
|
|
118
|
-
await tx
|
|
119
|
-
.getRepository(release_good_1.ReleaseGood)
|
|
120
|
-
.update({ id: orderPackage.releaseGood.id }, { manifest: manifest, updater: user, manifestedBy: user.id, manifestedAt: curDate });
|
|
121
|
-
}));
|
|
122
|
-
}
|
|
123
|
-
return true;
|
|
85
|
+
const manifestTransporter = manifest.transporter;
|
|
86
|
+
let newManifest;
|
|
87
|
+
newManifest = new manifest_1.Manifest();
|
|
88
|
+
newManifest.domain = domain;
|
|
89
|
+
newManifest.shippingProvider = manifestTransporter;
|
|
90
|
+
newManifest.name = utils_1.OrderNoGenerator.manifest();
|
|
91
|
+
newManifest.creator = user;
|
|
92
|
+
await tx.getRepository(manifest_1.Manifest).insert(newManifest);
|
|
93
|
+
let manifestInfo = await tx.getRepository(manifest_1.Manifest).findOne({
|
|
94
|
+
where: { name: newManifest.name, domain }
|
|
95
|
+
});
|
|
96
|
+
return manifestInfo;
|
|
124
97
|
}
|
|
125
98
|
async addTrackingNo(manifestId, trackingNo, shippingProvider, context) {
|
|
99
|
+
var _a;
|
|
126
100
|
const { domain, user, tx } = context.state;
|
|
127
101
|
const releaseGoodRepo = tx.getRepository(release_good_1.ReleaseGood);
|
|
128
102
|
const orderPackageRepo = tx.getRepository(order_package_1.OrderPackage);
|
|
@@ -138,13 +112,42 @@ let ManifestMutation = class ManifestMutation {
|
|
|
138
112
|
if (foundOrderPackage.manifest) {
|
|
139
113
|
throw new Error(i18next_1.default.t('error.tracking_no_already_scanned_before'));
|
|
140
114
|
}
|
|
141
|
-
if (foundOrderPackage.transporter !== shippingProvider) {
|
|
115
|
+
if (((_a = foundOrderPackage.transporter) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== (shippingProvider === null || shippingProvider === void 0 ? void 0 : shippingProvider.toLowerCase())) {
|
|
142
116
|
throw new Error(i18next_1.default.t('error.tracking_no_belongs_to_x', { x: foundOrderPackage.transporter }));
|
|
143
117
|
}
|
|
144
118
|
await orderPackageRepo.update({ id: foundOrderPackage.id }, { manifest: manifestId, manifestedAt: new Date(), manifestedBy: user });
|
|
145
119
|
await releaseGoodRepo.update({ id: foundReleaseOrder.id }, { manifest: manifestId, manifestedAt: new Date(), manifestedBy: user });
|
|
146
120
|
return true;
|
|
147
121
|
}
|
|
122
|
+
async submitTrackingNos(manifestId, patches, context) {
|
|
123
|
+
const { domain, user, tx } = context.state;
|
|
124
|
+
const trackingNos = patches.map(patch => patch.trackingNo);
|
|
125
|
+
const orderPackageRepo = tx.getRepository(order_package_1.OrderPackage);
|
|
126
|
+
//check if order belongs to same shipping provider
|
|
127
|
+
let foundOrderPackages = await orderPackageRepo.find({
|
|
128
|
+
where: { trackingNo: (0, typeorm_1.In)(trackingNos), domain },
|
|
129
|
+
relations: ['releaseGood', 'bizplace']
|
|
130
|
+
});
|
|
131
|
+
let foundReleaseOrders = foundOrderPackages.map(foundOrderPackage => foundOrderPackage.releaseGood);
|
|
132
|
+
const releaseGoodIds = foundReleaseOrders.map(rg => rg.id);
|
|
133
|
+
await tx
|
|
134
|
+
.createQueryBuilder()
|
|
135
|
+
.update(order_package_1.OrderPackage)
|
|
136
|
+
.set({
|
|
137
|
+
manifest: { id: manifestId },
|
|
138
|
+
manifestedAt: new Date(),
|
|
139
|
+
manifestedBy: user
|
|
140
|
+
})
|
|
141
|
+
.where('trackingNo IN (:...trackingNos)', { trackingNos })
|
|
142
|
+
.execute();
|
|
143
|
+
await tx
|
|
144
|
+
.createQueryBuilder()
|
|
145
|
+
.update(release_good_1.ReleaseGood)
|
|
146
|
+
.set({ manifest: manifestId, manifestedAt: new Date(), manifestedBy: user })
|
|
147
|
+
.where('id IN (:...releaseGoodIds)', { releaseGoodIds })
|
|
148
|
+
.execute();
|
|
149
|
+
return foundOrderPackages;
|
|
150
|
+
}
|
|
148
151
|
async dispatchManifest(name, patch, context) {
|
|
149
152
|
const { domain, user, tx } = context.state;
|
|
150
153
|
const manifest = await tx.getRepository(manifest_1.Manifest).findOne({
|
|
@@ -181,13 +184,14 @@ __decorate([
|
|
|
181
184
|
__param(2, (0, type_graphql_1.Arg)('shippingProvider', { nullable: true })),
|
|
182
185
|
__param(3, (0, type_graphql_1.Arg)('removePackages', type => [String], { nullable: true })),
|
|
183
186
|
__param(4, (0, type_graphql_1.Ctx)()),
|
|
187
|
+
__param(5, (0, type_graphql_1.Arg)('isPreventDeleteManifest', { nullable: true })),
|
|
184
188
|
__metadata("design:type", Function),
|
|
185
|
-
__metadata("design:paramtypes", [String, String, String, Array, Object]),
|
|
189
|
+
__metadata("design:paramtypes", [String, String, String, Array, Object, Boolean]),
|
|
186
190
|
__metadata("design:returntype", Promise)
|
|
187
191
|
], ManifestMutation.prototype, "updateManifest", null);
|
|
188
192
|
__decorate([
|
|
189
193
|
(0, type_graphql_1.Directive)('@transaction'),
|
|
190
|
-
(0, type_graphql_1.Mutation)(returns =>
|
|
194
|
+
(0, type_graphql_1.Mutation)(returns => manifest_1.Manifest, { description: 'To delete Manifest' }),
|
|
191
195
|
__param(0, (0, type_graphql_1.Arg)('name')),
|
|
192
196
|
__param(1, (0, type_graphql_1.Ctx)()),
|
|
193
197
|
__metadata("design:type", Function),
|
|
@@ -196,7 +200,7 @@ __decorate([
|
|
|
196
200
|
], ManifestMutation.prototype, "deleteManifest", null);
|
|
197
201
|
__decorate([
|
|
198
202
|
(0, type_graphql_1.Directive)('@transaction'),
|
|
199
|
-
(0, type_graphql_1.Mutation)(returns =>
|
|
203
|
+
(0, type_graphql_1.Mutation)(returns => manifest_1.Manifest, { description: 'To generate new Manifest' }),
|
|
200
204
|
__param(0, (0, type_graphql_1.Arg)('manifest')),
|
|
201
205
|
__param(1, (0, type_graphql_1.Ctx)()),
|
|
202
206
|
__metadata("design:type", Function),
|
|
@@ -214,6 +218,16 @@ __decorate([
|
|
|
214
218
|
__metadata("design:paramtypes", [String, String, String, Object]),
|
|
215
219
|
__metadata("design:returntype", Promise)
|
|
216
220
|
], ManifestMutation.prototype, "addTrackingNo", null);
|
|
221
|
+
__decorate([
|
|
222
|
+
(0, type_graphql_1.Directive)('@transaction'),
|
|
223
|
+
(0, type_graphql_1.Mutation)(returns => [order_package_1.OrderPackage], { description: 'To update multiple trackingNo' }),
|
|
224
|
+
__param(0, (0, type_graphql_1.Arg)('manifestId', { nullable: true })),
|
|
225
|
+
__param(1, (0, type_graphql_1.Arg)('patches', type => [manifest_type_1.ManifestItem])),
|
|
226
|
+
__param(2, (0, type_graphql_1.Ctx)()),
|
|
227
|
+
__metadata("design:type", Function),
|
|
228
|
+
__metadata("design:paramtypes", [String, Array, Object]),
|
|
229
|
+
__metadata("design:returntype", Promise)
|
|
230
|
+
], ManifestMutation.prototype, "submitTrackingNos", null);
|
|
217
231
|
__decorate([
|
|
218
232
|
(0, type_graphql_1.Directive)('@transaction'),
|
|
219
233
|
(0, type_graphql_1.Mutation)(returns => manifest_1.Manifest, { description: 'To dispatch Manifest when courier service collect packages' }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest-mutation.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,sDAA6B;AAC7B,+CAMqB;AACrB,qCAIgB;AAEhB,uEAAiE;AAEjE,+CAGwB;AACxB,uCAA8C;AAC9C,kEAA6D;AAC7D,+DAA0D;AAC1D,yCAGmB;AACnB,
|
|
1
|
+
{"version":3,"file":"manifest-mutation.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,sDAA6B;AAC7B,+CAMqB;AACrB,qCAIgB;AAEhB,uEAAiE;AAEjE,+CAGwB;AACxB,uCAA8C;AAC9C,kEAA6D;AAC7D,+DAA0D;AAC1D,yCAGmB;AACnB,mDAIwB;AAGjB,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAGrB,AAAN,KAAK,CAAC,cAAc,CACqB,UAAkB,EACtB,MAAc,EACJ,gBAAwB,EACR,cAAwB,EAC9E,OAAY,EACiC,uBAAiC;QAErF,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QACpC,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAA;QAC/C,eAAe;QACf,IAAI,MAAM,EAAE;YACV,IAAI,MAAM,IAAI,2BAAe,CAAC,IAAI,EAAE;gBAClC,sGAAsG;gBAEtG,IAAI,cAAc,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC;oBAC3C,KAAK,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,2BAAe,CAAC,IAAI,EAAE;iBAClE,CAAC,CAAA;gBAEF,IAAI,cAAc,CAAC,MAAM,IAAI,CAAC,EAAE;oBAC9B,MAAM,YAAY,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,2BAAe,CAAC,QAAQ,EAAE,CAAC,CAAA;iBAC9F;qBAAM,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpC,IAAI,aAAa,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;oBACvD,MAAM,IAAI,KAAK,CAAC,iBAAO,CAAC,CAAC,CAAC,8CAA8C,EAAE,EAAE,CAAC,EAAE,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAA;iBAC5G;aACF;YAED,MAAM,YAAY,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;SAC1D;QAED,+BAA+B;QAC/B,IAAI,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,MAAM,IAAG,CAAC,EAAE;YAC9B,4DAA4D;YAC5D,IAAI,eAAe,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,4BAAY,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,CAAA;YAErG,IAAI,aAAa,GAAmB,MAAM,EAAE;iBACzC,aAAa,CAAC,4BAAY,CAAC;iBAC3B,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;YAExE,IAAI,YAAY,GAAkB,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,CAAA;YAE/E,MAAM,EAAE;iBACL,aAAa,CAAC,4BAAY,CAAC;iBAC3B,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,IAAA,YAAE,EAAC,cAAc,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAA;YAE3G,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,YAAY,CAAC,GAAG,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;gBAC1B,IAAI,QAAQ,GAAG,MAAM,EAAE;qBACpB,aAAa,CAAC,4BAAY,CAAC;qBAC3B,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAA,aAAG,EAAC,IAAA,gBAAM,GAAE,CAAC,EAAE,EAAE,CAAC,CAAA;gBAEpE,uCACK,EAAE,KACL,QAAQ,EAAE,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,EAC5C,YAAY,EAAE,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,EACpD,YAAY,EAAE,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,IACrD;YACH,CAAC,CAAC,CACH,CAAA;YAED,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAW,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YAEtD,qFAAqF;YACrF,IAAI,uBAAuB,KAAK,IAAI,EAAE;gBACpC,IAAI,cAAc,CAAC,MAAM,IAAI,eAAe,EAAE;oBAC5C,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;oBACnD,OAAO,KAAK,CAAA;iBACb;aACF;SACF;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc,CAAc,IAAY,EAAS,OAAY;QACjE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEpC,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QACzD,OAAO,IAAI,CAAA;IACb,CAAC;IAIK,AAAN,KAAK,CAAC,gBAAgB,CAAkB,QAAqB,EAAS,OAAY;QAChF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAC1C,MAAM,mBAAmB,GAAQ,QAAQ,CAAC,WAAW,CAAA;QAErD,IAAI,WAAqB,CAAA;QAEzB,WAAW,GAAG,IAAI,mBAAQ,EAAE,CAAA;QAC5B,WAAW,CAAC,MAAM,GAAG,MAAM,CAAA;QAC3B,WAAW,CAAC,gBAAgB,GAAG,mBAAmB,CAAA;QAClD,WAAW,CAAC,IAAI,GAAG,wBAAgB,CAAC,QAAQ,EAAE,CAAA;QAC9C,WAAW,CAAC,OAAO,GAAG,IAAI,CAAA;QAC1B,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QAEpD,IAAI,YAAY,GAAa,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC;YACpE,KAAK,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE;SAC1C,CAAC,CAAA;QAEF,OAAO,YAAY,CAAA;IACrB,CAAC;IAIK,AAAN,KAAK,CAAC,aAAa,CACsB,UAAkB,EAClB,UAAkB,EACZ,gBAAwB,EAC9D,OAAY;;QAEnB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAC1C,MAAM,eAAe,GAAG,EAAE,CAAC,aAAa,CAAC,0BAAW,CAAC,CAAA;QACrD,MAAM,gBAAgB,GAAG,EAAE,CAAC,aAAa,CAAC,4BAAY,CAAC,CAAA;QACvD,kDAAkD;QAClD,IAAI,iBAAiB,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC;YACrD,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;YAC7B,SAAS,EAAE,CAAC,aAAa,EAAE,UAAU,CAAC;SACvC,CAAC,CAAA;QAEF,IAAI,iBAAiB,GAAgB,iBAAiB,CAAC,WAAW,CAAA;QAElE,IAAI,CAAC,iBAAiB,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,iBAAO,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAA;SAC5D;QAED,IAAI,iBAAiB,CAAC,QAAQ,EAAE;YAC9B,MAAM,IAAI,KAAK,CAAC,iBAAO,CAAC,CAAC,CAAC,0CAA0C,CAAC,CAAC,CAAA;SACvE;QAED,IAAI,CAAA,MAAA,iBAAiB,CAAC,WAAW,0CAAE,WAAW,EAAE,OAAK,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,WAAW,EAAE,CAAA,EAAE;YACpF,MAAM,IAAI,KAAK,CAAC,iBAAO,CAAC,CAAC,CAAC,gCAAgC,EAAE,EAAE,CAAC,EAAE,iBAAiB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;SACnG;QAED,MAAM,gBAAgB,CAAC,MAAM,CAC3B,EAAE,EAAE,EAAE,iBAAiB,CAAC,EAAE,EAAE,EAC5B,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CACvE,CAAA;QAED,MAAM,eAAe,CAAC,MAAM,CAC1B,EAAE,EAAE,EAAE,iBAAiB,CAAC,EAAE,EAAE,EAC5B,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CACvE,CAAA;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAIK,AAAN,KAAK,CAAC,iBAAiB,CACkB,UAAkB,EACjB,OAAuB,EACxD,OAAY;QAEnB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAC1C,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QAC1D,MAAM,gBAAgB,GAAG,EAAE,CAAC,aAAa,CAAC,4BAAY,CAAC,CAAA;QACvD,kDAAkD;QAClD,IAAI,kBAAkB,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC;YACnD,KAAK,EAAE,EAAE,UAAU,EAAE,IAAA,YAAE,EAAC,WAAW,CAAC,EAAE,MAAM,EAAE;YAC9C,SAAS,EAAE,CAAC,aAAa,EAAE,UAAU,CAAC;SACvC,CAAC,CAAA;QAEF,IAAI,kBAAkB,GAAkB,kBAAkB,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAA;QAElH,MAAM,cAAc,GAAG,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;QAE1D,MAAM,EAAE;aACL,kBAAkB,EAAE;aACpB,MAAM,CAAC,4BAAY,CAAC;aACpB,GAAG,CAAC;YACH,QAAQ,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE;YAC5B,YAAY,EAAE,IAAI,IAAI,EAAE;YACxB,YAAY,EAAE,IAAI;SACnB,CAAC;aACD,KAAK,CAAC,iCAAiC,EAAE,EAAE,WAAW,EAAE,CAAC;aACzD,OAAO,EAAE,CAAA;QAEZ,MAAM,EAAE;aACL,kBAAkB,EAAE;aACpB,MAAM,CAAC,0BAAW,CAAC;aACnB,GAAG,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;aAC3E,KAAK,CAAC,4BAA4B,EAAE,EAAE,cAAc,EAAE,CAAC;aACvD,OAAO,EAAE,CAAA;QAEZ,OAAO,kBAAkB,CAAA;IAC3B,CAAC;IAIK,AAAN,KAAK,CAAC,gBAAgB,CACP,IAAY,EACX,KAAoB,EAC3B,OAAY;QAEnB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE1C,MAAM,QAAQ,GAAa,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC;YAClE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAA,aAAG,EAAC,2BAAe,CAAC,MAAM,CAAC,EAAE;SAC7D,CAAC,CAAA;QACF,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAA;QAExD,IAAI,aAAa,GAAU,MAAM,EAAE,CAAC,aAAa,CAAC,4BAAY,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;QACrG,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,GAAiB,EAAE,EAAE;YACtD,uCACK,GAAG,KACN,kBAAkB,EAAE,+BAAmB,CAAC,UAAU,EAClD,OAAO,EAAE,IAAI,IACd;QACH,CAAC,CAAC,CAAA;QACF,MAAM,EAAE,CAAC,aAAa,CAAC,4BAAY,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QAExD,IAAI,YAAY,GAAU,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAW,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;QAEnG,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAwB,EAAE,EAAE;YAC3D,uCACK,WAAW,KACd,kBAAkB,EAAE,+BAAmB,CAAC,UAAU,EAClD,OAAO,EAAE,IAAI,IACd;QACH,CAAC,CAAC,CAAA;QACF,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAW,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAEtD,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;QAE1E,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,IAAI,+CACtD,QAAQ,GACR,KAAK,KACR,MAAM,EAAE,yBAAc,CAAC,MAAM,EAC7B,YAAY,EAAE,IAAI,IAAI,EAAE,EACxB,OAAO,EAAE,IAAI,IACb,CAAA;QAEF,IAAI;YACF,IAAA,iCAAc,EAAC,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,mBAAmB,EAAE,OAAO,CAAC,CAAA;SACvE;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;SACf;QAED,OAAO,aAAa,CAAA;IACtB,CAAC;CACF,CAAA;AAlPO;IAFL,IAAA,wBAAS,EAAC,cAAc,CAAC;IACzB,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;IAEjE,WAAA,IAAA,kBAAG,EAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IACrC,WAAA,IAAA,kBAAG,EAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IACjC,WAAA,IAAA,kBAAG,EAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IAC3C,WAAA,IAAA,kBAAG,EAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IAC3D,WAAA,IAAA,kBAAG,GAAE,CAAA;IACL,WAAA,IAAA,kBAAG,EAAC,yBAAyB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;;;;sDAiEpD;AAIK;IAFL,IAAA,wBAAS,EAAC,cAAc,CAAC;IACzB,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,mBAAQ,EAAE,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;IAC/C,WAAA,IAAA,kBAAG,EAAC,MAAM,CAAC,CAAA;IAAgB,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;sDAKrD;AAIK;IAFL,IAAA,wBAAS,EAAC,cAAc,CAAC;IACzB,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,mBAAQ,EAAE,EAAE,WAAW,EAAE,0BAA0B,EAAE,CAAC;IACnD,WAAA,IAAA,kBAAG,EAAC,UAAU,CAAC,CAAA;IAAyB,WAAA,IAAA,kBAAG,GAAE,CAAA;;qCAAnB,2BAAW;;wDAkB5D;AAIK;IAFL,IAAA,wBAAS,EAAC,cAAc,CAAC;IACzB,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,kCAAkC,EAAE,CAAC;IAE/E,WAAA,IAAA,kBAAG,EAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IACrC,WAAA,IAAA,kBAAG,EAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IACrC,WAAA,IAAA,kBAAG,EAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IAC3C,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;qDAoCP;AAIK;IAFL,IAAA,wBAAS,EAAC,cAAc,CAAC;IACzB,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC,4BAAY,CAAC,EAAE,EAAE,WAAW,EAAE,+BAA+B,EAAE,CAAC;IAEnF,WAAA,IAAA,kBAAG,EAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IACrC,WAAA,IAAA,kBAAG,EAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,4BAAY,CAAC,CAAC,CAAA;IACtC,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;yDAkCP;AAIK;IAFL,IAAA,wBAAS,EAAC,cAAc,CAAC;IACzB,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,mBAAQ,EAAE,EAAE,WAAW,EAAE,4DAA4D,EAAE,CAAC;IAE1G,WAAA,IAAA,kBAAG,EAAC,MAAM,CAAC,CAAA;IACX,WAAA,IAAA,kBAAG,EAAC,OAAO,CAAC,CAAA;IACZ,WAAA,IAAA,kBAAG,GAAE,CAAA;;6CADe,6BAAa;;wDAgDnC;AApPU,gBAAgB;IAD5B,IAAA,uBAAQ,EAAC,mBAAQ,CAAC;GACN,gBAAgB,CAqP5B;AArPY,4CAAgB"}
|
|
@@ -22,17 +22,24 @@ const order_package_1 = require("../order-package/order-package");
|
|
|
22
22
|
const manifest_1 = require("./manifest");
|
|
23
23
|
const manifest_type_1 = require("./manifest-type");
|
|
24
24
|
let ManifestQuery = class ManifestQuery {
|
|
25
|
-
async manifest(name, context, sortings) {
|
|
25
|
+
async manifest(name, context, sortings, filters) {
|
|
26
|
+
var _a;
|
|
26
27
|
const { domain, tx } = context.state;
|
|
28
|
+
const filterValue = filters ? (_a = filters[0]) === null || _a === void 0 ? void 0 : _a.value : null;
|
|
27
29
|
const manifest = await (0, typeorm_1.getRepository)(manifest_1.Manifest).findOne({ where: { domain, name } });
|
|
28
30
|
let qb = (0, typeorm_1.getRepository)(order_package_1.OrderPackage).createQueryBuilder('opk');
|
|
29
|
-
qb.innerJoinAndSelect('opk.releaseGood', 'rg')
|
|
31
|
+
qb.innerJoinAndSelect('opk.releaseGood', 'rg')
|
|
32
|
+
.innerJoinAndSelect('rg.bizplace', 'bz')
|
|
33
|
+
.where('opk.manifest_id = :manifestId', { manifestId: manifest.id });
|
|
34
|
+
if ((filterValue === null || filterValue === void 0 ? void 0 : filterValue.length) > 0) {
|
|
35
|
+
qb.andWhere('bz.name = :name', { name: filterValue });
|
|
36
|
+
}
|
|
30
37
|
if (sortings.length > 0) {
|
|
31
38
|
const sort = (sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [sort.name]: sort.desc ? 'DESC' : 'ASC' })), {});
|
|
32
39
|
qb.orderBy(sort);
|
|
33
40
|
}
|
|
34
41
|
else {
|
|
35
|
-
qb.orderBy('opk.
|
|
42
|
+
qb.orderBy('opk.manifestedAt', 'DESC');
|
|
36
43
|
}
|
|
37
44
|
const orderPackages = await qb.getMany();
|
|
38
45
|
const trackingNos = orderPackages.map(opk => {
|
|
@@ -49,12 +56,14 @@ let ManifestQuery = class ManifestQuery {
|
|
|
49
56
|
dispatchmentStatus: releaseGood.dispatchmentStatus,
|
|
50
57
|
orderStatus: releaseGood.status,
|
|
51
58
|
orderRemark: releaseGood.remark,
|
|
52
|
-
manifestedAt: opk.manifestedAt
|
|
59
|
+
manifestedAt: opk.manifestedAt,
|
|
60
|
+
bizplaceId: releaseGood.bizplace.id,
|
|
61
|
+
bizplaceName: releaseGood.bizplace.name
|
|
53
62
|
};
|
|
54
63
|
});
|
|
55
64
|
return Object.assign(Object.assign({}, manifest), { trackingNos });
|
|
56
65
|
}
|
|
57
|
-
async manifests(params, context) {
|
|
66
|
+
async manifests(params, context, isSelectOpen) {
|
|
58
67
|
const { domain } = context.state;
|
|
59
68
|
let orderInfoFilter;
|
|
60
69
|
const orderInfoParamIdx = params.filters.findIndex(param => param.name === 'orderInfo');
|
|
@@ -65,9 +74,22 @@ let ManifestQuery = class ManifestQuery {
|
|
|
65
74
|
let trackingNoFilter;
|
|
66
75
|
const trackingNoParamIdx = params.filters.findIndex(param => param.name === 'trackingNo');
|
|
67
76
|
if (trackingNoParamIdx >= 0) {
|
|
68
|
-
trackingNoFilter = params.filters[trackingNoParamIdx].value
|
|
77
|
+
trackingNoFilter = params.filters[trackingNoParamIdx].value
|
|
78
|
+
.split(',')
|
|
79
|
+
.map(value => `%${value.trim().toLowerCase()}%`);
|
|
69
80
|
params.filters.splice(trackingNoParamIdx, 1);
|
|
70
81
|
}
|
|
82
|
+
let nameFilter;
|
|
83
|
+
const nameParamIdx = params.filters.findIndex(param => param.name === 'name');
|
|
84
|
+
if (nameParamIdx >= 0) {
|
|
85
|
+
nameFilter = params.filters[nameParamIdx].value.split(',').map(value => `%${value.trim().toLowerCase()}%`);
|
|
86
|
+
params.filters.splice(nameParamIdx, 1);
|
|
87
|
+
}
|
|
88
|
+
let shippingProviderFilter;
|
|
89
|
+
const shipProviderIdx = params.filters.findIndex(param => param.name === 'shippingProvider');
|
|
90
|
+
if (shipProviderIdx >= 0) {
|
|
91
|
+
shippingProviderFilter = params.filters[shipProviderIdx].value;
|
|
92
|
+
}
|
|
71
93
|
const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
|
|
72
94
|
if (fromDateParamIdx >= 0) {
|
|
73
95
|
let fromDateVal = new Date(params.filters[fromDateParamIdx].value);
|
|
@@ -90,21 +112,56 @@ let ManifestQuery = class ManifestQuery {
|
|
|
90
112
|
relation: false
|
|
91
113
|
});
|
|
92
114
|
}
|
|
93
|
-
|
|
115
|
+
let qb = (0, typeorm_1.getRepository)(manifest_1.Manifest).createQueryBuilder('mf');
|
|
94
116
|
(0, shell_1.buildQuery)(qb, params, context);
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
117
|
+
if (isSelectOpen) {
|
|
118
|
+
qb.where('mf.domain_id = :domainId', { domainId: domain.id });
|
|
119
|
+
qb.andWhere('mf.status = :status', { status: 'OPEN' });
|
|
120
|
+
nameFilter ? qb.andWhere('LOWER(mf.name) ILIKE ANY (ARRAY[:...names])', { names: nameFilter }) : '';
|
|
121
|
+
if (shippingProviderFilter) {
|
|
122
|
+
qb.andWhere('LOWER(mf.shipping_provider) LIKE LOWER(:shipProvider)', { shipProvider: shippingProviderFilter });
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
qb.innerJoin('order_packages', 'op', 'op.manifest_id = mf.id');
|
|
127
|
+
qb.innerJoin('op.releaseGood', 'rg');
|
|
128
|
+
orderInfoFilter
|
|
129
|
+
? qb.andWhere('(rg.name ~* :orderInfoFilter or rg.ref_no ~* :orderInfoFilter or rg.ref_no_2 ~* :orderInfoFilter or rg.ref_no_3 ~* :orderInfoFilter)', { orderInfoFilter })
|
|
130
|
+
: '';
|
|
131
|
+
trackingNoFilter
|
|
132
|
+
? qb.andWhere('LOWER(op.tracking_no) ILIKE ANY (ARRAY[:...trackingNo])', { trackingNo: trackingNoFilter })
|
|
133
|
+
: '';
|
|
134
|
+
nameFilter ? qb.andWhere('LOWER(mf.name) ILIKE ANY (ARRAY[:...names])', { names: nameFilter }) : '';
|
|
135
|
+
}
|
|
102
136
|
const [items, total] = await qb.getManyAndCount();
|
|
103
137
|
await Promise.all(items.map(async (item) => {
|
|
104
138
|
item.totalTrackingNo = await (0, typeorm_1.getRepository)(order_package_1.OrderPackage).count({ where: { manifest: item.id } });
|
|
105
139
|
}));
|
|
106
140
|
return { items, total };
|
|
107
141
|
}
|
|
142
|
+
async validateTrackingNo(patches, context) {
|
|
143
|
+
const { domain } = context.state;
|
|
144
|
+
const trackingNumbers = patches.map(patch => patch.trackingNo);
|
|
145
|
+
let qb = (0, typeorm_1.getRepository)(order_package_1.OrderPackage)
|
|
146
|
+
.createQueryBuilder('op')
|
|
147
|
+
.where('op.domain_id = :domainId', { domainId: domain.id })
|
|
148
|
+
.andWhere('op.trackingNo IN (:...trackingNumbers)', { trackingNumbers });
|
|
149
|
+
let items = await qb.getMany();
|
|
150
|
+
const modifiedPatches = patches.map(patch => {
|
|
151
|
+
const matchingItem = items.find(item => item.trackingNo === patch.trackingNo);
|
|
152
|
+
if (!matchingItem) {
|
|
153
|
+
return Object.assign(Object.assign({}, patch), { remark: 'Tracking No does not exist' });
|
|
154
|
+
}
|
|
155
|
+
else if (matchingItem.transporter.toLowerCase() !== patch.transporter.toLowerCase()) {
|
|
156
|
+
return Object.assign(Object.assign({}, patch), { remark: 'Wrong transporter' });
|
|
157
|
+
}
|
|
158
|
+
else if (matchingItem.manifestedById) {
|
|
159
|
+
return Object.assign(Object.assign({}, patch), { remark: 'Tracking No already exists in another manifest' });
|
|
160
|
+
}
|
|
161
|
+
return patch;
|
|
162
|
+
});
|
|
163
|
+
return modifiedPatches;
|
|
164
|
+
}
|
|
108
165
|
async domain(manifest) {
|
|
109
166
|
return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(manifest.domainId);
|
|
110
167
|
}
|
|
@@ -120,18 +177,28 @@ __decorate([
|
|
|
120
177
|
__param(0, (0, type_graphql_1.Arg)('name')),
|
|
121
178
|
__param(1, (0, type_graphql_1.Ctx)()),
|
|
122
179
|
__param(2, (0, type_graphql_1.Arg)('sortings', type => [shell_1.Sorting], { nullable: true })),
|
|
180
|
+
__param(3, (0, type_graphql_1.Arg)('filters', type => [shell_1.Filter], { nullable: true })),
|
|
123
181
|
__metadata("design:type", Function),
|
|
124
|
-
__metadata("design:paramtypes", [String, Object, Array]),
|
|
182
|
+
__metadata("design:paramtypes", [String, Object, Array, Array]),
|
|
125
183
|
__metadata("design:returntype", Promise)
|
|
126
184
|
], ManifestQuery.prototype, "manifest", null);
|
|
127
185
|
__decorate([
|
|
128
186
|
(0, type_graphql_1.Query)(returns => manifest_type_1.ManifestList, { description: 'To fetch multiple Manifests' }),
|
|
129
187
|
__param(0, (0, type_graphql_1.Args)()),
|
|
130
188
|
__param(1, (0, type_graphql_1.Ctx)()),
|
|
189
|
+
__param(2, (0, type_graphql_1.Arg)('isSelectOpen', { nullable: true })),
|
|
131
190
|
__metadata("design:type", Function),
|
|
132
|
-
__metadata("design:paramtypes", [typeof (_a = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _a : Object, Object]),
|
|
191
|
+
__metadata("design:paramtypes", [typeof (_a = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _a : Object, Object, Boolean]),
|
|
133
192
|
__metadata("design:returntype", Promise)
|
|
134
193
|
], ManifestQuery.prototype, "manifests", null);
|
|
194
|
+
__decorate([
|
|
195
|
+
(0, type_graphql_1.Query)(type => [manifest_type_1.ValidateTrackingNoResponse], { description: 'To validate tracking no' }),
|
|
196
|
+
__param(0, (0, type_graphql_1.Arg)('patches', type => [manifest_type_1.ManifestItem])),
|
|
197
|
+
__param(1, (0, type_graphql_1.Ctx)()),
|
|
198
|
+
__metadata("design:type", Function),
|
|
199
|
+
__metadata("design:paramtypes", [Array, Object]),
|
|
200
|
+
__metadata("design:returntype", Promise)
|
|
201
|
+
], ManifestQuery.prototype, "validateTrackingNo", null);
|
|
135
202
|
__decorate([
|
|
136
203
|
(0, type_graphql_1.FieldResolver)(type => shell_1.Domain),
|
|
137
204
|
__param(0, (0, type_graphql_1.Root)()),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest-query.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"manifest-query.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,19 +9,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.TrackingNo = exports.ManifestList = exports.
|
|
12
|
+
exports.TrackingNo = exports.ManifestList = exports.NewManifest = exports.ValidateTrackingNoResponse = exports.ManifestItem = exports.ManifestPatch = void 0;
|
|
13
13
|
const type_graphql_1 = require("type-graphql");
|
|
14
14
|
const manifest_1 = require("./manifest");
|
|
15
|
-
let NewManifest = class NewManifest {
|
|
16
|
-
};
|
|
17
|
-
__decorate([
|
|
18
|
-
(0, type_graphql_1.Field)(type => [ManifestItem]),
|
|
19
|
-
__metadata("design:type", Array)
|
|
20
|
-
], NewManifest.prototype, "manifestItems", void 0);
|
|
21
|
-
NewManifest = __decorate([
|
|
22
|
-
(0, type_graphql_1.InputType)()
|
|
23
|
-
], NewManifest);
|
|
24
|
-
exports.NewManifest = NewManifest;
|
|
25
15
|
let ManifestPatch = class ManifestPatch {
|
|
26
16
|
};
|
|
27
17
|
__decorate([
|
|
@@ -54,6 +44,10 @@ ManifestPatch = __decorate([
|
|
|
54
44
|
exports.ManifestPatch = ManifestPatch;
|
|
55
45
|
let ManifestItem = class ManifestItem {
|
|
56
46
|
};
|
|
47
|
+
__decorate([
|
|
48
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
49
|
+
__metadata("design:type", String)
|
|
50
|
+
], ManifestItem.prototype, "cuFlag", void 0);
|
|
57
51
|
__decorate([
|
|
58
52
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
59
53
|
__metadata("design:type", String)
|
|
@@ -66,10 +60,50 @@ __decorate([
|
|
|
66
60
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
67
61
|
__metadata("design:type", String)
|
|
68
62
|
], ManifestItem.prototype, "transporter", void 0);
|
|
63
|
+
__decorate([
|
|
64
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
65
|
+
__metadata("design:type", String)
|
|
66
|
+
], ManifestItem.prototype, "remark", void 0);
|
|
69
67
|
ManifestItem = __decorate([
|
|
70
68
|
(0, type_graphql_1.InputType)()
|
|
71
69
|
], ManifestItem);
|
|
72
70
|
exports.ManifestItem = ManifestItem;
|
|
71
|
+
let ValidateTrackingNoResponse = class ValidateTrackingNoResponse {
|
|
72
|
+
};
|
|
73
|
+
__decorate([
|
|
74
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
75
|
+
__metadata("design:type", String)
|
|
76
|
+
], ValidateTrackingNoResponse.prototype, "cuFlag", void 0);
|
|
77
|
+
__decorate([
|
|
78
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
79
|
+
__metadata("design:type", String)
|
|
80
|
+
], ValidateTrackingNoResponse.prototype, "trackingNo", void 0);
|
|
81
|
+
__decorate([
|
|
82
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
83
|
+
__metadata("design:type", String)
|
|
84
|
+
], ValidateTrackingNoResponse.prototype, "refNo", void 0);
|
|
85
|
+
__decorate([
|
|
86
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
87
|
+
__metadata("design:type", String)
|
|
88
|
+
], ValidateTrackingNoResponse.prototype, "transporter", void 0);
|
|
89
|
+
__decorate([
|
|
90
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
91
|
+
__metadata("design:type", String)
|
|
92
|
+
], ValidateTrackingNoResponse.prototype, "remark", void 0);
|
|
93
|
+
ValidateTrackingNoResponse = __decorate([
|
|
94
|
+
(0, type_graphql_1.ObjectType)()
|
|
95
|
+
], ValidateTrackingNoResponse);
|
|
96
|
+
exports.ValidateTrackingNoResponse = ValidateTrackingNoResponse;
|
|
97
|
+
let NewManifest = class NewManifest {
|
|
98
|
+
};
|
|
99
|
+
__decorate([
|
|
100
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
101
|
+
__metadata("design:type", String)
|
|
102
|
+
], NewManifest.prototype, "transporter", void 0);
|
|
103
|
+
NewManifest = __decorate([
|
|
104
|
+
(0, type_graphql_1.InputType)()
|
|
105
|
+
], NewManifest);
|
|
106
|
+
exports.NewManifest = NewManifest;
|
|
73
107
|
let ManifestList = class ManifestList {
|
|
74
108
|
};
|
|
75
109
|
__decorate([
|
|
@@ -134,6 +168,14 @@ __decorate([
|
|
|
134
168
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
135
169
|
__metadata("design:type", String)
|
|
136
170
|
], TrackingNo.prototype, "manifestedAt", void 0);
|
|
171
|
+
__decorate([
|
|
172
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
173
|
+
__metadata("design:type", String)
|
|
174
|
+
], TrackingNo.prototype, "bizplaceId", void 0);
|
|
175
|
+
__decorate([
|
|
176
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
177
|
+
__metadata("design:type", String)
|
|
178
|
+
], TrackingNo.prototype, "bizplaceName", void 0);
|
|
137
179
|
TrackingNo = __decorate([
|
|
138
180
|
(0, type_graphql_1.ObjectType)()
|
|
139
181
|
], TrackingNo);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest-type.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-type.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"manifest-type.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-type.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,6 +62,18 @@ let OrderPackageQuery = class OrderPackageQuery {
|
|
|
62
62
|
let [items, total] = await qb.getManyAndCount();
|
|
63
63
|
return { items, total };
|
|
64
64
|
}
|
|
65
|
+
async fetchTransport(context) {
|
|
66
|
+
const { domain } = context.state;
|
|
67
|
+
let qb = (0, typeorm_1.getRepository)(order_package_1.OrderPackage)
|
|
68
|
+
.createQueryBuilder('op')
|
|
69
|
+
.distinctOn(['UPPER(op.transporter)'])
|
|
70
|
+
.where('op.domain_id = :domainId', { domainId: domain.id });
|
|
71
|
+
let item = await qb.getMany();
|
|
72
|
+
const transporters = item
|
|
73
|
+
.map(item => item.transporter)
|
|
74
|
+
.filter(transporter => transporter !== null && transporter !== '-');
|
|
75
|
+
return transporters;
|
|
76
|
+
}
|
|
65
77
|
async domain(orderPackage) {
|
|
66
78
|
return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(orderPackage.domainId);
|
|
67
79
|
}
|
|
@@ -91,6 +103,13 @@ __decorate([
|
|
|
91
103
|
__metadata("design:paramtypes", [Object, Array, typeof (_a = typeof shell_1.Pagination !== "undefined" && shell_1.Pagination) === "function" ? _a : Object, Array]),
|
|
92
104
|
__metadata("design:returntype", Promise)
|
|
93
105
|
], OrderPackageQuery.prototype, "orderPackages", null);
|
|
106
|
+
__decorate([
|
|
107
|
+
(0, type_graphql_1.Query)(returns => [String], { description: 'To fetch transport ' }),
|
|
108
|
+
__param(0, (0, type_graphql_1.Ctx)()),
|
|
109
|
+
__metadata("design:type", Function),
|
|
110
|
+
__metadata("design:paramtypes", [Object]),
|
|
111
|
+
__metadata("design:returntype", Promise)
|
|
112
|
+
], OrderPackageQuery.prototype, "fetchTransport", null);
|
|
94
113
|
__decorate([
|
|
95
114
|
(0, type_graphql_1.FieldResolver)(type => shell_1.Domain),
|
|
96
115
|
__param(0, (0, type_graphql_1.Root)()),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-package-query.js","sourceRoot":"","sources":["../../../server/service/order-package/order-package-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"order-package-query.js","sourceRoot":"","sources":["../../../server/service/order-package/order-package-query.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": "4.3.
|
|
3
|
+
"version": "4.3.416",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -29,14 +29,14 @@
|
|
|
29
29
|
"@things-factory/code-base": "^4.3.381",
|
|
30
30
|
"@things-factory/integration-accounting": "^4.3.411",
|
|
31
31
|
"@things-factory/integration-base": "^4.3.411",
|
|
32
|
-
"@things-factory/integration-powrup": "^4.3.
|
|
32
|
+
"@things-factory/integration-powrup": "^4.3.416",
|
|
33
33
|
"@things-factory/integration-sftp": "^4.3.411",
|
|
34
34
|
"@things-factory/notification": "^4.3.381",
|
|
35
35
|
"@things-factory/product-base": "^4.3.398",
|
|
36
36
|
"@things-factory/setting-base": "^4.3.381",
|
|
37
37
|
"@things-factory/shell": "^4.3.381",
|
|
38
38
|
"@things-factory/transport-base": "^4.3.381",
|
|
39
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
39
|
+
"@things-factory/warehouse-base": "^4.3.416"
|
|
40
40
|
},
|
|
41
|
-
"gitHead": "
|
|
41
|
+
"gitHead": "992ba7b9c4fcc48cef99f05811ef1b756392c161"
|
|
42
42
|
}
|
|
@@ -26,6 +26,7 @@ import {
|
|
|
26
26
|
ManifestStatus
|
|
27
27
|
} from './manifest'
|
|
28
28
|
import {
|
|
29
|
+
ManifestItem,
|
|
29
30
|
ManifestPatch,
|
|
30
31
|
NewManifest
|
|
31
32
|
} from './manifest-type'
|
|
@@ -39,7 +40,8 @@ export class ManifestMutation {
|
|
|
39
40
|
@Arg('status', { nullable: true }) status: string,
|
|
40
41
|
@Arg('shippingProvider', { nullable: true }) shippingProvider: string,
|
|
41
42
|
@Arg('removePackages', type => [String], { nullable: true }) removePackages: string[],
|
|
42
|
-
@Ctx() context: any
|
|
43
|
+
@Ctx() context: any,
|
|
44
|
+
@Arg('isPreventDeleteManifest', { nullable: true }) isPreventDeleteManifest?: boolean
|
|
43
45
|
): Promise<boolean> {
|
|
44
46
|
const { domain, tx } = context.state
|
|
45
47
|
const ManifestRepo = tx.getRepository(Manifest)
|
|
@@ -95,16 +97,19 @@ export class ManifestMutation {
|
|
|
95
97
|
|
|
96
98
|
await tx.getRepository(ReleaseGood).save(releaseGoods)
|
|
97
99
|
|
|
98
|
-
if
|
|
99
|
-
|
|
100
|
-
|
|
100
|
+
//validation preventation for deleting manifest if delete trackingNo on scanning page
|
|
101
|
+
if (isPreventDeleteManifest !== true) {
|
|
102
|
+
if (removePackages.length == totalTrackingNo) {
|
|
103
|
+
await tx.getRepository(Manifest).delete(manifestId)
|
|
104
|
+
return false
|
|
105
|
+
}
|
|
101
106
|
}
|
|
102
107
|
}
|
|
103
108
|
return true
|
|
104
109
|
}
|
|
105
110
|
|
|
106
111
|
@Directive('@transaction')
|
|
107
|
-
@Mutation(returns =>
|
|
112
|
+
@Mutation(returns => Manifest, { description: 'To delete Manifest' })
|
|
108
113
|
async deleteManifest(@Arg('name') name: string, @Ctx() context: any): Promise<boolean> {
|
|
109
114
|
const { domain, tx } = context.state
|
|
110
115
|
|
|
@@ -113,67 +118,25 @@ export class ManifestMutation {
|
|
|
113
118
|
}
|
|
114
119
|
|
|
115
120
|
@Directive('@transaction')
|
|
116
|
-
@Mutation(returns =>
|
|
117
|
-
async generateManifest(@Arg('manifest') manifest: NewManifest, @Ctx() context: any): Promise<
|
|
121
|
+
@Mutation(returns => Manifest, { description: 'To generate new Manifest' })
|
|
122
|
+
async generateManifest(@Arg('manifest') manifest: NewManifest, @Ctx() context: any): Promise<Manifest> {
|
|
118
123
|
const { domain, user, tx } = context.state
|
|
119
|
-
const
|
|
120
|
-
|
|
121
|
-
// regroup array of object by transporter
|
|
122
|
-
let shippingProviderGrouping: any = manifestItems.reduce((a, b) => {
|
|
123
|
-
a[b.transporter] = [...(a[b.transporter] || []), b]
|
|
124
|
-
return a
|
|
125
|
-
}, {})
|
|
126
|
-
|
|
127
|
-
for (const transporter in shippingProviderGrouping) {
|
|
128
|
-
const items: any[] = shippingProviderGrouping[transporter]
|
|
129
|
-
|
|
130
|
-
const openManifest: Manifest = await tx
|
|
131
|
-
.getRepository(Manifest)
|
|
132
|
-
.findOne({ domain, shippingProvider: transporter, status: ManifestStatus.OPEN })
|
|
133
|
-
|
|
134
|
-
let manifest: Manifest
|
|
135
|
-
|
|
136
|
-
if (openManifest) {
|
|
137
|
-
manifest = openManifest
|
|
138
|
-
} else {
|
|
139
|
-
manifest = new Manifest()
|
|
140
|
-
manifest.domain = domain
|
|
141
|
-
manifest.shippingProvider = transporter
|
|
142
|
-
manifest.name = OrderNoGenerator.manifest()
|
|
143
|
-
manifest.creator = user
|
|
144
|
-
manifest = await tx.getRepository(Manifest).save(manifest)
|
|
145
|
-
}
|
|
124
|
+
const manifestTransporter: any = manifest.transporter
|
|
146
125
|
|
|
147
|
-
|
|
148
|
-
await Promise.all(
|
|
149
|
-
items.map(async item => {
|
|
150
|
-
let orderPackage: OrderPackage = await tx
|
|
151
|
-
.getRepository(OrderPackage)
|
|
152
|
-
.createQueryBuilder('op')
|
|
153
|
-
.innerJoinAndSelect('op.releaseGood', 'rg')
|
|
154
|
-
.where('rg.ref_no = :refNo', { refNo: item.refNo })
|
|
155
|
-
.andWhere('op.domain_id = :domainId', { domainId: domain.id })
|
|
156
|
-
.andWhere('op.tracking_no = :trackingNo', { trackingNo: item.trackingNo })
|
|
157
|
-
.getOne()
|
|
158
|
-
|
|
159
|
-
await tx
|
|
160
|
-
.getRepository(OrderPackage)
|
|
161
|
-
.update(
|
|
162
|
-
{ id: orderPackage.id },
|
|
163
|
-
{ manifest: manifest, updater: user, manifestedBy: user.id, manifestedAt: curDate }
|
|
164
|
-
)
|
|
165
|
-
|
|
166
|
-
await tx
|
|
167
|
-
.getRepository(ReleaseGood)
|
|
168
|
-
.update(
|
|
169
|
-
{ id: orderPackage.releaseGood.id },
|
|
170
|
-
{ manifest: manifest, updater: user, manifestedBy: user.id, manifestedAt: curDate }
|
|
171
|
-
)
|
|
172
|
-
})
|
|
173
|
-
)
|
|
174
|
-
}
|
|
126
|
+
let newManifest: Manifest
|
|
175
127
|
|
|
176
|
-
|
|
128
|
+
newManifest = new Manifest()
|
|
129
|
+
newManifest.domain = domain
|
|
130
|
+
newManifest.shippingProvider = manifestTransporter
|
|
131
|
+
newManifest.name = OrderNoGenerator.manifest()
|
|
132
|
+
newManifest.creator = user
|
|
133
|
+
await tx.getRepository(Manifest).insert(newManifest)
|
|
134
|
+
|
|
135
|
+
let manifestInfo: Manifest = await tx.getRepository(Manifest).findOne({
|
|
136
|
+
where: { name: newManifest.name, domain }
|
|
137
|
+
})
|
|
138
|
+
|
|
139
|
+
return manifestInfo
|
|
177
140
|
}
|
|
178
141
|
|
|
179
142
|
@Directive('@transaction')
|
|
@@ -203,7 +166,7 @@ export class ManifestMutation {
|
|
|
203
166
|
throw new Error(i18next.t('error.tracking_no_already_scanned_before'))
|
|
204
167
|
}
|
|
205
168
|
|
|
206
|
-
if (foundOrderPackage.transporter !== shippingProvider) {
|
|
169
|
+
if (foundOrderPackage.transporter?.toLowerCase() !== shippingProvider?.toLowerCase()) {
|
|
207
170
|
throw new Error(i18next.t('error.tracking_no_belongs_to_x', { x: foundOrderPackage.transporter }))
|
|
208
171
|
}
|
|
209
172
|
|
|
@@ -220,6 +183,47 @@ export class ManifestMutation {
|
|
|
220
183
|
return true
|
|
221
184
|
}
|
|
222
185
|
|
|
186
|
+
@Directive('@transaction')
|
|
187
|
+
@Mutation(returns => [OrderPackage], { description: 'To update multiple trackingNo' })
|
|
188
|
+
async submitTrackingNos(
|
|
189
|
+
@Arg('manifestId', { nullable: true }) manifestId: string,
|
|
190
|
+
@Arg('patches', type => [ManifestItem]) patches: ManifestItem[],
|
|
191
|
+
@Ctx() context: any
|
|
192
|
+
): Promise<OrderPackage[]> {
|
|
193
|
+
const { domain, user, tx } = context.state
|
|
194
|
+
const trackingNos = patches.map(patch => patch.trackingNo)
|
|
195
|
+
const orderPackageRepo = tx.getRepository(OrderPackage)
|
|
196
|
+
//check if order belongs to same shipping provider
|
|
197
|
+
let foundOrderPackages = await orderPackageRepo.find({
|
|
198
|
+
where: { trackingNo: In(trackingNos), domain },
|
|
199
|
+
relations: ['releaseGood', 'bizplace']
|
|
200
|
+
})
|
|
201
|
+
|
|
202
|
+
let foundReleaseOrders: ReleaseGood[] = foundOrderPackages.map(foundOrderPackage => foundOrderPackage.releaseGood)
|
|
203
|
+
|
|
204
|
+
const releaseGoodIds = foundReleaseOrders.map(rg => rg.id)
|
|
205
|
+
|
|
206
|
+
await tx
|
|
207
|
+
.createQueryBuilder()
|
|
208
|
+
.update(OrderPackage)
|
|
209
|
+
.set({
|
|
210
|
+
manifest: { id: manifestId },
|
|
211
|
+
manifestedAt: new Date(),
|
|
212
|
+
manifestedBy: user
|
|
213
|
+
})
|
|
214
|
+
.where('trackingNo IN (:...trackingNos)', { trackingNos })
|
|
215
|
+
.execute()
|
|
216
|
+
|
|
217
|
+
await tx
|
|
218
|
+
.createQueryBuilder()
|
|
219
|
+
.update(ReleaseGood)
|
|
220
|
+
.set({ manifest: manifestId, manifestedAt: new Date(), manifestedBy: user })
|
|
221
|
+
.where('id IN (:...releaseGoodIds)', { releaseGoodIds })
|
|
222
|
+
.execute()
|
|
223
|
+
|
|
224
|
+
return foundOrderPackages
|
|
225
|
+
}
|
|
226
|
+
|
|
223
227
|
@Directive('@transaction')
|
|
224
228
|
@Mutation(returns => Manifest, { description: 'To dispatch Manifest when courier service collect packages' })
|
|
225
229
|
async dispatchManifest(
|
|
@@ -1,13 +1,34 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
1
|
+
import {
|
|
2
|
+
Arg,
|
|
3
|
+
Args,
|
|
4
|
+
Ctx,
|
|
5
|
+
FieldResolver,
|
|
6
|
+
Query,
|
|
7
|
+
Resolver,
|
|
8
|
+
Root
|
|
9
|
+
} from 'type-graphql'
|
|
10
|
+
import {
|
|
11
|
+
getRepository,
|
|
12
|
+
SelectQueryBuilder
|
|
13
|
+
} from 'typeorm'
|
|
3
14
|
|
|
4
15
|
import { User } from '@things-factory/auth-base'
|
|
5
|
-
import {
|
|
16
|
+
import {
|
|
17
|
+
buildQuery,
|
|
18
|
+
Domain,
|
|
19
|
+
Filter,
|
|
20
|
+
ListParam,
|
|
21
|
+
Sorting
|
|
22
|
+
} from '@things-factory/shell'
|
|
6
23
|
|
|
7
24
|
import { OrderPackage } from '../order-package/order-package'
|
|
8
25
|
import { ReleaseGood } from '../release-good/release-good'
|
|
9
26
|
import { Manifest } from './manifest'
|
|
10
|
-
import {
|
|
27
|
+
import {
|
|
28
|
+
ManifestItem,
|
|
29
|
+
ManifestList,
|
|
30
|
+
ValidateTrackingNoResponse
|
|
31
|
+
} from './manifest-type'
|
|
11
32
|
|
|
12
33
|
@Resolver(Manifest)
|
|
13
34
|
export class ManifestQuery {
|
|
@@ -15,13 +36,21 @@ export class ManifestQuery {
|
|
|
15
36
|
async manifest(
|
|
16
37
|
@Arg('name') name: string,
|
|
17
38
|
@Ctx() context: any,
|
|
18
|
-
@Arg('sortings', type => [Sorting], { nullable: true }) sortings?: Sorting[]
|
|
39
|
+
@Arg('sortings', type => [Sorting], { nullable: true }) sortings?: Sorting[],
|
|
40
|
+
@Arg('filters', type => [Filter], { nullable: true }) filters?: Filter[]
|
|
19
41
|
): Promise<Manifest> {
|
|
20
42
|
const { domain, tx } = context.state
|
|
43
|
+
const filterValue = filters ? filters[0]?.value : null
|
|
44
|
+
|
|
21
45
|
const manifest: Manifest = await getRepository(Manifest).findOne({ where: { domain, name } })
|
|
22
46
|
|
|
23
47
|
let qb: any = getRepository(OrderPackage).createQueryBuilder('opk')
|
|
24
|
-
qb.innerJoinAndSelect('opk.releaseGood', 'rg')
|
|
48
|
+
qb.innerJoinAndSelect('opk.releaseGood', 'rg')
|
|
49
|
+
.innerJoinAndSelect('rg.bizplace', 'bz')
|
|
50
|
+
.where('opk.manifest_id = :manifestId', { manifestId: manifest.id })
|
|
51
|
+
if (filterValue?.length > 0) {
|
|
52
|
+
qb.andWhere('bz.name = :name', { name: filterValue })
|
|
53
|
+
}
|
|
25
54
|
|
|
26
55
|
if (sortings.length > 0) {
|
|
27
56
|
const sort = (sortings || []).reduce(
|
|
@@ -34,7 +63,7 @@ export class ManifestQuery {
|
|
|
34
63
|
|
|
35
64
|
qb.orderBy(sort)
|
|
36
65
|
} else {
|
|
37
|
-
qb.orderBy('opk.
|
|
66
|
+
qb.orderBy('opk.manifestedAt', 'DESC')
|
|
38
67
|
}
|
|
39
68
|
|
|
40
69
|
const orderPackages: OrderPackage[] = await qb.getMany()
|
|
@@ -53,7 +82,9 @@ export class ManifestQuery {
|
|
|
53
82
|
dispatchmentStatus: releaseGood.dispatchmentStatus,
|
|
54
83
|
orderStatus: releaseGood.status,
|
|
55
84
|
orderRemark: releaseGood.remark,
|
|
56
|
-
manifestedAt: opk.manifestedAt
|
|
85
|
+
manifestedAt: opk.manifestedAt,
|
|
86
|
+
bizplaceId: releaseGood.bizplace.id,
|
|
87
|
+
bizplaceName: releaseGood.bizplace.name
|
|
57
88
|
}
|
|
58
89
|
})
|
|
59
90
|
|
|
@@ -64,7 +95,11 @@ export class ManifestQuery {
|
|
|
64
95
|
}
|
|
65
96
|
|
|
66
97
|
@Query(returns => ManifestList, { description: 'To fetch multiple Manifests' })
|
|
67
|
-
async manifests(
|
|
98
|
+
async manifests(
|
|
99
|
+
@Args() params: ListParam,
|
|
100
|
+
@Ctx() context: any,
|
|
101
|
+
@Arg('isSelectOpen', { nullable: true }) isSelectOpen?: Boolean
|
|
102
|
+
): Promise<ManifestList> {
|
|
68
103
|
const { domain } = context.state
|
|
69
104
|
|
|
70
105
|
let orderInfoFilter
|
|
@@ -79,10 +114,25 @@ export class ManifestQuery {
|
|
|
79
114
|
const trackingNoParamIdx = params.filters.findIndex(param => param.name === 'trackingNo')
|
|
80
115
|
if (trackingNoParamIdx >= 0) {
|
|
81
116
|
trackingNoFilter = params.filters[trackingNoParamIdx].value
|
|
117
|
+
.split(',')
|
|
118
|
+
.map(value => `%${value.trim().toLowerCase()}%`)
|
|
82
119
|
|
|
83
120
|
params.filters.splice(trackingNoParamIdx, 1)
|
|
84
121
|
}
|
|
85
122
|
|
|
123
|
+
let nameFilter
|
|
124
|
+
const nameParamIdx = params.filters.findIndex(param => param.name === 'name')
|
|
125
|
+
if (nameParamIdx >= 0) {
|
|
126
|
+
nameFilter = params.filters[nameParamIdx].value.split(',').map(value => `%${value.trim().toLowerCase()}%`)
|
|
127
|
+
params.filters.splice(nameParamIdx, 1)
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
let shippingProviderFilter
|
|
131
|
+
const shipProviderIdx = params.filters.findIndex(param => param.name === 'shippingProvider')
|
|
132
|
+
if (shipProviderIdx >= 0) {
|
|
133
|
+
shippingProviderFilter = params.filters[shipProviderIdx].value
|
|
134
|
+
}
|
|
135
|
+
|
|
86
136
|
const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
|
|
87
137
|
if (fromDateParamIdx >= 0) {
|
|
88
138
|
let fromDateVal = new Date(params.filters[fromDateParamIdx].value)
|
|
@@ -108,19 +158,30 @@ export class ManifestQuery {
|
|
|
108
158
|
relation: false
|
|
109
159
|
})
|
|
110
160
|
}
|
|
111
|
-
|
|
112
|
-
const qb: SelectQueryBuilder<Manifest> = getRepository(Manifest).createQueryBuilder('mf')
|
|
161
|
+
let qb: SelectQueryBuilder<Manifest> = getRepository(Manifest).createQueryBuilder('mf')
|
|
113
162
|
buildQuery(qb, params, context)
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
? qb.andWhere(
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
163
|
+
|
|
164
|
+
if (isSelectOpen) {
|
|
165
|
+
qb.where('mf.domain_id = :domainId', { domainId: domain.id })
|
|
166
|
+
qb.andWhere('mf.status = :status', { status: 'OPEN' })
|
|
167
|
+
nameFilter ? qb.andWhere('LOWER(mf.name) ILIKE ANY (ARRAY[:...names])', { names: nameFilter }) : ''
|
|
168
|
+
if (shippingProviderFilter) {
|
|
169
|
+
qb.andWhere('LOWER(mf.shipping_provider) LIKE LOWER(:shipProvider)', { shipProvider: shippingProviderFilter })
|
|
170
|
+
}
|
|
171
|
+
} else {
|
|
172
|
+
qb.innerJoin('order_packages', 'op', 'op.manifest_id = mf.id')
|
|
173
|
+
qb.innerJoin('op.releaseGood', 'rg')
|
|
174
|
+
orderInfoFilter
|
|
175
|
+
? qb.andWhere(
|
|
176
|
+
'(rg.name ~* :orderInfoFilter or rg.ref_no ~* :orderInfoFilter or rg.ref_no_2 ~* :orderInfoFilter or rg.ref_no_3 ~* :orderInfoFilter)',
|
|
177
|
+
{ orderInfoFilter }
|
|
178
|
+
)
|
|
179
|
+
: ''
|
|
180
|
+
trackingNoFilter
|
|
181
|
+
? qb.andWhere('LOWER(op.tracking_no) ILIKE ANY (ARRAY[:...trackingNo])', { trackingNo: trackingNoFilter })
|
|
182
|
+
: ''
|
|
183
|
+
nameFilter ? qb.andWhere('LOWER(mf.name) ILIKE ANY (ARRAY[:...names])', { names: nameFilter }) : ''
|
|
184
|
+
}
|
|
124
185
|
|
|
125
186
|
const [items, total] = await qb.getManyAndCount()
|
|
126
187
|
|
|
@@ -132,6 +193,47 @@ export class ManifestQuery {
|
|
|
132
193
|
return { items, total }
|
|
133
194
|
}
|
|
134
195
|
|
|
196
|
+
@Query(type => [ValidateTrackingNoResponse], { description: 'To validate tracking no' })
|
|
197
|
+
async validateTrackingNo(
|
|
198
|
+
@Arg('patches', type => [ManifestItem]) patches: ManifestItem[],
|
|
199
|
+
@Ctx() context: any
|
|
200
|
+
): Promise<ValidateTrackingNoResponse[]> {
|
|
201
|
+
const { domain } = context.state
|
|
202
|
+
|
|
203
|
+
const trackingNumbers = patches.map(patch => patch.trackingNo)
|
|
204
|
+
|
|
205
|
+
let qb = getRepository(OrderPackage)
|
|
206
|
+
.createQueryBuilder('op')
|
|
207
|
+
.where('op.domain_id = :domainId', { domainId: domain.id })
|
|
208
|
+
.andWhere('op.trackingNo IN (:...trackingNumbers)', { trackingNumbers })
|
|
209
|
+
|
|
210
|
+
let items = await qb.getMany()
|
|
211
|
+
|
|
212
|
+
const modifiedPatches = patches.map(patch => {
|
|
213
|
+
const matchingItem = items.find(item => item.trackingNo === patch.trackingNo)
|
|
214
|
+
|
|
215
|
+
if (!matchingItem) {
|
|
216
|
+
return {
|
|
217
|
+
...patch,
|
|
218
|
+
remark: 'Tracking No does not exist'
|
|
219
|
+
}
|
|
220
|
+
} else if (matchingItem.transporter.toLowerCase() !== patch.transporter.toLowerCase()) {
|
|
221
|
+
return {
|
|
222
|
+
...patch,
|
|
223
|
+
remark: 'Wrong transporter'
|
|
224
|
+
}
|
|
225
|
+
} else if (matchingItem.manifestedById) {
|
|
226
|
+
return {
|
|
227
|
+
...patch,
|
|
228
|
+
remark: 'Tracking No already exists in another manifest'
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
return patch
|
|
232
|
+
})
|
|
233
|
+
|
|
234
|
+
return modifiedPatches
|
|
235
|
+
}
|
|
236
|
+
|
|
135
237
|
@FieldResolver(type => Domain)
|
|
136
238
|
async domain(@Root() manifest: Manifest): Promise<Domain> {
|
|
137
239
|
return await getRepository(Domain).findOne(manifest.domainId)
|
|
@@ -1,12 +1,15 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
1
|
+
import {
|
|
2
|
+
Field,
|
|
3
|
+
ID,
|
|
4
|
+
InputType,
|
|
5
|
+
Int,
|
|
6
|
+
ObjectType
|
|
7
|
+
} from 'type-graphql'
|
|
8
|
+
|
|
9
|
+
import {
|
|
10
|
+
Manifest,
|
|
11
|
+
ManifestStatus
|
|
12
|
+
} from './manifest'
|
|
10
13
|
|
|
11
14
|
@InputType()
|
|
12
15
|
export class ManifestPatch {
|
|
@@ -31,6 +34,27 @@ export class ManifestPatch {
|
|
|
31
34
|
|
|
32
35
|
@InputType()
|
|
33
36
|
export class ManifestItem {
|
|
37
|
+
@Field({ nullable: true })
|
|
38
|
+
cuFlag?: string
|
|
39
|
+
|
|
40
|
+
@Field({ nullable: true })
|
|
41
|
+
trackingNo?: string
|
|
42
|
+
|
|
43
|
+
@Field({ nullable: true })
|
|
44
|
+
refNo?: string
|
|
45
|
+
|
|
46
|
+
@Field({ nullable: true })
|
|
47
|
+
transporter?: string
|
|
48
|
+
|
|
49
|
+
@Field({ nullable: true })
|
|
50
|
+
remark?: string
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
@ObjectType()
|
|
54
|
+
export class ValidateTrackingNoResponse {
|
|
55
|
+
@Field({ nullable: true })
|
|
56
|
+
cuFlag?: string
|
|
57
|
+
|
|
34
58
|
@Field({ nullable: true })
|
|
35
59
|
trackingNo?: string
|
|
36
60
|
|
|
@@ -39,6 +63,15 @@ export class ManifestItem {
|
|
|
39
63
|
|
|
40
64
|
@Field({ nullable: true })
|
|
41
65
|
transporter?: string
|
|
66
|
+
|
|
67
|
+
@Field({ nullable: true })
|
|
68
|
+
remark?: string
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
@InputType()
|
|
72
|
+
export class NewManifest {
|
|
73
|
+
@Field({ nullable: true })
|
|
74
|
+
transporter?: string
|
|
42
75
|
}
|
|
43
76
|
|
|
44
77
|
@ObjectType()
|
|
@@ -87,4 +120,10 @@ export class TrackingNo {
|
|
|
87
120
|
|
|
88
121
|
@Field({ nullable: true })
|
|
89
122
|
manifestedAt?: string
|
|
123
|
+
|
|
124
|
+
@Field({ nullable: true })
|
|
125
|
+
bizplaceId?: string
|
|
126
|
+
|
|
127
|
+
@Field({ nullable: true })
|
|
128
|
+
bizplaceName?: string
|
|
90
129
|
}
|
|
@@ -1,9 +1,24 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
1
|
+
import {
|
|
2
|
+
Arg,
|
|
3
|
+
Ctx,
|
|
4
|
+
FieldResolver,
|
|
5
|
+
Query,
|
|
6
|
+
Resolver,
|
|
7
|
+
Root
|
|
8
|
+
} from 'type-graphql'
|
|
9
|
+
import {
|
|
10
|
+
getRepository,
|
|
11
|
+
In
|
|
12
|
+
} from 'typeorm'
|
|
3
13
|
|
|
4
14
|
import { User } from '@things-factory/auth-base'
|
|
5
15
|
import { getPermittedBizplaceIds } from '@things-factory/biz-base'
|
|
6
|
-
import {
|
|
16
|
+
import {
|
|
17
|
+
Domain,
|
|
18
|
+
Filter,
|
|
19
|
+
Pagination,
|
|
20
|
+
Sorting
|
|
21
|
+
} from '@things-factory/shell'
|
|
7
22
|
|
|
8
23
|
import { OrderPackage } from './order-package'
|
|
9
24
|
import { OrderPackageList } from './order-package-types'
|
|
@@ -69,6 +84,24 @@ export class OrderPackageQuery {
|
|
|
69
84
|
return { items, total }
|
|
70
85
|
}
|
|
71
86
|
|
|
87
|
+
@Query(returns => [String], { description: 'To fetch transport ' })
|
|
88
|
+
async fetchTransport(@Ctx() context: any): Promise<string[]> {
|
|
89
|
+
const { domain } = context.state
|
|
90
|
+
|
|
91
|
+
let qb = getRepository(OrderPackage)
|
|
92
|
+
.createQueryBuilder('op')
|
|
93
|
+
.distinctOn(['UPPER(op.transporter)'])
|
|
94
|
+
.where('op.domain_id = :domainId', { domainId: domain.id })
|
|
95
|
+
|
|
96
|
+
let item = await qb.getMany()
|
|
97
|
+
|
|
98
|
+
const transporters = item
|
|
99
|
+
.map(item => item.transporter)
|
|
100
|
+
.filter(transporter => transporter !== null && transporter !== '-')
|
|
101
|
+
|
|
102
|
+
return transporters
|
|
103
|
+
}
|
|
104
|
+
|
|
72
105
|
@FieldResolver(type => Domain)
|
|
73
106
|
async domain(@Root() orderPackage: OrderPackage): Promise<Domain> {
|
|
74
107
|
return await getRepository(Domain).findOne(orderPackage.domainId)
|