npm - @things-factory/worksheet-base - Versions diffs - 4.3.2 → 4.4.0-alpha.0 - Mend

@things-factory/worksheet-base 4.3.2 → 4.4.0-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (131) hide show

package/dist-server/controllers/outbound/sorting-worksheet-controller.js CHANGED Viewed

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SortingWorksheetController = void 0;
-const typeorm_1 = require("typeorm");
 const vas_worksheet_controller_1 = require("../vas/vas-worksheet-controller");
 const warehouse_base_1 = require("@things-factory/warehouse-base");
 const sales_base_1 = require("@things-factory/sales-base");
@@ -37,7 +36,7 @@ class SortingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             await this.updateOrderTargets(targetInventories);
         return await this.activateWorksheet(worksheet, worksheetDetails, sortingWorksheetDetails);
     }
-    async scanProductSorting(taskNo, releaseGoodNo, productBarcode, serialNumber, toteNo) {
+    async scanProductSorting(taskNo, releaseGoodNo, productBarcode, serialNumber) {
         const worksheet = await this.trxMgr.getRepository(entities_1.Worksheet).findOne({
             where: {
                 domain: this.domain,
@@ -49,8 +48,6 @@ class SortingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 'worksheetDetails',
                 'worksheetDetails.targetInventory',
                 'worksheetDetails.targetInventory.product',
-                'worksheetDetails.targetInventory.orderProduct',
-                'worksheetDetails.targetInventory.bizplace',
                 'worksheetDetails.targetInventory.inventory',
                 'worksheetDetails.targetInventory.inventory.product',
                 'worksheetDetails.targetInventory.inventory.product.productDetails',
@@ -161,15 +158,12 @@ class SortingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                         else {
                             await this.updateOrderTargets([matchingOI]);
                         }
-                        if (toteNo) {
-                            await this.toteScanning(toteNo, matchingOI.orderProduct, matchingOI, 1, releaseGood, matchingOI.bizplace);
-                        }
                     }
                 }));
             }
         }
     }
-    async sortingProduct(taskNo, releaseGoodNo, productId, sortingQty, serialNumber, toteNo) {
+    async sortingProduct(taskNo, releaseGoodNo, productId, sortingQty, serialNumber) {
         const worksheet = await this.trxMgr.getRepository(entities_1.Worksheet).findOne({
             where: {
                 domain: this.domain,
@@ -181,8 +175,6 @@ class SortingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 'worksheetDetails',
                 'worksheetDetails.targetInventory',
                 'worksheetDetails.targetInventory.product',
-                'worksheetDetails.targetInventory.orderProduct',
-                'worksheetDetails.targetInventory.bizplace',
                 'worksheetDetails.targetInventory.inventory',
                 'worksheetDetails.targetInventory.inventory.product',
                 'worksheetDetails.targetInventory.inventory.product.productDetails',
@@ -239,9 +231,6 @@ class SortingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                         foundSerialNumber = await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItem);
                     }
                 }
-                if (toteNo) {
-                    await this.toteScanning(toteNo, matchingOI.orderProduct, matchingOI, sortingQty, releaseGood, matchingOI.bizplace);
-                }
                 if (releaseQty != (matchingOI === null || matchingOI === void 0 ? void 0 : matchingOI.sortedQty) && sortingQty != 0) {
                     if (product === null || product === void 0 ? void 0 : product.isRequireSerialNumberScanningOutbound) {
                         matchingOI.sortedQty += sortingQty;
@@ -280,39 +269,25 @@ class SortingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         }
     }
     async completeOrderSorting(releaseGoodNo) {
-        try {
-            let releaseGood = await this.findRefOrder(sales_base_1.ReleaseGood, {
-                domain: this.domain,
-                name: releaseGoodNo,
-                status: sales_base_1.ORDER_STATUS.SORTING
-            }, ['bizplace', 'orderInventories']);
-            if (!releaseGood) {
-                throw new Error('Order is already sorted');
-            }
-            const foundNotSealedOrderTote = await this.trxMgr
-                .getRepository(sales_base_1.OrderTote)
-                .findOne({ where: { releaseGood, closedDate: (0, typeorm_1.IsNull)() } });
-            if (foundNotSealedOrderTote) {
-                throw new Error('Please seal the tote(s) before proceeding');
-            }
-            releaseGood.status = sales_base_1.ORDER_STATUS.READY_TO_LOAD;
-            releaseGood.updater = this.user;
-            await this.trxMgr.getRepository(sales_base_1.ReleaseGood).save(releaseGood);
-            let inventoryItems = await this.trxMgr
-                .getRepository(warehouse_base_1.InventoryItem)
-                .find({ where: { outboundOrderId: releaseGood.id } });
-            if (inventoryItems.length > 0) {
-                inventoryItems.forEach((itm) => {
-                    itm.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
-                    itm.updater = this.user;
-                });
-                await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItems);
-            }
-            return releaseGood;
-        }
-        catch (e) {
-            throw e;
+        let releaseGood = await this.findRefOrder(sales_base_1.ReleaseGood, {
+            domain: this.domain,
+            name: releaseGoodNo,
+            status: sales_base_1.ORDER_STATUS.SORTING
+        }, ['bizplace', 'orderInventories']);
+        releaseGood.status = sales_base_1.ORDER_STATUS.READY_TO_LOAD;
+        releaseGood.updater = this.user;
+        await this.trxMgr.getRepository(sales_base_1.ReleaseGood).save(releaseGood);
+        let inventoryItems = await this.trxMgr
+            .getRepository(warehouse_base_1.InventoryItem)
+            .find({ where: { outboundOrderId: releaseGood.id } });
+        if (inventoryItems.length > 0) {
+            inventoryItems.forEach((itm) => {
+                itm.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
+                itm.updater = this.user;
+            });
+            await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItems);
         }
+        return releaseGood;
     }
     async completeWorksheetSorting(taskNo) {
         let worksheet = await this.trxMgr.getRepository(entities_1.Worksheet).findOne({
@@ -328,13 +303,6 @@ class SortingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 'worksheetDetails.targetInventory.releaseGood'
             ]
         });
-        let releaseGoodIds = worksheet.worksheetDetails.map(itm => itm.targetInventory.releaseGood.id);
-        const foundNotSealedOrderTote = await this.trxMgr
-            .getRepository(sales_base_1.OrderTote)
-            .findOne({ where: { releaseGood: (0, typeorm_1.In)(releaseGoodIds), closedDate: (0, typeorm_1.IsNull)() } });
-        if (foundNotSealedOrderTote) {
-            throw new Error('Please seal the tote(s) before proceeding');
-        }
         this.checkRecordValidity(worksheet, { status: constants_1.WORKSHEET_STATUS.EXECUTING });
         const worksheetDetails = worksheet.worksheetDetails;
         const allTaskCompleted = worksheetDetails.every(wsd => wsd.status === constants_1.WORKSHEET_STATUS.DONE);
@@ -346,70 +314,6 @@ class SortingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         worksheet = await this.trxMgr.getRepository(entities_1.Worksheet).save(worksheet);
         return worksheet;
     }
-    async toteScanning(toteNo, targetProduct, targetInventory, pickedQty, releaseGood, bizplace) {
-        //1. find tote
-        let foundTote = await this.trxMgr
-            .getRepository(warehouse_base_1.Tote)
-            .findOne({ where: { bizplace, name: toteNo, deletedAt: (0, typeorm_1.IsNull)() } });
-        if ((foundTote === null || foundTote === void 0 ? void 0 : foundTote.status) == warehouse_base_1.TOTE_STATUS.DAMAGED) {
-            throw new Error('Tote is damaged');
-        }
-        if ((foundTote === null || foundTote === void 0 ? void 0 : foundTote.status) == warehouse_base_1.TOTE_STATUS.DISPATCHED) {
-            throw new Error('Tote is dispatched');
-        }
-        //2. find order tote
-        let foundOrderTote = await this.trxMgr
-            .getRepository(sales_base_1.OrderTote)
-            .findOne({ where: { domain: this.domain, name: toteNo, releaseGood } });
-        //if order tote not found the create one, if tote not found means it's tote box
-        //create order tote item
-        if (!foundOrderTote) {
-            const orderTote = await this.trxMgr.getRepository(sales_base_1.OrderTote).save({
-                name: toteNo,
-                domain: this.domain,
-                releaseGood,
-                tote: foundTote ? foundTote : null,
-                updater: this.user
-            });
-            const orderToteItem = await this.trxMgr.getRepository(sales_base_1.OrderToteItem).save({
-                domain: this.domain,
-                name: sales_base_1.OrderNoGenerator.orderToteItem(),
-                orderProduct: targetProduct,
-                orderInventory: targetInventory,
-                orderTote,
-                qty: pickedQty,
-                updater: this.user
-            });
-        }
-        else {
-            if (foundOrderTote.closedDate) {
-                throw new Error('Tote has been sealed, please try another tote!');
-            }
-            //if found order tote then check if order tote item exist
-            const foundOrderToteItem = await this.trxMgr.getRepository(sales_base_1.OrderToteItem).findOne({
-                domain: this.domain,
-                orderProduct: targetProduct,
-                orderInventory: targetInventory,
-                orderTote: foundOrderTote
-            });
-            //if not order tote item doesnt exist then create one
-            if (!foundOrderToteItem) {
-                const orderToteItem = await this.trxMgr.getRepository(sales_base_1.OrderToteItem).save({
-                    domain: this.domain,
-                    name: sales_base_1.OrderNoGenerator.orderToteItem(),
-                    orderProduct: targetProduct,
-                    orderInventory: targetInventory,
-                    orderTote: foundOrderTote,
-                    qty: pickedQty,
-                    updater: this.user
-                });
-            }
-            else {
-                //if found order tote item found then add the quantity
-                const orderToteItem = await this.trxMgr.getRepository(sales_base_1.OrderToteItem).save(Object.assign(Object.assign({}, foundOrderToteItem), { qty: foundOrderToteItem.qty + pickedQty }));
-            }
-        }
-    }
 }
 exports.SortingWorksheetController = SortingWorksheetController;
 //# sourceMappingURL=sorting-worksheet-controller.js.map

package/dist-server/controllers/outbound/sorting-worksheet-controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sorting-worksheet-controller.js","sourceRoot":"","sources":["../../../server/controllers/outbound/sorting-worksheet-controller.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"sorting-worksheet-controller.js","sourceRoot":"","sources":["../../../server/controllers/outbound/sorting-worksheet-controller.ts"],"names":[],"mappings":"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"}

package/dist-server/controllers/render-grn.js CHANGED Viewed

@@ -46,25 +46,25 @@ async function renderGRN({ grnNo, timezoneOffSet }, context) {
         relations: ['company']
     });
     const qbReducedInventory = (0, typeorm_1.getRepository)(warehouse_base_2.ReducedInventoryHistory)
-        .createQueryBuilder('ivh')
-        .select('product_id', 'productId')
-        .addSelect('batch_id', 'batchId')
-        .addSelect('reusable_pallet_id', 'reusablePalletId')
-        .addSelect('packing_type', 'packingType')
-        .addSelect('sum(qty)', 'qty')
-        .addSelect('sum(uom_value)', 'uomValue')
-        .addSelect('uom', 'uom')
-        .addSelect('count(distinct pallet_id)', 'pallet')
-        .addSelect(`string_agg(distinct expiration_date::varchar,', ' order by expiration_date::varchar)`, 'expiryDate')
-        .addSelect(`string_agg(distinct pallet_id::varchar,', ' order by pallet_id::varchar)`, 'palletId')
-        .where('ivh.domain_id = :domainId', { domainId: domain.id })
-        .andWhere('ivh.ref_order_id = :refOrderId', { refOrderId: foundGAN.id })
+        .createQueryBuilder(`ivh`)
+        .select(`product_id`, `productId`)
+        .addSelect(`batch_id`, `batchId`)
+        .addSelect(`reusable_pallet_id`, `reusablePalletId`)
+        .addSelect(`packing_type`, `packingType`)
+        .addSelect(`sum(qty)`, `qty`)
+        .addSelect(`sum(uom_value)`, `uomValue`)
+        .addSelect(`uom`, `uom`)
+        .addSelect(`count(distinct pallet_id)`, `pallet`)
+        .addSelect(`string_agg(distinct expiration_date::varchar,', ' order by expiration_date::varchar)`, `expiryDate`)
+        .addSelect(`string_agg(distinct pallet_id::varchar,', ' order by pallet_id::varchar)`, `palletId`)
+        .where(`ivh.domain_id = :domainId`, { domainId: domain.id })
+        .andWhere(`ivh.ref_order_id = :refOrderId`, { refOrderId: foundGAN.id })
         .andWhere(`ivh.transaction_type = 'UNLOADING'`)
-        .groupBy('reusable_pallet_id')
-        .addGroupBy('product_id')
-        .addGroupBy('batch_id')
-        .addGroupBy('packing_type')
-        .addGroupBy('uom')
+        .groupBy(`reusable_pallet_id`)
+        .addGroupBy(`product_id`)
+        .addGroupBy(`batch_id`)
+        .addGroupBy(`packing_type`)
+        .addGroupBy(`uom`)
         .getRawMany();
     // 5. find domain contact point
     const foundCP = await (0, typeorm_1.getRepository)(biz_base_1.ContactPoint).findOne({

package/dist-server/controllers/vas/index.js CHANGED Viewed

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist-server/controllers/vas/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/controllers/vas/index.ts"],"names":[],"mappings":"~~;;;;;;;;;;;;~~AAAA,6DAA0C"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/controllers/vas/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6DAA0C"}

package/dist-server/graphql/index.js CHANGED Viewed

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist-server/graphql/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/graphql/index.ts"],"names":[],"mappings":"~~;;;;;;;;;;;;;;;;;;;;;;~~AAAA,kDAAmC;AACnC,uDAAwC;AAE3B,QAAA,MAAM,GAAG;IACpB,QAAQ;IACR,SAAS;CACV,CAAA"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/graphql/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAmC;AACnC,uDAAwC;AAE3B,QAAA,MAAM,GAAG;IACpB,QAAQ;IACR,SAAS;CACV,CAAA"}

package/dist-server/graphql/resolvers/index.js CHANGED Viewed

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist-server/graphql/resolvers/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/resolvers/index.ts"],"names":[],"mappings":"~~;;;;;;;;;;;;;;;;;;;;;;~~AAAA,uDAAwC;AACxC,oEAAqD;AACrD,wEAAyD;AACzD,iDAAkC;AAErB,QAAA,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAA;AAE3E,QAAA,SAAS,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,eAAe,CAAC,QAAQ,EAAE,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAA"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/resolvers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAwC;AACxC,oEAAqD;AACrD,wEAAyD;AACzD,iDAAkC;AAErB,QAAA,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAA;AAE3E,QAAA,SAAS,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,eAAe,CAAC,QAAQ,EAAE,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAA"}

package/dist-server/graphql/resolvers/worksheet/batch-picking-worksheet.js CHANGED Viewed

@@ -5,7 +5,6 @@ const typeorm_1 = require("typeorm");
 const sales_base_1 = require("@things-factory/sales-base");
 const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
-const warehouse_base_1 = require("@things-factory/warehouse-base");
 exports.batchPickingWorksheetResolver = {
     async batchPickingWorksheet(_, { taskNo, locationSortingRules }, context) {
         var _a;
@@ -44,7 +43,6 @@ exports.batchPickingWorksheetResolver = {
             .addSelect('LOC.column', 'column')
             .addSelect('LOC.shelf', 'shelf')
             .addSelect('BIN_LOC.name', 'binLocationName')
-            .addSelect('WSD.status', 'status')
             .leftJoin('WSD.targetInventory', 'T_INV')
             .leftJoin('T_INV.inventory', 'INV')
             .leftJoin('T_INV.product', 'PROD')
@@ -72,8 +70,7 @@ exports.batchPickingWorksheetResolver = {
             .addGroupBy('LOC.zone')
             .addGroupBy('LOC.column')
             .addGroupBy('LOC.row')
-            .addGroupBy('LOC.shelf')
-            .addGroupBy('WSD.status');
+            .addGroupBy('LOC.shelf');
         if ((locationSortingRules === null || locationSortingRules === void 0 ? void 0 : locationSortingRules.length) > 0) {
             locationSortingRules.forEach((rule) => {
                 qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC');
@@ -87,14 +84,6 @@ exports.batchPickingWorksheetResolver = {
                 partnerDomainId: (_a = worksheet.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id
             },
             worksheetDetailInfos: items.map(async (item) => {
-                const inventoryChangesCount = await (0, typeorm_1.getRepository)(warehouse_base_1.InventoryChange).count({
-                    where: {
-                        inventory: item.inventoryId,
-                        status: 'PENDING',
-                        transactionType: 'MISSING'
-                    },
-                    relations: ['inventory', 'product']
-                });
                 return {
                     palletId: item === null || item === void 0 ? void 0 : item.palletId,
                     cartonId: item === null || item === void 0 ? void 0 : item.cartonId,
@@ -107,8 +96,6 @@ exports.batchPickingWorksheetResolver = {
                     },
                     qty: item === null || item === void 0 ? void 0 : item.qty,
                     releaseQty: item.releaseQty,
-                    hasMissingInventoryChanges: inventoryChangesCount > 0 ? true : false,
-                    status: item.status,
                     pickedQty: item.pickedQty,
                     packingType: item === null || item === void 0 ? void 0 : item.packingType,
                     packingSize: item === null || item === void 0 ? void 0 : item.packingSize,

package/dist-server/graphql/resolvers/worksheet/batch-picking-worksheet.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"batch-picking-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/batch-picking-worksheet.ts"],"names":[],"mappings":";;;AACA,qCAA2D;AAC3D,2DAAmE;AACnE,kDAAqE;AACrE,gDAA8D;~~AAC9D~~,~~mEAAgE;AAEnD,~~QAAA,6BAA6B,GAAG;IAC3C,KAAK,CAAC,qBAAqB,CAAC,CAAM,EAAE,EAAE,MAAM,EAAE,oBAAoB,EAAE,EAAE,OAAY;;QAChF,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QACpD,MAAM,SAAS,GAAc,MAAM,IAAA,uBAAa,EAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YAClE,KAAK,EAAE;gBACL,MAAM;gBACN,MAAM;gBACN,IAAI,EAAE,0BAAc,CAAC,aAAa;gBAClC,MAAM,EAAE,4BAAgB,CAAC,SAAS;aACnC;YACD,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,CAAC;SAC3C,CAAC,CAAA;QAEF,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,MAAM,GAAG,CAAC,CAAA;QAEhF,MAAM,EAAE,GAAwC,IAAA,uBAAa,EAAC,0BAAe,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;QACxG,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC;aAC/B,SAAS,CAAC,uBAAuB,EAAE,YAAY,CAAC;aAChD,SAAS,CAAC,sBAAsB,EAAE,WAAW,CAAC;aAC9C,SAAS,CAAC,iBAAiB,EAAE,UAAU,CAAC;aACxC,SAAS,CAAC,iBAAiB,EAAE,UAAU,CAAC;aACxC,SAAS,CAAC,uBAAuB,EAAE,gBAAgB,CAAC;aACpD,SAAS,CAAC,gBAAgB,EAAE,SAAS,CAAC;aACtC,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;aACnC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;aACvC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;aACrC,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;aACrD,SAAS,CAAC,WAAW,EAAE,KAAK,CAAC;aAC7B,SAAS,CAAC,oBAAoB,EAAE,aAAa,CAAC;aAC9C,SAAS,CAAC,oBAAoB,EAAE,aAAa,CAAC;aAC9C,SAAS,CAAC,kBAAkB,EAAE,eAAe,CAAC;aAC9C,SAAS,CAAC,sBAAsB,EAAE,mBAAmB,CAAC;aACtD,SAAS,CAAC,UAAU,EAAE,cAAc,CAAC;aACrC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;aAC7B,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC;aAC3B,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC;aACjC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;aAC/B,SAAS,CAAC,cAAc,EAAE,iBAAiB,CAAC;aAC5C,~~SAAS,CAAC,YAAY,EAAE,~~QAAQ,CAAC~~;aACjC~~,~~QAAQ,CAAC,~~qBAAqB,EAAE,OAAO,CAAC;aACxC,QAAQ,CAAC,iBAAiB,EAAE,KAAK,CAAC;aAClC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;aACjC,QAAQ,CAAC,mBAAmB,EAAE,SAAS,CAAC;aACxC,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC;aAC/B,KAAK,CAAC,qCAAqC,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC;aAC3E,QAAQ,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,4BAAgB,CAAC,QAAQ,EAAE,CAAC;aAC5E,QAAQ,CAAC,kCAAkC,EAAE,EAAE,WAAW,EAAE,mCAAsB,CAAC,SAAS,EAAE,CAAC;aAC/F,OAAO,CAAC,UAAU,CAAC;aACnB,UAAU,CAAC,iBAAiB,CAAC;aAC7B,UAAU,CAAC,iBAAiB,CAAC;aAC7B,UAAU,CAAC,uBAAuB,CAAC;aACnC,UAAU,CAAC,gBAAgB,CAAC;aAC5B,UAAU,CAAC,WAAW,CAAC;aACvB,UAAU,CAAC,oBAAoB,CAAC;aAChC,UAAU,CAAC,oBAAoB,CAAC;aAChC,UAAU,CAAC,WAAW,CAAC;aACvB,UAAU,CAAC,aAAa,CAAC;aACzB,UAAU,CAAC,YAAY,CAAC;aACxB,UAAU,CAAC,oBAAoB,CAAC;aAChC,UAAU,CAAC,kBAAkB,CAAC;aAC9B,UAAU,CAAC,sBAAsB,CAAC;aAClC,UAAU,CAAC,cAAc,CAAC;aAC1B,UAAU,CAAC,UAAU,CAAC;aACtB,UAAU,CAAC,UAAU,CAAC;aACtB,UAAU,CAAC,YAAY,CAAC;aACxB,UAAU,CAAC,SAAS,CAAC;aACrB,UAAU,CAAC,WAAW,CAAC~~;aACvB~~,~~UAAU,CAAC,YAAY,CAAC,~~CAAA;~~QAE3B~~,IAAI,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,IAAG,CAAC,EAAE;YACpC,oBAAoB,CAAC,OAAO,CAAC,CAAC,IAAqC,EAAE,EAAE;gBACrE,EAAE,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YAC/D,CAAC,CAAC,CAAA;SACH;QAED,MAAM,KAAK,GAAU,MAAM,EAAE,CAAC,UAAU,EAAE,CAAA;QAE1C,OAAO;YACL,aAAa,EAAE;gBACb,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,YAAY,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI;gBACrC,eAAe,EAAE,MAAA,SAAS,CAAC,QAAQ,0CAAE,MAAM,CAAC,EAAE;aAC/C;YACD,oBAAoB,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAS,EAAE,EAAE;gBAClD,MAAM,qBAAqB,GAAW,MAAM,IAAA,uBAAa,EAAC,gCAAe,CAAC,CAAC,KAAK,CAAC;oBAC/E,KAAK,EAAE;wBACL,SAAS,EAAE,IAAI,CAAC,WAAW;wBAC3B,MAAM,EAAE,SAAS;wBACjB,eAAe,EAAE,SAAS;qBAC3B;oBACD,SAAS,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC;iBACpC,CAAC,CAAA;gBAEF,OAAO;oBACL,QAAQ,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ;oBACxB,QAAQ,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ;oBACxB,OAAO,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO;oBACtB,OAAO,EAAE;wBACP,EAAE,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS;wBACnB,IAAI,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW;wBACvB,WAAW,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,kBAAkB;wBACrC,GAAG,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU;qBACtB;oBACD,GAAG,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG;oBACd,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,~~0BAA0B,EAAE,qBAAqB,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;oBACpE,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,~~SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,WAAW,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW;oBAC9B,WAAW,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW;oBAC9B,cAAc,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,cAAc;oBACpC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY,EAAE;oBACtC,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,eAAe,EAAE;oBAC5C,eAAe,EAAE;wBACf,OAAO,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,aAAa;wBAC5B,WAAW,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,iBAAiB;wBACpC,OAAO,EAAE;4BACP,EAAE,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS;4BACnB,IAAI,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW;4BACvB,WAAW,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,kBAAkB;4BACrC,GAAG,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU;yBACtB;qBACF;iBACF,CAAA;YACH,CAAC,CAAC;SACH,CAAA;IACH,CAAC;CACF,CAAA"}
1	+ {"version":3,"file":"batch-picking-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/batch-picking-worksheet.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/worksheet/loading/loading.js CHANGED Viewed

@@ -7,11 +7,18 @@ exports.loadingResolver = {
     async loading(_, { loadedWorksheetDetails, releaseGoodNo, orderInfo }, context) {
         var _a;
         const { tx, domain, user } = context.state;
-        const worksheetDetails = await loading(tx, domain, user, loadedWorksheetDetails, releaseGoodNo);
+        await loading(tx, domain, user, loadedWorksheetDetails, releaseGoodNo);
         const worksheetController = new controllers_1.WorksheetController(tx, domain, user);
         const releaseGood = await worksheetController.findRefOrder(sales_base_1.ReleaseGood, { domain, name: releaseGoodNo }, ['bizplace', 'deliverTo']);
         const loadingWorksheetController = new controllers_1.LoadingWorksheetController(tx, domain, user);
-        let targetInventories = worksheetDetails.map(itm => itm.targetInventory);
+        let targetInventories = [];
+        for (let worksheetDetail of loadedWorksheetDetails) {
+            worksheetDetail = await loadingWorksheetController.findWorksheetDetailByName(worksheetDetail.name, [
+                'targetInventory'
+            ]);
+            const targetInventory = worksheetDetail.targetInventory;
+            targetInventories.push(targetInventory);
+        }
         const bizplace = releaseGood.bizplace;
         orderInfo = Object.assign(Object.assign({}, orderInfo), { contactPointRefId: ((_a = releaseGood.deliverTo) === null || _a === void 0 ? void 0 : _a.id) || null });
         await (0, sales_base_1.generateDeliveryOrder)(orderInfo, targetInventories, bizplace, releaseGood, domain, user, tx);
@@ -19,7 +26,7 @@ exports.loadingResolver = {
 };
 async function loading(tx, domain, user, worksheetDetails, releaseGoodNo) {
     const worksheetController = new controllers_1.LoadingWorksheetController(tx, domain, user);
-    return await worksheetController.loading(releaseGoodNo, worksheetDetails);
+    await worksheetController.loading(releaseGoodNo, worksheetDetails);
 }
 exports.loading = loading;
 //# sourceMappingURL=loading.js.map

package/dist-server/graphql/resolvers/worksheet/loading/loading.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"loading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/loading/loading.ts"],"names":[],"mappings":";;;AAEA,2DAA+F;AAG/F,yDAAyF;AAG5E,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CAAC,CAAM,EAAE,EAAE,sBAAsB,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,OAAY;;QACtF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,~~gBAAgB,GAAG,MAAM,~~OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,sBAAsB,EAAE,aAAa,CAAC,CAAA;~~QAC/F~~,MAAM,mBAAmB,GAAwB,IAAI,iCAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC1F,MAAM,WAAW,GAAgB,MAAM,mBAAmB,CAAC,YAAY,CACrE,wBAAW,EACX,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,EAC/B,CAAC,UAAU,EAAE,WAAW,CAAC,CAC1B,CAAA;QAED,MAAM,0BAA0B,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC/G,IAAI,iBAAiB,GAAqB,~~gBAAgB~~,~~CAAC~~,GAAG,CAAC,~~GAAG~~,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;~~QAE1F~~,MAAM,QAAQ,GAAa,WAAW,CAAC,QAAQ,CAAA;QAC/C,SAAS,mCACJ,SAAS,KACZ,iBAAiB,EAAE,CAAA,MAAA,WAAW,CAAC,SAAS,0CAAE,EAAE,KAAI,IAAI,GACrD,CAAA;QAED,MAAM,IAAA,kCAAqB,EAAC,SAAS,EAAE,iBAAiB,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IACpG,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAC3B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,~~gBAA2F~~,~~EAC3F~~,aAAqB;IAErB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,~~OAAO,~~MAAM,mBAAmB,CAAC,OAAO,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAA;~~AAC3E~~,CAAC;AATD,0BASC"}
1	+ {"version":3,"file":"loading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/loading/loading.ts"],"names":[],"mappings":";;;AAEA,2DAA+F;AAG/F,yDAAyF;AAG5E,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CAAC,CAAM,EAAE,EAAE,sBAAsB,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,OAAY;;QACtF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,sBAAsB,EAAE,aAAa,CAAC,CAAA;QACtE,MAAM,mBAAmB,GAAwB,IAAI,iCAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC1F,MAAM,WAAW,GAAgB,MAAM,mBAAmB,CAAC,YAAY,CACrE,wBAAW,EACX,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,EAC/B,CAAC,UAAU,EAAE,WAAW,CAAC,CAC1B,CAAA;QAED,MAAM,0BAA0B,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC/G,IAAI,iBAAiB,GAAqB,EAAE,CAAA;QAC5C,KAAK,IAAI,eAAe,IAAI,sBAAsB,EAAE;YAClD,eAAe,GAAG,MAAM,0BAA0B,CAAC,yBAAyB,CAAC,eAAe,CAAC,IAAI,EAAE;gBACjG,iBAAiB;aAClB,CAAC,CAAA;YACF,MAAM,eAAe,GAAG,eAAe,CAAC,eAAe,CAAA;YACvD,iBAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;SACxC;QAED,MAAM,QAAQ,GAAa,WAAW,CAAC,QAAQ,CAAA;QAC/C,SAAS,mCACJ,SAAS,KACZ,iBAAiB,EAAE,CAAA,MAAA,WAAW,CAAC,SAAS,0CAAE,EAAE,KAAI,IAAI,GACrD,CAAA;QAED,MAAM,IAAA,kCAAqB,EAAC,SAAS,EAAE,iBAAiB,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IACpG,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAC3B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,gBAAoE,EACpE,aAAqB;IAErB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,OAAO,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAA;AACpE,CAAC;AATD,0BASC"}

package/dist-server/graphql/resolvers/worksheet/loading-worksheet.js CHANGED Viewed

@@ -24,9 +24,7 @@ exports.loadingWorksheetResolver = {
                 .innerJoinAndSelect('releaseGood.bizplace', 'bizplace')
                 .innerJoinAndSelect('bizplace.domain', 'domain')
                 .where('orderInventory.domain_id = :domainId', { domainId: domain.id })
-                .andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
-                orderInventoryStatus: [sales_base_1.ORDER_INVENTORY_STATUS.LOADING, sales_base_1.ORDER_INVENTORY_STATUS.LOADED]
-            })
+                .andWhere('orderInventory.status IN (:...orderInventoryStatus)', { orderInventoryStatus: [sales_base_1.ORDER_INVENTORY_STATUS.LOADING, sales_base_1.ORDER_INVENTORY_STATUS.LOADED] })
                 .andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
                 .andWhere('releaseGood.status = :status', { status: sales_base_1.ORDER_STATUS.LOADING });
             const orderInventoryByBin = await qb.getOne();
@@ -37,11 +35,8 @@ exports.loadingWorksheetResolver = {
         }
         if (!releaseGood)
             throw new Error(`Release good doesn't exists.`);
-        let [orderTotes, orderTotesTotal] = await (0, typeorm_1.getRepository)(sales_base_1.OrderTote).findAndCount({
-            where: { releaseGood: releaseGood.id }
-        });
         const foundWorksheet = await (0, utils_1.fetchExecutingWorksheet)(domain, releaseGood.bizplace, ['bizplace', 'worksheetDetails'], constants_1.WORKSHEET_TYPE.LOADING, releaseGood);
-        let foundWSD = await (0, typeorm_1.getRepository)(entities_1.WorksheetDetail).find({
+        const foundWSD = await (0, typeorm_1.getRepository)(entities_1.WorksheetDetail).find({
             where: {
                 domain,
                 worksheet: foundWorksheet,
@@ -50,58 +45,11 @@ exports.loadingWorksheetResolver = {
             },
             relations: [
                 'targetInventory',
-                'targetInventory.orderProduct',
                 'targetInventory.inventory',
                 'targetInventory.inventory.location',
                 'targetInventory.inventory.product'
             ]
         });
-        if (orderTotesTotal > 0) {
-            let [toteItems, toteItemsTotal] = await (0, typeorm_1.getRepository)(sales_base_1.OrderToteItem).findAndCount({
-                where: { orderTote: (0, typeorm_1.In)(orderTotes.map(itm => itm.id)) },
-                relations: ['orderTote', 'orderInventory']
-            });
-            let toteWsd = [];
-            for (let i = 0; i < toteItemsTotal; i++) {
-                let wsdIndex = foundWSD.findIndex(itm => !(itm === null || itm === void 0 ? void 0 : itm.toteName) && itm.targetInventory.id == toteItems[i].orderInventory.id);
-                if (wsdIndex >= 0) {
-                    let filterWSD = JSON.parse(JSON.stringify(foundWSD[wsdIndex]));
-                    let uomValue = Math.round((filterWSD.targetInventory.releaseUomValue / filterWSD.targetInventory.releaseQty) * 100) / 100;
-                    foundWSD[wsdIndex].targetInventory.releaseQty -= toteItems[i].qty;
-                    foundWSD[wsdIndex].targetInventory.pickedQty -= toteItems[i].qty;
-                    foundWSD[wsdIndex].targetInventory.releaseUomValue = foundWSD[wsdIndex].targetInventory.releaseQty * uomValue;
-                    filterWSD.targetInventory.releaseQty = toteItems[i].qty;
-                    filterWSD.targetInventory.pickedQty = toteItems[i].qty;
-                    filterWSD.targetInventory.releaseUomValue = toteItems[i].qty * uomValue;
-                    filterWSD.toteName = toteItems[i].orderTote.name;
-                    toteWsd.push(filterWSD);
-                }
-            }
-            foundWSD = foundWSD.concat(toteWsd);
-            foundWSD.sort((a, b) => (a.toteName > b.toteName ? 1 : -1));
-        }
-        let worksheetDetailInfos = foundWSD
-            .filter(itm => itm.targetInventory.releaseQty > 0)
-            .map((loadingWSD) => {
-            const targetInventory = loadingWSD.targetInventory;
-            const inventory = targetInventory.inventory;
-            return {
-                name: loadingWSD.name,
-                palletId: inventory.palletId,
-                batchId: inventory.batchId,
-                batchIdRef: inventory.batchIdRef,
-                product: inventory.product,
-                releaseQty: targetInventory.releaseQty,
-                releaseUomValue: targetInventory.releaseUomValue,
-                status: loadingWSD.status,
-                description: loadingWSD.description,
-                targetName: targetInventory.name,
-                packingType: inventory.packingType,
-                packingSize: inventory.packingSize,
-                inventory: targetInventory.inventory,
-                toteName: loadingWSD.toteName
-            };
-        });
         return {
             worksheetInfo: {
                 releaseGood,
@@ -110,7 +58,25 @@ exports.loadingWorksheetResolver = {
                 refNo: releaseGood.refNo,
                 ownCollection: releaseGood.ownTransport
             },
-            worksheetDetailInfos
+            worksheetDetailInfos: foundWSD.map(async (loadingWSD) => {
+                const targetInventory = loadingWSD.targetInventory;
+                const inventory = targetInventory.inventory;
+                return {
+                    name: loadingWSD.name,
+                    palletId: inventory.palletId,
+                    batchId: inventory.batchId,
+                    batchIdRef: inventory.batchIdRef,
+                    product: inventory.product,
+                    releaseQty: targetInventory.releaseQty,
+                    releaseUomValue: targetInventory.releaseUomValue,
+                    status: loadingWSD.status,
+                    description: loadingWSD.description,
+                    targetName: targetInventory.name,
+                    packingType: inventory.packingType,
+                    packingSize: inventory.packingSize,
+                    inventory: targetInventory.inventory
+                };
+            })
         };
     }
 };

package/dist-server/graphql/resolvers/worksheet/loading-worksheet.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"loading-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/loading-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAA2E;AAE3E,~~2DAOmC~~;~~AAEnC~~,mEAAoE;AAEpE,kDAAqE;AACrE,gDAA8D;AAC9D,0CAAwD;AAE3C,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,gBAAgB,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;QAC5D,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QACpD,IAAI,WAAW,GAAgB,MAAM,IAAA,uBAAa,EAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YACtE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,gCAAgC,EAAE;YACvE,SAAS,EAAE,CAAC,UAAU,CAAC;SACxB,CAAC,CAAA;QAEF,kCAAkC;QAClC,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,WAAW,GAAa,MAAM,IAAA,uBAAa,EAAC,yBAAQ,CAAC,CAAC,OAAO,CAAC;gBAClE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE;aACvC,CAAC,CAAA;YAEF,MAAM,EAAE,GAAuC,IAAA,uBAAa,EAAC,2BAAc,CAAC,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAA;YACjH,EAAE,CAAC,kBAAkB,CAAC,4BAA4B,EAAE,aAAa,CAAC;iBAC/D,kBAAkB,CAAC,sBAAsB,EAAE,UAAU,CAAC;iBACtD,kBAAkB,CAAC,iBAAiB,EAAE,QAAQ,CAAC;iBAC/C,KAAK,CAAC,sCAAsC,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;iBACtE,QAAQ,CAAC,qDAAqD,EAAE~~;gBAC/D~~,oBAAoB,EAAE,CAAC,mCAAsB,CAAC,OAAO,EAAE,mCAAsB,CAAC,MAAM,CAAC~~;aACtF~~,CAAC;~~iBACD~~,QAAQ,CAAC,8CAA8C,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC;iBACxF,QAAQ,CAAC,8BAA8B,EAAE,EAAE,MAAM,EAAE,yBAAY,CAAC,OAAO,EAAE,CAAC,CAAA;YAE7E,MAAM,mBAAmB,GAAG,MAAM,EAAE,CAAC,MAAM,EAAE,CAAA;YAE7C,IAAI,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,WAAW,EAAE;gBACpC,aAAa,GAAG,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAA;gBACpD,WAAW,GAAG,mBAAmB,CAAC,WAAW,CAAA;aAC9C;SACF;QAED,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAEjE,~~IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,GAAc,~~MAAM,~~IAAA,uBAAa,EAAC,sBAAS,CAAC,CAAC,YAAY,CAAC;YACzF,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE;SACvC,CAAC,CAAA;QAEF,MAAM,~~cAAc,GAAc,MAAM,IAAA,+BAAuB,EAC7D,MAAM,EACN,WAAW,CAAC,QAAQ,EACpB,CAAC,UAAU,EAAE,kBAAkB,CAAC,EAChC,0BAAc,CAAC,OAAO,EACtB,WAAW,CACZ,CAAA;QACD,~~IAAI~~,QAAQ,~~GAAU~~,MAAM,IAAA,uBAAa,EAAC,0BAAe,CAAC,CAAC,IAAI,CAAC;~~YAC9D~~,KAAK,EAAE;gBACL,MAAM;gBACN,SAAS,EAAE,cAAc;gBACzB,IAAI,EAAE,0BAAc,CAAC,OAAO;gBAC5B,MAAM,EAAE,IAAA,aAAG,EAAC,IAAA,eAAK,EAAC,4BAAgB,CAAC,IAAI,CAAC,CAAC;aAC1C;YACD,SAAS,EAAE;gBACT,iBAAiB;gBACjB,~~8BAA8B;gBAC9B,~~2BAA2B;gBAC3B,oCAAoC;gBACpC,mCAAmC;aACpC;SACF,CAAC,CAAA;QAEF,~~IAAI,eAAe,GAAG,CAAC,EAAE~~;~~YACvB~~,~~IAAI~~,~~CAAC,SAAS,~~EAAE~~,cAAc,CAAC,GAAkB,MAAM,IAAA,uBAAa,EAAC,0BAAa,CAAC,CAAC,YAAY,CAAC~~;~~gBAC/F~~,~~KAAK,EAAE,EAAE,SAAS,EAAE,IAAA,YAAE,EAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE~~;~~gBACvD~~,~~SAAS~~,EAAE,~~CAAC,~~WAAW,~~EAAE~~,~~gBAAgB~~,CAAC~~;aAC3C~~,~~CAAC,CAAA;YAEF,~~IAAI~~,OAAO,GAAG,EAAE,CAAA~~;~~YAEhB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE;~~gBACvC,~~IAAI,QAAQ,GAAG,QAAQ,CAAC,~~SAAS,~~CAC/B,GAAG,CAAC,~~EAAE,~~CAAC~~,CAAC,~~CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ,CAAA,IAAI,GAAG,CAAC,eAAe,CAAC,EAAE,IAAI,~~SAAS~~,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAClF,CAAA~~;~~gBAED~~,~~IAAI~~,~~QAAQ,IAAI,CAAC,~~EAAE~~;oBACjB~~,~~IAAI~~,~~SAAS,GAAQ,IAAI,~~CAAC,KAAK~~,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA~~;~~oBACnE~~,~~IAAI~~,~~QAAQ~~,~~GACV~~,~~IAAI,~~CAAC,~~KAAK,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,eAAe,GAAG,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA~~;~~oBAE5G,QAAQ,CAAC,QAAQ,CAAC,CAAC,eAAe,CAAC,UAAU,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA~~;~~oBACjE~~,~~QAAQ~~,CAAC,QAAQ,CAAC,CAAC,eAAe,CAAC,SAAS,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;oBAChE,QAAQ,CAAC,QAAQ,CAAC,CAAC,eAAe,CAAC,eAAe,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,eAAe,CAAC,UAAU,GAAG,QAAQ,CAAA;oBAE7G,SAAS,CAAC,eAAe,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;oBACvD,SAAS,CAAC,eAAe,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;oBACtD,SAAS,CAAC,eAAe,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAA;oBACvE,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAA;oBAChD,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;iBACxB;aACF;YAED,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YACnC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,~~CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,~~QAAQ,~~GAAG,~~CAAC,~~CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;SAC5D;QAED,IAAI,oBAAoB,~~GAAG,~~QAAQ;aAChC,MAAM,~~CAAC,~~GAAG~~,~~CAAC,~~EAAE,~~CAAC~~,~~GAAG,CAAC,eAAe,CAAC,UAAU,GAAG,CAAC,CAAC;aACjD,GAAG,CAAC,CAAC,UAAe,~~EAAE,EAAE;~~YACvB~~,MAAM,eAAe,GAAmB,UAAU,CAAC,eAAe,CAAA;~~YAClE~~,MAAM,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;~~YACtD~~,OAAO;~~gBACL~~,IAAI,EAAE,UAAU,CAAC,IAAI;~~gBACrB~~,QAAQ,EAAE,SAAS,CAAC,QAAQ;~~gBAC5B~~,OAAO,EAAE,SAAS,CAAC,OAAO;~~gBAC1B~~,UAAU,EAAE,SAAS,CAAC,UAAU;~~gBAChC~~,OAAO,EAAE,SAAS,CAAC,OAAO;~~gBAC1B~~,UAAU,EAAE,eAAe,CAAC,UAAU;~~gBACtC~~,eAAe,EAAE,eAAe,CAAC,eAAe;~~gBAChD~~,MAAM,EAAE,UAAU,CAAC,MAAM;~~gBACzB~~,WAAW,EAAE,UAAU,CAAC,WAAW;~~gBACnC~~,UAAU,EAAE,eAAe,CAAC,IAAI;~~gBAChC~~,WAAW,EAAE,SAAS,CAAC,WAAW;~~gBAClC~~,WAAW,EAAE,SAAS,CAAC,WAAW;~~gBAClC~~,SAAS,EAAE,eAAe,CAAC,SAAS;~~gBACpC~~,~~QAAQ,EAAE,UAAU,CAAC,QAAQ;aAC9B,~~CAAA;~~QACH~~,CAAC,CAAC~~,CAAA~~;~~QAEJ~~,~~OAAO;YACL,aAAa,EAAE;gBACb,WAAW;gBACX,YAAY,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI;gBACvC,SAAS,EAAE,cAAc,CAAC,SAAS;gBACnC,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,aAAa,EAAE,WAAW,CAAC,YAAY;aACxC;YACD,oBAAoB;SACrB,~~CAAA;IACH,CAAC;CACF,CAAA"}
1	+ {"version":3,"file":"loading-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/loading-worksheet.ts"],"names":[],"mappings":"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"}