@things-factory/worksheet-base 4.3.146 → 4.3.149
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.
|
@@ -26,10 +26,11 @@ async function renderManifest({ manifestNo }, context) {
|
|
|
26
26
|
relations: ['domain']
|
|
27
27
|
});
|
|
28
28
|
// find release good
|
|
29
|
-
let
|
|
29
|
+
let orderPackages = await (0, typeorm_1.getRepository)(sales_base_1.OrderPackage).find({
|
|
30
30
|
where: { domain, manifest },
|
|
31
|
-
relations: ['bizplace']
|
|
31
|
+
relations: ['releaseGood', 'releaseGood.bizplace']
|
|
32
32
|
});
|
|
33
|
+
let releaseGoods = orderPackages.map(op => op.releaseGood);
|
|
33
34
|
// 7. find grn template based on category
|
|
34
35
|
const foundTemplate = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
|
|
35
36
|
where: { domain, category: constants_1.TEMPLATE_TYPE.MANIFEST_TEMPLATE }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-manifest.js","sourceRoot":"","sources":["../../server/controllers/render-manifest.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAgC;AAChC,4DAA8B;AAC9B,qCAAuC;AAEvC,qEAAqE;AACrE,6CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"render-manifest.js","sourceRoot":"","sources":["../../server/controllers/render-manifest.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worksheet-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.149",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -40,5 +40,5 @@
|
|
|
40
40
|
"@things-factory/transport-base": "^4.3.146",
|
|
41
41
|
"@things-factory/warehouse-base": "^4.3.146"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "e356037b0698767ee19833663373cb1eff8327b0"
|
|
44
44
|
}
|
|
@@ -4,7 +4,7 @@ import { getRepository } from 'typeorm'
|
|
|
4
4
|
|
|
5
5
|
import { Attachment, STORAGE } from '@things-factory/attachment-base'
|
|
6
6
|
import { config } from '@things-factory/env'
|
|
7
|
-
import { Manifest, ReleaseGood } from '@things-factory/sales-base'
|
|
7
|
+
import { Manifest, ReleaseGood, OrderPackage } from '@things-factory/sales-base'
|
|
8
8
|
import { Domain } from '@things-factory/shell'
|
|
9
9
|
import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
|
|
10
10
|
|
|
@@ -26,11 +26,13 @@ export async function renderManifest({ manifestNo }, context: any) {
|
|
|
26
26
|
})
|
|
27
27
|
|
|
28
28
|
// find release good
|
|
29
|
-
let
|
|
29
|
+
let orderPackages: OrderPackage[] = await getRepository(OrderPackage).find({
|
|
30
30
|
where: { domain, manifest },
|
|
31
|
-
relations: ['bizplace']
|
|
31
|
+
relations: ['releaseGood', 'releaseGood.bizplace']
|
|
32
32
|
})
|
|
33
33
|
|
|
34
|
+
let releaseGoods: ReleaseGood[] = orderPackages.map(op => op.releaseGood)
|
|
35
|
+
|
|
34
36
|
// 7. find grn template based on category
|
|
35
37
|
const foundTemplate: Attachment = await getRepository(Attachment).findOne({
|
|
36
38
|
where: { domain, category: TEMPLATE_TYPE.MANIFEST_TEMPLATE }
|
|
@@ -43,23 +45,25 @@ export async function renderManifest({ manifestNo }, context: any) {
|
|
|
43
45
|
manifest_no: manifest?.name,
|
|
44
46
|
manifest_date: DateTimeConverter.date(manifest?.createdAt).toString(),
|
|
45
47
|
total_list: releaseGoods?.length || 0,
|
|
46
|
-
product_list: await Promise.all
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
48
|
+
product_list: await Promise.all(
|
|
49
|
+
releaseGoods.map(async (item, idx) => {
|
|
50
|
+
const customerBizplaceId: string = item.bizplace.id
|
|
51
|
+
const custCompanyBizplace: Bizplace = await getCompanyBizplace(null, null, customerBizplaceId)
|
|
52
|
+
return {
|
|
53
|
+
list_no: idx + 1,
|
|
54
|
+
order_no: item?.refNo,
|
|
55
|
+
tracking_no: item?.trackingNo,
|
|
56
|
+
phone: item?.phone1,
|
|
57
|
+
delivery_date: DateTimeConverter.date(manifest?.dispatchedAt).toString(),
|
|
58
|
+
attention_to: item?.attentionTo,
|
|
59
|
+
delivery_address: item?.deliveryAddress1,
|
|
60
|
+
postal_code_city: `${item?.postalCode}, ${item?.city}`,
|
|
61
|
+
remark: item?.remark,
|
|
62
|
+
status: item?.status,
|
|
63
|
+
company_domain_name: custCompanyBizplace.domain.name
|
|
64
|
+
}
|
|
65
|
+
})
|
|
66
|
+
)
|
|
63
67
|
}
|
|
64
68
|
|
|
65
69
|
const formData = new FormData()
|