@things-factory/worksheet-base 4.3.76 → 4.3.79-alpha.0
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/controllers/outbound/packing-worksheet-controller.js +14 -2
- package/dist-server/controllers/outbound/packing-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/picking-worksheet-controller.js +6 -9
- package/dist-server/controllers/outbound/picking-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/worksheet-controller.js +14 -1
- package/dist-server/controllers/worksheet-controller.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/confirm-cancellation-release-order.js +12 -0
- package/dist-server/graphql/resolvers/worksheet/confirm-cancellation-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.js +3 -3
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.js +4 -4
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js +67 -28
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/activate-packing.js +23 -8
- package/dist-server/graphql/resolvers/worksheet/packing/activate-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js +30 -7
- package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/packing.js +23 -8
- package/dist-server/graphql/resolvers/worksheet/packing/packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js +25 -8
- package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +112 -22
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/pending-cancellation-release-order.js +87 -79
- package/dist-server/graphql/resolvers/worksheet/pending-cancellation-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/activate-picking.js +51 -25
- package/dist-server/graphql/resolvers/worksheet/picking/activate-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js +2 -2
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +266 -140
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/putaway/complete-putaway.js +39 -14
- package/dist-server/graphql/resolvers/worksheet/putaway/complete-putaway.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/reject-cancellation-release-order.js +92 -150
- package/dist-server/graphql/resolvers/worksheet/reject-cancellation-release-order.js.map +1 -1
- package/dist-server/graphql/types/worksheet/index.js +5 -2
- package/dist-server/graphql/types/worksheet/index.js.map +1 -1
- package/dist-server/graphql/types/worksheet/multiple-release-good-worksheet.js +11 -0
- package/dist-server/graphql/types/worksheet/multiple-release-good-worksheet.js.map +1 -0
- package/dist-server/utils/worksheet-util.js +3 -1
- package/dist-server/utils/worksheet-util.js.map +1 -1
- package/package.json +17 -17
- package/server/controllers/outbound/packing-worksheet-controller.ts +21 -2
- package/server/controllers/outbound/picking-worksheet-controller.ts +7 -11
- package/server/controllers/worksheet-controller.ts +25 -2
- package/server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts +13 -0
- package/server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.ts +3 -7
- package/server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts +5 -4
- package/server/graphql/resolvers/worksheet/loading/complete-loading.ts +77 -33
- package/server/graphql/resolvers/worksheet/packing/activate-packing.ts +26 -9
- package/server/graphql/resolvers/worksheet/packing/complete-packing.ts +34 -9
- package/server/graphql/resolvers/worksheet/packing/packing.ts +26 -9
- package/server/graphql/resolvers/worksheet/packing/scan-product-packing.ts +28 -9
- package/server/graphql/resolvers/worksheet/packing-worksheet.ts +128 -23
- package/server/graphql/resolvers/worksheet/pending-cancellation-release-order.ts +99 -94
- package/server/graphql/resolvers/worksheet/picking/activate-picking.ts +60 -30
- package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts +2 -2
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +288 -149
- package/server/graphql/resolvers/worksheet/putaway/complete-putaway.ts +45 -15
- package/server/graphql/resolvers/worksheet/reject-cancellation-release-order.ts +98 -213
- package/server/graphql/types/worksheet/index.ts +5 -2
- package/server/graphql/types/worksheet/multiple-release-good-worksheet.ts +8 -0
- package/server/utils/worksheet-util.ts +3 -1
|
@@ -4,11 +4,11 @@ exports.generateMultipleReleaseGoodWorksheetResolver = void 0;
|
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
5
|
const generate_release_good_worksheet_1 = require("./generate-release-good-worksheet");
|
|
6
6
|
exports.generateMultipleReleaseGoodWorksheetResolver = {
|
|
7
|
-
async generateMultipleReleaseGoodWorksheet(_, {
|
|
7
|
+
async generateMultipleReleaseGoodWorksheet(_, { releaseGoods }, context) {
|
|
8
8
|
const { tx, domain, user } = context.state;
|
|
9
|
-
for (let idx = 0; idx <
|
|
9
|
+
for (let idx = 0; idx < releaseGoods.length; idx++) {
|
|
10
10
|
await (0, typeorm_1.getManager)().transaction(async (txMgr) => {
|
|
11
|
-
await (0, generate_release_good_worksheet_1.generatePickingWorksheet)(txMgr, domain, user,
|
|
11
|
+
await (0, generate_release_good_worksheet_1.generatePickingWorksheet)(txMgr, domain, user, releaseGoods[idx].name, releaseGoods[idx].status);
|
|
12
12
|
});
|
|
13
13
|
}
|
|
14
14
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-multiple-release-good-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;
|
|
1
|
+
{"version":3,"file":"generate-multiple-release-good-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AAKnD,uFAA4E;AAE/D,QAAA,4CAA4C,GAAG;IAC1D,KAAK,CAAC,oCAAoC,CAAC,CAAM,EAAE,EAAE,YAAY,EAAE,EAAE,OAAY;QAC/E,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YAClD,MAAM,IAAA,oBAAU,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;gBAC3C,MAAM,IAAA,0DAAwB,EAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAA;YACvG,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}
|
|
@@ -7,12 +7,12 @@ const controllers_1 = require("../../../../controllers/");
|
|
|
7
7
|
const entities_1 = require("../../../../entities");
|
|
8
8
|
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
9
9
|
exports.generateReleaseGoodWorksheetResolver = {
|
|
10
|
-
async generateReleaseGoodWorksheet(_, { releaseGoodNo }, context) {
|
|
10
|
+
async generateReleaseGoodWorksheet(_, { releaseGoodNo, currentStatus = null }, context) {
|
|
11
11
|
const { tx, domain, user } = context.state;
|
|
12
|
-
return await generatePickingWorksheet(tx, domain, user, releaseGoodNo);
|
|
12
|
+
return await generatePickingWorksheet(tx, domain, user, releaseGoodNo, currentStatus);
|
|
13
13
|
}
|
|
14
14
|
};
|
|
15
|
-
async function generatePickingWorksheet(tx, domain, user, releaseGoodNo) {
|
|
15
|
+
async function generatePickingWorksheet(tx, domain, user, releaseGoodNo, currentStatus = null) {
|
|
16
16
|
try {
|
|
17
17
|
const worksheetController = new controllers_1.PickingWorksheetController(tx, domain, user);
|
|
18
18
|
let releaseGood = await worksheetController.findRefOrder(sales_base_1.ReleaseGood, {
|
|
@@ -53,7 +53,7 @@ async function generatePickingWorksheet(tx, domain, user, releaseGoodNo) {
|
|
|
53
53
|
await tx.getRepository(sales_base_1.ReleaseGood).update({ id: releaseGood.id }, { status: sales_base_1.ORDER_STATUS.DONE });
|
|
54
54
|
}
|
|
55
55
|
else {
|
|
56
|
-
worksheet = await worksheetController.generatePickingWorksheet(releaseGoodNo);
|
|
56
|
+
worksheet = await worksheetController.generatePickingWorksheet(releaseGoodNo, currentStatus);
|
|
57
57
|
}
|
|
58
58
|
return worksheet;
|
|
59
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-release-good-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts"],"names":[],"mappings":";;;AAGA,2DAA8G;AAE9G,+DAAsE;AAEtE,0DAAqE;AACrE,mDAAiE;AAEjE,mEAAqG;AAExF,QAAA,oCAAoC,GAAG;IAClD,KAAK,CAAC,4BAA4B,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;
|
|
1
|
+
{"version":3,"file":"generate-release-good-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createReturnWorksheet = exports.completeLoading = exports.completeLoadingResolver = void 0;
|
|
4
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
4
5
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
5
6
|
const integration_fulfillment_1 = require("@things-factory/integration-fulfillment");
|
|
6
7
|
const integration_sftp_1 = require("@things-factory/integration-sftp");
|
|
@@ -39,37 +40,75 @@ async function completeLoading(tx, domain, user, releaseGoodNo) {
|
|
|
39
40
|
.find({ where: { company: warehouseCompany }, relations: ['domain'] });
|
|
40
41
|
const warehouseCompanyBizplaces = warehouseBizplaces.filter(biz => biz.domain.extType == 'company');
|
|
41
42
|
const warehouseCompanyDomain = warehouseCompanyBizplaces[0].domain;
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
.
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
let inventoryItems = await tx.getRepository(warehouse_base_1.InventoryItem).find({
|
|
53
|
-
where: { domain, outboundOrderId: releaseGood.id }
|
|
54
|
-
});
|
|
55
|
-
// if (responseFileTypes.enableShipment) {
|
|
56
|
-
// let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
|
|
57
|
-
// releaseGood,
|
|
58
|
-
// orderInventories: targetInventories,
|
|
59
|
-
// sftp: customerAvailableSftp
|
|
60
|
-
// })
|
|
61
|
-
// customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
|
|
62
|
-
// }
|
|
63
|
-
if (responseFileTypes.enableSerialNumber) {
|
|
64
|
-
let snResult = await integration_sftp_1.SftpAPI.createSerialNumber(customerAvailableSftp, {
|
|
65
|
-
releaseGood,
|
|
66
|
-
inventoryItems,
|
|
67
|
-
sftp: customerAvailableSftp
|
|
43
|
+
const orderSource = releaseGood.source;
|
|
44
|
+
switch (orderSource) {
|
|
45
|
+
case auth_base_1.ApplicationType.SFTP:
|
|
46
|
+
const customerDomain = releaseGood.bizplace.domain;
|
|
47
|
+
const fulfillmentCenter = await tx
|
|
48
|
+
.getRepository(integration_fulfillment_1.FulfillmentCenter)
|
|
49
|
+
.findOne({ domain: warehouseCompanyDomain, centerId: domain.subdomain, status: 'active' });
|
|
50
|
+
if (fulfillmentCenter) {
|
|
51
|
+
let customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).findOne({
|
|
52
|
+
where: { domain: customerDomain, status: 'ACTIVE', fulfillmentCenter }
|
|
68
53
|
});
|
|
69
|
-
|
|
54
|
+
if (customerAvailableSftp) {
|
|
55
|
+
const responseFileTypes = JSON.parse(customerAvailableSftp.responseFileTypes);
|
|
56
|
+
let inventoryItems = await tx.getRepository(warehouse_base_1.InventoryItem).find({
|
|
57
|
+
where: { domain, outboundOrderId: releaseGood.id }
|
|
58
|
+
});
|
|
59
|
+
// if (responseFileTypes.enableShipment) {
|
|
60
|
+
// let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
|
|
61
|
+
// releaseGood,
|
|
62
|
+
// orderInventories: targetInventories,
|
|
63
|
+
// sftp: customerAvailableSftp
|
|
64
|
+
// })
|
|
65
|
+
// customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
|
|
66
|
+
// }
|
|
67
|
+
if (responseFileTypes.enableSerialNumber) {
|
|
68
|
+
let snResult = await integration_sftp_1.SftpAPI.createSerialNumber(customerAvailableSftp, {
|
|
69
|
+
releaseGood,
|
|
70
|
+
inventoryItems,
|
|
71
|
+
sftp: customerAvailableSftp
|
|
72
|
+
});
|
|
73
|
+
customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).save(snResult);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
70
76
|
}
|
|
71
|
-
|
|
77
|
+
break;
|
|
78
|
+
default:
|
|
79
|
+
break;
|
|
72
80
|
}
|
|
81
|
+
// const customerDomain: Domain = releaseGood.bizplace.domain
|
|
82
|
+
// const fulfillmentCenter: FulfillmentCenter = await tx
|
|
83
|
+
// .getRepository(FulfillmentCenter)
|
|
84
|
+
// .findOne({ domain: warehouseCompanyDomain, centerId: domain.subdomain, status: 'active' })
|
|
85
|
+
// if (fulfillmentCenter) {
|
|
86
|
+
// let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
|
|
87
|
+
// where: { domain: customerDomain, status: 'ACTIVE', fulfillmentCenter }
|
|
88
|
+
// })
|
|
89
|
+
// if (customerAvailableSftp) {
|
|
90
|
+
// const responseFileTypes: any = JSON.parse(customerAvailableSftp.responseFileTypes)
|
|
91
|
+
// let inventoryItems: InventoryItem[] = await tx.getRepository(InventoryItem).find({
|
|
92
|
+
// where: { domain, outboundOrderId: releaseGood.id }
|
|
93
|
+
// })
|
|
94
|
+
// // if (responseFileTypes.enableShipment) {
|
|
95
|
+
// // let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
|
|
96
|
+
// // releaseGood,
|
|
97
|
+
// // orderInventories: targetInventories,
|
|
98
|
+
// // sftp: customerAvailableSftp
|
|
99
|
+
// // })
|
|
100
|
+
// // customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
|
|
101
|
+
// // }
|
|
102
|
+
// if (responseFileTypes.enableSerialNumber) {
|
|
103
|
+
// let snResult: Sftp = await SftpAPI.createSerialNumber(customerAvailableSftp, {
|
|
104
|
+
// releaseGood,
|
|
105
|
+
// inventoryItems,
|
|
106
|
+
// sftp: customerAvailableSftp
|
|
107
|
+
// })
|
|
108
|
+
// customerAvailableSftp = await tx.getRepository(Sftp).save(snResult)
|
|
109
|
+
// }
|
|
110
|
+
// }
|
|
111
|
+
// }
|
|
73
112
|
await worksheetController.completeLoading(releaseGoodNo);
|
|
74
113
|
if (remainInventories.length) {
|
|
75
114
|
await createReturnWorksheet(tx, domain, user, releaseGoodNo, remainInventories);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-loading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/loading/complete-loading.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"complete-loading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/loading/complete-loading.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.activatePacking = exports.activatePackingResolver = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
5
6
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
6
7
|
const controllers_1 = require("../../../../controllers");
|
|
7
8
|
exports.activatePackingResolver = {
|
|
@@ -24,15 +25,29 @@ async function activatePacking(tx, domain, user, worksheetNo) {
|
|
|
24
25
|
const worksheetController = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
25
26
|
const worksheet = await worksheetController.activatePacking(worksheetNo);
|
|
26
27
|
let releaseGood = worksheet.releaseGood;
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
28
|
+
const orderSource = releaseGood.source;
|
|
29
|
+
switch (orderSource) {
|
|
30
|
+
case auth_base_1.ApplicationType.SELLERCRAFT:
|
|
31
|
+
const sellercraft = await tx
|
|
32
|
+
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
33
|
+
.findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
34
|
+
if (sellercraft) {
|
|
35
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
36
|
+
sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood);
|
|
37
|
+
}
|
|
38
|
+
break;
|
|
39
|
+
default:
|
|
40
|
+
break;
|
|
35
41
|
}
|
|
42
|
+
// if (releaseGood.type == 'b2c') {
|
|
43
|
+
// const sellercraft: Sellercraft = await tx
|
|
44
|
+
// .getRepository(Sellercraft)
|
|
45
|
+
// .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
|
|
46
|
+
// if (sellercraft) {
|
|
47
|
+
// const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
48
|
+
// sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
|
|
49
|
+
// }
|
|
50
|
+
// }
|
|
36
51
|
return worksheet;
|
|
37
52
|
}
|
|
38
53
|
exports.activatePacking = activatePacking;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activate-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/activate-packing.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;
|
|
1
|
+
{"version":3,"file":"activate-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/activate-packing.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AAEnD,yDAAiE;AACjE,qFAAwF;AAIxF,yDAA2F;AAG9E,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,EAAE,WAAW,EAAE,EAAE,OAAY;QACzD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;QAEtE,IAAI,kBAAkB,GAAG,EAAE,CAAA;QAE3B,MAAM,OAAO,CAAC,GAAG,CACf,WAAW,CAAC,GAAG,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;YAC3B,IAAI;gBACF,MAAM,IAAA,oBAAU,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;oBAC3C,IAAI,MAAM,GAAG,MAAM,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;oBAC7D,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gBACjC,CAAC,CAAC,CAAA;aACH;YAAC,OAAO,KAAK,EAAE,GAAE;QACpB,CAAC,CAAC,CACH,CAAA;QACD,OAAO,kBAAkB,CAAA;IAC3B,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,eAAe,CACnC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,WAAmB;IAEnB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;IACxE,IAAI,WAAW,GAAgB,SAAS,CAAC,WAAW,CAAA;IAEpD,MAAM,WAAW,GAAW,WAAW,CAAC,MAAM,CAAA;IAC9C,QAAQ,WAAW,EAAE;QACnB,KAAK,2BAAe,CAAC,WAAW;YAC9B,MAAM,WAAW,GAAgB,MAAM,EAAE;iBACtC,aAAa,CAAC,qCAAW,CAAC;iBAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;YAErF,IAAI,WAAW,EAAE;gBACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;gBAC1F,eAAe,CAAC,qBAAqB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;aAChE;YACD,MAAK;QAEP;YACE,MAAK;KACR;IAED,mCAAmC;IACnC,8CAA8C;IAC9C,kCAAkC;IAClC,0FAA0F;IAE1F,uBAAuB;IACvB,iGAAiG;IACjG,sEAAsE;IACtE,MAAM;IACN,IAAI;IACJ,OAAO,SAAS,CAAA;AAClB,CAAC;AAtCD,0CAsCC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.completePacking = exports.completePackingResolver = void 0;
|
|
4
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
4
5
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
5
|
-
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
6
6
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
7
7
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
8
8
|
const controllers_1 = require("../../../../controllers/");
|
|
@@ -23,11 +23,9 @@ exports.completePackingResolver = {
|
|
|
23
23
|
'orderInventories.product'
|
|
24
24
|
]
|
|
25
25
|
});
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
.findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
30
|
-
if (!sellercraft) {
|
|
26
|
+
const orderSource = releaseGood.source;
|
|
27
|
+
switch (orderSource) {
|
|
28
|
+
case auth_base_1.ApplicationType.MMS:
|
|
31
29
|
const companyDomain = releaseGood.bizplace.company.domain;
|
|
32
30
|
const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
33
31
|
where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
@@ -44,8 +42,33 @@ exports.completePackingResolver = {
|
|
|
44
42
|
const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
|
|
45
43
|
await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain);
|
|
46
44
|
}
|
|
47
|
-
|
|
45
|
+
break;
|
|
46
|
+
default:
|
|
47
|
+
break;
|
|
48
48
|
}
|
|
49
|
+
// if (releaseGood.type === 'b2c') {
|
|
50
|
+
// const sellercraft: Sellercraft = await tx
|
|
51
|
+
// .getRepository(Sellercraft)
|
|
52
|
+
// .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
|
|
53
|
+
// if (!sellercraft) {
|
|
54
|
+
// const companyDomain: Domain = releaseGood.bizplace.company.domain
|
|
55
|
+
// const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
|
|
56
|
+
// where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
57
|
+
// relations: [
|
|
58
|
+
// 'marketplaceOrderItems',
|
|
59
|
+
// 'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
60
|
+
// 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
|
|
61
|
+
// 'marketplaceStore',
|
|
62
|
+
// 'marketplaceStore.marketplaceDistributors'
|
|
63
|
+
// ]
|
|
64
|
+
// })
|
|
65
|
+
// const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
|
|
66
|
+
// if (marketplaceStore.isAutoUpdateShipment) {
|
|
67
|
+
// const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
|
|
68
|
+
// await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain)
|
|
69
|
+
// }
|
|
70
|
+
// }
|
|
71
|
+
// }
|
|
49
72
|
const bizplace = await (0, biz_base_1.getMyBizplace)(domain, user);
|
|
50
73
|
const worksheetController = new worksheet_controller_1.WorksheetController(tx, domain, user);
|
|
51
74
|
await worksheetController.notifyToCustomer(bizplace, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/complete-packing.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"complete-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/complete-packing.ts"],"names":[],"mappings":";;;AAEA,yDAAiE;AACjE,uDAAkE;AAElE,uEAAmE;AACnE,2DAAwD;AAGxD,0DAAqE;AACrE,iEAAuE;AACvE,uFAAkF;AAErE,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;QAC3D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,CAAA;QAEtD,MAAM,WAAW,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YAC3E,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE;YACtC,SAAS,EAAE;gBACT,UAAU;gBACV,iBAAiB;gBACjB,kBAAkB;gBAClB,yBAAyB;gBACzB,kBAAkB;gBAClB,0BAA0B;aAC3B;SACF,CAAC,CAAA;QAEF,MAAM,WAAW,GAAW,WAAW,CAAC,MAAM,CAAA;QAC9C,QAAQ,WAAW,EAAE;YACnB,KAAK,2BAAe,CAAC,GAAG;gBACtB,MAAM,aAAa,GAAW,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAA;gBACjE,MAAM,gBAAgB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAgB,CAAC,CAAC,OAAO,CAAC;oBAC1F,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE;oBAC5D,SAAS,EAAE;wBACT,uBAAuB;wBACvB,qDAAqD;wBACrD,8EAA8E;wBAC9E,kBAAkB;wBAClB,0CAA0C;qBAC3C;iBACF,CAAC,CAAA;gBACF,MAAM,gBAAgB,GAAqB,gBAAgB,CAAC,gBAAgB,CAAA;gBAE5E,IAAI,gBAAgB,CAAC,oBAAoB,EAAE;oBACzC,MAAM,aAAa,GAAwB,IAAI,+BAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;oBACpF,MAAM,aAAa,CAAC,eAAe,CAAC,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAA;iBACpG;gBACD,MAAK;YAEP;gBACE,MAAK;SACR;QAED,oCAAoC;QACpC,8CAA8C;QAC9C,kCAAkC;QAClC,0FAA0F;QAE1F,wBAAwB;QACxB,wEAAwE;QACxE,oGAAoG;QACpG,sEAAsE;QACtE,qBAAqB;QACrB,mCAAmC;QACnC,iEAAiE;QACjE,0FAA0F;QAC1F,8BAA8B;QAC9B,qDAAqD;QACrD,UAAU;QACV,SAAS;QACT,mFAAmF;QAEnF,mDAAmD;QACnD,6FAA6F;QAC7F,4GAA4G;QAC5G,QAAQ;QACR,MAAM;QACN,IAAI;QAEJ,MAAM,QAAQ,GAAa,MAAM,IAAA,wBAAa,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAC5D,MAAM,mBAAmB,GAAwB,IAAI,0CAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC1F,MAAM,mBAAmB,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YACnD,KAAK,EAAE,+BAA+B,QAAQ,CAAC,IAAI,KAAK,aAAa,GAAG;YACxE,IAAI,EAAE,4CAA4C;YAClD,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO;YAC3B,IAAI,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE;SACtC,CAAC,CAAA;IACJ,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,eAAe,CACnC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAAqB;IAErB,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAClG,MAAM,aAAa,CAAC,eAAe,CAAC,aAAa,CAAC,CAAA;AACpD,CAAC;AARD,0CAQC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.packing = exports.packingResolver = void 0;
|
|
4
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
4
5
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
5
6
|
const controllers_1 = require("../../../../controllers");
|
|
6
7
|
exports.packingResolver = {
|
|
@@ -14,15 +15,29 @@ async function packing(tx, domain, user, worksheetDetailName, releaseQty, serial
|
|
|
14
15
|
const worksheetDetail = await worksheetController.packing(worksheetDetailName, releaseQty, serialNumber);
|
|
15
16
|
let releaseGood = worksheetDetail.targetInventory.releaseGood;
|
|
16
17
|
const worksheet = worksheetDetail.worksheet;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
18
|
+
const orderSource = releaseGood.source;
|
|
19
|
+
switch (orderSource) {
|
|
20
|
+
case auth_base_1.ApplicationType.SELLERCRAFT:
|
|
21
|
+
const sellercraft = await tx
|
|
22
|
+
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
23
|
+
.findOne({ domain: worksheet.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
24
|
+
if (sellercraft) {
|
|
25
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
26
|
+
await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood);
|
|
27
|
+
}
|
|
28
|
+
break;
|
|
29
|
+
default:
|
|
30
|
+
break;
|
|
25
31
|
}
|
|
32
|
+
// if (releaseGood.type === 'b2c' && !releaseGood?.airwayBill) {
|
|
33
|
+
// const sellercraft: Sellercraft = await tx
|
|
34
|
+
// .getRepository(Sellercraft)
|
|
35
|
+
// .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
|
|
36
|
+
// if (sellercraft) {
|
|
37
|
+
// const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
38
|
+
// await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
|
|
39
|
+
// }
|
|
40
|
+
// }
|
|
26
41
|
}
|
|
27
42
|
exports.packing = packing;
|
|
28
43
|
//# sourceMappingURL=packing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/packing.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/packing.ts"],"names":[],"mappings":";;;AAEA,yDAAiE;AACjE,qFAAwF;AAIxF,yDAA2F;AAG9E,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,OAAY;QACnF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;IAChF,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAC3B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,UAAkB,EAClB,YAAoB;IAEpB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,mBAAmB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;IAExG,IAAI,WAAW,GAAgB,eAAe,CAAC,eAAe,CAAC,WAAW,CAAA;IAC1E,MAAM,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;IAEtD,MAAM,WAAW,GAAW,WAAW,CAAC,MAAM,CAAA;IAC9C,QAAQ,WAAW,EAAE;QACnB,KAAK,2BAAe,CAAC,WAAW;YAC9B,MAAM,WAAW,GAAgB,MAAM,EAAE;iBACtC,aAAa,CAAC,qCAAW,CAAC;iBAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;YAEnF,IAAI,WAAW,EAAE;gBACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;gBAC1F,MAAM,eAAe,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;aACnE;YACD,MAAK;QAEP;YACE,MAAK;KACR;IAED,gEAAgE;IAChE,8CAA8C;IAC9C,kCAAkC;IAClC,wFAAwF;IAExF,uBAAuB;IACvB,iGAAiG;IACjG,yEAAyE;IACzE,MAAM;IACN,IAAI;AACN,CAAC;AAzCD,0BAyCC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.scanProductPacking = exports.scanProductPackingResolver = void 0;
|
|
4
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
4
5
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
5
6
|
const controllers_1 = require("../../../../controllers");
|
|
6
7
|
exports.scanProductPackingResolver = {
|
|
@@ -15,15 +16,31 @@ async function scanProductPacking(tx, domain, user, worksheetDetailName, product
|
|
|
15
16
|
const worksheetDetail = await worksheetController.scanProductPacking(worksheetDetailName, productBarcode, serialNumber);
|
|
16
17
|
let releaseGood = worksheetDetail.targetInventory.releaseGood;
|
|
17
18
|
const worksheet = worksheetDetail.worksheet;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
19
|
+
const orderSource = releaseGood.source;
|
|
20
|
+
switch (orderSource) {
|
|
21
|
+
case auth_base_1.ApplicationType.SELLERCRAFT:
|
|
22
|
+
if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill)) {
|
|
23
|
+
const sellercraft = await tx
|
|
24
|
+
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
25
|
+
.findOne({ domain: worksheet.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
26
|
+
if (sellercraft) {
|
|
27
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
28
|
+
sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
break;
|
|
32
|
+
default:
|
|
33
|
+
break;
|
|
26
34
|
}
|
|
35
|
+
// if (releaseGood.type === 'b2c' && !releaseGood?.airwayBill) {
|
|
36
|
+
// const sellercraft: Sellercraft = await tx
|
|
37
|
+
// .getRepository(Sellercraft)
|
|
38
|
+
// .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
|
|
39
|
+
// if (sellercraft) {
|
|
40
|
+
// const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
41
|
+
// sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
|
|
42
|
+
// }
|
|
43
|
+
// }
|
|
27
44
|
}
|
|
28
45
|
catch (error) {
|
|
29
46
|
throw error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan-product-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/scan-product-packing.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"scan-product-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/scan-product-packing.ts"],"names":[],"mappings":";;;AAEA,yDAAiE;AACjE,qFAAwF;AAIxF,yDAA2F;AAG9E,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,OAAY;QAClG,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAA;IAC/F,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CACtC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,cAAsB,EACtB,YAAqB;IAErB,IAAI;QACF,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QACxG,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,kBAAkB,CAClE,mBAAmB,EACnB,cAAc,EACd,YAAY,CACb,CAAA;QAED,IAAI,WAAW,GAAgB,eAAe,CAAC,eAAe,CAAC,WAAW,CAAA;QAC1E,MAAM,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;QAEtD,MAAM,WAAW,GAAW,WAAW,CAAC,MAAM,CAAA;QAC9C,QAAQ,WAAW,EAAE;YACnB,KAAK,2BAAe,CAAC,WAAW;gBAC9B,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAA,EAAE;oBAC5B,MAAM,WAAW,GAAgB,MAAM,EAAE;yBACtC,aAAa,CAAC,qCAAW,CAAC;yBAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;oBAEnF,IAAI,WAAW,EAAE;wBACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;wBAC1F,eAAe,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;qBAC7D;iBACF;gBAED,MAAK;YAEP;gBACE,MAAK;SACR;QAED,gEAAgE;QAChE,8CAA8C;QAC9C,kCAAkC;QAClC,wFAAwF;QAExF,uBAAuB;QACvB,iGAAiG;QACjG,mEAAmE;QACnE,MAAM;QACN,IAAI;KACL;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,KAAK,CAAA;KACZ;AACH,CAAC;AApDD,gDAoDC"}
|