@things-factory/worksheet-base 3.8.1 → 3.8.2
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 +1 -1
- package/dist-server/controllers/ecommerce/sellercraft-controller.js.map +1 -1
- package/dist-server/controllers/outbound/packing-worksheet-controller.js +1 -9
- package/dist-server/controllers/outbound/packing-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/picking-worksheet-controller.js +10 -12
- package/dist-server/controllers/outbound/picking-worksheet-controller.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +4 -3
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/package.json +4 -4
- package/server/controllers/ecommerce/sellercraft-controller.ts +2 -2
- package/server/controllers/outbound/packing-worksheet-controller.ts +1 -14
- package/server/controllers/outbound/picking-worksheet-controller.ts +30 -36
- package/server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts +3 -1
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +4 -3
|
@@ -131,7 +131,7 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
|
|
|
131
131
|
if (dropoffAddress)
|
|
132
132
|
releaseGood.dropoffAddress = dropoffAddress;
|
|
133
133
|
releaseGood.updater = this.user;
|
|
134
|
-
await this.trxMgr.getRepository(sales_base_1.ReleaseGood).save(releaseGood);
|
|
134
|
+
return await this.trxMgr.getRepository(sales_base_1.ReleaseGood).save(releaseGood);
|
|
135
135
|
}
|
|
136
136
|
async initiateOrderDocument(sellercraft, releaseGood) {
|
|
137
137
|
const orderInformation = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sellercraft-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/sellercraft-controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"sellercraft-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/sellercraft-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,12 +7,7 @@ const constants_1 = require("../../constants");
|
|
|
7
7
|
const entities_1 = require("../../entities");
|
|
8
8
|
const vas_worksheet_controller_1 = require("../vas/vas-worksheet-controller");
|
|
9
9
|
class PackingWorksheetController extends vas_worksheet_controller_1.VasWorksheetController {
|
|
10
|
-
async generatePackingWorksheet(
|
|
11
|
-
let releaseGood = await this.findRefOrder(sales_base_1.ReleaseGood, {
|
|
12
|
-
domain: this.domain,
|
|
13
|
-
name: releaseGoodNo,
|
|
14
|
-
status: sales_base_1.ORDER_STATUS.READY_TO_PACK
|
|
15
|
-
}, ['orderInventories', 'orderInventories.inventory']);
|
|
10
|
+
async generatePackingWorksheet(releaseGood) {
|
|
16
11
|
const orderInventories = releaseGood.orderInventories;
|
|
17
12
|
const existingPackingWorksheet = await this.trxMgr.getRepository(entities_1.Worksheet).findOne({
|
|
18
13
|
where: { domain: this.domain, releaseGood, type: constants_1.WORKSHEET_TYPE.PACKING, status: constants_1.WORKSHEET_STATUS.DEACTIVATED }
|
|
@@ -28,9 +23,6 @@ class PackingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
|
|
|
28
23
|
oi.updater = this.user;
|
|
29
24
|
});
|
|
30
25
|
await this.updateOrderTargets(orderInventories);
|
|
31
|
-
releaseGood.status = sales_base_1.ORDER_STATUS.READY_TO_PACK;
|
|
32
|
-
releaseGood.updater = this.user;
|
|
33
|
-
await this.updateRefOrder(releaseGood);
|
|
34
26
|
return worksheet;
|
|
35
27
|
}
|
|
36
28
|
async activatePacking(worksheetNo) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packing-worksheet-controller.js","sourceRoot":"","sources":["../../../server/controllers/outbound/packing-worksheet-controller.ts"],"names":[],"mappings":";;;AACA,2DAA8G;AAC9G,mEAAsF;AAEtF,+CAAkE;AAClE,6CAA2D;AAC3D,8EAAwE;AAExE,MAAa,0BAA2B,SAAQ,iDAAsB;IACpE,KAAK,CAAC,wBAAwB,CAAC,
|
|
1
|
+
{"version":3,"file":"packing-worksheet-controller.js","sourceRoot":"","sources":["../../../server/controllers/outbound/packing-worksheet-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -255,9 +255,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
|
|
|
255
255
|
}
|
|
256
256
|
await this.trxMgr.getRepository(entities_1.WorksheetDetail).delete(worksheetDetailIds);
|
|
257
257
|
await this.trxMgr.getRepository(sales_base_1.OrderInventory).delete(targetInventoryIds);
|
|
258
|
-
await this.trxMgr
|
|
259
|
-
.getRepository(sales_base_1.OrderInventory)
|
|
260
|
-
.update({
|
|
258
|
+
await this.trxMgr.getRepository(sales_base_1.OrderInventory).update({
|
|
261
259
|
refWorksheetId: worksheet.id,
|
|
262
260
|
batchId,
|
|
263
261
|
product: { id: productId },
|
|
@@ -283,7 +281,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
|
|
|
283
281
|
let targetInventory = worksheetDetail.targetInventory;
|
|
284
282
|
const product = targetInventory.product;
|
|
285
283
|
let inventory = targetInventory.inventory;
|
|
286
|
-
//validation to prevent duplicated picking
|
|
284
|
+
//validation to prevent duplicated picking
|
|
287
285
|
let oiValidate = await this.trxMgr.getRepository(sales_base_1.OrderInventory).findOne({
|
|
288
286
|
where: { domain: this.domain, id: targetInventory.id, status: sales_base_1.ORDER_INVENTORY_STATUS.PICKING }
|
|
289
287
|
});
|
|
@@ -320,10 +318,10 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
|
|
|
320
318
|
}
|
|
321
319
|
}
|
|
322
320
|
if (product === null || product === void 0 ? void 0 : product.isRequireSerialNumberScanning) {
|
|
323
|
-
if (
|
|
321
|
+
if (!serialNumber || serialNumber == '')
|
|
324
322
|
throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `require serial number`));
|
|
325
323
|
if (serialNumber) {
|
|
326
|
-
targetInventory.serialNumber = JSON.stringify(targetInventory.serialNumber ? [...
|
|
324
|
+
targetInventory.serialNumber = JSON.stringify(targetInventory.serialNumber ? [...JSON.parse(targetInventory.serialNumber), serialNumber] : [serialNumber]);
|
|
327
325
|
}
|
|
328
326
|
}
|
|
329
327
|
await this.updatePickingTransaction(releaseGood, targetInventory, worksheetDetail, inventory, pickedQty);
|
|
@@ -340,13 +338,13 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
|
|
|
340
338
|
'targetInventory.releaseGood',
|
|
341
339
|
'targetInventory.inventory',
|
|
342
340
|
'targetInventory.inventory.location',
|
|
343
|
-
'targetInventory.product'
|
|
341
|
+
'targetInventory.product'
|
|
344
342
|
]);
|
|
345
343
|
const releaseGood = worksheetDetail.targetInventory.releaseGood;
|
|
346
344
|
let targetInventory = worksheetDetail.targetInventory;
|
|
347
345
|
const product = targetInventory.product;
|
|
348
346
|
let inventory = targetInventory.inventory;
|
|
349
|
-
//validation to prevent duplicated picking
|
|
347
|
+
//validation to prevent duplicated picking
|
|
350
348
|
let oiValidate = await this.trxMgr.getRepository(sales_base_1.OrderInventory).findOne({
|
|
351
349
|
where: { domain: this.domain, id: targetInventory.id, status: sales_base_1.ORDER_INVENTORY_STATUS.PICKING }
|
|
352
350
|
});
|
|
@@ -358,10 +356,10 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
|
|
|
358
356
|
if (inventory.palletId !== palletId)
|
|
359
357
|
throw new Error(this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('Pallet ID', palletId, inventory.palletId));
|
|
360
358
|
if (product === null || product === void 0 ? void 0 : product.isRequireSerialNumberScanning) {
|
|
361
|
-
if (
|
|
359
|
+
if (!serialNumber || serialNumber == '')
|
|
362
360
|
throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `require serial number`));
|
|
363
361
|
if (serialNumber) {
|
|
364
|
-
targetInventory.serialNumber = JSON.stringify(targetInventory.serialNumber ? [...
|
|
362
|
+
targetInventory.serialNumber = JSON.stringify(targetInventory.serialNumber ? [...JSON.parse(targetInventory.serialNumber), serialNumber] : [serialNumber]);
|
|
365
363
|
}
|
|
366
364
|
}
|
|
367
365
|
targetInventory = await this.checkAndSetBinPicking(targetInventory, binLocation);
|
|
@@ -584,7 +582,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
|
|
|
584
582
|
if (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packingOption) {
|
|
585
583
|
orderStatus = sales_base_1.ORDER_STATUS.READY_TO_PACK;
|
|
586
584
|
}
|
|
587
|
-
else
|
|
585
|
+
else {
|
|
588
586
|
orderStatus = sales_base_1.ORDER_STATUS.LOADING;
|
|
589
587
|
}
|
|
590
588
|
return await this.completeWorksheet(worksheet, orderStatus);
|
|
@@ -662,7 +660,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
|
|
|
662
660
|
name: 'enable-bin-picking'
|
|
663
661
|
}
|
|
664
662
|
});
|
|
665
|
-
if (binPickingSetting != undefined &&
|
|
663
|
+
if (binPickingSetting != undefined && binPickingSetting.value.toLowerCase() == 'true') {
|
|
666
664
|
if (binLocation) {
|
|
667
665
|
const foundBinLocation = await this.trxMgr.getRepository(warehouse_base_1.Location).findOne({
|
|
668
666
|
where: { domain: this.domain, name: binLocation, type: warehouse_base_1.LOCATION_TYPE.BIN }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"picking-worksheet-controller.js","sourceRoot":"","sources":["../../../server/controllers/outbound/picking-worksheet-controller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"picking-worksheet-controller.js","sourceRoot":"","sources":["../../../server/controllers/outbound/picking-worksheet-controller.ts"],"names":[],"mappings":";;;AAAA,qCAA4B;AAE5B,uDAAmD;AACnD,+DAAyD;AACzD,+DAAqE;AACrE,2DAOmC;AACnC,+DAAsD;AACtD,mEAMuC;AAEvC,+CAAkH;AAClH,6CAA2D;AAC3D,uCAAkD;AAClD,8EAAwE;AAExE,MAAa,0BAA2B,SAAQ,iDAAsB;IACpE,KAAK,CAAC,wBAAwB,CAAC,aAAqB;QAClD,IAAI,WAAW,GAAgB,MAAM,IAAI,CAAC,YAAY,CACpD,wBAAW,EACX;YACE,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,yBAAY,CAAC,iBAAiB;SACvC,EACD,CAAC,kBAAkB,EAAE,4BAA4B,EAAE,WAAW,CAAC,CAChE,CAAA;QACD,MAAM,gBAAgB,GAAqB,WAAW,CAAC,gBAAgB,CAAA;QACvE,MAAM,SAAS,GAAe,WAAW,CAAC,SAAS,CAAA;QAEnD,IAAI,SAAS,GAAc,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,0BAAc,CAAC,OAAO,CAAC,CAAA;QAE1F,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAkB,EAAE,EAAE,WAAC,OAAA,MAAA,EAAE,CAAC,SAAS,0CAAE,EAAE,CAAA,EAAA,CAAC,IAAI,WAAW,CAAC,YAAY,EAAE;YAChG,SAAS,CAAC,gBAAgB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAC5D,SAAS,EACT,0BAAc,CAAC,OAAO,EACtB,gBAAgB,CACjB,CAAA;SACF;QAED,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAkB,EAAE,EAAE;;YAC9C,EAAE,CAAC,MAAM;gBACP,EAAE,CAAC,YAAY,KAAI,MAAA,EAAE,CAAC,SAAS,0CAAE,EAAE,CAAA;oBACjC,CAAC,CAAC,mCAAsB,CAAC,aAAa;oBACtC,CAAC,CAAC,mCAAsB,CAAC,aAAa,CAAA;YAC1C,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QACxB,CAAC,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAA;QAE/C,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,IAAG,CAAC,EAAE;YACzB,MAAM,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;SAC7C;QAED,WAAW,CAAC,MAAM,GAAG,yBAAY,CAAC,aAAa,CAAA;QAC/C,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QAC/B,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;QAEtC,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,KAAK,CAAC,6BAA6B,CAAC,cAAwB,EAAE,iBAAyB;QACrF,IAAI,YAAY,GAAkB,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,IAAI,CAAC;YAClF,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAA,YAAE,EAAC,cAAc,CAAC,EAAE,MAAM,EAAE,yBAAY,CAAC,iBAAiB,EAAE;YAChG,SAAS,EAAE,CAAC,kBAAkB,EAAE,4BAA4B,CAAC;SAC9D,CAAC,CAAA;QAEF,MAAM,eAAe,GAAa,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;QAEtG,IAAI,gBAAgB,GAAqB,EAAE,CAAA;QAC3C,YAAY,CAAC,GAAG,CAAC,CAAC,WAAwB,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAqB,WAAW,CAAC,gBAAgB,CAAA;YAC/D,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAkB,EAAE,EAAE;gBAClC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAC3B,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,MAAM,gBAAgB,GAAY,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,sBAAO,CAAC,CAAC,OAAO,CAAC;YACjF,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,IAAI,EAAE,mCAAuB,CAAC,YAAY;aAC3C;SACF,CAAC,CAAA;QACF,IAAI,CAAC,gBAAgB;YAAE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,CAAA;QAEzF,IAAI,SAAS,GAAc,IAAI,oBAAS,EAAE,CAAA;QAC1C,SAAS,CAAC,IAAI,GAAG,4BAAoB,CAAC,QAAQ,CAAC,0BAAc,CAAC,aAAa,CAAC,CAAA;QAC5E,SAAS,CAAC,IAAI,GAAG,0BAAc,CAAC,aAAa,CAAA;QAC7C,SAAS,CAAC,MAAM,GAAG,MAAM,IAAA,yBAAU,EAAC;YAClC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,EAAE,iCAAqB,CAAC,OAAO;YACnC,IAAI,EAAE,EAAE;SACT,CAAC,CAAA;QACF,SAAS,CAAC,MAAM,GAAG,4BAAgB,CAAC,WAAW,CAAA;QAC/C,SAAS,CAAC,QAAQ,GAAG,eAAe,CAAA;QACpC,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;QAC9B,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QAC7B,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QAC7B,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAEtE,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,EAAkB,EAAE,EAAE,WAAC,OAAA,MAAA,EAAE,CAAC,SAAS,0CAAE,EAAE,CAAA,EAAA,CAAC,EAAE;YACnE,MAAM,eAAe,GAAqB,gBAAgB,CAAC,MAAM,CAC/D,CAAC,cAA8B,EAAE,EAAE,CAAC,cAAc,CAAC,SAAS,KAAK,IAAI,CACtE,CAAA;YAED,SAAS,CAAC,gBAAgB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAC5D,SAAS,EACT,0BAAc,CAAC,aAAa,EAC5B,eAAe,CAChB,CAAA;SACF;QAED,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAkB,EAAE,EAAE;;YAC9C,EAAE,CAAC,cAAc,GAAG,SAAS,CAAC,EAAE,CAAA;YAChC,EAAE,CAAC,MAAM,GAAG,CAAA,MAAA,EAAE,CAAC,SAAS,0CAAE,EAAE,EAAC,CAAC,CAAC,mCAAsB,CAAC,aAAa,CAAC,CAAC,CAAC,mCAAsB,CAAC,aAAa,CAAA;YAC1G,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QACxB,CAAC,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAA;QAE/C,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAwB,EAAE,EAAE;YAC3D,uCACK,WAAW,KACd,MAAM,EAAE,yBAAY,CAAC,aAAa,EAClC,OAAO,EAAE,IAAI,CAAC,IAAI,IACnB;QACH,CAAC,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAE/D,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,KAAK,CAAC,mCAAmC,CACvC,SAAoB,EACpB,eAA0C;QAE1C,2BAA2B;QAC3B,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE,0BAAc,CAAC,aAAa,EAAE,CAAC,eAAe,CAAC,CAAC,CAAA;IACtG,CAAC;IAED,KAAK,CAAC,8BAA8B,CAClC,SAAoB,EACpB,eAA0C;QAE1C,2BAA2B;QAC3B,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE,0BAAc,CAAC,OAAO,EAAE,CAAC,eAAe,CAAC,CAAC,CAAA;IAChG,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,WAAmB;QACvC,IAAI,SAAS,GAAc,MAAM,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,0BAAc,CAAC,OAAO,EAAE;YAClG,aAAa;YACb,sBAAsB;YACtB,QAAQ;YACR,UAAU;YACV,iBAAiB;YACjB,kBAAkB;YAClB,yBAAyB;YACzB,kBAAkB;YAClB,kCAAkC;YAClC,0CAA0C;SAC3C,CAAC,CAAA;QAEF,MAAM,gBAAgB,GAAsB,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,aAAa,CAAC,CAAA;QAC7G,MAAM,iBAAiB,GAAqB,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE;YACxF,IAAI,eAAe,GAAmB,GAAG,CAAC,eAAe,CAAA;YACzD,eAAe,CAAC,MAAM,GAAG,mCAAsB,CAAC,OAAO,CAAA;YACvD,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;YACnC,OAAO,eAAe,CAAA;QACxB,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAA;QAE1C,IAAI,WAAW,GAAgB,SAAS,CAAC,WAAW,CAAA;QACpD,WAAW,CAAC,MAAM,GAAG,yBAAY,CAAC,OAAO,CAAA;QACzC,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QAC/B,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;QAEhC,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAA;QAEzE,IAAI;YACF,MAAM,YAAY,GAAc,MAAM,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,0BAAc,CAAC,GAAG,CAAC,CAAA;YACnG,IAAI,YAAY,EAAE;gBAChB,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAA;aACzE;SACF;QAAC,OAAO,CAAC,EAAE,GAAE;QAEd,MAAM,eAAe,GAAqB,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,IAAI,CAAC;YAC7F,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,mCAAsB,CAAC,aAAa,EAAE;SAC1F,CAAC,CAAA;QACF,IAAI,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,EAAE;YAC3B,MAAM,GAAG,GAAa,eAAe,CAAC,GAAG,CAAC,CAAC,EAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;YACxE,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;SAC5D;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,WAAmB;QAC5C,IAAI,SAAS,GAAc,MAAM,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,0BAAc,CAAC,aAAa,EAAE;YACxG,kBAAkB;YAClB,kCAAkC;YAClC,8CAA8C;YAC9C,0CAA0C;YAC1C,UAAU;YACV,iBAAiB;YACjB,kBAAkB;YAClB,yBAAyB;SAC1B,CAAC,CAAA;QAEF,MAAM,gBAAgB,GAAsB,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,aAAa,CAAC,CAAA;QAC7G,MAAM,iBAAiB,GAAqB,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE;YACxF,IAAI,eAAe,GAAmB,GAAG,CAAC,eAAe,CAAA;YACzD,eAAe,CAAC,MAAM,GAAG,mCAAsB,CAAC,OAAO,CAAA;YACvD,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;YACnC,OAAO,eAAe,CAAA;QACxB,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAA;QAE1C,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAA;QAEzE,MAAM,gBAAgB,GAAqB,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,IAAI,CAAC;YAC9F,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,mCAAsB,CAAC,cAAc,EAAE;YAC3G,SAAS,EAAE,CAAC,aAAa,CAAC;SAC3B,CAAC,CAAA;QAEF,IAAI,YAAY,GAAkB,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QAE9F,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,EAAE;YACxB,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,EAAe,EAAE,EAAE;gBAClD,uCACK,EAAE,KACL,MAAM,EAAE,yBAAY,CAAC,OAAO,EAC5B,OAAO,EAAE,IAAI,CAAC,IAAI,IACnB;YACH,CAAC,CAAC,CAAA;YACF,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;SAChE;QAED,IAAI,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,MAAM,EAAE;YAC5B,MAAM,GAAG,GAAa,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;YACzE,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;SAC5D;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,WAAmB,EACnB,OAAe,EACf,SAAiB,EACjB,WAAmB,EACnB,WAAmB,EACnB,gBAA4C;;QAE5C,kDAAkD;QAClD,MAAM,SAAS,GAAc,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE;YACrE,UAAU;YACV,aAAa;YACb,kBAAkB;SACnB,CAAC,CAAA;QACF,MAAM,WAAW,GAAgB,SAAS,CAAC,WAAW,CAAA;QACtD,MAAM,QAAQ,GAAa,SAAS,CAAC,QAAQ,CAAA;QAC7C,MAAM,oBAAoB,GAAsB,MAAM,IAAI,CAAC,8BAA8B,CACvF,SAAS,CAAC,gBAAgB,EAC1B,OAAO,EACP,SAAS,EACT,WAAW,EACX,WAAW,CACZ,CAAA;QACD,2BAA2B;QAC3B,IAAI,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,EAAE;YAChC,MAAM,kBAAkB,GAAa,oBAAoB,CAAC,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YAC/F,MAAM,sBAAsB,GAAa,oBAAoB,CAAC,GAAG,CAC/D,CAAC,GAAoB,EAAE,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CACjD,CAAA;YAED,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;YAC3E,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAA;SAC/E;QAED,KAAK,IAAI,eAAe,IAAI,gBAAgB,EAAE;YAC5C,IAAI,MAAA,MAAA,eAAe,CAAC,eAAe,0CAAE,SAAS,0CAAE,EAAE,EAAE;gBAClD,eAAe,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE;oBAChE,iBAAiB;oBACjB,2BAA2B;iBAC5B,CAAC,CAAA;aACH;YAED,MAAM,eAAe,GAAmB,eAAe,CAAC,eAAe,CAAA;YACvE,IAAI,SAAS,GAAc,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;YAC3G,MAAM,OAAO,GAAY,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,sBAAO,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;YAEpF,2BAA2B;YAC3B,IAAI,kBAAkB,GAAmB,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,eAAe,CAAC,CAAA;YAC3E,OAAO,kBAAkB,CAAC,EAAE,CAAA;YAC5B,kBAAkB,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;YACvC,kBAAkB,CAAC,QAAQ,GAAG,QAAQ,CAAA;YACtC,kBAAkB,CAAC,IAAI,GAAG,6BAAgB,CAAC,cAAc,EAAE,CAAA;YAC3D,kBAAkB,CAAC,WAAW,GAAG,WAAW,CAAA;YAC5C,kBAAkB,CAAC,SAAS,GAAG,SAAS,CAAA;YACxC,kBAAkB,CAAC,OAAO,GAAG,OAAO,CAAA;YACpC,kBAAkB,CAAC,OAAO,GAAG,OAAO,CAAA;YACpC,kBAAkB,CAAC,WAAW,GAAG,WAAW,CAAA;YAC5C,kBAAkB,CAAC,WAAW,GAAG,WAAW,CAAA;YAC5C,kBAAkB,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;YACtC,kBAAkB,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;YACtC,kBAAkB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;YAE7F,8CAA8C;YAC9C,SAAS,CAAC,SAAS,GAAG,eAAe,CAAC,UAAU,GAAG,CAAC,SAAS,CAAC,SAAS,IAAI,CAAC,CAAC,CAAA;YAC7E,SAAS,CAAC,cAAc,GAAG,eAAe,CAAC,eAAe,GAAG,CAAC,SAAS,CAAC,cAAc,IAAI,CAAC,CAAC,CAAA;YAC5F,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAA;YAErC,2BAA2B;YAC3B,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE,0BAAc,CAAC,OAAO,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAA;SAC3F;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,WAAmB,EACnB,OAAe,EACf,SAAiB,EACjB,WAAmB,EACnB,WAAmB;QAEnB,MAAM,SAAS,GAAc,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE;YACrE,kBAAkB;YAClB,kCAAkC;YAClC,4CAA4C;YAC5C,0CAA0C;SAC3C,CAAC,CAAA;QAEF,MAAM,gBAAgB,GAAsB,MAAM,IAAI,CAAC,8BAA8B,CACnF,SAAS,CAAC,gBAAgB,EAC1B,OAAO,EACP,SAAS,EACT,WAAW,EACX,WAAW,EACX,CAAC,iBAAiB,EAAE,2BAA2B,CAAC,CACjD,CAAA;QAED,IAAI,kBAAkB,GAAa,EAAE,CAAA;QACrC,IAAI,kBAAkB,GAAa,EAAE,CAAA;QAErC,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE;YAC9C,kBAAkB,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;YAC3C,MAAM,eAAe,GAAmB,eAAe,CAAC,eAAe,CAAA;YACvE,kBAAkB,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;YAE3C,IAAI,SAAS,GAAc,MAAM,IAAI,CAAC,MAAM;iBACzC,aAAa,CAAC,0BAAS,CAAC;iBACxB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;YAC3E,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,GAAG,eAAe,CAAC,UAAU,CAAA;YACtE,SAAS,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,GAAG,eAAe,CAAC,eAAe,CAAA;YACrF,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAA;SACtC;QAED,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;QAC3E,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;QAE1E,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,MAAM,CACpD;YACE,cAAc,EAAE,SAAS,CAAC,EAAE;YAC5B,OAAO;YACP,OAAO,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE;YAC1B,WAAW;YACX,WAAW;YACX,MAAM,EAAE,mCAAsB,CAAC,cAAc;SAC9C,EACD,EAAE,MAAM,EAAE,mCAAsB,CAAC,aAAa,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE,CAC5F,CAAA;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,mBAA2B,EAC3B,aAAqB,EACrB,cAAsB,EACtB,QAAgB,EAChB,WAAoB,EACpB,YAAqB;QAErB,IAAI;YACF,IAAI,eAAe,GAAoB,MAAM,IAAI,CAAC,mCAAmC,CACnF,mBAAmB,EACnB,aAAa,EACb;gBACE,WAAW;gBACX,oBAAoB;gBACpB,iBAAiB;gBACjB,6BAA6B;gBAC7B,2BAA2B;gBAC3B,yBAAyB;gBACzB,wCAAwC;gBACxC,gDAAgD;gBAChD,2DAA2D;aAC5D,CACF,CAAA;YAED,MAAM,WAAW,GAAgB,eAAe,CAAC,eAAe,CAAC,WAAW,CAAA;YAC5E,IAAI,eAAe,GAAmB,eAAe,CAAC,eAAe,CAAA;YACrE,MAAM,OAAO,GAAY,eAAe,CAAC,OAAO,CAAA;YAChD,IAAI,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;YAEpD,0CAA0C;YAC1C,IAAI,UAAU,GAAmB,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,OAAO,CAAC;gBACvF,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,mCAAsB,CAAC,OAAO,EAAE;aAC/F,CAAC,CAAA;YACF,IAAI,CAAC,UAAU;gBAAE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAA;YAEpG,oCAAoC;YACpC,IAAI,SAAS,CAAC,GAAG,IAAI,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAA;YAEhH,IAAI,SAAS,CAAC,QAAQ,KAAK,QAAQ;gBACjC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,sBAAsB,CAAC,WAAW,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;YAE5G,MAAM,WAAW,GAAW,SAAS,CAAC,WAAW,CAAA;YACjD,MAAM,WAAW,GAAW,SAAS,CAAC,WAAW,CAAA;YAEjD,IAAI,SAAS,GAAW,CAAC,CAAA;YACzB,MAAM,UAAU,GAAW,eAAe,CAAC,UAAU,CAAA;YAErD,eAAe,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,eAAe,EAAE,WAAW,CAAC,CAAA;YAEhF,sCAAsC;YACtC,MAAM,cAAc,GAAoB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YACnG,MAAM,iBAAiB,GAAY,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAA;YACrG,IAAI,CAAC,iBAAiB;gBAAE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAA;YAEtF,sDAAsD;YACtD,MAAM,kBAAkB,GAAkB,cAAc,CAAC,IAAI,CAC3D,CAAC,MAAqB,EAAE,EAAE;;gBACxB,OAAA,MAAM,CAAC,IAAI,KAAK,cAAc;oBAC9B,MAAM,CAAC,WAAW,KAAK,WAAW;oBAClC,MAAM,CAAC,WAAW,IAAI,WAAW;oBACjC,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,EAAE,MAAK,OAAO,CAAC,EAAE,CAAA;aAAA,CACpC,CAAA;YAED,IAAI,CAAC,kBAAkB,EAAE;gBACvB,MAAM,eAAe,GAAkB,cAAc,CAAC,IAAI,CACxD,CAAC,YAA2B,EAAE,EAAE,CAC9B,YAAY,CAAC,WAAW,KAAK,WAAW,IAAI,YAAY,CAAC,WAAW,IAAI,WAAW,CACtF,CAAA;gBAED,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,cAAc,EAAE,eAAe,CAAC,CAAA;gBACnF,IAAI,SAAS,GAAG,UAAU,EAAE;oBAC1B,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAA;iBACzF;aACF;YAED,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,6BAA6B,EAAE;gBAC1C,IAAI,CAAC,YAAY,IAAI,YAAY,IAAI,EAAE;oBACrC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC,CAAA;gBAEnG,IAAI,YAAY,EAAE;oBAChB,eAAe,CAAC,YAAY,GAAG,IAAI,CAAC,SAAS,CAC3C,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAC5G,CAAA;iBACF;aACF;YAED,MAAM,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;SACzG;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CACX,mBAA2B,EAC3B,aAAqB,EACrB,QAAgB,EAChB,YAAoB,EACpB,SAAiB,EACjB,WAAoB,EACpB,YAAqB;QAErB,IAAI;YACF,IAAI,eAAe,GAAoB,MAAM,IAAI,CAAC,mCAAmC,CACnF,mBAAmB,EACnB,aAAa,EACb;gBACE,WAAW;gBACX,iBAAiB;gBACjB,6BAA6B;gBAC7B,2BAA2B;gBAC3B,oCAAoC;gBACpC,yBAAyB;aAC1B,CACF,CAAA;YAED,MAAM,WAAW,GAAgB,eAAe,CAAC,eAAe,CAAC,WAAW,CAAA;YAC5E,IAAI,eAAe,GAAmB,eAAe,CAAC,eAAe,CAAA;YACrE,MAAM,OAAO,GAAY,eAAe,CAAC,OAAO,CAAA;YAChD,IAAI,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;YAEpD,0CAA0C;YAC1C,IAAI,UAAU,GAAmB,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,OAAO,CAAC;gBACvF,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,mCAAsB,CAAC,OAAO,EAAE;aAC/F,CAAC,CAAA;YACF,IAAI,CAAC,UAAU;gBAAE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAA;YAEpG,oCAAoC;YACpC,IAAI,SAAS,CAAC,GAAG,IAAI,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAA;YAEhH,IAAI,SAAS,CAAC,QAAQ,KAAK,QAAQ;gBACjC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,sBAAsB,CAAC,WAAW,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;YAE5G,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,6BAA6B,EAAE;gBAC1C,IAAI,CAAC,YAAY,IAAI,YAAY,IAAI,EAAE;oBACrC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC,CAAA;gBAEnG,IAAI,YAAY,EAAE;oBAChB,eAAe,CAAC,YAAY,GAAG,IAAI,CAAC,SAAS,CAC3C,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAC5G,CAAA;iBACF;aACF;YAED,eAAe,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,eAAe,EAAE,WAAW,CAAC,CAAA;YAEhF,MAAM,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;YAExG,MAAM,YAAY,GAAa,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAA;YACjE,IAAI,YAAY,EAAE;gBAChB,MAAM,UAAU,GAAa,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,yBAAQ,CAAC,CAAC,OAAO,CAAC;oBAC7E,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE;oBAClD,SAAS,EAAE,CAAC,WAAW,CAAC;iBACzB,CAAC,CAAA;gBAEF,IAAI,CAAC,UAAU;oBAAE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAA;gBAE7E,IAAI,YAAY,CAAC,EAAE,KAAK,UAAU,CAAC,EAAE,EAAE;oBACrC,SAAS,CAAC,QAAQ,GAAG,UAAU,CAAA;oBAC/B,SAAS,CAAC,SAAS,GAAG,UAAU,CAAC,SAAS,CAAA;oBAC1C,SAAS,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAA;oBAChC,SAAS,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,EAAE,2CAA0B,CAAC,QAAQ,CAAC,CAAA;iBAC/G;aACF;SACF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,MAAc,EACd,aAAqB,EACrB,QAAgB,EAChB,YAAoB,EACpB,eAAuB,EACvB,UAAkB;QAElB,MAAM,SAAS,GAAc,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YAC9E,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,4BAAgB,CAAC,SAAS,EAAE;SAChG,CAAC,CAAA;QAEF,MAAM,cAAc,GAAc,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,OAAO,CAAC;YACnF,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE;SACzC,CAAC,CAAA;QAEF,MAAM,iBAAiB,GAAqB,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,IAAI,CAAC;YAC/F,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,cAAc,EAAE,SAAS,CAAC,EAAE;gBAC5B,MAAM,EAAE,mCAAsB,CAAC,OAAO;gBACtC,SAAS,EAAE,cAAc;aAC1B;YACD,SAAS,EAAE,CAAC,WAAW,EAAE,oBAAoB,EAAE,aAAa,CAAC;SAC9D,CAAC,CAAA;QAEF,MAAM,iBAAiB,GAAa,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;QAExF,IAAI,gBAAgB,GAAsB,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,IAAI,CAAC;YAC9F,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,IAAI,EAAE,aAAa;gBACnB,MAAM,EAAE,4BAAgB,CAAC,SAAS;gBAClC,eAAe,EAAE,IAAA,YAAE,EAAC,iBAAiB,CAAC;aACvC;SACF,CAAC,CAAA;QAEF,MAAM,eAAe,GAAW,iBAAiB;aAC9C,GAAG,CAAC,CAAC,EAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC;aAC1C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;QAE7B,IAAI,eAAe,IAAI,UAAU;YAC/B,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,+BAA+B,CAAC,CAAC,CAAA;QAE3G,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjD,IAAI,eAAe,GAAmB,iBAAiB,CAAC,CAAC,CAAC,CAAA;YAC1D,IAAI,SAAS,GAAc,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,OAAO,CAAC;gBAC5E,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,eAAe,CAAC,SAAS,CAAC,EAAE,EAAE;aACjE,CAAC,CAAA;YAEF,MAAM,WAAW,GAAgB,eAAe,CAAC,WAAW,CAAA;YAE5D,IAAI,SAAS,CAAC,QAAQ,KAAK,QAAQ;gBACjC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,sBAAsB,CAAC,WAAW,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;YAE5G,MAAM,OAAO,GAAW,SAAS,CAAC,GAAG,GAAG,eAAe,CAAC,UAAU,CAAA;YAClE,IAAI,OAAO,GAAG,CAAC,EAAE;gBACf,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,kCAAkC,CAAC,CAAC,CAAA;aAC7G;YAED,IAAI,eAAe,EAAE;gBACnB,MAAM,WAAW,GAAa,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,yBAAQ,CAAC,CAAC,OAAO,CAAC;oBAC9E,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,8BAAa,CAAC,GAAG,EAAE;iBAC/E,CAAC,CAAA;gBAEF,IAAI,CAAC,WAAW;oBACd,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC,CAAA;gBAErG,eAAe,CAAC,WAAW,GAAG,WAAW,CAAA;aAC1C;YAED,eAAe,CAAC,SAAS,GAAG,eAAe,CAAC,UAAU,CAAA;YACtD,eAAe,CAAC,MAAM,GAAG,mCAAsB,CAAC,MAAM,CAAA;YACtD,MAAM,IAAI,CAAC,kBAAkB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAA;YAEhD,SAAS,CAAC,GAAG,IAAI,eAAe,CAAC,UAAU,CAAA;YAC3C,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,QAAQ,GAAG,eAAe,CAAC,eAAe,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;YACnG,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,GAAG,eAAe,CAAC,UAAU,CAAA;YACtE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,cAAc,GAAG,eAAe,CAAC,eAAe,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;YAC/G,MAAM,IAAI,CAAC,oBAAoB,CAC7B,SAAS,EACT,WAAW,EACX,CAAC,eAAe,CAAC,UAAU,EAC3B,CAAC,eAAe,CAAC,eAAe,EAChC,2CAA0B,CAAC,OAAO,CACnC,CAAA;YAED,IAAI,OAAO,KAAK,CAAC,EAAE;gBACjB,SAAS,CAAC,MAAM,GAAG,iCAAgB,CAAC,UAAU,CAAA;gBAC9C,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,EAAE,2CAA0B,CAAC,UAAU,CAAC,CAAA;aACrG;YAED,MAAM,YAAY,GAAa,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAA;YACjE,IAAI,YAAY,EAAE;gBAChB,MAAM,UAAU,GAAa,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,yBAAQ,CAAC,CAAC,OAAO,CAAC;oBAC7E,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE;oBAClD,SAAS,EAAE,CAAC,WAAW,CAAC;iBACzB,CAAC,CAAA;gBAEF,IAAI,CAAC,UAAU;oBAAE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAA;gBAE7E,IAAI,YAAY,CAAC,EAAE,KAAK,UAAU,CAAC,EAAE,EAAE;oBACrC,SAAS,CAAC,QAAQ,GAAG,UAAU,CAAA;oBAC/B,SAAS,CAAC,SAAS,GAAG,UAAU,CAAC,SAAS,CAAA;oBAC1C,SAAS,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAA;oBAChC,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,EAAE,2CAA0B,CAAC,QAAQ,CAAC,CAAA;iBACnG;aACF;SACF;QAED,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,eAAgC,EAAE,EAAE;YAC3E,uCACK,eAAe,KAClB,MAAM,EAAE,4BAAgB,CAAC,IAAI,EAC7B,OAAO,EAAE,IAAI,CAAC,IAAI,IACnB;QACH,CAAC,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;IACzE,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,MAAc,EACd,aAAqB,EACrB,QAAgB,EAChB,cAAsB,EACtB,SAAc,EACd,eAAuB;QAEvB,MAAM,SAAS,GAAc,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YAC9E,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,4BAAgB,CAAC,SAAS,EAAE;YAC/F,SAAS,EAAE;gBACT,kBAAkB;gBAClB,kCAAkC;gBAClC,8CAA8C;gBAC9C,4CAA4C;gBAC5C,qDAAqD;gBACrD,0CAA0C;gBAC1C,yDAAyD;gBACzD,4EAA4E;aAC7E;SACF,CAAC,CAAA;QAEF,MAAM,gBAAgB,GAAsB,SAAS,CAAC,gBAAgB,CAAA;QACtE,MAAM,OAAO,GAAY,gBAAgB;aACtC,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC;aAC1D,IAAI,CAAC,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAElE,MAAM,OAAO,GAAW,SAAS,CAAC,OAAO,CAAA;QACzC,MAAM,WAAW,GAAW,SAAS,CAAC,WAAW,CAAA;QACjD,MAAM,WAAW,GAAW,SAAS,CAAC,WAAW,CAAA;QACjD,IAAI,SAAS,GAAW,CAAC,CAAA;QAEzB,MAAM,iBAAiB,GAAqB,gBAAgB;aACzD,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC;aAClD,MAAM,CACL,CAAC,eAA+B,EAAE,EAAE,CAClC,eAAe,CAAC,OAAO,KAAK,OAAO;YACnC,eAAe,CAAC,WAAW,KAAK,WAAW;YAC3C,eAAe,CAAC,SAAS,CAAC,QAAQ,KAAK,QAAQ;YAC/C,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAC5C,CAAA;QAEH,sCAAsC;QACtC,MAAM,cAAc,GAAoB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACnG,MAAM,iBAAiB,GAAY,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAA;QACrG,IAAI,CAAC,iBAAiB;YAAE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,cAAc,GAAG,CAAC,CAAC,CAAA;QAElG,sDAAsD;QACtD,MAAM,kBAAkB,GAAkB,cAAc,CAAC,IAAI,CAC3D,CAAC,MAAqB,EAAE,EAAE,CACxB,MAAM,CAAC,IAAI,KAAK,cAAc,IAAI,MAAM,CAAC,WAAW,KAAK,WAAW,IAAI,MAAM,CAAC,WAAW,IAAI,WAAW,CAC5G,CAAA;QAED,IAAI,CAAC,kBAAkB,EAAE;YACvB,MAAM,eAAe,GAAkB,cAAc,CAAC,IAAI,CACxD,CAAC,YAA2B,EAAE,EAAE,CAC9B,YAAY,CAAC,WAAW,KAAK,WAAW,IAAI,YAAY,CAAC,WAAW,IAAI,WAAW,CACtF,CAAA;YACD,IAAI,CAAC,eAAe;gBAClB,MAAM,IAAI,KAAK,CACb,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,kBAAkB,WAAW,sBAAsB,WAAW,GAAG,CAAC,CACjG,CAAA;YAEH,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,cAAc,EAAE,eAAe,CAAC,CAAA;SACpF;QAED,MAAM,eAAe,GAAW,iBAAiB;aAC9C,GAAG,CAAC,CAAC,EAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC;aAC1C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;QAE7B,MAAM,cAAc,GAClB,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAA;QAEpG,IAAI,cAAc,GAAG,eAAe;YAClC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,kCAAkC,CAAC,CAAC,CAAA;QAE9G,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjD,IAAI,eAAe,GAAmB,iBAAiB,CAAC,CAAC,CAAC,CAAA;YAC1D,IAAI,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;YACpD,MAAM,gBAAgB,GAAW,eAAe,CAAC,UAAU,CAAA;YAC3D,MAAM,eAAe,GAAW,eAAe,CAAC,SAAS,CAAA;YACzD,MAAM,WAAW,GAAgB,eAAe,CAAC,WAAW,CAAA;YAC5D,IAAI,SAAS,IAAI,CAAC;gBAAE,MAAK;YAEzB,IACE,eAAe,CAAC,MAAM,KAAK,mCAAsB,CAAC,OAAO;gBACzD,gBAAgB,GAAG,eAAe;gBAClC,SAAS,GAAG,CAAC,EACb;gBACA,IAAI,oBAAoB,GAAW,SAAS,GAAG,CAAC,gBAAgB,GAAG,eAAe,CAAC,CAAA,CAAC,WAAW;gBAC/F,MAAM,eAAe,GAAW,gBAAgB,GAAG,eAAe,CAAA,CAAC,MAAM;gBAEzE,IAAI,eAAe,IAAI,CAAC,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,CAAA,EAAE;oBACpD,MAAM,WAAW,GAAa,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,yBAAQ,CAAC,CAAC,OAAO,CAAC;wBAC9E,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,8BAAa,CAAC,GAAG,EAAE;qBAC/E,CAAC,CAAA;oBAEF,IAAI,CAAC,WAAW;wBACd,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC,CAAA;oBAErG,eAAe,CAAC,WAAW,GAAG,WAAW,CAAA;iBAC1C;gBAED,+EAA+E;gBAC/E,eAAe,CAAC,SAAS,IAAI,SAAS,GAAG,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAA;gBACtF,oBAAoB,GAAG,oBAAoB,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAA;gBAE1E,IAAI,eAAe,CAAC,SAAS,IAAI,gBAAgB,EAAE;oBACjD,MAAM,OAAO,GAAW,SAAS,CAAC,GAAG,GAAG,eAAe,CAAC,UAAU,CAAA;oBAClE,IAAI,OAAO,GAAG,CAAC,EAAE;wBACf,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,kCAAkC,CAAC,CAAC,CAAA;qBAC7G;oBAED,eAAe,CAAC,MAAM,GAAG,mCAAsB,CAAC,MAAM,CAAA;oBACtD,MAAM,IAAI,CAAC,kBAAkB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAA;oBAEhD,SAAS,CAAC,GAAG,IAAI,eAAe,CAAC,UAAU,CAAA;oBAC3C,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,QAAQ,GAAG,eAAe,CAAC,eAAe,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;oBACnG,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,GAAG,eAAe,CAAC,UAAU,CAAA;oBACtE,SAAS,CAAC,cAAc;wBACtB,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,cAAc,GAAG,eAAe,CAAC,eAAe,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;oBACtF,MAAM,IAAI,CAAC,oBAAoB,CAC7B,SAAS,EACT,WAAW,EACX,CAAC,eAAe,CAAC,UAAU,EAC3B,CAAC,eAAe,CAAC,eAAe,EAChC,2CAA0B,CAAC,OAAO,CACnC,CAAA;oBAED,IAAI,OAAO,KAAK,CAAC,EAAE;wBACjB,SAAS,CAAC,MAAM,GAAG,iCAAgB,CAAC,UAAU,CAAA;wBAC9C,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,EAAE,2CAA0B,CAAC,UAAU,CAAC,CAAA;qBACrG;oBAED,IAAI,eAAe,GAAoB,gBAAgB,CAAC,IAAI,CAC1D,CAAC,GAAoB,EAAE,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,KAAK,eAAe,CAAC,EAAE,CACxE,CAAA;oBACD,eAAe,CAAC,MAAM,GAAG,4BAAgB,CAAC,IAAI,CAAA;oBAC9C,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;oBACnC,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;iBACvE;qBAAM;oBACL,MAAM,IAAI,CAAC,kBAAkB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAA;iBACjD;gBACD,SAAS,GAAG,SAAS,GAAG,CAAC,gBAAgB,GAAG,eAAe,CAAC,CAAA;aAC7D;SACF;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,aAAqB;QACzC,IAAI,WAAW,GAAgB,MAAM,IAAI,CAAC,YAAY,CAAC,wBAAW,EAAE;YAClE,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,yBAAY,CAAC,OAAO;SAC7B,CAAC,CAAA;QAEF,MAAM,SAAS,GAAc,MAAM,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,0BAAc,CAAC,OAAO,EAAE;YACnG,kBAAkB;YAClB,kCAAkC;SACnC,CAAC,CAAA;QACF,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,4BAAgB,CAAC,SAAS,EAAE,CAAC,CAAA;QAE3E,IAAI,WAAmB,CAAA;QACvB,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,aAAa,EAAE;YAC9B,WAAW,GAAG,yBAAY,CAAC,aAAa,CAAA;SACzC;aAAM;YACL,WAAW,GAAG,yBAAY,CAAC,OAAO,CAAA;SACnC;QAED,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;IAC7D,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,MAAc;QACvC,IAAI,SAAS,GAAc,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YAC5E,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,MAAM;gBACN,IAAI,EAAE,0BAAc,CAAC,aAAa;aACnC;YACD,SAAS,EAAE;gBACT,UAAU;gBACV,iBAAiB;gBACjB,kBAAkB;gBAClB,kCAAkC;gBAClC,8CAA8C;aAC/C;SACF,CAAC,CAAA;QAEF,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,4BAAgB,CAAC,SAAS,EAAE,CAAC,CAAA;QAE3E,SAAS,CAAC,MAAM,GAAG,4BAAgB,CAAC,IAAI,CAAA;QACxC,SAAS,CAAC,OAAO,GAAG,IAAI,IAAI,EAAE,CAAA;QAC9B,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QAC7B,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAEtE,MAAM,gBAAgB,GAAsB,SAAS,CAAC,gBAAgB,CAAA;QACtE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAAoB,EAAE,EAAE;YAChD,GAAG,CAAC,MAAM,GAAG,4BAAgB,CAAC,IAAI,CAAA;YAClC,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QACzB,CAAC,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAEvE,MAAM,iBAAiB,GAAqB,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE;YAClG,IAAI,eAAe,GAAmB,GAAG,CAAC,eAAe,CAAA;YACzD,eAAe,CAAC,MAAM,GAAG,mCAAsB,CAAC,UAAU,CAAA;YAC1D,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;YACnC,OAAO,eAAe,CAAA;QACxB,CAAC,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAA;QAEhD,MAAM,YAAY,GAAkB,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE;YAC1F,IAAI,WAAW,GAAgB,GAAG,CAAC,eAAe,CAAC,WAAW,CAAA;YAE9D,IAAI,WAAmB,CAAA;YACvB,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,aAAa,EAAE;gBAC9B,WAAW,GAAG,yBAAY,CAAC,aAAa,CAAA;aACzC;iBAAM;gBACL,WAAW,GAAG,yBAAY,CAAC,aAAa,CAAA;aACzC;YAED,WAAW,CAAC,MAAM,GAAG,WAAW,CAAA;YAChC,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;YAC/B,OAAO,WAAW,CAAA;QACpB,CAAC,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAE/D,OAAO,SAAS,CAAA;IAClB,CAAC;IAEO,KAAK,CAAC,8BAA8B,CAC1C,gBAA4C,EAC5C,eAAuB,EACvB,iBAAyB,EACzB,mBAA2B,EAC3B,mBAA2B,EAC3B,YAAsB,CAAC,iBAAiB,EAAE,yBAAyB,CAAC;;QAEpE,KAAK,IAAI,GAAG,IAAI,gBAAgB,EAAE;YAChC,IAAI,CAAC,CAAA,MAAA,GAAG,CAAC,eAAe,0CAAE,OAAO,CAAA,IAAI,CAAC,CAAA,MAAA,MAAA,GAAG,CAAC,eAAe,0CAAE,OAAO,0CAAE,EAAE,CAAA,IAAI,CAAC,CAAA,MAAA,GAAG,CAAC,eAAe,0CAAE,WAAW,CAAA,EAAE;gBAC3G,GAAG,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC,iBAAiB,EAAE,yBAAyB,CAAC,CAAC,CAAA;aAC1F;SACF;QAED,gBAAgB,GAAG,gBAAgB,CAAC,MAAM,CACxC,CAAC,GAAoB,EAAE,EAAE,CACvB,GAAG,CAAC,eAAe,CAAC,OAAO,KAAK,eAAe;YAC/C,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,iBAAiB;YACpD,GAAG,CAAC,eAAe,CAAC,WAAW,KAAK,mBAAmB;YACvD,GAAG,CAAC,eAAe,CAAC,WAAW,KAAK,mBAAmB,CAC1D,CAAA;QAED,KAAK,IAAI,GAAG,IAAI,gBAAgB,EAAE;YAChC,GAAG,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;SACrD;QAED,OAAO,gBAAgB,CAAA;IACzB,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,cAAc,EAAE,WAAW;QAC7D,yBAAyB;QACzB,MAAM,iBAAiB,GAAY,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,sBAAO,CAAC,CAAC,OAAO,CAAC;YAClF,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,IAAI,EAAE,oBAAoB;aAC3B;SACF,CAAC,CAAA;QACF,IAAI,iBAAiB,IAAI,SAAS,IAAI,iBAAiB,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,MAAM,EAAE;YACrF,IAAI,WAAW,EAAE;gBACf,MAAM,gBAAgB,GAAa,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,yBAAQ,CAAC,CAAC,OAAO,CAAC;oBACnF,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,8BAAa,CAAC,GAAG,EAAE;iBAC3E,CAAC,CAAA;gBAEF,IAAI,CAAC,gBAAgB;oBACnB,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC,CAAA;gBAErG,cAAc,CAAC,WAAW,GAAG,gBAAgB,CAAA;aAC9C;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC,CAAA;aACpG;SACF;QAED,OAAO,cAAc,CAAA;IACvB,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAAC,WAAW,EAAE,cAAc,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS;QACvG,MAAM,UAAU,GAAW,cAAc,CAAC,UAAU,CAAA;QAEpD,cAAc,CAAC,SAAS,GAAG,OAAO,CAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,SAAS,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;QAChH,IAAI,cAAc,CAAC,SAAS,IAAI,UAAU,EAAE;YAC1C,MAAM,OAAO,GAAW,SAAS,CAAC,GAAG,GAAG,UAAU,CAAA;YAClD,IAAI,OAAO,GAAG,CAAC,EAAE;gBACf,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,kCAAkC,CAAC,CAAC,CAAA;aAC7G;YAED,cAAc,CAAC,MAAM,GAAG,mCAAsB,CAAC,MAAM,CAAA;YAErD,SAAS,CAAC,GAAG,IAAI,cAAc,CAAC,UAAU,CAAA;YAC1C,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,QAAQ,GAAG,cAAc,CAAC,eAAe,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;YAClG,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,GAAG,cAAc,CAAC,UAAU,CAAA;YACrE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,cAAc,GAAG,cAAc,CAAC,eAAe,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;YAC9G,SAAS,GAAG,MAAM,IAAI,CAAC,oBAAoB,CACzC,SAAS,EACT,WAAW,EACX,CAAC,cAAc,CAAC,UAAU,EAC1B,CAAC,cAAc,CAAC,eAAe,EAC/B,2CAA0B,CAAC,OAAO,CACnC,CAAA;YAED,eAAe,CAAC,MAAM,GAAG,4BAAgB,CAAC,IAAI,CAAA;YAC9C,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;YACnC,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;YAEtE,IAAI,OAAO,KAAK,CAAC,EAAE;gBACjB,SAAS,CAAC,MAAM,GAAG,iCAAgB,CAAC,UAAU,CAAA;gBAC9C,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,EAAE,2CAA0B,CAAC,UAAU,CAAC,CAAA;aACrG;SACF;QAED,MAAM,IAAI,CAAC,kBAAkB,CAAC,CAAC,cAAc,CAAC,CAAC,CAAA;QAE/C,OAAO,cAAc,CAAA;IACvB,CAAC;CACF;AAp8BD,gEAo8BC"}
|
|
@@ -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":";;;
|
|
1
|
+
{"version":3,"file":"generate-release-good-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts"],"names":[],"mappings":";;;AAMA,0DAAqE;AAGxD,QAAA,oCAAoC,GAAG;IAClD,KAAK,CAAC,4BAA4B,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;QACxE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,OAAO,MAAM,wBAAwB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,CAAA;IACxE,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,wBAAwB,CAC5C,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAAqB;IAErB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,OAAO,MAAM,mBAAmB,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAA;AAC1E,CAAC;AARD,4DAQC;AAED;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,8BAA8B,CAClD,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,SAAoB,EACpB,eAA0C;IAE1C,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,OAAO,MAAM,mBAAmB,CAAC,8BAA8B,CAAC,SAAS,EAAE,eAAe,CAAC,CAAA;AAC7F,CAAC;AATD,wEASC"}
|
|
@@ -30,7 +30,7 @@ exports.completePickingResolver = {
|
|
|
30
30
|
async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
31
31
|
var _a, _b, _c;
|
|
32
32
|
const pickingWSCtrl = new controllers_1.PickingWorksheetController(tx, domain, user);
|
|
33
|
-
|
|
33
|
+
let releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
34
34
|
where: { domain, name: releaseGoodNo },
|
|
35
35
|
relations: [
|
|
36
36
|
'bizplace',
|
|
@@ -38,6 +38,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
38
38
|
'bizplace.company',
|
|
39
39
|
'bizplace.company.domain',
|
|
40
40
|
'orderInventories',
|
|
41
|
+
'orderInventories.inventory',
|
|
41
42
|
'orderInventories.product'
|
|
42
43
|
]
|
|
43
44
|
});
|
|
@@ -61,7 +62,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
61
62
|
.findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
62
63
|
if (sellercraft) {
|
|
63
64
|
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
64
|
-
await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
|
|
65
|
+
releaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
|
|
65
66
|
await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood);
|
|
66
67
|
}
|
|
67
68
|
else {
|
|
@@ -166,7 +167,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
166
167
|
.findOne({
|
|
167
168
|
where: { setting: directActivatePackingWorksheet, domain: domain, partnerDomain: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain }
|
|
168
169
|
});
|
|
169
|
-
let packingWorksheet = await packingWSCtrl.generatePackingWorksheet(
|
|
170
|
+
let packingWorksheet = await packingWSCtrl.generatePackingWorksheet(releaseGood);
|
|
170
171
|
if (directActivatePackingWorksheet != undefined && directActivatePackingWorksheet.value.toLowerCase() == 'true') {
|
|
171
172
|
if (partnerDirectActivatePackingWorksheetSetting != undefined) {
|
|
172
173
|
if (partnerDirectActivatePackingWorksheetSetting.value.toLowerCase() == 'true')
|
|
@@ -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;AAC9G,+DAAsE;AAGtE,qDAAwE;AACxE,0DAKiC;AACjC,iEAAuE;AACvE,uFAAkF;AAClF,mDAAiE;AAEpD,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;QAE7F,MAAM,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,CAAA;QAEtD,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,kCAAkC;YACxC,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,
|
|
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": "3.8.
|
|
3
|
+
"version": "3.8.2",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -33,11 +33,11 @@
|
|
|
33
33
|
"@things-factory/integration-sellercraft": "^3.8.0",
|
|
34
34
|
"@things-factory/marketplace-base": "^3.8.0",
|
|
35
35
|
"@things-factory/notification": "^3.8.0",
|
|
36
|
-
"@things-factory/sales-base": "^3.8.
|
|
36
|
+
"@things-factory/sales-base": "^3.8.2",
|
|
37
37
|
"@things-factory/setting-base": "^3.8.0",
|
|
38
38
|
"@things-factory/shell": "^3.8.0",
|
|
39
39
|
"@things-factory/transport-base": "^3.8.0",
|
|
40
|
-
"@things-factory/warehouse-base": "^3.8.
|
|
40
|
+
"@things-factory/warehouse-base": "^3.8.2"
|
|
41
41
|
},
|
|
42
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "d2f935bdad2321ef93780978e593157ef0c1eb52"
|
|
43
43
|
}
|
|
@@ -158,7 +158,7 @@ export class SellercraftController extends WorksheetController {
|
|
|
158
158
|
await SellercraftAPI.updateProduct(sellercraft, { sellercraftInv })
|
|
159
159
|
}
|
|
160
160
|
|
|
161
|
-
async initiateOrderShipment(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<
|
|
161
|
+
async initiateOrderShipment(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<ReleaseGood> {
|
|
162
162
|
const orderInformation: any = {
|
|
163
163
|
accountId: sellercraft.accountId,
|
|
164
164
|
orderId: releaseGood.refNo2,
|
|
@@ -179,7 +179,7 @@ export class SellercraftController extends WorksheetController {
|
|
|
179
179
|
}
|
|
180
180
|
if (dropoffAddress) releaseGood.dropoffAddress = dropoffAddress
|
|
181
181
|
releaseGood.updater = this.user
|
|
182
|
-
await this.trxMgr.getRepository(ReleaseGood).save(releaseGood)
|
|
182
|
+
return await this.trxMgr.getRepository(ReleaseGood).save(releaseGood)
|
|
183
183
|
}
|
|
184
184
|
|
|
185
185
|
async initiateOrderDocument(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<void> {
|
|
@@ -7,16 +7,7 @@ import { Worksheet, WorksheetDetail } from '../../entities'
|
|
|
7
7
|
import { VasWorksheetController } from '../vas/vas-worksheet-controller'
|
|
8
8
|
|
|
9
9
|
export class PackingWorksheetController extends VasWorksheetController {
|
|
10
|
-
async generatePackingWorksheet(
|
|
11
|
-
let releaseGood: ReleaseGood = await this.findRefOrder(
|
|
12
|
-
ReleaseGood,
|
|
13
|
-
{
|
|
14
|
-
domain: this.domain,
|
|
15
|
-
name: releaseGoodNo,
|
|
16
|
-
status: ORDER_STATUS.READY_TO_PACK
|
|
17
|
-
},
|
|
18
|
-
['orderInventories', 'orderInventories.inventory']
|
|
19
|
-
)
|
|
10
|
+
async generatePackingWorksheet(releaseGood: ReleaseGood): Promise<Worksheet> {
|
|
20
11
|
const orderInventories: OrderInventory[] = releaseGood.orderInventories
|
|
21
12
|
|
|
22
13
|
const existingPackingWorksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
|
|
@@ -40,10 +31,6 @@ export class PackingWorksheetController extends VasWorksheetController {
|
|
|
40
31
|
})
|
|
41
32
|
await this.updateOrderTargets(orderInventories)
|
|
42
33
|
|
|
43
|
-
releaseGood.status = ORDER_STATUS.READY_TO_PACK
|
|
44
|
-
releaseGood.updater = this.user
|
|
45
|
-
await this.updateRefOrder(releaseGood)
|
|
46
|
-
|
|
47
34
|
return worksheet
|
|
48
35
|
}
|
|
49
36
|
|
|
@@ -17,8 +17,7 @@ import {
|
|
|
17
17
|
INVENTORY_STATUS,
|
|
18
18
|
INVENTORY_TRANSACTION_TYPE,
|
|
19
19
|
Location,
|
|
20
|
-
LOCATION_TYPE
|
|
21
|
-
LOCATION_STATUS
|
|
20
|
+
LOCATION_TYPE
|
|
22
21
|
} from '@things-factory/warehouse-base'
|
|
23
22
|
|
|
24
23
|
import { TASK_NUMBER_RULE_TYPE, TASK_NUMBER_SETTING_KEY, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
|
|
@@ -191,7 +190,7 @@ export class PickingWorksheetController extends VasWorksheetController {
|
|
|
191
190
|
if (vasWorksheet) {
|
|
192
191
|
await this.activateVAS(vasWorksheet.name, vasWorksheet.worksheetDetails)
|
|
193
192
|
}
|
|
194
|
-
} catch (e) {
|
|
193
|
+
} catch (e) {}
|
|
195
194
|
|
|
196
195
|
const pendingSplitOIs: OrderInventory[] = await this.trxMgr.getRepository(OrderInventory).find({
|
|
197
196
|
where: { domain: this.domain, releaseGood, status: ORDER_INVENTORY_STATUS.PENDING_SPLIT }
|
|
@@ -367,19 +366,17 @@ export class PickingWorksheetController extends VasWorksheetController {
|
|
|
367
366
|
await this.trxMgr.getRepository(WorksheetDetail).delete(worksheetDetailIds)
|
|
368
367
|
await this.trxMgr.getRepository(OrderInventory).delete(targetInventoryIds)
|
|
369
368
|
|
|
370
|
-
await this.trxMgr
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
{ status: ORDER_INVENTORY_STATUS.PENDING_SPLIT, updater: this.user, updatedAt: new Date() }
|
|
382
|
-
)
|
|
369
|
+
await this.trxMgr.getRepository(OrderInventory).update(
|
|
370
|
+
{
|
|
371
|
+
refWorksheetId: worksheet.id,
|
|
372
|
+
batchId,
|
|
373
|
+
product: { id: productId },
|
|
374
|
+
packingType,
|
|
375
|
+
packingSize,
|
|
376
|
+
status: ORDER_INVENTORY_STATUS.COMPLETE_SPLIT
|
|
377
|
+
},
|
|
378
|
+
{ status: ORDER_INVENTORY_STATUS.PENDING_SPLIT, updater: this.user, updatedAt: new Date() }
|
|
379
|
+
)
|
|
383
380
|
}
|
|
384
381
|
|
|
385
382
|
async scanProductPicking(
|
|
@@ -412,16 +409,14 @@ export class PickingWorksheetController extends VasWorksheetController {
|
|
|
412
409
|
const product: Product = targetInventory.product
|
|
413
410
|
let inventory: Inventory = targetInventory.inventory
|
|
414
411
|
|
|
415
|
-
//validation to prevent duplicated picking
|
|
412
|
+
//validation to prevent duplicated picking
|
|
416
413
|
let oiValidate: OrderInventory = await this.trxMgr.getRepository(OrderInventory).findOne({
|
|
417
414
|
where: { domain: this.domain, id: targetInventory.id, status: ORDER_INVENTORY_STATUS.PICKING }
|
|
418
415
|
})
|
|
419
|
-
if (!oiValidate)
|
|
420
|
-
throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`))
|
|
416
|
+
if (!oiValidate) throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`))
|
|
421
417
|
|
|
422
418
|
//validation to prevent over release
|
|
423
|
-
if (inventory.qty <= 0)
|
|
424
|
-
throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
|
|
419
|
+
if (inventory.qty <= 0) throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
|
|
425
420
|
|
|
426
421
|
if (inventory.cartonId !== cartonId)
|
|
427
422
|
throw new Error(this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('Carton ID', cartonId, inventory.cartonId))
|
|
@@ -461,16 +456,17 @@ export class PickingWorksheetController extends VasWorksheetController {
|
|
|
461
456
|
}
|
|
462
457
|
|
|
463
458
|
if (product?.isRequireSerialNumberScanning) {
|
|
464
|
-
if (
|
|
459
|
+
if (!serialNumber || serialNumber == '')
|
|
465
460
|
throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `require serial number`))
|
|
466
461
|
|
|
467
462
|
if (serialNumber) {
|
|
468
|
-
targetInventory.serialNumber = JSON.stringify(
|
|
463
|
+
targetInventory.serialNumber = JSON.stringify(
|
|
464
|
+
targetInventory.serialNumber ? [...JSON.parse(targetInventory.serialNumber), serialNumber] : [serialNumber]
|
|
465
|
+
)
|
|
469
466
|
}
|
|
470
467
|
}
|
|
471
468
|
|
|
472
469
|
await this.updatePickingTransaction(releaseGood, targetInventory, worksheetDetail, inventory, pickedQty)
|
|
473
|
-
|
|
474
470
|
} catch (error) {
|
|
475
471
|
throw error
|
|
476
472
|
}
|
|
@@ -495,7 +491,7 @@ export class PickingWorksheetController extends VasWorksheetController {
|
|
|
495
491
|
'targetInventory.releaseGood',
|
|
496
492
|
'targetInventory.inventory',
|
|
497
493
|
'targetInventory.inventory.location',
|
|
498
|
-
'targetInventory.product'
|
|
494
|
+
'targetInventory.product'
|
|
499
495
|
]
|
|
500
496
|
)
|
|
501
497
|
|
|
@@ -504,27 +500,26 @@ export class PickingWorksheetController extends VasWorksheetController {
|
|
|
504
500
|
const product: Product = targetInventory.product
|
|
505
501
|
let inventory: Inventory = targetInventory.inventory
|
|
506
502
|
|
|
507
|
-
//validation to prevent duplicated picking
|
|
503
|
+
//validation to prevent duplicated picking
|
|
508
504
|
let oiValidate: OrderInventory = await this.trxMgr.getRepository(OrderInventory).findOne({
|
|
509
505
|
where: { domain: this.domain, id: targetInventory.id, status: ORDER_INVENTORY_STATUS.PICKING }
|
|
510
506
|
})
|
|
511
|
-
if (!oiValidate)
|
|
512
|
-
throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`))
|
|
507
|
+
if (!oiValidate) throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`))
|
|
513
508
|
|
|
514
509
|
//validation to prevent over release
|
|
515
|
-
if (inventory.qty <= 0)
|
|
516
|
-
throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
|
|
510
|
+
if (inventory.qty <= 0) throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
|
|
517
511
|
|
|
518
512
|
if (inventory.palletId !== palletId)
|
|
519
513
|
throw new Error(this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('Pallet ID', palletId, inventory.palletId))
|
|
520
514
|
|
|
521
|
-
|
|
522
515
|
if (product?.isRequireSerialNumberScanning) {
|
|
523
|
-
if (
|
|
516
|
+
if (!serialNumber || serialNumber == '')
|
|
524
517
|
throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `require serial number`))
|
|
525
518
|
|
|
526
519
|
if (serialNumber) {
|
|
527
|
-
targetInventory.serialNumber = JSON.stringify(
|
|
520
|
+
targetInventory.serialNumber = JSON.stringify(
|
|
521
|
+
targetInventory.serialNumber ? [...JSON.parse(targetInventory.serialNumber), serialNumber] : [serialNumber]
|
|
522
|
+
)
|
|
528
523
|
}
|
|
529
524
|
}
|
|
530
525
|
|
|
@@ -837,7 +832,7 @@ export class PickingWorksheetController extends VasWorksheetController {
|
|
|
837
832
|
let orderStatus: string
|
|
838
833
|
if (releaseGood?.packingOption) {
|
|
839
834
|
orderStatus = ORDER_STATUS.READY_TO_PACK
|
|
840
|
-
} else
|
|
835
|
+
} else {
|
|
841
836
|
orderStatus = ORDER_STATUS.LOADING
|
|
842
837
|
}
|
|
843
838
|
|
|
@@ -938,7 +933,7 @@ export class PickingWorksheetController extends VasWorksheetController {
|
|
|
938
933
|
name: 'enable-bin-picking'
|
|
939
934
|
}
|
|
940
935
|
})
|
|
941
|
-
if (binPickingSetting != undefined &&
|
|
936
|
+
if (binPickingSetting != undefined && binPickingSetting.value.toLowerCase() == 'true') {
|
|
942
937
|
if (binLocation) {
|
|
943
938
|
const foundBinLocation: Location = await this.trxMgr.getRepository(Location).findOne({
|
|
944
939
|
where: { domain: this.domain, name: binLocation, type: LOCATION_TYPE.BIN }
|
|
@@ -995,4 +990,3 @@ export class PickingWorksheetController extends VasWorksheetController {
|
|
|
995
990
|
return orderInventory
|
|
996
991
|
}
|
|
997
992
|
}
|
|
998
|
-
|
package/server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { EntityManager } from 'typeorm'
|
|
2
|
+
|
|
1
3
|
import { User } from '@things-factory/auth-base'
|
|
2
4
|
import { OrderInventory } from '@things-factory/sales-base'
|
|
3
5
|
import { Domain } from '@things-factory/shell'
|
|
4
|
-
|
|
6
|
+
|
|
5
7
|
import { PickingWorksheetController } from '../../../../controllers/'
|
|
6
8
|
import { Worksheet, WorksheetDetail } from '../../../../entities'
|
|
7
9
|
|
|
@@ -45,7 +45,7 @@ export async function completePicking(
|
|
|
45
45
|
releaseGoodNo: string
|
|
46
46
|
): Promise<void> {
|
|
47
47
|
const pickingWSCtrl: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
|
|
48
|
-
|
|
48
|
+
let releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
|
|
49
49
|
where: { domain, name: releaseGoodNo },
|
|
50
50
|
relations: [
|
|
51
51
|
'bizplace',
|
|
@@ -53,6 +53,7 @@ export async function completePicking(
|
|
|
53
53
|
'bizplace.company',
|
|
54
54
|
'bizplace.company.domain',
|
|
55
55
|
'orderInventories',
|
|
56
|
+
'orderInventories.inventory',
|
|
56
57
|
'orderInventories.product'
|
|
57
58
|
]
|
|
58
59
|
})
|
|
@@ -84,7 +85,7 @@ export async function completePicking(
|
|
|
84
85
|
|
|
85
86
|
if (sellercraft) {
|
|
86
87
|
const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
87
|
-
await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
|
|
88
|
+
releaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
|
|
88
89
|
await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
|
|
89
90
|
} else {
|
|
90
91
|
const companyDomain: Domain = releaseGood.bizplace.company.domain
|
|
@@ -199,7 +200,7 @@ export async function completePicking(
|
|
|
199
200
|
where: { setting: directActivatePackingWorksheet, domain: domain, partnerDomain: releaseGood.bizplace?.domain }
|
|
200
201
|
})
|
|
201
202
|
|
|
202
|
-
let packingWorksheet: Worksheet = await packingWSCtrl.generatePackingWorksheet(
|
|
203
|
+
let packingWorksheet: Worksheet = await packingWSCtrl.generatePackingWorksheet(releaseGood)
|
|
203
204
|
|
|
204
205
|
if (directActivatePackingWorksheet != undefined && directActivatePackingWorksheet.value.toLowerCase() == 'true') {
|
|
205
206
|
if (partnerDirectActivatePackingWorksheetSetting != undefined) {
|