@things-factory/worksheet-base 4.3.214 → 4.3.217
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/picking/complete-batch-picking.js +39 -0
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +22 -45
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/package.json +11 -10
- package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts +48 -21
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +25 -78
|
@@ -5,6 +5,8 @@ const typeorm_1 = require("typeorm");
|
|
|
5
5
|
const auth_base_1 = require("@things-factory/auth-base");
|
|
6
6
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
7
7
|
const env_1 = require("@things-factory/env");
|
|
8
|
+
const integration_accounting_1 = require("@things-factory/integration-accounting");
|
|
9
|
+
const integration_base_1 = require("@things-factory/integration-base");
|
|
8
10
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
9
11
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
10
12
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
@@ -67,6 +69,7 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
|
|
|
67
69
|
'orderProducts.product',
|
|
68
70
|
'orderProducts.productDetail',
|
|
69
71
|
'bizplace',
|
|
72
|
+
'bizplace.domain',
|
|
70
73
|
'bizplace.company',
|
|
71
74
|
'bizplace.company.domain'
|
|
72
75
|
]
|
|
@@ -149,6 +152,42 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
|
|
|
149
152
|
foundReleaseGood.orderPackages = [orderPackage];
|
|
150
153
|
break;
|
|
151
154
|
}
|
|
155
|
+
const account = await tx
|
|
156
|
+
.getRepository(integration_accounting_1.Account)
|
|
157
|
+
.findOne({ where: { domain: foundReleaseGood.bizplace.domain, status: 'active' }, relations: ['domain'] });
|
|
158
|
+
// Xilnex Create Sales Order and Post Sales Order to Sales Invoice
|
|
159
|
+
const createSalesOrder = async (account, releaseGood, tx) => {
|
|
160
|
+
if (account) {
|
|
161
|
+
if (account.platform == 'xilnex') {
|
|
162
|
+
try {
|
|
163
|
+
delete releaseGood.orderPackages;
|
|
164
|
+
delete releaseGood.creator;
|
|
165
|
+
delete releaseGood.updater;
|
|
166
|
+
const body = {
|
|
167
|
+
accessToken: account.accessToken,
|
|
168
|
+
appId: account.accountId,
|
|
169
|
+
accountInfo: account.accountInfo,
|
|
170
|
+
req: JSON.stringify({
|
|
171
|
+
releaseGood,
|
|
172
|
+
orderProducts: releaseGood.orderProducts
|
|
173
|
+
})
|
|
174
|
+
};
|
|
175
|
+
await (0, integration_base_1.sqsSendMessage)({
|
|
176
|
+
body,
|
|
177
|
+
deduplicationId: releaseGood.refNo,
|
|
178
|
+
groupId: releaseGood.refNo,
|
|
179
|
+
queueName: 'prototypeQueue.fifo'
|
|
180
|
+
});
|
|
181
|
+
}
|
|
182
|
+
catch (e) {
|
|
183
|
+
throw new Error(e);
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
};
|
|
188
|
+
if (foundReleaseGood.type == 'b2c') {
|
|
189
|
+
createSalesOrder(account, foundReleaseGood, tx);
|
|
190
|
+
}
|
|
152
191
|
// trigger LMD API to create parcel
|
|
153
192
|
if (((_a = foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length) &&
|
|
154
193
|
foundReleaseGood.lmdOption &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"complete-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ const auth_base_1 = require("@things-factory/auth-base");
|
|
|
6
6
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
7
7
|
const env_1 = require("@things-factory/env");
|
|
8
8
|
const integration_accounting_1 = require("@things-factory/integration-accounting");
|
|
9
|
+
const integration_base_1 = require("@things-factory/integration-base");
|
|
9
10
|
const integration_lmd_1 = require("@things-factory/integration-lmd");
|
|
10
11
|
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
11
12
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
@@ -256,61 +257,37 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
256
257
|
.getRepository(integration_accounting_1.Account)
|
|
257
258
|
.findOne({ where: { domain: releaseGood.bizplace.domain, status: 'active' }, relations: ['domain'] });
|
|
258
259
|
// Xilnex Create Sales Order and Post Sales Order to Sales Invoice
|
|
259
|
-
const createSalesOrder = async (account, tx) => {
|
|
260
|
+
const createSalesOrder = async (account, releaseGood, tx) => {
|
|
260
261
|
if (account) {
|
|
261
262
|
if (account.platform == 'xilnex') {
|
|
262
|
-
let integrationInfo = {
|
|
263
|
-
xilnex: {
|
|
264
|
-
accountId: account.accountId,
|
|
265
|
-
startTime: new Date()
|
|
266
|
-
}
|
|
267
|
-
};
|
|
268
263
|
try {
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
264
|
+
delete releaseGood.orderPackages;
|
|
265
|
+
delete releaseGood.creator;
|
|
266
|
+
delete releaseGood.updater;
|
|
267
|
+
const body = {
|
|
268
|
+
accessToken: account.accessToken,
|
|
269
|
+
appId: account.accountId,
|
|
270
|
+
accountInfo: account.accountInfo,
|
|
271
|
+
req: JSON.stringify({
|
|
272
|
+
releaseGood,
|
|
273
|
+
orderProducts: releaseGood.orderProducts
|
|
274
|
+
})
|
|
275
|
+
};
|
|
276
|
+
await (0, integration_base_1.sqsSendMessage)({
|
|
277
|
+
body,
|
|
278
|
+
deduplicationId: releaseGood.refNo,
|
|
279
|
+
groupId: releaseGood.refNo,
|
|
280
|
+
queueName: 'prototypeQueue.fifo'
|
|
272
281
|
});
|
|
273
|
-
if (salesOrder) {
|
|
274
|
-
integrationInfo.xilnex = Object.assign(Object.assign({}, integrationInfo.xilnex), { salesOrderId: salesOrder.id, endTime: new Date() });
|
|
275
|
-
try {
|
|
276
|
-
const salesInvoice = await integration_accounting_1.AccountingAPI.postSalesOrderToSalesInvoice(account, {
|
|
277
|
-
orderId: (salesOrder === null || salesOrder === void 0 ? void 0 : salesOrder.id) || null
|
|
278
|
-
});
|
|
279
|
-
if (salesInvoice) {
|
|
280
|
-
integrationInfo.xilnex = Object.assign(Object.assign({}, integrationInfo.xilnex), { salesInvoiceId: salesInvoice.salesId, endTime: new Date() });
|
|
281
|
-
const salesOrderItems = salesInvoice.sale.items;
|
|
282
|
-
await Promise.all(releaseGood.orderProducts.map(async (op) => {
|
|
283
|
-
const matchedProduct = salesOrderItems.find(soi => soi.itemId == op.productDetail.refCode);
|
|
284
|
-
if (matchedProduct) {
|
|
285
|
-
await tx.getRepository(sales_base_1.OrderProduct).update({ id: op.id }, { refItemId: matchedProduct.id });
|
|
286
|
-
}
|
|
287
|
-
}));
|
|
288
|
-
await tx
|
|
289
|
-
.getRepository(sales_base_1.ReleaseGood)
|
|
290
|
-
.update({ id: releaseGood.id }, { collectionOrderNo: salesInvoice.salesId, integrationInfo, updater: releaseGood.updater });
|
|
291
|
-
}
|
|
292
|
-
}
|
|
293
|
-
catch (error) {
|
|
294
|
-
integrationInfo.xilnex = Object.assign(Object.assign({}, integrationInfo.xilnex), { endTime: new Date() });
|
|
295
|
-
await tx
|
|
296
|
-
.getRepository(sales_base_1.ReleaseGood)
|
|
297
|
-
.update({ id: releaseGood.id }, { integrationInfo, integrationFail: true, updater: releaseGood.updater });
|
|
298
|
-
env_1.logger.error(`complete-picking[createSalesInvoice][${releaseGood.refNo}]: ${error}`);
|
|
299
|
-
}
|
|
300
|
-
}
|
|
301
282
|
}
|
|
302
|
-
catch (
|
|
303
|
-
|
|
304
|
-
await tx
|
|
305
|
-
.getRepository(sales_base_1.ReleaseGood)
|
|
306
|
-
.update({ id: releaseGood.id }, { integrationInfo, integrationFail: true, updater: releaseGood.updater });
|
|
307
|
-
env_1.logger.error(`complete-picking[createSalesOrder][${releaseGood.refNo}]: ${error}`);
|
|
283
|
+
catch (e) {
|
|
284
|
+
console.log(`[Create Sales Order] SQS Send Message: ${e}`);
|
|
308
285
|
}
|
|
309
286
|
}
|
|
310
287
|
}
|
|
311
288
|
};
|
|
312
289
|
if (releaseGood.type == 'b2c') {
|
|
313
|
-
|
|
290
|
+
createSalesOrder(account, releaseGood, tx);
|
|
314
291
|
}
|
|
315
292
|
if (releaseGood.packingOption) {
|
|
316
293
|
const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.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.217",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -27,19 +27,20 @@
|
|
|
27
27
|
"@things-factory/biz-base": "^4.3.179",
|
|
28
28
|
"@things-factory/document-template-base": "^4.3.179",
|
|
29
29
|
"@things-factory/id-rule-base": "^4.3.187",
|
|
30
|
-
"@things-factory/integration-accounting": "^4.3.
|
|
31
|
-
"@things-factory/integration-
|
|
32
|
-
"@things-factory/integration-
|
|
33
|
-
"@things-factory/integration-
|
|
34
|
-
"@things-factory/integration-
|
|
35
|
-
"@things-factory/
|
|
30
|
+
"@things-factory/integration-accounting": "^4.3.216",
|
|
31
|
+
"@things-factory/integration-base": "^4.3.216",
|
|
32
|
+
"@things-factory/integration-lmd": "^4.3.216",
|
|
33
|
+
"@things-factory/integration-marketplace": "^4.3.216",
|
|
34
|
+
"@things-factory/integration-sellercraft": "^4.3.216",
|
|
35
|
+
"@things-factory/integration-sftp": "^4.3.216",
|
|
36
|
+
"@things-factory/marketplace-base": "^4.3.216",
|
|
36
37
|
"@things-factory/notification": "^4.3.186",
|
|
37
|
-
"@things-factory/sales-base": "^4.3.
|
|
38
|
+
"@things-factory/sales-base": "^4.3.217",
|
|
38
39
|
"@things-factory/setting-base": "^4.3.186",
|
|
39
40
|
"@things-factory/shell": "^4.3.179",
|
|
40
41
|
"@things-factory/transport-base": "^4.3.179",
|
|
41
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
42
|
+
"@things-factory/warehouse-base": "^4.3.216",
|
|
42
43
|
"uuid": "^9.0.0"
|
|
43
44
|
},
|
|
44
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "377157858e97ac070f427bc4030e52ae62dc277d"
|
|
45
46
|
}
|
|
@@ -1,23 +1,12 @@
|
|
|
1
|
-
import {
|
|
2
|
-
EntityManager,
|
|
3
|
-
getManager,
|
|
4
|
-
In
|
|
5
|
-
} from 'typeorm'
|
|
1
|
+
import { EntityManager, getManager, In } from 'typeorm'
|
|
6
2
|
|
|
7
|
-
import {
|
|
8
|
-
|
|
9
|
-
User
|
|
10
|
-
} from '@things-factory/auth-base'
|
|
11
|
-
import {
|
|
12
|
-
Bizplace,
|
|
13
|
-
getMyBizplace
|
|
14
|
-
} from '@things-factory/biz-base'
|
|
3
|
+
import { ApplicationType, User } from '@things-factory/auth-base'
|
|
4
|
+
import { Bizplace, getMyBizplace } from '@things-factory/biz-base'
|
|
15
5
|
import { logger } from '@things-factory/env'
|
|
6
|
+
import { Account } from '@things-factory/integration-accounting'
|
|
7
|
+
import { sqsSendMessage } from '@things-factory/integration-base'
|
|
16
8
|
import { MarketplaceStore } from '@things-factory/integration-marketplace'
|
|
17
|
-
import {
|
|
18
|
-
Sellercraft,
|
|
19
|
-
SellercraftStatus
|
|
20
|
-
} from '@things-factory/integration-sellercraft'
|
|
9
|
+
import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
|
|
21
10
|
import { MarketplaceOrder } from '@things-factory/marketplace-base'
|
|
22
11
|
import {
|
|
23
12
|
ORDER_STATUS,
|
|
@@ -39,10 +28,7 @@ import {
|
|
|
39
28
|
} from '../../../../controllers/'
|
|
40
29
|
import { EcommerceController } from '../../../../controllers/ecommerce'
|
|
41
30
|
import { WorksheetController } from '../../../../controllers/worksheet-controller'
|
|
42
|
-
import {
|
|
43
|
-
Worksheet,
|
|
44
|
-
WorksheetDetail
|
|
45
|
-
} from '../../../../entities'
|
|
31
|
+
import { Worksheet, WorksheetDetail } from '../../../../entities'
|
|
46
32
|
import { createLmdParcel } from '../../../../utils'
|
|
47
33
|
|
|
48
34
|
export const completeBatchPickingResolver = {
|
|
@@ -109,6 +95,7 @@ export async function completeBatchPicking(
|
|
|
109
95
|
'orderProducts.product',
|
|
110
96
|
'orderProducts.productDetail',
|
|
111
97
|
'bizplace',
|
|
98
|
+
'bizplace.domain',
|
|
112
99
|
'bizplace.company',
|
|
113
100
|
'bizplace.company.domain'
|
|
114
101
|
]
|
|
@@ -207,6 +194,46 @@ export async function completeBatchPicking(
|
|
|
207
194
|
break
|
|
208
195
|
}
|
|
209
196
|
|
|
197
|
+
const account: Account = await tx
|
|
198
|
+
.getRepository(Account)
|
|
199
|
+
.findOne({ where: { domain: foundReleaseGood.bizplace.domain, status: 'active' }, relations: ['domain'] })
|
|
200
|
+
|
|
201
|
+
// Xilnex Create Sales Order and Post Sales Order to Sales Invoice
|
|
202
|
+
const createSalesOrder = async (account, releaseGood, tx) => {
|
|
203
|
+
if (account) {
|
|
204
|
+
if (account.platform == 'xilnex') {
|
|
205
|
+
try {
|
|
206
|
+
delete releaseGood.orderPackages
|
|
207
|
+
delete releaseGood.creator
|
|
208
|
+
delete releaseGood.updater
|
|
209
|
+
|
|
210
|
+
const body = {
|
|
211
|
+
accessToken: account.accessToken,
|
|
212
|
+
appId: account.accountId,
|
|
213
|
+
accountInfo: account.accountInfo,
|
|
214
|
+
req: JSON.stringify({
|
|
215
|
+
releaseGood,
|
|
216
|
+
orderProducts: releaseGood.orderProducts
|
|
217
|
+
})
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
await sqsSendMessage({
|
|
221
|
+
body,
|
|
222
|
+
deduplicationId: releaseGood.refNo,
|
|
223
|
+
groupId: releaseGood.refNo,
|
|
224
|
+
queueName: 'prototypeQueue.fifo'
|
|
225
|
+
})
|
|
226
|
+
} catch (e) {
|
|
227
|
+
throw new Error(e)
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
if (foundReleaseGood.type == 'b2c') {
|
|
234
|
+
createSalesOrder(account, foundReleaseGood, tx)
|
|
235
|
+
}
|
|
236
|
+
|
|
210
237
|
// trigger LMD API to create parcel
|
|
211
238
|
if (
|
|
212
239
|
foundReleaseGood?.orderPackages?.length &&
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { EntityManager, getManager, In
|
|
1
|
+
import { EntityManager, getManager, In } from 'typeorm'
|
|
2
2
|
|
|
3
3
|
import { ApplicationType, User } from '@things-factory/auth-base'
|
|
4
4
|
import { Bizplace, ContactPoint, getMyBizplace } from '@things-factory/biz-base'
|
|
5
5
|
import { logger } from '@things-factory/env'
|
|
6
|
-
import { Account
|
|
6
|
+
import { Account } from '@things-factory/integration-accounting'
|
|
7
|
+
import { sqsSendMessage } from '@things-factory/integration-base'
|
|
7
8
|
import { LastMileAPI, LastMileDelivery } from '@things-factory/integration-lmd'
|
|
8
9
|
import { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integration-marketplace'
|
|
9
10
|
import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
|
|
@@ -319,93 +320,39 @@ export async function completePicking(
|
|
|
319
320
|
.findOne({ where: { domain: releaseGood.bizplace.domain, status: 'active' }, relations: ['domain'] })
|
|
320
321
|
|
|
321
322
|
// Xilnex Create Sales Order and Post Sales Order to Sales Invoice
|
|
322
|
-
const createSalesOrder = async (account, tx) => {
|
|
323
|
+
const createSalesOrder = async (account, releaseGood, tx) => {
|
|
323
324
|
if (account) {
|
|
324
325
|
if (account.platform == 'xilnex') {
|
|
325
|
-
let integrationInfo: any = {
|
|
326
|
-
xilnex: {
|
|
327
|
-
accountId: account.accountId,
|
|
328
|
-
startTime: new Date()
|
|
329
|
-
}
|
|
330
|
-
}
|
|
331
|
-
|
|
332
326
|
try {
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
try {
|
|
346
|
-
const salesInvoice: any = await AccountingAPI.postSalesOrderToSalesInvoice(account, {
|
|
347
|
-
orderId: salesOrder?.id || null
|
|
348
|
-
})
|
|
349
|
-
|
|
350
|
-
if (salesInvoice) {
|
|
351
|
-
integrationInfo.xilnex = {
|
|
352
|
-
...integrationInfo.xilnex,
|
|
353
|
-
salesInvoiceId: salesInvoice.salesId,
|
|
354
|
-
endTime: new Date()
|
|
355
|
-
}
|
|
356
|
-
|
|
357
|
-
const salesOrderItems: any = salesInvoice.sale.items
|
|
358
|
-
await Promise.all(
|
|
359
|
-
releaseGood.orderProducts.map(async op => {
|
|
360
|
-
const matchedProduct: any = salesOrderItems.find(soi => soi.itemId == op.productDetail.refCode)
|
|
361
|
-
if (matchedProduct) {
|
|
362
|
-
await tx.getRepository(OrderProduct).update({ id: op.id }, { refItemId: matchedProduct.id })
|
|
363
|
-
}
|
|
364
|
-
})
|
|
365
|
-
)
|
|
366
|
-
|
|
367
|
-
await tx
|
|
368
|
-
.getRepository(ReleaseGood)
|
|
369
|
-
.update(
|
|
370
|
-
{ id: releaseGood.id },
|
|
371
|
-
{ collectionOrderNo: salesInvoice.salesId, integrationInfo, updater: releaseGood.updater }
|
|
372
|
-
)
|
|
373
|
-
}
|
|
374
|
-
} catch (error) {
|
|
375
|
-
integrationInfo.xilnex = {
|
|
376
|
-
...integrationInfo.xilnex,
|
|
377
|
-
endTime: new Date()
|
|
378
|
-
}
|
|
379
|
-
|
|
380
|
-
await tx
|
|
381
|
-
.getRepository(ReleaseGood)
|
|
382
|
-
.update(
|
|
383
|
-
{ id: releaseGood.id },
|
|
384
|
-
{ integrationInfo, integrationFail: true, updater: releaseGood.updater }
|
|
385
|
-
)
|
|
386
|
-
logger.error(`complete-picking[createSalesInvoice][${releaseGood.refNo}]: ${error}`)
|
|
387
|
-
}
|
|
388
|
-
}
|
|
389
|
-
} catch (error) {
|
|
390
|
-
integrationInfo.xilnex = {
|
|
391
|
-
...integrationInfo.xilnex,
|
|
392
|
-
endTime: new Date()
|
|
327
|
+
delete releaseGood.orderPackages
|
|
328
|
+
delete releaseGood.creator
|
|
329
|
+
delete releaseGood.updater
|
|
330
|
+
|
|
331
|
+
const body = {
|
|
332
|
+
accessToken: account.accessToken,
|
|
333
|
+
appId: account.accountId,
|
|
334
|
+
accountInfo: account.accountInfo,
|
|
335
|
+
req: JSON.stringify({
|
|
336
|
+
releaseGood,
|
|
337
|
+
orderProducts: releaseGood.orderProducts
|
|
338
|
+
})
|
|
393
339
|
}
|
|
394
340
|
|
|
395
|
-
await
|
|
396
|
-
|
|
397
|
-
.
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
341
|
+
await sqsSendMessage({
|
|
342
|
+
body,
|
|
343
|
+
deduplicationId: releaseGood.refNo,
|
|
344
|
+
groupId: releaseGood.refNo,
|
|
345
|
+
queueName: 'prototypeQueue.fifo'
|
|
346
|
+
})
|
|
347
|
+
} catch (e) {
|
|
348
|
+
console.log(`[Create Sales Order] SQS Send Message: ${e}`)
|
|
402
349
|
}
|
|
403
350
|
}
|
|
404
351
|
}
|
|
405
352
|
}
|
|
406
353
|
|
|
407
354
|
if (releaseGood.type == 'b2c') {
|
|
408
|
-
|
|
355
|
+
createSalesOrder(account, releaseGood, tx)
|
|
409
356
|
}
|
|
410
357
|
|
|
411
358
|
if (releaseGood.packingOption) {
|