@things-factory/operato-hub 4.3.524 → 4.3.526
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/config.development.js +27 -120
- package/dist-server/graphql/resolvers/synchronization/retry-create-lmd-parcels.js +1 -7
- package/dist-server/graphql/resolvers/synchronization/retry-create-lmd-parcels.js.map +1 -1
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-draft-order-details.js +15 -1
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-draft-order-details.js.map +1 -1
- package/openapi/v1/outbound.yaml +32 -0
- package/package.json +58 -58
- package/server/graphql/resolvers/synchronization/retry-create-lmd-parcels.ts +1 -7
- package/server/routers/api/restful-apis/v1/warehouse/get-draft-order-details.ts +32 -5
- package/translations/en.json +1 -9
- package/translations/ja.json +1 -8
- package/translations/ko.json +1 -9
- package/translations/ms.json +1 -8
- package/translations/zh.json +1 -9
package/config.development.js
CHANGED
|
@@ -4,119 +4,52 @@ module.exports = {
|
|
|
4
4
|
useVirtualHostBasedDomain: false,
|
|
5
5
|
fallbackRoute: '/',
|
|
6
6
|
subdomainOffset: 2,
|
|
7
|
-
port:
|
|
7
|
+
port: 1200,
|
|
8
8
|
inspect: '9260',
|
|
9
|
-
//postgres
|
|
10
|
-
ormconfig: {
|
|
11
|
-
name: 'default',
|
|
12
|
-
type: 'postgres',
|
|
13
|
-
database: 'postgres',
|
|
14
|
-
username: 'postgres',
|
|
15
|
-
password: 'hatio',
|
|
16
|
-
host: '192.168.0.161',
|
|
17
|
-
port: 15432,
|
|
18
|
-
synchronize: true,
|
|
19
|
-
logging: true
|
|
20
|
-
},
|
|
21
|
-
//eric2
|
|
22
|
-
// ormconfig: {
|
|
23
|
-
// name: 'default',
|
|
24
|
-
// type: 'postgres',
|
|
25
|
-
// database: 'eric2',
|
|
26
|
-
// username: 'postgres',
|
|
27
|
-
// password: 'hatio',
|
|
28
|
-
// host: '192.168.0.153',
|
|
29
|
-
// port: 15432,
|
|
30
|
-
// synchronize: false,
|
|
31
|
-
// logging: true
|
|
32
|
-
// },
|
|
33
|
-
// arif's
|
|
34
|
-
// ormconfig: {
|
|
35
|
-
// name: 'default',
|
|
36
|
-
// type: 'postgres',
|
|
37
|
-
// database: 'arif',
|
|
38
|
-
// username: 'postgres',
|
|
39
|
-
// password: 'hatio',
|
|
40
|
-
// host: '192.168.0.151',
|
|
41
|
-
// port: 15432,
|
|
42
|
-
// synchronize: false,
|
|
43
|
-
// logging: true
|
|
44
|
-
// },
|
|
45
|
-
//EMS
|
|
46
|
-
// ormconfig: {
|
|
47
|
-
// name: 'default',
|
|
48
|
-
// type: 'postgres',
|
|
49
|
-
// database: 'EMS',
|
|
50
|
-
// username: 'postgres',
|
|
51
|
-
// password: 'hatio',
|
|
52
|
-
// host: '192.168.0.161',
|
|
53
|
-
// port: 15432,
|
|
54
|
-
// synchronize: false,
|
|
55
|
-
// logging: true
|
|
56
|
-
// },
|
|
57
|
-
//db nora
|
|
58
9
|
// ormconfig: {
|
|
59
10
|
// name: 'default',
|
|
60
11
|
// type: 'postgres',
|
|
61
12
|
// database: 'postgres',
|
|
62
13
|
// username: 'postgres',
|
|
63
|
-
// password: '
|
|
64
|
-
// host: '
|
|
65
|
-
// port:
|
|
66
|
-
// synchronize:
|
|
14
|
+
// password: 'abcd1234',
|
|
15
|
+
// host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
|
|
16
|
+
// port: 55432,
|
|
17
|
+
// synchronize: false,
|
|
67
18
|
// logging: true
|
|
68
19
|
// },
|
|
69
20
|
// ormconfig: {
|
|
70
21
|
// name: 'default',
|
|
71
22
|
// type: 'postgres',
|
|
72
|
-
// database: '
|
|
23
|
+
// database: 'v3-hub1',
|
|
73
24
|
// username: 'postgres',
|
|
74
25
|
// password: 'hatio',
|
|
75
|
-
// host: '
|
|
26
|
+
// host: 'localhost',
|
|
76
27
|
// port: 15432,
|
|
77
28
|
// synchronize: true,
|
|
78
29
|
// logging: true
|
|
79
30
|
// },
|
|
80
|
-
//db izzah
|
|
81
31
|
// ormconfig: {
|
|
82
32
|
// name: 'default',
|
|
83
33
|
// type: 'postgres',
|
|
84
|
-
// database: '
|
|
34
|
+
// database: 'dev',
|
|
85
35
|
// username: 'postgres',
|
|
86
36
|
// password: 'hatio',
|
|
87
|
-
// host: '192.168.0.
|
|
37
|
+
// host: '192.168.0.161',
|
|
88
38
|
// port: 15432,
|
|
89
39
|
// synchronize: true,
|
|
90
40
|
// logging: true
|
|
91
41
|
// },
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
// extra: { poolSize: 30 }
|
|
104
|
-
// },
|
|
105
|
-
|
|
106
|
-
// ormconfig: {
|
|
107
|
-
// name: 'default',
|
|
108
|
-
// type: 'postgres',
|
|
109
|
-
// host: 'localhost',
|
|
110
|
-
// port: 15432,
|
|
111
|
-
// database: 'postgres',
|
|
112
|
-
// username: 'postgres',
|
|
113
|
-
// password: 'hatio',
|
|
114
|
-
// synchronize: false,
|
|
115
|
-
// logging: true,
|
|
116
|
-
// connectTimeoutMS: 30000,
|
|
117
|
-
// extra: { poolSize: 30 }
|
|
118
|
-
// },
|
|
119
|
-
|
|
42
|
+
ormconfig: {
|
|
43
|
+
name: 'default',
|
|
44
|
+
type: 'postgres',
|
|
45
|
+
database: 'dev',
|
|
46
|
+
username: 'postgres',
|
|
47
|
+
password: 'hatio',
|
|
48
|
+
host: 'localhost',
|
|
49
|
+
port: 15432,
|
|
50
|
+
synchronize: true,
|
|
51
|
+
logging: true
|
|
52
|
+
},
|
|
120
53
|
password: {
|
|
121
54
|
lowerCase: true,
|
|
122
55
|
upperCase: false,
|
|
@@ -193,21 +126,20 @@ module.exports = {
|
|
|
193
126
|
// }
|
|
194
127
|
},
|
|
195
128
|
fulfillmentIntegrationOperato: {
|
|
196
|
-
host: '
|
|
129
|
+
host: 'operato-h.com:3000',
|
|
197
130
|
protocol: 'http',
|
|
198
131
|
platform: 'operato',
|
|
199
132
|
application: 'Operato MMS',
|
|
200
133
|
appKey: 'a9bf751e622bf146662b240d58971051',
|
|
201
134
|
appSecret: '1c385935dc131c4b902b9bbf6a4798af',
|
|
202
|
-
callback: 'http://
|
|
135
|
+
callback: 'http://operato-retail.com:5000/callback-operato'
|
|
203
136
|
},
|
|
204
137
|
marketplaceIntegrationShopee: {
|
|
205
138
|
platform: 'shopee',
|
|
206
139
|
isUAT: false,
|
|
207
140
|
application: 'Operato MMS',
|
|
208
141
|
partnerId: 846025,
|
|
209
|
-
partnerKey: 'd34cfd85a603f196a0d74ebe08043280c1a27788bb36bdffd61e7e0bb1c90b64'
|
|
210
|
-
v2: true
|
|
142
|
+
partnerKey: 'd34cfd85a603f196a0d74ebe08043280c1a27788bb36bdffd61e7e0bb1c90b64'
|
|
211
143
|
},
|
|
212
144
|
marketplaceIntegrationLazada: {
|
|
213
145
|
platform: 'lazada',
|
|
@@ -216,16 +148,6 @@ module.exports = {
|
|
|
216
148
|
appSecret: 'HB3RTNEXHlVSlBr9SmWF8AjbSUT7a825',
|
|
217
149
|
callback: 'https://maybank.operato-m.com/lazada-callback'
|
|
218
150
|
},
|
|
219
|
-
|
|
220
|
-
//testinglazada
|
|
221
|
-
// marketplaceIntegrationLazada: {
|
|
222
|
-
// platform: 'lazada',
|
|
223
|
-
// application: 'powrup_bi',
|
|
224
|
-
// appKey: '117890',
|
|
225
|
-
// appSecret: 'tQVllnUa7irAHoNxAwXEVxoP1we1bUjE',
|
|
226
|
-
// callback: 'https://73c5-175-141-30-142.ngrok-free.app/lazada-callback'
|
|
227
|
-
// },
|
|
228
|
-
|
|
229
151
|
accountingIntegrationXero: {
|
|
230
152
|
platform: 'xero',
|
|
231
153
|
application: 'Operato WMS',
|
|
@@ -234,31 +156,16 @@ module.exports = {
|
|
|
234
156
|
callback: 'http://operato-h.com:3000/callback-xero',
|
|
235
157
|
hostname: 'http://operato-h.com:3000/'
|
|
236
158
|
},
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
159
|
+
lambda: {
|
|
160
|
+
region: 'ap-southeast-1',
|
|
161
|
+
accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
|
|
162
|
+
secretAccessKey: 'OG2qS0Usg4wyjPWbfv1ahPZzP80/w8z4i8MYHl+e'
|
|
241
163
|
},
|
|
242
|
-
|
|
243
|
-
lmdIntegrationEms: { refreshThreshold: 43200 },
|
|
244
|
-
|
|
245
|
-
lmdIntegrationCitylink: { refreshThreshold: 172800000 },
|
|
246
164
|
awbFileStorage: {
|
|
247
165
|
type: 's3',
|
|
248
166
|
accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
|
|
249
167
|
secretAccessKey: 'OG2qS0Usg4wyjPWbfv1ahPZzP80/w8z4i8MYHl+e',
|
|
250
168
|
bucketName: 'operato-awb',
|
|
251
169
|
region: 'ap-southeast-1'
|
|
252
|
-
},
|
|
253
|
-
lambda: {
|
|
254
|
-
region: 'ap-southeast-1',
|
|
255
|
-
accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
|
|
256
|
-
secretAccessKey: 'OG2qS0Usg4wyjPWbfv1ahPZzP80/w8z4i8MYHl+e'
|
|
257
|
-
},
|
|
258
|
-
lmdIntegrationConfig: {
|
|
259
|
-
version: {
|
|
260
|
-
v1: 'lmdMiddleware',
|
|
261
|
-
v2: 'lmdMiddlewareV2'
|
|
262
|
-
}
|
|
263
170
|
}
|
|
264
171
|
}
|
|
@@ -66,13 +66,7 @@ exports.retryCreateLmdParcelsResolver = {
|
|
|
66
66
|
'orderPackages.orderPackageItems',
|
|
67
67
|
'orderPackages.orderPackageItems.orderProduct',
|
|
68
68
|
'orderPackages.orderPackageItems.orderProduct.product',
|
|
69
|
-
'orderPackages.orderPackageItems.orderProduct.productDetail'
|
|
70
|
-
'orderConsignments',
|
|
71
|
-
'orderConsignments.orderPackages',
|
|
72
|
-
'orderConsignments.orderPackages.orderPackageItems',
|
|
73
|
-
'orderConsignments.orderPackages.orderPackageItems.orderProduct',
|
|
74
|
-
'orderConsignments.orderPackages.orderPackageItems.orderProduct.product',
|
|
75
|
-
'orderConsignments.orderPackages.orderPackageItems.orderProduct.productDetail'
|
|
69
|
+
'orderPackages.orderPackageItems.orderProduct.productDetail'
|
|
76
70
|
]
|
|
77
71
|
});
|
|
78
72
|
await (0, worksheet_base_1.createLmdParcel)([newReleaseGood], tx, newReleaseGood.domain, releaseGood.user, releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.marketplaceOrder);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-create-lmd-parcels.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/retry-create-lmd-parcels.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AAEtD,6CAA4C;AAE5C,2DAAoF;AACpF,mEAA2E;AAE9D,QAAA,6BAA6B,GAAG;IAC3C,KAAK,CAAC,qBAAqB,CAAC,CAAO,EAAE,EAAE,EAAE,OAAY;QACnD,IAAI;YACF,IAAI;gBACF,IAAI,aAAa,GAAG,IAAA,uBAAa,EAAC,wBAAW,CAAC;qBAC3C,kBAAkB,CAAC,IAAI,CAAC;qBACxB,kBAAkB,CAAC,qBAAqB,EAAE,KAAK,CAAC;qBAChD,kBAAkB,CAAC,WAAW,EAAE,QAAQ,CAAC;qBACzC,kBAAkB,CAAC,aAAa,EAAE,UAAU,CAAC;qBAC7C,kBAAkB,CAAC,YAAY,EAAE,SAAS,CAAC;qBAC3C,KAAK,CAAC,sBAAsB,CAAC;qBAC7B,QAAQ,CAAC,2BAA2B,EAAE;oBACrC,MAAM,EAAE,CAAC,yBAAY,CAAC,OAAO,EAAE,yBAAY,CAAC,aAAa,EAAE,yBAAY,CAAC,OAAO,CAAC;iBACjF,CAAC;qBACD,QAAQ,CAAC,kCAAkC,CAAC;qBAC5C,QAAQ,CAAC,EAAE,CAAC,EAAE;oBACb,MAAM,QAAQ,GAAG,EAAE;yBAChB,QAAQ,EAAE;yBACV,IAAI,CAAC,0BAAS,EAAE,IAAI,CAAC;yBACrB,SAAS,CAAC,qBAAqB,EAAE,KAAK,CAAC;yBACvC,SAAS,CAAC,qBAAqB,EAAE,IAAI,CAAC;yBACtC,KAAK,CAAC,4BAA4B,CAAC;yBACnC,QAAQ,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,CAAC,SAAS,EAAE,eAAe,CAAC,EAAE,CAAC;yBAC7E,QAAQ,CAAC,4DAA4D,CAAC;yBACtE,QAAQ,EAAE,CAAA;oBACb,OAAO,SAAS,GAAG,QAAQ,CAAA;gBAC7B,CAAC,CAAC;qBACD,QAAQ,CAAC,EAAE,CAAC,EAAE;oBACb,MAAM,QAAQ,GAAG,EAAE;yBAChB,QAAQ,EAAE;yBACV,IAAI,CAAC,yBAAY,EAAE,KAAK,CAAC;yBACzB,KAAK,CAAC,6BAA6B,CAAC;yBACpC,QAAQ,CAAC,sBAAsB,CAAC;yBAChC,QAAQ,EAAE,CAAA;oBACb,OAAO,SAAS,GAAG,QAAQ,CAAA;gBAC7B,CAAC,CAAC;qBACD,OAAO,CACN;;;;;cAKE,EACF,KAAK,CACN;qBACA,YAAY,CAAC,eAAe,EAAE,yBAAY,CAAC,OAAO,CAAC;qBACnD,YAAY,CAAC,mBAAmB,EAAE,yBAAY,CAAC,aAAa,CAAC;qBAC7D,YAAY,CAAC,eAAe,EAAE,yBAAY,CAAC,OAAO,CAAC;qBACnD,KAAK,CAAC,GAAG,CAAC,CAAA;gBAEb,IAAI,YAAY,GAAkB,MAAM,aAAa,CAAC,OAAO,EAAE,CAAA;gBAE/D,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,EAAE;oBACxB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;wBACtC,IAAI;4BACF,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;gCAC3C,IAAI,cAAc,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;oCAC5E,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,EAAE,EAAE;oCAC7B,SAAS,EAAE;wCACT,QAAQ;wCACR,UAAU;wCACV,kBAAkB;wCAClB,eAAe;wCACf,iCAAiC;wCACjC,8CAA8C;wCAC9C,sDAAsD;wCACtD,4DAA4D;
|
|
1
|
+
{"version":3,"file":"retry-create-lmd-parcels.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/retry-create-lmd-parcels.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,13 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-draft-order-details', middlewares_
|
|
|
30
30
|
}
|
|
31
31
|
const draftReleaseGood = await (0, typeorm_1.getRepository)(sales_base_1.DraftReleaseGood).findOne({
|
|
32
32
|
where: filter,
|
|
33
|
-
relations: [
|
|
33
|
+
relations: [
|
|
34
|
+
'orderProducts',
|
|
35
|
+
'orderProducts.productBundle',
|
|
36
|
+
'orderProducts.productBundle.productBundleSettings',
|
|
37
|
+
'orderProducts.productBundle.productBundleSettings.product',
|
|
38
|
+
'orderProducts.product'
|
|
39
|
+
]
|
|
34
40
|
});
|
|
35
41
|
if (!draftReleaseGood)
|
|
36
42
|
throw new error_util_1.ApiError('E04', `draft release order: ${filter['name']}`);
|
|
@@ -47,6 +53,14 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-draft-order-details', middlewares_
|
|
|
47
53
|
id: op.id,
|
|
48
54
|
sku: op.productBundle.sku,
|
|
49
55
|
name: op.productBundle.name,
|
|
56
|
+
products: op.productBundle.productBundleSettings.map(pbs => {
|
|
57
|
+
return {
|
|
58
|
+
id: pbs.product.id,
|
|
59
|
+
sku: pbs.product.sku,
|
|
60
|
+
name: pbs.product.name,
|
|
61
|
+
releaseQty: op.releaseQty * pbs.bundleQty
|
|
62
|
+
};
|
|
63
|
+
}),
|
|
50
64
|
type: 'BUNDLE',
|
|
51
65
|
releaseQty: op.releaseQty
|
|
52
66
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-draft-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-draft-order-details.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,
|
|
1
|
+
{"version":3,"file":"get-draft-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-draft-order-details.ts"],"names":[],"mappings":"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"}
|
package/openapi/v1/outbound.yaml
CHANGED
|
@@ -1630,6 +1630,38 @@ definitions:
|
|
|
1630
1630
|
name:
|
|
1631
1631
|
type: string
|
|
1632
1632
|
example: 'Bundle XX'
|
|
1633
|
+
products:
|
|
1634
|
+
type: array
|
|
1635
|
+
items:
|
|
1636
|
+
oneOf:
|
|
1637
|
+
- type: object
|
|
1638
|
+
properties:
|
|
1639
|
+
id:
|
|
1640
|
+
type: string
|
|
1641
|
+
example: 'd61cd39-f9de-4a28-8d24-981e6ea5c4r6'
|
|
1642
|
+
sku:
|
|
1643
|
+
type: string
|
|
1644
|
+
example: 'SKU Y'
|
|
1645
|
+
name:
|
|
1646
|
+
type: string
|
|
1647
|
+
example: 'SKU YY'
|
|
1648
|
+
releaseQty:
|
|
1649
|
+
type: integer
|
|
1650
|
+
example: '3'
|
|
1651
|
+
- type: object
|
|
1652
|
+
properties:
|
|
1653
|
+
id:
|
|
1654
|
+
type: string
|
|
1655
|
+
example: 'd61cd39-f9de-4a28-8d24-981e6ea5c4r6'
|
|
1656
|
+
sku:
|
|
1657
|
+
type: string
|
|
1658
|
+
example: 'SKU Z'
|
|
1659
|
+
name:
|
|
1660
|
+
type: string
|
|
1661
|
+
example: 'SKU ZZ'
|
|
1662
|
+
releaseQty:
|
|
1663
|
+
type: integer
|
|
1664
|
+
example: '2'
|
|
1633
1665
|
type:
|
|
1634
1666
|
type: string
|
|
1635
1667
|
example: 'bundle'
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-hub",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.526",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -55,61 +55,61 @@
|
|
|
55
55
|
"@operato/scene-tab": "^0.1.8",
|
|
56
56
|
"@operato/scene-table": "^0.1.8",
|
|
57
57
|
"@operato/scene-wheel-sorter": "^0.1.8",
|
|
58
|
-
"@things-factory/api": "^4.3.
|
|
59
|
-
"@things-factory/apptool-ui": "^4.3.
|
|
60
|
-
"@things-factory/attachment-base": "^4.3.
|
|
61
|
-
"@things-factory/auth-base": "^4.3.
|
|
62
|
-
"@things-factory/auth-ui": "^4.3.
|
|
63
|
-
"@things-factory/biz-base": "^4.3.
|
|
64
|
-
"@things-factory/biz-ui": "^4.3.
|
|
65
|
-
"@things-factory/board-service": "^4.3.
|
|
66
|
-
"@things-factory/board-ui": "^4.3.
|
|
67
|
-
"@things-factory/code-ui": "^4.3.
|
|
68
|
-
"@things-factory/component-ui": "^4.3.
|
|
69
|
-
"@things-factory/context-ui": "^4.3.
|
|
70
|
-
"@things-factory/document-template-ui": "^4.3.
|
|
71
|
-
"@things-factory/export-ui": "^4.3.
|
|
72
|
-
"@things-factory/export-ui-csv": "^4.3.
|
|
73
|
-
"@things-factory/export-ui-excel": "^4.3.
|
|
74
|
-
"@things-factory/geography": "^4.3.
|
|
75
|
-
"@things-factory/grist-ui": "^4.3.
|
|
76
|
-
"@things-factory/help": "^4.3.
|
|
77
|
-
"@things-factory/i18n-base": "^4.3.
|
|
78
|
-
"@things-factory/import-ui": "^4.3.
|
|
79
|
-
"@things-factory/import-ui-excel": "^4.3.
|
|
80
|
-
"@things-factory/integration-accounting": "^4.3.
|
|
81
|
-
"@things-factory/integration-fulfillment": "^4.3.
|
|
82
|
-
"@things-factory/integration-lmd": "^4.3.
|
|
83
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
84
|
-
"@things-factory/integration-pos": "^4.3.
|
|
85
|
-
"@things-factory/integration-powrup": "^4.3.
|
|
86
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
87
|
-
"@things-factory/integration-sftp": "^4.3.
|
|
88
|
-
"@things-factory/lite-menu": "^4.3.
|
|
89
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
90
|
-
"@things-factory/more-ui": "^4.3.
|
|
91
|
-
"@things-factory/notification": "^4.3.
|
|
92
|
-
"@things-factory/pdf": "^4.3.
|
|
93
|
-
"@things-factory/product-ui": "^4.3.
|
|
94
|
-
"@things-factory/resource-ui": "^4.3.
|
|
95
|
-
"@things-factory/sales-base": "^4.3.
|
|
96
|
-
"@things-factory/scene-data-transform": "^4.3.
|
|
97
|
-
"@things-factory/scene-excel": "^4.3.
|
|
98
|
-
"@things-factory/scene-firebase": "^4.3.
|
|
99
|
-
"@things-factory/scene-form": "^4.3.
|
|
100
|
-
"@things-factory/scene-google-map": "^4.3.
|
|
101
|
-
"@things-factory/scene-graphql": "^4.3.
|
|
102
|
-
"@things-factory/scene-label": "^4.3.
|
|
103
|
-
"@things-factory/scene-marker": "^4.3.
|
|
104
|
-
"@things-factory/scene-mqtt": "^4.3.
|
|
105
|
-
"@things-factory/scene-restful": "^4.3.
|
|
106
|
-
"@things-factory/scene-visualizer": "^4.3.
|
|
107
|
-
"@things-factory/setting-ui": "^4.3.
|
|
108
|
-
"@things-factory/shell": "^4.3.
|
|
109
|
-
"@things-factory/system-ui": "^4.3.
|
|
110
|
-
"@things-factory/transport-base": "^4.3.
|
|
111
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
112
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
58
|
+
"@things-factory/api": "^4.3.526",
|
|
59
|
+
"@things-factory/apptool-ui": "^4.3.526",
|
|
60
|
+
"@things-factory/attachment-base": "^4.3.526",
|
|
61
|
+
"@things-factory/auth-base": "^4.3.526",
|
|
62
|
+
"@things-factory/auth-ui": "^4.3.526",
|
|
63
|
+
"@things-factory/biz-base": "^4.3.526",
|
|
64
|
+
"@things-factory/biz-ui": "^4.3.526",
|
|
65
|
+
"@things-factory/board-service": "^4.3.526",
|
|
66
|
+
"@things-factory/board-ui": "^4.3.526",
|
|
67
|
+
"@things-factory/code-ui": "^4.3.526",
|
|
68
|
+
"@things-factory/component-ui": "^4.3.526",
|
|
69
|
+
"@things-factory/context-ui": "^4.3.526",
|
|
70
|
+
"@things-factory/document-template-ui": "^4.3.526",
|
|
71
|
+
"@things-factory/export-ui": "^4.3.526",
|
|
72
|
+
"@things-factory/export-ui-csv": "^4.3.526",
|
|
73
|
+
"@things-factory/export-ui-excel": "^4.3.526",
|
|
74
|
+
"@things-factory/geography": "^4.3.526",
|
|
75
|
+
"@things-factory/grist-ui": "^4.3.526",
|
|
76
|
+
"@things-factory/help": "^4.3.526",
|
|
77
|
+
"@things-factory/i18n-base": "^4.3.526",
|
|
78
|
+
"@things-factory/import-ui": "^4.3.526",
|
|
79
|
+
"@things-factory/import-ui-excel": "^4.3.526",
|
|
80
|
+
"@things-factory/integration-accounting": "^4.3.526",
|
|
81
|
+
"@things-factory/integration-fulfillment": "^4.3.526",
|
|
82
|
+
"@things-factory/integration-lmd": "^4.3.526",
|
|
83
|
+
"@things-factory/integration-marketplace": "^4.3.526",
|
|
84
|
+
"@things-factory/integration-pos": "^4.3.526",
|
|
85
|
+
"@things-factory/integration-powrup": "^4.3.526",
|
|
86
|
+
"@things-factory/integration-sellercraft": "^4.3.526",
|
|
87
|
+
"@things-factory/integration-sftp": "^4.3.526",
|
|
88
|
+
"@things-factory/lite-menu": "^4.3.526",
|
|
89
|
+
"@things-factory/marketplace-base": "^4.3.526",
|
|
90
|
+
"@things-factory/more-ui": "^4.3.526",
|
|
91
|
+
"@things-factory/notification": "^4.3.526",
|
|
92
|
+
"@things-factory/pdf": "^4.3.526",
|
|
93
|
+
"@things-factory/product-ui": "^4.3.526",
|
|
94
|
+
"@things-factory/resource-ui": "^4.3.526",
|
|
95
|
+
"@things-factory/sales-base": "^4.3.526",
|
|
96
|
+
"@things-factory/scene-data-transform": "^4.3.526",
|
|
97
|
+
"@things-factory/scene-excel": "^4.3.526",
|
|
98
|
+
"@things-factory/scene-firebase": "^4.3.526",
|
|
99
|
+
"@things-factory/scene-form": "^4.3.526",
|
|
100
|
+
"@things-factory/scene-google-map": "^4.3.526",
|
|
101
|
+
"@things-factory/scene-graphql": "^4.3.526",
|
|
102
|
+
"@things-factory/scene-label": "^4.3.526",
|
|
103
|
+
"@things-factory/scene-marker": "^4.3.526",
|
|
104
|
+
"@things-factory/scene-mqtt": "^4.3.526",
|
|
105
|
+
"@things-factory/scene-restful": "^4.3.526",
|
|
106
|
+
"@things-factory/scene-visualizer": "^4.3.526",
|
|
107
|
+
"@things-factory/setting-ui": "^4.3.526",
|
|
108
|
+
"@things-factory/shell": "^4.3.526",
|
|
109
|
+
"@things-factory/system-ui": "^4.3.526",
|
|
110
|
+
"@things-factory/transport-base": "^4.3.526",
|
|
111
|
+
"@things-factory/warehouse-base": "^4.3.526",
|
|
112
|
+
"@things-factory/worksheet-base": "^4.3.526",
|
|
113
113
|
"cron-parser": "^4.7.0",
|
|
114
114
|
"koa2-swagger-ui": "^5.0.2",
|
|
115
115
|
"swagger-jsdoc": "^5.0.0",
|
|
@@ -117,10 +117,10 @@
|
|
|
117
117
|
"yamljs": "^0.3.0"
|
|
118
118
|
},
|
|
119
119
|
"devDependencies": {
|
|
120
|
-
"@things-factory/builder": "^4.3.
|
|
120
|
+
"@things-factory/builder": "^4.3.526"
|
|
121
121
|
},
|
|
122
122
|
"resolutions": {
|
|
123
123
|
"core-js": "^3.16.0"
|
|
124
124
|
},
|
|
125
|
-
"gitHead": "
|
|
125
|
+
"gitHead": "a9a0046f9332bc4b538265ac81c93f0a14346330"
|
|
126
126
|
}
|
|
@@ -71,13 +71,7 @@ export const retryCreateLmdParcelsResolver = {
|
|
|
71
71
|
'orderPackages.orderPackageItems',
|
|
72
72
|
'orderPackages.orderPackageItems.orderProduct',
|
|
73
73
|
'orderPackages.orderPackageItems.orderProduct.product',
|
|
74
|
-
'orderPackages.orderPackageItems.orderProduct.productDetail'
|
|
75
|
-
'orderConsignments',
|
|
76
|
-
'orderConsignments.orderPackages',
|
|
77
|
-
'orderConsignments.orderPackages.orderPackageItems',
|
|
78
|
-
'orderConsignments.orderPackages.orderPackageItems.orderProduct',
|
|
79
|
-
'orderConsignments.orderPackages.orderPackageItems.orderProduct.product',
|
|
80
|
-
'orderConsignments.orderPackages.orderPackageItems.orderProduct.productDetail'
|
|
74
|
+
'orderPackages.orderPackageItems.orderProduct.productDetail'
|
|
81
75
|
]
|
|
82
76
|
})
|
|
83
77
|
await createLmdParcel(
|
|
@@ -1,9 +1,22 @@
|
|
|
1
1
|
import _ from 'lodash'
|
|
2
|
-
import { getRepository
|
|
2
|
+
import { getRepository } from 'typeorm'
|
|
3
|
+
|
|
3
4
|
import { restfulApiRouter as router } from '@things-factory/api'
|
|
4
|
-
import {
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
import {
|
|
6
|
+
DraftReleaseGood,
|
|
7
|
+
ReleaseGood
|
|
8
|
+
} from '@things-factory/sales-base'
|
|
9
|
+
|
|
10
|
+
import {
|
|
11
|
+
businessMiddleware,
|
|
12
|
+
loggingMiddleware,
|
|
13
|
+
validationMiddleware
|
|
14
|
+
} from '../middlewares'
|
|
15
|
+
import {
|
|
16
|
+
ApiError,
|
|
17
|
+
ApiErrorHandler,
|
|
18
|
+
throwInternalServerError
|
|
19
|
+
} from '../utils/error-util'
|
|
7
20
|
|
|
8
21
|
router.get(
|
|
9
22
|
'/v1/warehouse/get-draft-order-details',
|
|
@@ -36,7 +49,13 @@ router.get(
|
|
|
36
49
|
|
|
37
50
|
const draftReleaseGood: DraftReleaseGood = await getRepository(DraftReleaseGood).findOne({
|
|
38
51
|
where: filter,
|
|
39
|
-
relations: [
|
|
52
|
+
relations: [
|
|
53
|
+
'orderProducts',
|
|
54
|
+
'orderProducts.productBundle',
|
|
55
|
+
'orderProducts.productBundle.productBundleSettings',
|
|
56
|
+
'orderProducts.productBundle.productBundleSettings.product',
|
|
57
|
+
'orderProducts.product'
|
|
58
|
+
]
|
|
40
59
|
})
|
|
41
60
|
|
|
42
61
|
if (!draftReleaseGood) throw new ApiError('E04', `draft release order: ${filter['name']}`)
|
|
@@ -57,6 +76,14 @@ router.get(
|
|
|
57
76
|
id: op.id,
|
|
58
77
|
sku: op.productBundle.sku,
|
|
59
78
|
name: op.productBundle.name,
|
|
79
|
+
products: op.productBundle.productBundleSettings.map(pbs => {
|
|
80
|
+
return {
|
|
81
|
+
id: pbs.product.id,
|
|
82
|
+
sku: pbs.product.sku,
|
|
83
|
+
name: pbs.product.name,
|
|
84
|
+
releaseQty: op.releaseQty * pbs.bundleQty
|
|
85
|
+
}
|
|
86
|
+
}),
|
|
60
87
|
type: 'BUNDLE',
|
|
61
88
|
releaseQty: op.releaseQty
|
|
62
89
|
}
|
package/translations/en.json
CHANGED
|
@@ -38,11 +38,6 @@
|
|
|
38
38
|
"text.do_you_want_to_invite_x": "do you want to invite {x}",
|
|
39
39
|
"text.invalid_bundle_qty_for_item_number": "invalid bundle qty for item #{number}",
|
|
40
40
|
"label.warehouse": "warehouse",
|
|
41
|
-
"label.mps": "MPS",
|
|
42
|
-
"label.max_parcel_weight": "Max Parcel Weight (KG)",
|
|
43
|
-
"label.max_consignment_weight": "Max Consignment Weight (KG)",
|
|
44
|
-
"label.multi_piece_shipment": "Multi-Piece Shipment",
|
|
45
|
-
|
|
46
41
|
|
|
47
42
|
"text.are_you_sure_to_sync_product": "are you sure to sync product?",
|
|
48
43
|
"text.attachment_info_not_valid": "attachment info not valid",
|
|
@@ -59,7 +54,6 @@
|
|
|
59
54
|
"text.contact_type_does_not_exist": "contact type does not exist",
|
|
60
55
|
"text.authentication_failed": "authentication failed",
|
|
61
56
|
"text.successfully_authenticated": "successfully authenticated",
|
|
62
|
-
"text.lmd_mps_form_invalid":"lmd mps form is invalid",
|
|
63
57
|
|
|
64
58
|
"error.company not found": "company not found",
|
|
65
59
|
"error.eta date is invalid": "eta date is invalid",
|
|
@@ -82,7 +76,5 @@
|
|
|
82
76
|
"title.owner_transfer": "business owner transfer",
|
|
83
77
|
"title.sync_direction": "sync direction",
|
|
84
78
|
"title.upload_document_template": "upload document template",
|
|
85
|
-
"title.bizplace_settings": "bizplace settings"
|
|
86
|
-
"title.mps": "multi-pieces shipment",
|
|
87
|
-
"title.weight_setting:":"Weight Setting"
|
|
79
|
+
"title.bizplace_settings": "bizplace settings"
|
|
88
80
|
}
|
package/translations/ja.json
CHANGED
|
@@ -52,10 +52,6 @@
|
|
|
52
52
|
"label.upload_template": "upload template",
|
|
53
53
|
"label.user": "ユーザー",
|
|
54
54
|
"label.warehouse": "倉庫",
|
|
55
|
-
"label.mps": "[jp]MPS",
|
|
56
|
-
"label.max_parcel_weight": "[jp]Max Parcel Weight (KG)",
|
|
57
|
-
"label.max_consignment_weight": "[jp]Max Consignment Weight (KG)",
|
|
58
|
-
"label.multi_piece_shipment": "[jp]Multi-Piece Shipment",
|
|
59
55
|
"text.cannot_delete": "削除できません.",
|
|
60
56
|
"text.do_you_want_to_invite_x": "{x}を招待しますか?",
|
|
61
57
|
"text.invalid_bundle_qty_for_item_number": "[jp]invalid bundle qty for item #{number}",
|
|
@@ -64,7 +60,6 @@
|
|
|
64
60
|
"text.transform_to_x": "{x}に変更",
|
|
65
61
|
"text.user_deleted_successfully": "正常にユーザーを削除しました.",
|
|
66
62
|
"text.x_cannot_delete": "{x}は削除できません.",
|
|
67
|
-
"text.lmd_mps_form_invalid":"[jp]lmd mps form is invalid",
|
|
68
63
|
"text.contact_type_does_not_exist": "[jp]contact type does not exist",
|
|
69
64
|
"error.warehouse not found": "倉庫が見つかりません.",
|
|
70
65
|
"error.warehouse not found in the company": "会社内で倉庫を見つかりません.",
|
|
@@ -75,7 +70,5 @@
|
|
|
75
70
|
"title.owner_transfer": "ビジネスオーナーを移転する",
|
|
76
71
|
"title.sync_direction": "[jp]sync direction",
|
|
77
72
|
"title.upload_document_template": "テンプレート アップロード",
|
|
78
|
-
"title.bizplace_settings": "[jp]bizplace settings"
|
|
79
|
-
"title.mps": "[jp] multi-pieces shipment",
|
|
80
|
-
"title.weight_setting:":"[jp] Weight Setting"
|
|
73
|
+
"title.bizplace_settings": "[jp]bizplace settings"
|
|
81
74
|
}
|
package/translations/ko.json
CHANGED
|
@@ -52,11 +52,6 @@
|
|
|
52
52
|
"label.upload_template": "upload template",
|
|
53
53
|
"label.user": "사용자",
|
|
54
54
|
"label.warehouse": "창고",
|
|
55
|
-
"label.mps": "[ko]MPS",
|
|
56
|
-
"label.max_parcel_weight": "[ko]Max Parcel Weight (KG)",
|
|
57
|
-
"label.max_consignment_weight": "[ko]Max Consignment Weight (KG)",
|
|
58
|
-
"label.multi_piece_shipment": "[ko]Multi-Piece Shipment",
|
|
59
|
-
|
|
60
55
|
"text.cannot_delete": "삭제할 수 없습니다.",
|
|
61
56
|
"text.do_you_want_to_invite_x": "{x}을(를) 초대하시겠습니까?",
|
|
62
57
|
"text.invalid_bundle_qty_for_item_number": "[ko]invalid bundle qty for item #{number}",
|
|
@@ -66,7 +61,6 @@
|
|
|
66
61
|
"text.user_deleted_successfully": "성공적으로 사용자를 삭제하였습니다.",
|
|
67
62
|
"text.x_cannot_delete": "{x}(은)는 삭제할 수 없습니다.",
|
|
68
63
|
"text.contact_type_does_not_exist": "[ko]contact type does not exist",
|
|
69
|
-
"text.lmd_mps_form_invalid":"[jp]lmd mps form is invalid",
|
|
70
64
|
"error.warehouse not found": "웨어하우스를 찾을 수 없습니다.",
|
|
71
65
|
"error.warehouse not found in the company": "회사내에서 웨어하우스를 찾을 수 없습니다.",
|
|
72
66
|
|
|
@@ -76,7 +70,5 @@
|
|
|
76
70
|
"title.owner_transfer": "비즈니스 소유자 이전하기",
|
|
77
71
|
"title.sync_direction": "[ko]sync direction",
|
|
78
72
|
"title.upload_document_template": "템플릿 업로드",
|
|
79
|
-
"title.bizplace_settings": "[ko]bizplace settings"
|
|
80
|
-
"title.mps": "[ko] multi-pieces shipment",
|
|
81
|
-
"title.weight_setting:":"[ko] Weight Setting"
|
|
73
|
+
"title.bizplace_settings": "[ko]bizplace settings"
|
|
82
74
|
}
|
package/translations/ms.json
CHANGED
|
@@ -32,10 +32,6 @@
|
|
|
32
32
|
"label.user": "[ms] user",
|
|
33
33
|
"label.upload_template": "[ms] upload template",
|
|
34
34
|
"label.warehouse": "[ms] warehouse",
|
|
35
|
-
"label.mps": "[ms] MPS",
|
|
36
|
-
"label.max_parcel_weight": "[ms]Max Parcel Weight (KG)",
|
|
37
|
-
"label.max_consignment_weight": "[ms]Max Consignment Weight (KG)",
|
|
38
|
-
"label.multi_piece_shipment": "[ms]Multi-Piece Shipment",
|
|
39
35
|
|
|
40
36
|
"text.are_you_sure_to_sync_product": "[ms] are you sure to sync product?",
|
|
41
37
|
"text.attachment_info_not_valid": "informasi lampiran tidak sah",
|
|
@@ -48,7 +44,6 @@
|
|
|
48
44
|
"text.contact_type_does_not_exist": "[ms]contact type does not exist",
|
|
49
45
|
"text.authentication_failed": "[ms]authentication failed",
|
|
50
46
|
"text.successfully_authenticated": "[ms]successfully authenticated",
|
|
51
|
-
"text.lmd_mps_form_invalid":"[ms]lmd mps form is invalid",
|
|
52
47
|
|
|
53
48
|
"error.company not found": "[ms] company not found",
|
|
54
49
|
"error.eta date is invalid": "[ms] eta date is invalid",
|
|
@@ -75,7 +70,5 @@
|
|
|
75
70
|
"title.owner_transfer": "[ms] business owner transfer",
|
|
76
71
|
"title.sync_direction": "[ms] sync direction",
|
|
77
72
|
"title.upload_document_template": "[ms] upload document template",
|
|
78
|
-
"title.bizplace_settings": "[ms]bizplace settings"
|
|
79
|
-
"title.mps": "[ms] multi-pieces shipment",
|
|
80
|
-
"title.weight_setting:":"[ms] Weight Setting"
|
|
73
|
+
"title.bizplace_settings": "[ms]bizplace settings"
|
|
81
74
|
}
|
package/translations/zh.json
CHANGED
|
@@ -36,10 +36,6 @@
|
|
|
36
36
|
"label.user": "用户",
|
|
37
37
|
"label.upload_template": "上传模板",
|
|
38
38
|
"label.warehouse": "仓库",
|
|
39
|
-
"label.mps": "[zh] MPS",
|
|
40
|
-
"label.max_parcel_weight": "[zh]Max Parcel Weight (KG)",
|
|
41
|
-
"label.max_consignment_weight": "[zh] Max Consignment Weight (KG)",
|
|
42
|
-
"label.multi_piece_shipment": "[zh] Multi-Piece Shipment",
|
|
43
39
|
|
|
44
40
|
"text.are_you_sure_to_sync_product": "您确定要同步产品信息吗?",
|
|
45
41
|
"text.attachment_info_not_valid": "attachment info not valid",
|
|
@@ -52,8 +48,6 @@
|
|
|
52
48
|
"text.contact_type_does_not_exist": "[zh]contact type does not exist",
|
|
53
49
|
"text.authentication_failed": "[zh]authentication failed",
|
|
54
50
|
"text.successfully_authenticated": "[zh]successfully authenticated",
|
|
55
|
-
"text.lmd_mps_form_invalid":"[zh]lmd mps form is invalid",
|
|
56
|
-
"text.invalid_weight_value": "[zh]invalid weight value",
|
|
57
51
|
|
|
58
52
|
"error.company not found": "未找到公司信息。",
|
|
59
53
|
"error.eta date is invalid": "[zh] eta date is invalid",
|
|
@@ -76,7 +70,5 @@
|
|
|
76
70
|
"title.owner_transfer": "企业主转让",
|
|
77
71
|
"title.sync_direction": "同步方向",
|
|
78
72
|
"title.upload_document_template": "上传文件模板",
|
|
79
|
-
"title.bizplace_settings": "[zh]bizplace settings"
|
|
80
|
-
"title.mps": "[zh] multi-pieces shipment",
|
|
81
|
-
"title.weight_setting:":"[zh] Weight Setting"
|
|
73
|
+
"title.bizplace_settings": "[zh]bizplace settings"
|
|
82
74
|
}
|