@things-factory/worksheet-base 4.3.88 → 4.3.89
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/worksheet/delivery-order-by-worksheet.js +7 -4
- package/dist-server/graphql/resolvers/worksheet/delivery-order-by-worksheet.js.map +1 -1
- package/dist-server/graphql/types/worksheet/delivery-order-info.js +1 -0
- package/dist-server/graphql/types/worksheet/delivery-order-info.js.map +1 -1
- package/package.json +7 -7
- package/server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts +7 -6
- package/server/graphql/types/worksheet/delivery-order-info.ts +1 -0
|
@@ -7,6 +7,7 @@ const transport_base_1 = require("@things-factory/transport-base");
|
|
|
7
7
|
const env_1 = require("@things-factory/env");
|
|
8
8
|
exports.deliveryOrderByWorksheetResolver = {
|
|
9
9
|
async deliveryOrderByWorksheet(_, { name }, context) {
|
|
10
|
+
var _a;
|
|
10
11
|
const { domain, tx } = context.state;
|
|
11
12
|
try {
|
|
12
13
|
const foundDO = await tx.getRepository(sales_base_1.DeliveryOrder).findOne({
|
|
@@ -18,7 +19,9 @@ exports.deliveryOrderByWorksheetResolver = {
|
|
|
18
19
|
});
|
|
19
20
|
if (!foundDO)
|
|
20
21
|
throw new Error('Delivery order not found!');
|
|
21
|
-
const foundOI = await tx
|
|
22
|
+
const foundOI = await tx
|
|
23
|
+
.getRepository(sales_base_1.OrderInventory)
|
|
24
|
+
.createQueryBuilder('oi')
|
|
22
25
|
.select('p.name', 'name')
|
|
23
26
|
.addSelect('p.sku', 'sku')
|
|
24
27
|
.addSelect('p.type', 'type')
|
|
@@ -69,8 +72,8 @@ exports.deliveryOrderByWorksheetResolver = {
|
|
|
69
72
|
reusablePallet: foundDO.reusablePallet || '',
|
|
70
73
|
createdDate: foundDO.createdAt.toISOString().split('T')[0],
|
|
71
74
|
isManualDo: foundDO.releaseGood ? false : true,
|
|
72
|
-
attentionTo: foundDO.attentionTo,
|
|
73
|
-
releaseGood: Object.assign(Object.assign({}, foundDO.releaseGood), { attentionTo: foundDO.attentionTo || foundDO.releaseGood.attentionTo, bizplace: partnerBiz }),
|
|
75
|
+
attentionTo: foundDO.attentionTo || '',
|
|
76
|
+
releaseGood: Object.assign(Object.assign({}, foundDO.releaseGood), { attentionTo: foundDO.attentionTo || ((_a = foundDO.releaseGood) === null || _a === void 0 ? void 0 : _a.attentionTo), bizplace: partnerBiz }),
|
|
74
77
|
productList: foundOI
|
|
75
78
|
},
|
|
76
79
|
contactPointInfo: partnerContactPoint.map(async (cp) => {
|
|
@@ -82,7 +85,7 @@ exports.deliveryOrderByWorksheetResolver = {
|
|
|
82
85
|
phone: cp.phone || '',
|
|
83
86
|
contactName: cp.name || ''
|
|
84
87
|
};
|
|
85
|
-
})
|
|
88
|
+
})
|
|
86
89
|
};
|
|
87
90
|
}
|
|
88
91
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-order-by-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts"],"names":[],"mappings":";;;AAAA,uDAAiE;AACjE,2DAA0E;AAG1E,mEAAgE;AAChE,6CAA4C;AAE/B,QAAA,gCAAgC,GAAG;IAC9C,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY
|
|
1
|
+
{"version":3,"file":"delivery-order-by-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-order-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/delivery-order-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,iBAAiB,GAAG,IAAA,uBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"delivery-order-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/delivery-order-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,iBAAiB,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;CAsBnC,CAAA"}
|
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.89",
|
|
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.86",
|
|
30
30
|
"@things-factory/id-rule-base": "^4.3.86",
|
|
31
31
|
"@things-factory/integration-lmd": "^4.3.86",
|
|
32
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
33
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
32
|
+
"@things-factory/integration-marketplace": "^4.3.89",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^4.3.89",
|
|
34
34
|
"@things-factory/integration-sftp": "^4.3.86",
|
|
35
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
35
|
+
"@things-factory/marketplace-base": "^4.3.89",
|
|
36
36
|
"@things-factory/notification": "^4.3.86",
|
|
37
|
-
"@things-factory/sales-base": "^4.3.
|
|
37
|
+
"@things-factory/sales-base": "^4.3.89",
|
|
38
38
|
"@things-factory/setting-base": "^4.3.86",
|
|
39
39
|
"@things-factory/shell": "^4.3.86",
|
|
40
40
|
"@things-factory/transport-base": "^4.3.86",
|
|
41
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
41
|
+
"@things-factory/warehouse-base": "^4.3.89"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "7bcc26bb32589c622ab05813a6b5012729aa3b9e"
|
|
44
44
|
}
|
|
@@ -7,7 +7,7 @@ import { logger } from '@things-factory/env'
|
|
|
7
7
|
|
|
8
8
|
export const deliveryOrderByWorksheetResolver = {
|
|
9
9
|
async deliveryOrderByWorksheet(_: any, { name }, context: any) {
|
|
10
|
-
const { domain, tx }: { domain: Domain
|
|
10
|
+
const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
|
|
11
11
|
try {
|
|
12
12
|
const foundDO: DeliveryOrder = await tx.getRepository(DeliveryOrder).findOne({
|
|
13
13
|
where: {
|
|
@@ -19,7 +19,9 @@ export const deliveryOrderByWorksheetResolver = {
|
|
|
19
19
|
|
|
20
20
|
if (!foundDO) throw new Error('Delivery order not found!')
|
|
21
21
|
|
|
22
|
-
const foundOI: any = await tx
|
|
22
|
+
const foundOI: any = await tx
|
|
23
|
+
.getRepository(OrderInventory)
|
|
24
|
+
.createQueryBuilder('oi')
|
|
23
25
|
.select('p.name', 'name')
|
|
24
26
|
.addSelect('p.sku', 'sku')
|
|
25
27
|
.addSelect('p.type', 'type')
|
|
@@ -74,10 +76,10 @@ export const deliveryOrderByWorksheetResolver = {
|
|
|
74
76
|
reusablePallet: foundDO.reusablePallet || '',
|
|
75
77
|
createdDate: foundDO.createdAt.toISOString().split('T')[0],
|
|
76
78
|
isManualDo: foundDO.releaseGood ? false : true,
|
|
77
|
-
attentionTo: foundDO.attentionTo,
|
|
79
|
+
attentionTo: foundDO.attentionTo || '',
|
|
78
80
|
releaseGood: {
|
|
79
81
|
...foundDO.releaseGood,
|
|
80
|
-
attentionTo: foundDO.attentionTo || foundDO.releaseGood
|
|
82
|
+
attentionTo: foundDO.attentionTo || foundDO.releaseGood?.attentionTo,
|
|
81
83
|
bizplace: partnerBiz
|
|
82
84
|
},
|
|
83
85
|
productList: foundOI
|
|
@@ -91,12 +93,11 @@ export const deliveryOrderByWorksheetResolver = {
|
|
|
91
93
|
phone: cp.phone || '',
|
|
92
94
|
contactName: cp.name || ''
|
|
93
95
|
}
|
|
94
|
-
})
|
|
96
|
+
})
|
|
95
97
|
}
|
|
96
98
|
} catch (error) {
|
|
97
99
|
logger.error(`delivery-order-by-worksheet:(data:${JSON.stringify({ name, domain })}) ${error} `)
|
|
98
100
|
throw new Error('Something went wrong. Please contact support.')
|
|
99
101
|
}
|
|
100
|
-
|
|
101
102
|
}
|
|
102
103
|
}
|