@things-factory/worksheet-base 4.3.21 → 4.3.22
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.
|
@@ -11,6 +11,7 @@ const attachment_base_1 = require("@things-factory/attachment-base");
|
|
|
11
11
|
const env_1 = require("@things-factory/env");
|
|
12
12
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
13
13
|
const shell_1 = require("@things-factory/shell");
|
|
14
|
+
const biz_base_1 = require("@things-factory/biz-base");
|
|
14
15
|
const constants_1 = require("../constants");
|
|
15
16
|
const datetime_util_1 = require("../utils/datetime-util");
|
|
16
17
|
const REPORT_API_URL = env_1.config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html');
|
|
@@ -25,8 +26,9 @@ async function renderManifest({ manifestNo }, context) {
|
|
|
25
26
|
relations: ['domain']
|
|
26
27
|
});
|
|
27
28
|
// find release good
|
|
28
|
-
|
|
29
|
-
where: { domain, manifest }
|
|
29
|
+
let releaseGoods = await (0, typeorm_1.getRepository)(sales_base_1.ReleaseGood).find({
|
|
30
|
+
where: { domain, manifest },
|
|
31
|
+
relations: ['bizplace']
|
|
30
32
|
});
|
|
31
33
|
// 7. find grn template based on category
|
|
32
34
|
const foundTemplate = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
|
|
@@ -38,7 +40,9 @@ async function renderManifest({ manifestNo }, context) {
|
|
|
38
40
|
manifest_no: manifest === null || manifest === void 0 ? void 0 : manifest.name,
|
|
39
41
|
manifest_date: datetime_util_1.DateTimeConverter.date(manifest === null || manifest === void 0 ? void 0 : manifest.createdAt).toString(),
|
|
40
42
|
total_list: (releaseGoods === null || releaseGoods === void 0 ? void 0 : releaseGoods.length) || 0,
|
|
41
|
-
product_list: releaseGoods.map((item, idx) => {
|
|
43
|
+
product_list: await Promise.all(releaseGoods.map(async (item, idx) => {
|
|
44
|
+
const customerBizplaceId = item.bizplace.id;
|
|
45
|
+
const custCompanyBizplace = await (0, biz_base_1.getCompanyBizplace)(null, null, customerBizplaceId);
|
|
42
46
|
return {
|
|
43
47
|
list_no: idx + 1,
|
|
44
48
|
order_no: item === null || item === void 0 ? void 0 : item.refNo,
|
|
@@ -47,9 +51,12 @@ async function renderManifest({ manifestNo }, context) {
|
|
|
47
51
|
delivery_date: datetime_util_1.DateTimeConverter.date(manifest === null || manifest === void 0 ? void 0 : manifest.dispatchedAt).toString(),
|
|
48
52
|
attention_to: item === null || item === void 0 ? void 0 : item.attentionTo,
|
|
49
53
|
delivery_address: item === null || item === void 0 ? void 0 : item.deliveryAddress1,
|
|
50
|
-
postal_code_city: `${item === null || item === void 0 ? void 0 : item.postalCode}, ${item === null || item === void 0 ? void 0 : item.city}
|
|
54
|
+
postal_code_city: `${item === null || item === void 0 ? void 0 : item.postalCode}, ${item === null || item === void 0 ? void 0 : item.city}`,
|
|
55
|
+
remark: item === null || item === void 0 ? void 0 : item.remark,
|
|
56
|
+
status: item === null || item === void 0 ? void 0 : item.status,
|
|
57
|
+
company_domain_name: custCompanyBizplace.domain.name
|
|
51
58
|
};
|
|
52
|
-
})
|
|
59
|
+
}))
|
|
53
60
|
};
|
|
54
61
|
const formData = new form_data_1.default();
|
|
55
62
|
formData.append('template', 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,2DAAkE;AAClE,iDAA8C;
|
|
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.22",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -29,16 +29,16 @@
|
|
|
29
29
|
"@things-factory/document-template-base": "^4.3.20",
|
|
30
30
|
"@things-factory/id-rule-base": "^4.3.20",
|
|
31
31
|
"@things-factory/integration-lmd": "^4.3.20",
|
|
32
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
33
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
32
|
+
"@things-factory/integration-marketplace": "^4.3.22",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^4.3.22",
|
|
34
34
|
"@things-factory/integration-sftp": "^4.3.21",
|
|
35
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
35
|
+
"@things-factory/marketplace-base": "^4.3.22",
|
|
36
36
|
"@things-factory/notification": "^4.3.20",
|
|
37
|
-
"@things-factory/sales-base": "^4.3.
|
|
37
|
+
"@things-factory/sales-base": "^4.3.22",
|
|
38
38
|
"@things-factory/setting-base": "^4.3.20",
|
|
39
39
|
"@things-factory/shell": "^4.3.20",
|
|
40
40
|
"@things-factory/transport-base": "^4.3.20",
|
|
41
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
41
|
+
"@things-factory/warehouse-base": "^4.3.22"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "9dd1ce192948dbc0e4f3611e11f4804b71d06643"
|
|
44
44
|
}
|
|
@@ -6,6 +6,7 @@ import { Attachment, STORAGE } from '@things-factory/attachment-base'
|
|
|
6
6
|
import { config } from '@things-factory/env'
|
|
7
7
|
import { Manifest, ReleaseGood } from '@things-factory/sales-base'
|
|
8
8
|
import { Domain } from '@things-factory/shell'
|
|
9
|
+
import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
|
|
9
10
|
|
|
10
11
|
import { TEMPLATE_TYPE } from '../constants'
|
|
11
12
|
import { DateTimeConverter } from '../utils/datetime-util'
|
|
@@ -25,8 +26,9 @@ export async function renderManifest({ manifestNo }, context: any) {
|
|
|
25
26
|
})
|
|
26
27
|
|
|
27
28
|
// find release good
|
|
28
|
-
|
|
29
|
-
where: { domain, manifest }
|
|
29
|
+
let releaseGoods: ReleaseGood[] = await getRepository(ReleaseGood).find({
|
|
30
|
+
where: { domain, manifest },
|
|
31
|
+
relations: ['bizplace']
|
|
30
32
|
})
|
|
31
33
|
|
|
32
34
|
// 7. find grn template based on category
|
|
@@ -41,7 +43,9 @@ export async function renderManifest({ manifestNo }, context: any) {
|
|
|
41
43
|
manifest_no: manifest?.name,
|
|
42
44
|
manifest_date: DateTimeConverter.date(manifest?.createdAt).toString(),
|
|
43
45
|
total_list: releaseGoods?.length || 0,
|
|
44
|
-
product_list: releaseGoods.map((item, idx) => {
|
|
46
|
+
product_list: await Promise.all (releaseGoods.map(async(item, idx) => {
|
|
47
|
+
const customerBizplaceId: string = item.bizplace.id
|
|
48
|
+
const custCompanyBizplace: Bizplace = await getCompanyBizplace(null, null, customerBizplaceId)
|
|
45
49
|
return {
|
|
46
50
|
list_no: idx + 1,
|
|
47
51
|
order_no: item?.refNo,
|
|
@@ -50,9 +54,12 @@ export async function renderManifest({ manifestNo }, context: any) {
|
|
|
50
54
|
delivery_date: DateTimeConverter.date(manifest?.dispatchedAt).toString(),
|
|
51
55
|
attention_to: item?.attentionTo,
|
|
52
56
|
delivery_address: item?.deliveryAddress1,
|
|
53
|
-
postal_code_city: `${item?.postalCode}, ${item?.city}
|
|
57
|
+
postal_code_city: `${item?.postalCode}, ${item?.city}`,
|
|
58
|
+
remark: item?.remark,
|
|
59
|
+
status: item?.status,
|
|
60
|
+
company_domain_name: custCompanyBizplace.domain.name
|
|
54
61
|
}
|
|
55
|
-
})
|
|
62
|
+
}))
|
|
56
63
|
}
|
|
57
64
|
|
|
58
65
|
const formData = new FormData()
|