@things-factory/sales-base 4.3.321 → 4.3.323
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-query.js +9 -3
- package/dist-server/service/manifest/manifest-query.js.map +1 -1
- package/dist-server/service/manifest/manifest-type.js +4 -0
- package/dist-server/service/manifest/manifest-type.js.map +1 -1
- package/package.json +2 -2
- package/server/service/manifest/manifest-query.ts +16 -9
- package/server/service/manifest/manifest-type.ts +3 -0
|
@@ -27,8 +27,13 @@ let ManifestQuery = class ManifestQuery {
|
|
|
27
27
|
const manifest = await (0, typeorm_1.getRepository)(manifest_1.Manifest).findOne({ where: { domain, name } });
|
|
28
28
|
let qb = (0, typeorm_1.getRepository)(order_package_1.OrderPackage).createQueryBuilder('opk');
|
|
29
29
|
qb.innerJoinAndSelect('opk.releaseGood', 'rg').where('opk.manifest_id = :manifestId', { manifestId: manifest.id });
|
|
30
|
-
|
|
31
|
-
|
|
30
|
+
if (sortings.length > 0) {
|
|
31
|
+
const sort = (sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [sort.name]: sort.desc ? 'DESC' : 'ASC' })), {});
|
|
32
|
+
qb.orderBy(sort);
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
qb.orderBy('opk.trackingNo');
|
|
36
|
+
}
|
|
32
37
|
const orderPackages = await qb.getMany();
|
|
33
38
|
const trackingNos = orderPackages.map(opk => {
|
|
34
39
|
const releaseGood = opk.releaseGood;
|
|
@@ -43,7 +48,8 @@ let ManifestQuery = class ManifestQuery {
|
|
|
43
48
|
phone: releaseGood.phone1,
|
|
44
49
|
dispatchmentStatus: releaseGood.dispatchmentStatus,
|
|
45
50
|
orderStatus: releaseGood.status,
|
|
46
|
-
orderRemark: releaseGood.remark
|
|
51
|
+
orderRemark: releaseGood.remark,
|
|
52
|
+
manifestedAt: opk.manifestedAt
|
|
47
53
|
};
|
|
48
54
|
});
|
|
49
55
|
return Object.assign(Object.assign({}, manifest), { trackingNos });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest-query.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAAmF;AACnF,qCAA2D;AAE3D,yDAAgD;AAChD,iDAA8E;AAE9E,kEAA6D;AAE7D,yCAAqC;AACrC,mDAA8C;AAGvC,IAAM,aAAa,GAAnB,MAAM,aAAa;IAElB,AAAN,KAAK,CAAC,QAAQ,CACC,IAAY,EAClB,OAAY,EACqC,QAAoB;QAE5E,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QACpC,MAAM,QAAQ,GAAa,MAAM,IAAA,uBAAa,EAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;QAE7F,IAAI,EAAE,GAAQ,IAAA,uBAAa,EAAC,4BAAY,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;QACnE,EAAE,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,+BAA+B,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"manifest-query.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -130,6 +130,10 @@ __decorate([
|
|
|
130
130
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
131
131
|
__metadata("design:type", String)
|
|
132
132
|
], TrackingNo.prototype, "orderRemark", void 0);
|
|
133
|
+
__decorate([
|
|
134
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
135
|
+
__metadata("design:type", String)
|
|
136
|
+
], TrackingNo.prototype, "manifestedAt", void 0);
|
|
133
137
|
TrackingNo = __decorate([
|
|
134
138
|
(0, type_graphql_1.ObjectType)()
|
|
135
139
|
], TrackingNo);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest-type.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-type.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAoE;AAEpE,yCAAqD;AAG9C,IAAM,WAAW,GAAjB,MAAM,WAAW;CAGvB,CAAA;AAFC;IAAC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC;;kDACD;AAFlB,WAAW;IADvB,IAAA,wBAAS,GAAE;GACC,WAAW,CAGvB;AAHY,kCAAW;AAMjB,IAAM,aAAa,GAAnB,MAAM,aAAa;CAkBzB,CAAA;AAjBC;IAAC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC3B;AAEX;IAAC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAEb;IAAC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACD;AAEzB;IAAC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACH;AAEvB;IAAC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACC;AAE3B;IAAC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,yBAAc,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CAC3B;AAjBZ,aAAa;IADzB,IAAA,wBAAS,GAAE;GACC,aAAa,CAkBzB;AAlBY,sCAAa;AAqBnB,IAAM,YAAY,GAAlB,MAAM,YAAY;CASxB,CAAA;AARC;IAAC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACP;AAEnB;IAAC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACZ;AAEd;IAAC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACN;AART,YAAY;IADxB,IAAA,wBAAS,GAAE;GACC,YAAY,CASxB;AATY,oCAAY;AAYlB,IAAM,YAAY,GAAlB,MAAM,YAAY;CAMxB,CAAA;AALC;IAAC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,mBAAQ,CAAC,CAAC;;2CACT;AAEjB;IAAC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,CAAC;;2CACN;AALF,YAAY;IADxB,IAAA,yBAAU,GAAE;GACA,YAAY,CAMxB;AANY,oCAAY;AASlB,IAAM,UAAU,GAAhB,MAAM,UAAU;
|
|
1
|
+
{"version":3,"file":"manifest-type.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-type.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.323",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -37,5 +37,5 @@
|
|
|
37
37
|
"@things-factory/transport-base": "^4.3.301",
|
|
38
38
|
"@things-factory/warehouse-base": "^4.3.318"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "12b40eb70ae76ad2bb5ac77e5e157b097faca233"
|
|
41
41
|
}
|
|
@@ -22,14 +22,20 @@ export class ManifestQuery {
|
|
|
22
22
|
|
|
23
23
|
let qb: any = getRepository(OrderPackage).createQueryBuilder('opk')
|
|
24
24
|
qb.innerJoinAndSelect('opk.releaseGood', 'rg').where('opk.manifest_id = :manifestId', { manifestId: manifest.id })
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
25
|
+
|
|
26
|
+
if (sortings.length > 0) {
|
|
27
|
+
const sort = (sortings || []).reduce(
|
|
28
|
+
(acc, sort) => ({
|
|
29
|
+
...acc,
|
|
30
|
+
[sort.name]: sort.desc ? 'DESC' : 'ASC'
|
|
31
|
+
}),
|
|
32
|
+
{}
|
|
33
|
+
)
|
|
34
|
+
|
|
35
|
+
qb.orderBy(sort)
|
|
36
|
+
} else {
|
|
37
|
+
qb.orderBy('opk.trackingNo')
|
|
38
|
+
}
|
|
33
39
|
|
|
34
40
|
const orderPackages: OrderPackage[] = await qb.getMany()
|
|
35
41
|
|
|
@@ -46,7 +52,8 @@ export class ManifestQuery {
|
|
|
46
52
|
phone: releaseGood.phone1,
|
|
47
53
|
dispatchmentStatus: releaseGood.dispatchmentStatus,
|
|
48
54
|
orderStatus: releaseGood.status,
|
|
49
|
-
orderRemark: releaseGood.remark
|
|
55
|
+
orderRemark: releaseGood.remark,
|
|
56
|
+
manifestedAt: opk.manifestedAt
|
|
50
57
|
}
|
|
51
58
|
})
|
|
52
59
|
|