@things-factory/worksheet-base 3.7.1 → 3.7.6
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/ecommerce/sellercraft-controller.js +3 -3
- package/dist-server/controllers/ecommerce/sellercraft-controller.js.map +1 -1
- package/dist-server/controllers/inbound/unloading-worksheet-controller.js +48 -25
- package/dist-server/controllers/inbound/unloading-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/loading-worksheet-controller.js +4 -0
- package/dist-server/controllers/outbound/loading-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/picking-worksheet-controller.js +121 -67
- package/dist-server/controllers/outbound/picking-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/worksheet-controller.js +27 -2
- package/dist-server/controllers/worksheet-controller.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/loading-worksheet.js +27 -2
- package/dist-server/graphql/resolvers/worksheet/loading-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +26 -0
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +27 -5
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.js +72 -0
- package/dist-server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.js.map +1 -0
- package/dist-server/graphql/resolvers/worksheet/picking/index.js +2 -1
- package/dist-server/graphql/resolvers/worksheet/picking/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/picking.js +4 -4
- package/dist-server/graphql/resolvers/worksheet/picking/picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking-worksheet.js +86 -57
- package/dist-server/graphql/resolvers/worksheet/picking-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/unloading-return-worksheet.js +2 -2
- package/dist-server/graphql/resolvers/worksheet/unloading-return-worksheet.js.map +1 -1
- package/dist-server/graphql/types/worksheet/index.js +5 -1
- package/dist-server/graphql/types/worksheet/index.js.map +1 -1
- package/dist-server/utils/inventory-util.js +29 -2
- package/dist-server/utils/inventory-util.js.map +1 -1
- package/package.json +16 -16
- package/server/controllers/ecommerce/sellercraft-controller.ts +3 -3
- package/server/controllers/inbound/unloading-worksheet-controller.ts +67 -30
- package/server/controllers/outbound/loading-worksheet-controller.ts +20 -0
- package/server/controllers/outbound/picking-worksheet-controller.ts +148 -83
- package/server/controllers/worksheet-controller.ts +40 -2
- package/server/graphql/resolvers/worksheet/loading-worksheet.ts +33 -4
- package/server/graphql/resolvers/worksheet/packing-worksheet.ts +31 -3
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +37 -5
- package/server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.ts +78 -0
- package/server/graphql/resolvers/worksheet/picking/index.ts +3 -1
- package/server/graphql/resolvers/worksheet/picking/picking.ts +5 -4
- package/server/graphql/resolvers/worksheet/picking-worksheet.ts +102 -62
- package/server/graphql/resolvers/worksheet/unloading-return-worksheet.ts +6 -4
- package/server/graphql/types/worksheet/index.ts +5 -1
- package/server/utils/inventory-util.ts +31 -7
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getTrackingNo = exports.packingWorksheetResolver = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
4
5
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
5
6
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
6
7
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
8
|
+
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
7
9
|
const constants_1 = require("../../../constants");
|
|
8
10
|
const controllers_1 = require("../../../controllers");
|
|
9
11
|
const utils_1 = require("../../../utils");
|
|
@@ -18,6 +20,29 @@ exports.packingWorksheetResolver = {
|
|
|
18
20
|
},
|
|
19
21
|
relations: ['bizplace', 'bizplace.domain']
|
|
20
22
|
});
|
|
23
|
+
// Find Release Order based on Bin
|
|
24
|
+
if (!releaseGood) {
|
|
25
|
+
const binLocation = await tx.getRepository(warehouse_base_1.Location).findOne({
|
|
26
|
+
where: { domain, name: releaseGoodNo }
|
|
27
|
+
});
|
|
28
|
+
const orderInventoryByBin = await tx.getRepository(sales_base_1.OrderInventory).findOne({
|
|
29
|
+
where: {
|
|
30
|
+
domain, binLocation, status: (0, typeorm_1.In)([sales_base_1.ORDER_INVENTORY_STATUS.PACKING, sales_base_1.ORDER_INVENTORY_STATUS.PACKED])
|
|
31
|
+
},
|
|
32
|
+
order: {
|
|
33
|
+
createdAt: 'ASC'
|
|
34
|
+
},
|
|
35
|
+
relations: [
|
|
36
|
+
'releaseGood',
|
|
37
|
+
'releaseGood.bizplace',
|
|
38
|
+
'releaseGood.bizplace.domain'
|
|
39
|
+
]
|
|
40
|
+
});
|
|
41
|
+
if (orderInventoryByBin === null || orderInventoryByBin === void 0 ? void 0 : orderInventoryByBin.releaseGood) {
|
|
42
|
+
releaseGoodNo = orderInventoryByBin.releaseGood.name;
|
|
43
|
+
releaseGood = orderInventoryByBin.releaseGood;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
21
46
|
if (!releaseGood)
|
|
22
47
|
throw new Error(`Release good dosen't exist.`);
|
|
23
48
|
const worksheet = await (0, utils_1.fetchExecutingWorksheet)(domain, releaseGood.bizplace, [
|
|
@@ -90,6 +115,7 @@ exports.packingWorksheetResolver = {
|
|
|
90
115
|
}
|
|
91
116
|
return {
|
|
92
117
|
worksheetInfo: {
|
|
118
|
+
releaseGood,
|
|
93
119
|
bizplaceName: releaseGood.bizplace.name,
|
|
94
120
|
refNo: releaseGood.refNo,
|
|
95
121
|
refNo2: releaseGood.refNo2,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ const controllers_1 = require("../../../../controllers/");
|
|
|
12
12
|
const ecommerce_1 = require("../../../../controllers/ecommerce");
|
|
13
13
|
const worksheet_controller_1 = require("../../../../controllers/worksheet-controller");
|
|
14
14
|
const entities_1 = require("../../../../entities");
|
|
15
|
+
const setting_base_1 = require("@things-factory/setting-base");
|
|
15
16
|
exports.completePickingResolver = {
|
|
16
17
|
async completePicking(_, { releaseGoodNo }, context) {
|
|
17
18
|
const { tx, domain, user } = context.state;
|
|
@@ -27,7 +28,7 @@ exports.completePickingResolver = {
|
|
|
27
28
|
}
|
|
28
29
|
};
|
|
29
30
|
async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
30
|
-
var _a;
|
|
31
|
+
var _a, _b, _c;
|
|
31
32
|
const pickingWSCtrl = new controllers_1.PickingWorksheetController(tx, domain, user);
|
|
32
33
|
const releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
33
34
|
where: { domain, name: releaseGoodNo },
|
|
@@ -156,11 +157,26 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
156
157
|
}
|
|
157
158
|
if (releaseGood.packingOption) {
|
|
158
159
|
const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
159
|
-
await
|
|
160
|
+
const directActivatePackingWorksheet = await tx.getRepository(setting_base_1.Setting).findOne({
|
|
161
|
+
where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-packing-worksheet' }
|
|
162
|
+
});
|
|
163
|
+
const partnerDirectActivatePackingWorksheetSetting = await tx.getRepository(setting_base_1.PartnerSetting).findOne({
|
|
164
|
+
where: { setting: directActivatePackingWorksheet, domain: domain, partnerDomain: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain }
|
|
165
|
+
});
|
|
166
|
+
let packingWorksheet = await packingWSCtrl.generatePackingWorksheet(releaseGoodNo);
|
|
167
|
+
if (directActivatePackingWorksheet != undefined && (directActivatePackingWorksheet.value).toLowerCase() == 'true') {
|
|
168
|
+
if (partnerDirectActivatePackingWorksheetSetting != undefined) {
|
|
169
|
+
if ((partnerDirectActivatePackingWorksheetSetting.value).toLowerCase() == 'true')
|
|
170
|
+
await packingWSCtrl.activatePacking(packingWorksheet.name);
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
await packingWSCtrl.activatePacking(packingWorksheet.name);
|
|
174
|
+
}
|
|
175
|
+
}
|
|
160
176
|
}
|
|
161
177
|
else {
|
|
162
178
|
// Find Existing Loading Worksheet if any
|
|
163
|
-
|
|
179
|
+
let existLoadingWorksheet = await tx.getRepository(entities_1.Worksheet).findOne({
|
|
164
180
|
where: {
|
|
165
181
|
releaseGood,
|
|
166
182
|
type: constants_1.WORKSHEET_TYPE.LOADING,
|
|
@@ -170,14 +186,20 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
170
186
|
if (!existLoadingWorksheet && !releaseGood.courierOption && !releaseGood.packingOption) {
|
|
171
187
|
const loadingWSCtrl = new controllers_1.LoadingWorksheetController(tx, domain, user);
|
|
172
188
|
let loadingWorksheet = await loadingWSCtrl.generateLoadingWorksheet(releaseGoodNo, pickedTargetInventories);
|
|
173
|
-
if (!((
|
|
189
|
+
if (!((_b = loadingWorksheet.worksheetDetails) === null || _b === void 0 ? void 0 : _b.length)) {
|
|
174
190
|
loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id);
|
|
175
191
|
}
|
|
176
192
|
const loadingWorksheetDetails = loadingWorksheet.worksheetDetails;
|
|
177
193
|
await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails);
|
|
178
194
|
}
|
|
179
195
|
else {
|
|
180
|
-
|
|
196
|
+
const loadingWSCtrl = new controllers_1.LoadingWorksheetController(tx, domain, user);
|
|
197
|
+
let loadingWorksheet = await loadingWSCtrl.updateLoadingWorksheet(releaseGoodNo, pickedTargetInventories, existLoadingWorksheet);
|
|
198
|
+
if (!((_c = loadingWorksheet.worksheetDetails) === null || _c === void 0 ? void 0 : _c.length)) {
|
|
199
|
+
loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id);
|
|
200
|
+
}
|
|
201
|
+
const loadingWorksheetDetails = loadingWorksheet.worksheetDetails;
|
|
202
|
+
await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails);
|
|
181
203
|
}
|
|
182
204
|
}
|
|
183
205
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":";;;AAGA,uDAAgF;AAChF,qEAA+E;AAC/E,qFAAkG;AAClG,qFAAwF;AACxF,uEAAmH;AACnH,2DAA8G;AAG9G,qDAAwE;AACxE,0DAKiC;AACjC,iEAAuE;AACvE,uFAAkF;AAClF,mDAAiE;
|
|
1
|
+
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.fetchAndAssignPickingTaskResolver = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
5
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
6
|
+
const setting_base_1 = require("@things-factory/setting-base");
|
|
7
|
+
const constants_1 = require("../../../../constants");
|
|
8
|
+
const entities_1 = require("../../../../entities");
|
|
9
|
+
const picking_worksheet_1 = require("../picking-worksheet");
|
|
10
|
+
const activate_picking_1 = require("./activate-picking");
|
|
11
|
+
exports.fetchAndAssignPickingTaskResolver = {
|
|
12
|
+
async fetchAndAssignPickingTask(_, {}, context) {
|
|
13
|
+
const { tx, domain, user } = context.state;
|
|
14
|
+
const assignee = await tx.getRepository(auth_base_1.User).findOne(user.id, { relations: ['domains'] });
|
|
15
|
+
if (((assignee === null || assignee === void 0 ? void 0 : assignee.domains) || []).every((userDomain) => userDomain.id !== domain.id))
|
|
16
|
+
throw new Error('Target user is not belong to current domain');
|
|
17
|
+
if (!assignee)
|
|
18
|
+
throw new Error('failed to find target user');
|
|
19
|
+
let worksheet;
|
|
20
|
+
worksheet = await tx.getRepository(entities_1.Worksheet).findOne({
|
|
21
|
+
relations: ['releaseGood'],
|
|
22
|
+
where: [
|
|
23
|
+
{
|
|
24
|
+
domain,
|
|
25
|
+
type: constants_1.WORKSHEET_TYPE.PICKING,
|
|
26
|
+
status: constants_1.WORKSHEET_STATUS.EXECUTING,
|
|
27
|
+
assignee: assignee
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
domain,
|
|
31
|
+
type: constants_1.WORKSHEET_TYPE.PICKING,
|
|
32
|
+
status: constants_1.WORKSHEET_STATUS.DEACTIVATED,
|
|
33
|
+
assignee: assignee
|
|
34
|
+
}
|
|
35
|
+
],
|
|
36
|
+
order: {
|
|
37
|
+
name: 'ASC'
|
|
38
|
+
}
|
|
39
|
+
});
|
|
40
|
+
if (!worksheet) {
|
|
41
|
+
worksheet = await tx.getRepository(entities_1.Worksheet).findOne({
|
|
42
|
+
relations: ['releaseGood'],
|
|
43
|
+
where: [
|
|
44
|
+
{
|
|
45
|
+
domain,
|
|
46
|
+
type: constants_1.WORKSHEET_TYPE.PICKING,
|
|
47
|
+
status: constants_1.WORKSHEET_STATUS.EXECUTING,
|
|
48
|
+
assignee: null
|
|
49
|
+
},
|
|
50
|
+
{
|
|
51
|
+
domain,
|
|
52
|
+
type: constants_1.WORKSHEET_TYPE.PICKING,
|
|
53
|
+
status: constants_1.WORKSHEET_STATUS.DEACTIVATED,
|
|
54
|
+
assignee: null
|
|
55
|
+
}
|
|
56
|
+
]
|
|
57
|
+
});
|
|
58
|
+
await (0, typeorm_1.getRepository)(entities_1.Worksheet).update({ id: worksheet.id }, { assignee: assignee });
|
|
59
|
+
}
|
|
60
|
+
if (worksheet.status == constants_1.WORKSHEET_STATUS.DEACTIVATED)
|
|
61
|
+
await (0, activate_picking_1.activatePicking)(tx, domain, user, worksheet.name);
|
|
62
|
+
const locationSortingRules = await tx.getRepository(setting_base_1.Setting).findOne({
|
|
63
|
+
where: { domain, name: 'rule-for-picking-product' }
|
|
64
|
+
});
|
|
65
|
+
const sortingRule = JSON.parse(locationSortingRules.value);
|
|
66
|
+
const locationSortingRule = Object.keys(sortingRule).map(field => {
|
|
67
|
+
return { name: field, desc: sortingRule[field] === 'DESC' };
|
|
68
|
+
});
|
|
69
|
+
return await (0, picking_worksheet_1.pickingWorksheet)(domain, worksheet.releaseGood.name, locationSortingRule, tx);
|
|
70
|
+
}
|
|
71
|
+
};
|
|
72
|
+
//# sourceMappingURL=fetch-and-assign-picking-task.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fetch-and-assign-picking-task.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ const activate_batch_picking_1 = require("./activate-batch-picking");
|
|
|
5
5
|
const activate_picking_1 = require("./activate-picking");
|
|
6
6
|
const assign_picking_inventories_1 = require("./assign-picking-inventories");
|
|
7
7
|
const assign_picking_worker_1 = require("./assign-picking-worker");
|
|
8
|
+
const fetch_and_assign_picking_task_1 = require("./fetch-and-assign-picking-task");
|
|
8
9
|
const batch_picking_1 = require("./batch-picking");
|
|
9
10
|
const complete_batch_picking_1 = require("./complete-batch-picking");
|
|
10
11
|
const complete_picking_1 = require("./complete-picking");
|
|
@@ -12,5 +13,5 @@ const picking_1 = require("./picking");
|
|
|
12
13
|
const scan_product_picking_1 = require("./scan-product-picking");
|
|
13
14
|
const scan_product_batch_picking_1 = require("./scan-product-batch-picking");
|
|
14
15
|
const undo_picking_assignment_1 = require("./undo-picking-assignment");
|
|
15
|
-
exports.Mutations = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, assign_picking_inventories_1.assignPickingInventoriesResolver), undo_picking_assignment_1.undoPickingAssigmentResolver), activate_picking_1.activatePickingResolver), activate_batch_picking_1.activateBatchPickingResolver), picking_1.pickingResolver), scan_product_picking_1.scanProductPickingResolver), scan_product_batch_picking_1.scanProductBatchPickingResolver), batch_picking_1.batchPickingResolver), complete_picking_1.completePickingResolver), complete_batch_picking_1.completeBatchPickingResolver), assign_picking_worker_1.assignPickingWorkerResolver);
|
|
16
|
+
exports.Mutations = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, assign_picking_inventories_1.assignPickingInventoriesResolver), undo_picking_assignment_1.undoPickingAssigmentResolver), activate_picking_1.activatePickingResolver), activate_batch_picking_1.activateBatchPickingResolver), picking_1.pickingResolver), scan_product_picking_1.scanProductPickingResolver), scan_product_batch_picking_1.scanProductBatchPickingResolver), batch_picking_1.batchPickingResolver), complete_picking_1.completePickingResolver), complete_batch_picking_1.completeBatchPickingResolver), assign_picking_worker_1.assignPickingWorkerResolver), fetch_and_assign_picking_task_1.fetchAndAssignPickingTaskResolver);
|
|
16
17
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/index.ts"],"names":[],"mappings":";;;AAAA,qEAAuE;AACvE,yDAA4D;AAC5D,6EAA+E;AAC/E,mEAAqE;AACrE,mDAAsD;AACtD,qEAAuE;AACvE,yDAA4D;AAC5D,uCAA2C;AAC3C,iEAAmE;AACnE,6EAA8E;AAC9E,uEAAwE;AAE3D,QAAA,SAAS,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/index.ts"],"names":[],"mappings":";;;AAAA,qEAAuE;AACvE,yDAA4D;AAC5D,6EAA+E;AAC/E,mEAAqE;AACrE,mFAAmF;AACnF,mDAAsD;AACtD,qEAAuE;AACvE,yDAA4D;AAC5D,uCAA2C;AAC3C,iEAAmE;AACnE,6EAA8E;AAC9E,uEAAwE;AAE3D,QAAA,SAAS,+KACjB,6DAAgC,GAChC,sDAA4B,GAC5B,0CAAuB,GACvB,qDAA4B,GAC5B,yBAAe,GACf,iDAA0B,GAC1B,4DAA+B,GAC/B,oCAAoB,GACpB,0CAAuB,GACvB,qDAA4B,GAC5B,mDAA2B,GAC3B,iEAAiC,EACrC"}
|
|
@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.picking = exports.pickingResolver = void 0;
|
|
4
4
|
const controllers_1 = require("../../../../controllers");
|
|
5
5
|
exports.pickingResolver = {
|
|
6
|
-
async picking(_, { worksheetDetailName, worksheetType, palletId, locationName, releaseQty }, context) {
|
|
6
|
+
async picking(_, { worksheetDetailName, worksheetType, palletId, locationName, releaseQty, binLocation }, context) {
|
|
7
7
|
const { tx, domain, user } = context.state;
|
|
8
|
-
await picking(tx, domain, user, worksheetDetailName, worksheetType, palletId, locationName, releaseQty);
|
|
8
|
+
await picking(tx, domain, user, worksheetDetailName, worksheetType, palletId, locationName, releaseQty, binLocation);
|
|
9
9
|
}
|
|
10
10
|
};
|
|
11
|
-
async function picking(tx, domain, user, worksheetDetailName, worksheetType, palletId, locationName, releaseQty) {
|
|
11
|
+
async function picking(tx, domain, user, worksheetDetailName, worksheetType, palletId, locationName, releaseQty, binLocation) {
|
|
12
12
|
const worksheetController = new controllers_1.PickingWorksheetController(tx, domain, user);
|
|
13
|
-
await worksheetController.picking(worksheetDetailName, worksheetType, palletId, locationName, releaseQty);
|
|
13
|
+
await worksheetController.picking(worksheetDetailName, worksheetType, palletId, locationName, releaseQty, binLocation);
|
|
14
14
|
}
|
|
15
15
|
exports.picking = picking;
|
|
16
16
|
//# sourceMappingURL=picking.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/picking.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,OAAY;
|
|
1
|
+
{"version":3,"file":"picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/picking.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,OAAY;QACzH,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,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,CAAC,CAAA;IACtH,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAC3B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,aAAqB,EACrB,QAAgB,EAChB,YAAoB,EACpB,UAAkB,EAClB,WAAoB;IAEpB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,OAAO,CAAC,mBAAmB,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,CAAC,CAAA;AACxH,CAAC;AAbD,0BAaC"}
|
|
@@ -1,70 +1,99 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.pickingWorksheetResolver = void 0;
|
|
3
|
+
exports.pickingWorksheet = exports.pickingWorksheetResolver = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
5
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
6
|
+
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
6
7
|
const constants_1 = require("../../../constants");
|
|
7
8
|
const entities_1 = require("../../../entities");
|
|
8
9
|
const utils_1 = require("../../../utils");
|
|
9
10
|
exports.pickingWorksheetResolver = {
|
|
10
11
|
async pickingWorksheet(_, { releaseGoodNo, locationSortingRules }, context) {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
const { domain, tx } = context.state;
|
|
13
|
+
return await pickingWorksheet(domain, releaseGoodNo, locationSortingRules, tx);
|
|
14
|
+
}
|
|
15
|
+
};
|
|
16
|
+
async function pickingWorksheet(domain, releaseGoodNo, locationSortingRules, tx) {
|
|
17
|
+
var _a;
|
|
18
|
+
let releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
19
|
+
where: { domain, name: releaseGoodNo /*status: ORDER_STATUS.PICKING*/ },
|
|
20
|
+
relations: ['bizplace', 'bizplace.domain']
|
|
21
|
+
});
|
|
22
|
+
// Find Release Order based on Bin
|
|
23
|
+
if (!releaseGood) {
|
|
24
|
+
const binLocation = await tx.getRepository(warehouse_base_1.Location).findOne({
|
|
25
|
+
where: { domain, name: releaseGoodNo }
|
|
16
26
|
});
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
.leftJoinAndSelect('T_INV.inventory', 'INV')
|
|
23
|
-
.leftJoinAndSelect('T_INV.product', 'PROD')
|
|
24
|
-
.leftJoinAndSelect('INV.location', 'LOC');
|
|
25
|
-
if ((locationSortingRules === null || locationSortingRules === void 0 ? void 0 : locationSortingRules.length) > 0) {
|
|
26
|
-
locationSortingRules.forEach((rule) => {
|
|
27
|
-
qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC');
|
|
28
|
-
});
|
|
29
|
-
}
|
|
30
|
-
const worksheetDetails = await qb
|
|
31
|
-
.where('"WSD"."worksheet_id" = :worksheetId', { worksheetId: worksheet.id })
|
|
32
|
-
.andWhere('"WSD"."status" != :status', { status: constants_1.WORKSHEET_STATUS.REPLACED })
|
|
33
|
-
.andWhere('"T_INV"."status" != :t_invstatus', { t_invstatus: sales_base_1.ORDER_INVENTORY_STATUS.CANCELLED })
|
|
34
|
-
.getMany();
|
|
35
|
-
return {
|
|
36
|
-
worksheetInfo: {
|
|
37
|
-
bizplaceName: releaseGood.bizplace.name,
|
|
38
|
-
partnerDomainId: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id,
|
|
39
|
-
startedAt: worksheet.startedAt,
|
|
40
|
-
refNo: releaseGood.refNo,
|
|
41
|
-
refNo2: releaseGood.refNo2,
|
|
42
|
-
releaseGood
|
|
27
|
+
const orderInventoryByBin = await tx.getRepository(sales_base_1.OrderInventory).findOne({
|
|
28
|
+
where: {
|
|
29
|
+
domain,
|
|
30
|
+
binLocation,
|
|
31
|
+
status: (0, typeorm_1.In)([sales_base_1.ORDER_INVENTORY_STATUS.PICKING, sales_base_1.ORDER_INVENTORY_STATUS.PICKED])
|
|
43
32
|
},
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
product: inventory === null || inventory === void 0 ? void 0 : inventory.product,
|
|
54
|
-
qty: inventory === null || inventory === void 0 ? void 0 : inventory.qty,
|
|
55
|
-
releaseQty: targetInventory.releaseQty,
|
|
56
|
-
pickedQty: targetInventory.pickedQty,
|
|
57
|
-
status: pickingWSD.status,
|
|
58
|
-
description: pickingWSD.description,
|
|
59
|
-
targetName: targetInventory.name,
|
|
60
|
-
packingType: inventory === null || inventory === void 0 ? void 0 : inventory.packingType,
|
|
61
|
-
packingSize: inventory === null || inventory === void 0 ? void 0 : inventory.packingSize,
|
|
62
|
-
expirationDate: inventory === null || inventory === void 0 ? void 0 : inventory.expirationDate,
|
|
63
|
-
location: inventory === null || inventory === void 0 ? void 0 : inventory.location,
|
|
64
|
-
relatedOrderInv: targetInventory
|
|
65
|
-
};
|
|
66
|
-
})
|
|
67
|
-
};
|
|
33
|
+
order: {
|
|
34
|
+
createdAt: 'ASC'
|
|
35
|
+
},
|
|
36
|
+
relations: ['releaseGood', 'releaseGood.bizplace', 'releaseGood.bizplace.domain']
|
|
37
|
+
});
|
|
38
|
+
if (orderInventoryByBin === null || orderInventoryByBin === void 0 ? void 0 : orderInventoryByBin.releaseGood) {
|
|
39
|
+
releaseGoodNo = orderInventoryByBin.releaseGood.name;
|
|
40
|
+
releaseGood = orderInventoryByBin.releaseGood;
|
|
41
|
+
}
|
|
68
42
|
}
|
|
69
|
-
|
|
43
|
+
if (!releaseGood)
|
|
44
|
+
throw new Error(`Couldn't find picking worksheet by order no (${releaseGoodNo})`);
|
|
45
|
+
const worksheet = await (0, utils_1.fetchExecutingWorksheet)(domain, releaseGood.bizplace, ['bizplace'], constants_1.WORKSHEET_TYPE.PICKING, releaseGood, tx);
|
|
46
|
+
const qb = tx.createQueryBuilder(entities_1.WorksheetDetail, 'WSD');
|
|
47
|
+
qb.leftJoinAndSelect('WSD.targetInventory', 'T_INV')
|
|
48
|
+
.leftJoinAndSelect('T_INV.binLocation', 'BIN_LOC')
|
|
49
|
+
.leftJoinAndSelect('T_INV.inventory', 'INV')
|
|
50
|
+
.leftJoinAndSelect('T_INV.product', 'PROD')
|
|
51
|
+
.leftJoinAndSelect('INV.location', 'LOC');
|
|
52
|
+
if ((locationSortingRules === null || locationSortingRules === void 0 ? void 0 : locationSortingRules.length) > 0) {
|
|
53
|
+
locationSortingRules.forEach((rule) => {
|
|
54
|
+
qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC');
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
qb.addOrderBy(`PROD.name`, 'ASC');
|
|
58
|
+
const worksheetDetails = await qb
|
|
59
|
+
.where('"WSD"."worksheet_id" = :worksheetId', { worksheetId: worksheet.id })
|
|
60
|
+
.andWhere('"WSD"."status" != :status', { status: constants_1.WORKSHEET_STATUS.REPLACED })
|
|
61
|
+
.andWhere('"T_INV"."status" != :t_invstatus', { t_invstatus: sales_base_1.ORDER_INVENTORY_STATUS.CANCELLED })
|
|
62
|
+
.getMany();
|
|
63
|
+
return {
|
|
64
|
+
worksheetInfo: {
|
|
65
|
+
bizplaceName: releaseGood.bizplace.name,
|
|
66
|
+
partnerDomainId: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id,
|
|
67
|
+
startedAt: worksheet.startedAt,
|
|
68
|
+
refNo: releaseGood.refNo,
|
|
69
|
+
refNo2: releaseGood.refNo2,
|
|
70
|
+
releaseGood
|
|
71
|
+
},
|
|
72
|
+
worksheetDetailInfos: worksheetDetails.map(async (pickingWSD) => {
|
|
73
|
+
const targetInventory = pickingWSD.targetInventory;
|
|
74
|
+
const inventory = targetInventory.inventory;
|
|
75
|
+
return {
|
|
76
|
+
name: pickingWSD.name,
|
|
77
|
+
palletId: inventory === null || inventory === void 0 ? void 0 : inventory.palletId,
|
|
78
|
+
cartonId: inventory === null || inventory === void 0 ? void 0 : inventory.cartonId,
|
|
79
|
+
batchId: inventory === null || inventory === void 0 ? void 0 : inventory.batchId,
|
|
80
|
+
batchIdRef: inventory === null || inventory === void 0 ? void 0 : inventory.batchIdRef,
|
|
81
|
+
product: inventory === null || inventory === void 0 ? void 0 : inventory.product,
|
|
82
|
+
qty: inventory === null || inventory === void 0 ? void 0 : inventory.qty,
|
|
83
|
+
binLocation: (targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.binLocation) || '',
|
|
84
|
+
releaseQty: targetInventory.releaseQty,
|
|
85
|
+
pickedQty: targetInventory.pickedQty,
|
|
86
|
+
status: pickingWSD.status,
|
|
87
|
+
description: pickingWSD.description,
|
|
88
|
+
targetName: targetInventory.name,
|
|
89
|
+
packingType: inventory === null || inventory === void 0 ? void 0 : inventory.packingType,
|
|
90
|
+
packingSize: inventory === null || inventory === void 0 ? void 0 : inventory.packingSize,
|
|
91
|
+
expirationDate: inventory === null || inventory === void 0 ? void 0 : inventory.expirationDate,
|
|
92
|
+
location: inventory === null || inventory === void 0 ? void 0 : inventory.location,
|
|
93
|
+
relatedOrderInv: targetInventory
|
|
94
|
+
};
|
|
95
|
+
})
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
exports.pickingWorksheet = pickingWorksheet;
|
|
70
99
|
//# sourceMappingURL=picking-worksheet.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"picking-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/picking-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAA+
|
|
1
|
+
{"version":3,"file":"picking-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/picking-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.unloadingReturnWorksheetResolver = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
-
const utils_1 = require("../../../utils");
|
|
6
5
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
7
6
|
const constants_1 = require("../../../constants");
|
|
7
|
+
const utils_1 = require("../../../utils");
|
|
8
8
|
exports.unloadingReturnWorksheetResolver = {
|
|
9
9
|
async unloadingReturnWorksheet(_, { returnOrderNo }, context) {
|
|
10
10
|
var _a;
|
|
@@ -50,7 +50,7 @@ exports.unloadingReturnWorksheetResolver = {
|
|
|
50
50
|
description: productWSD.description,
|
|
51
51
|
targetName: targetInventory.name,
|
|
52
52
|
packingType: targetInventory.packingType,
|
|
53
|
-
packingSize: targetInventory.packingSize,
|
|
53
|
+
packingSize: targetInventory.inventory.packingSize,
|
|
54
54
|
palletQty: targetInventory.palletQty,
|
|
55
55
|
actualPalletQty: targetInventory.actualPalletQty,
|
|
56
56
|
packQty: targetInventory.returnQty,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unloading-return-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/unloading-return-worksheet.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"unloading-return-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/unloading-return-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAGvC,2DAAwE;AAGxE,kDAAmD;AAEnD,0CAAwD;AAE3C,QAAA,gCAAgC,GAAG;IAC9C,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;;QACpE,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QACpD,MAAM,WAAW,GAAgB,MAAM,IAAA,uBAAa,EAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YACxE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE;YACtC,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,yBAAyB,CAAC;SAC1F,CAAC,CAAA;QACF,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAEhE,MAAM,gBAAgB,GAAa,WAAW,CAAC,QAAQ,CAAA;QACvD,MAAM,qBAAqB,GAAW,MAAA,WAAW,CAAC,QAAQ,0CAAE,OAAO,CAAC,MAAM,CAAA;QAE1E,MAAM,SAAS,GAAc,MAAM,IAAA,+BAAuB,EACxD,MAAM,EACN,gBAAgB,EAChB;YACE,UAAU;YACV,iBAAiB;YACjB,gBAAgB;YAChB,0BAA0B;YAC1B,aAAa;YACb,kBAAkB;YAClB,kCAAkC;YAClC,0CAA0C;YAC1C,4CAA4C;YAC5C,SAAS;YACT,SAAS;SACV,EACD,0BAAc,CAAC,gBAAgB,EAC/B,WAAW,CACZ,CAAA;QAED,OAAO;YACL,aAAa,EAAE;gBACb,YAAY,EAAE,gBAAgB,CAAC,IAAI;gBACnC,eAAe,EAAE,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,MAAM,CAAC,EAAE;gBAC5C,uBAAuB,EAAE,qBAAqB,CAAC,EAAE;gBACjD,cAAc,EAAE,SAAS,CAAC,cAAc,CAAC,IAAI;gBAC7C,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,KAAK,EAAE,WAAW,CAAC,KAAK;aACzB;YACD,oBAAoB,EAAE,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,UAA2B,EAAE,EAAE;gBACnF,MAAM,eAAe,GAAmB,UAAU,CAAC,eAAe,CAAA;gBAElE,OAAO;oBACL,EAAE,EAAE,UAAU,CAAC,EAAE;oBACjB,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,OAAO,EAAE,eAAe,CAAC,OAAO;oBAChC,QAAQ,EAAE,eAAe,CAAC,SAAS,CAAC,QAAQ;oBAC5C,OAAO,EAAE,eAAe,CAAC,OAAO;oBAChC,WAAW,EAAE,UAAU,CAAC,WAAW;oBACnC,UAAU,EAAE,eAAe,CAAC,IAAI;oBAChC,WAAW,EAAE,eAAe,CAAC,WAAW;oBACxC,WAAW,EAAE,eAAe,CAAC,SAAS,CAAC,WAAW;oBAClD,SAAS,EAAE,eAAe,CAAC,SAAS;oBACpC,eAAe,EAAE,eAAe,CAAC,eAAe;oBAChD,OAAO,EAAE,eAAe,CAAC,SAAS;oBAClC,aAAa,EAAE,eAAe,CAAC,aAAa;oBAC5C,MAAM,EAAE,eAAe,CAAC,MAAM;oBAC9B,SAAS,EAAE,eAAe,CAAC,SAAS;oBACpC,KAAK,EAAE,UAAU,CAAC,KAAK;oBACvB,MAAM,EAAE,UAAU,CAAC,MAAM;iBAC1B,CAAA;YACH,CAAC,CAAC;SACH,CAAA;IACH,CAAC;CACF,CAAA"}
|
|
@@ -292,6 +292,7 @@ exports.Mutation = `
|
|
|
292
292
|
cartonId: String
|
|
293
293
|
locationName: String!
|
|
294
294
|
releaseQty: Int!
|
|
295
|
+
binLocation: String
|
|
295
296
|
): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
|
|
296
297
|
|
|
297
298
|
scanProductPicking (
|
|
@@ -517,6 +518,9 @@ exports.Mutation = `
|
|
|
517
518
|
worksheetId: String!
|
|
518
519
|
userId: String!
|
|
519
520
|
): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
|
|
521
|
+
|
|
522
|
+
fetchAndAssignPickingTask
|
|
523
|
+
: ExecutingWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
|
|
520
524
|
|
|
521
525
|
palletizingPallets (
|
|
522
526
|
refOrderNo: String!
|
|
@@ -589,7 +593,7 @@ exports.Query = `
|
|
|
589
593
|
|
|
590
594
|
pickingWorksheet (
|
|
591
595
|
releaseGoodNo: String!, locationSortingRules: [Sorting]
|
|
592
|
-
): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
|
|
596
|
+
): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query") @transaction
|
|
593
597
|
|
|
594
598
|
sortingWorksheet (
|
|
595
599
|
releaseGoodNo: String!
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,yEAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,6DAAwD;AACxD,+DAA0D;AAC1D,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AAExD,QAAA,QAAQ,GAAiB
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,yEAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,6DAAwD;AACxD,+DAA0D;AAC1D,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AAExD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqfrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0IlC,CAAA;AAEY,QAAA,KAAK,GAAiB;IACjC,qBAAS;IACT,uBAAU;IACV,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;CAC1B,CAAA"}
|