npm - @things-factory/worksheet-base - Versions diffs - 5.0.13 → 6.0.0-alpha.1 - Mend

@things-factory/worksheet-base 5.0.13 → 6.0.0-alpha.1

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 (534) hide show

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

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.completePicking = exports.completePickingResolver = void 0;
+const typeorm_1 = require("typeorm");
 const biz_base_1 = require("@things-factory/biz-base");
 const integration_lmd_1 = require("@things-factory/integration-lmd");
 const integration_marketplace_1 = require("@things-factory/integration-marketplace");
 const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
 const marketplace_base_1 = require("@things-factory/marketplace-base");
 const sales_base_1 = require("@things-factory/sales-base");
-const setting_base_1 = require("@things-factory/setting-base");
 const constants_1 = require("../../../../constants");
 const controllers_1 = require("../../../../controllers/");
 const ecommerce_1 = require("../../../../controllers/ecommerce");
@@ -28,10 +28,10 @@ exports.completePickingResolver = {
     }
 };
 async function completePicking(tx, domain, user, releaseGoodNo) {
-    var _a, _b, _c;
+    var _a, _b;
     const pickingWSCtrl = new controllers_1.PickingWorksheetController(tx, domain, user);
     let releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
-        where: { domain, name: releaseGoodNo },
+        where: { domain: { id: domain.id }, name: releaseGoodNo },
         relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
     });
     const worksheet = await pickingWSCtrl.findWorksheetByRefOrder(releaseGood, constants_1.WORKSHEET_TYPE.PICKING, [
@@ -40,7 +40,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
     ]);
     const warehouseContactPoint = await tx.getRepository(biz_base_1.ContactPoint).findOne({
         where: {
-            domain,
+            domain: { id: domain.id },
             type: 'WAREHOUSE'
         }
     });
@@ -49,21 +49,34 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
     const pickedTargetInventories = targetInventories.filter(targetInventory => targetInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.PICKED);
     await pickingWSCtrl.completePicking(releaseGoodNo);
     if (releaseGood.type == 'b2c') {
-        const sellercraft = await tx
-            .getRepository(integration_sellercraft_1.Sellercraft)
-            .findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
-        if (sellercraft) {
-            const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
-            if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packageId)) {
-                const orderProducts = await tx.getRepository(sales_base_1.OrderProduct).find({
-                    where: { releaseGood },
-                    relations: ['product', 'product.productDetails']
+        const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOneBy({
+            domain: {
+                id: releaseGood.bizplace.domain.id
+            },
+            status: integration_sellercraft_1.SellercraftStatus.ACTIVE
+        });
+        const initSCOrderShipment = async (sellercraft) => {
+            if (sellercraft) {
+                await (0, typeorm_1.getManager)().transaction(async (txMgr) => {
+                    const sellercraftCtrl = new controllers_1.SellercraftController(txMgr, domain, user);
+                    if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packageId)) {
+                        const orderProducts = await tx.getRepository(sales_base_1.OrderProduct).find({
+                            where: { releaseGood },
+                            relations: ['product', 'product.productDetails']
+                        });
+                        releaseGood = await sellercraftCtrl.packOrder(sellercraft, Object.assign(Object.assign({}, releaseGood), { orderProducts }));
+                        if (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packageId) {
+                            await txMgr
+                                .getRepository(sales_base_1.ReleaseGood)
+                                .update({ id: releaseGood.id }, { packageId: releaseGood.packageId, updater: releaseGood.updater });
+                        }
+                    }
+                    await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
                 });
-                releaseGood = await sellercraftCtrl.packOrder(sellercraft, Object.assign(Object.assign({}, releaseGood), { orderProducts }));
             }
-            releaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
-            await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood);
-        }
+        };
+        // asynchronouly call to initiate sellercraft order shipment/ RTS
+        initSCOrderShipment(sellercraft);
         const companyDomain = releaseGood.bizplace.company.domain;
         let marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
             where: { orderNo: releaseGood.refNo, domain: companyDomain },
@@ -94,7 +107,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
                 const marketplaceOrderShipping = marketplaceOrderShippingItems[0].marketplaceOrderShipping;
                 const lmd = await tx.getRepository(integration_lmd_1.LastMileDelivery).findOne({
                     where: {
-                        domain,
+                        domain: { id: domain.id },
                         platform: 'eTrax'
                     }
                 });
@@ -169,24 +182,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
     }
     if (releaseGood.packingOption) {
         const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
-        const directActivatePackingWorksheet = await tx.getRepository(setting_base_1.Setting).findOne({
-            where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-packing-worksheet' }
-        });
-        const partnerDirectActivatePackingWorksheetSetting = await tx
-            .getRepository(setting_base_1.PartnerSetting)
-            .findOne({
-            where: { setting: directActivatePackingWorksheet, domain: domain, partnerDomain: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain }
-        });
-        let packingWorksheet = await packingWSCtrl.generatePackingWorksheet(releaseGoodNo);
-        if (directActivatePackingWorksheet != undefined && directActivatePackingWorksheet.value.toLowerCase() == 'true') {
-            if (partnerDirectActivatePackingWorksheetSetting != undefined) {
-                if (partnerDirectActivatePackingWorksheetSetting.value.toLowerCase() == 'true')
-                    await packingWSCtrl.activatePacking(packingWorksheet.name);
-            }
-            else {
-                await packingWSCtrl.activatePacking(packingWorksheet.name);
-            }
-        }
+        await packingWSCtrl.generatePackingWorksheet(releaseGoodNo);
     }
     else {
         // Find Existing Loading Worksheet if any
@@ -201,7 +197,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
             if (pickedTargetInventories.length > 0) {
                 const loadingWSCtrl = new controllers_1.LoadingWorksheetController(tx, domain, user);
                 let loadingWorksheet = await loadingWSCtrl.generateLoadingWorksheet(releaseGoodNo, pickedTargetInventories);
-                if (!((_b = loadingWorksheet.worksheetDetails) === null || _b === void 0 ? void 0 : _b.length)) {
+                if (!((_a = loadingWorksheet.worksheetDetails) === null || _a === void 0 ? void 0 : _a.length)) {
                     loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id);
                 }
                 const loadingWorksheetDetails = loadingWorksheet.worksheetDetails;
@@ -211,7 +207,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
         else {
             const loadingWSCtrl = new controllers_1.LoadingWorksheetController(tx, domain, user);
             let loadingWorksheet = await loadingWSCtrl.updateLoadingWorksheet(releaseGoodNo, pickedTargetInventories, existLoadingWorksheet);
-            if (!((_c = loadingWorksheet.worksheetDetails) === null || _c === void 0 ? void 0 : _c.length)) {
+            if (!((_b = loadingWorksheet.worksheetDetails) === null || _b === void 0 ? void 0 : _b.length)) {
                 loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id);
             }
             const loadingWorksheetDetails = loadingWorksheet.worksheetDetails;

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

	@@ -1 +1 @@
1	- {"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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","sourcesContent":["import { EntityManager } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { Bizplace, ContactPoint, getMyBizplace } from '@things-factory/biz-base'\nimport { LastMileAPI, LastMileDelivery } from '@things-factory/integration-lmd'\nimport { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integration-marketplace'\nimport { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'\nimport {\n MarketplaceOrder,\n MarketplaceOrderItem,\n MarketplaceOrderShipping,\n MarketplaceOrderShippingItem\n} from '@things-factory/marketplace-base'\nimport {\n ORDER_INVENTORY_STATUS,\n ORDER_STATUS,\n OrderInventory,\n OrderProduct,\n ReleaseGood\n} from '@things-factory/sales-base'\nimport { PartnerSetting, Setting } from '@things-factory/setting-base'\nimport { Domain } from '@things-factory/shell'\n\nimport { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../constants'\nimport {\n LoadingWorksheetController,\n PackingWorksheetController,\n PickingWorksheetController,\n SellercraftController\n} from '../../../../controllers/'\nimport { EcommerceController } from '../../../../controllers/ecommerce'\nimport { WorksheetController } from '../../../../controllers/worksheet-controller'\nimport { Worksheet, WorksheetDetail } from '../../../../entities'\n\nexport const completePickingResolver = {\n async completePicking(_: any, { releaseGoodNo }, context: any) {\n const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state\n\n await completePicking(tx, domain, user, releaseGoodNo)\n\n const bizplace: Bizplace = await getMyBizplace(domain, user)\n const worksheetController: WorksheetController = new WorksheetController(tx, domain, user)\n await worksheetController.notifyToCustomer(bizplace, {\n title: `Picking has been completed (${bizplace.name}, ${releaseGoodNo})`,\n body: `Items now are ready to be loaded`,\n url: context.header.referer,\n data: { url: context.header.referer }\n })\n }\n}\n\nexport async function completePicking(\n tx: EntityManager,\n domain: Domain,\n user: User,\n releaseGoodNo: string\n): Promise<void> {\n const pickingWSCtrl: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)\n let releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({\n where: { domain, name: releaseGoodNo },\n relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']\n })\n\n const worksheet: Worksheet = await pickingWSCtrl.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.PICKING, [\n 'worksheetDetails',\n 'worksheetDetails.targetInventory'\n ])\n\n const warehouseContactPoint: ContactPoint = await tx.getRepository(ContactPoint).findOne({\n where: {\n domain,\n type: 'WAREHOUSE'\n }\n })\n\n const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails\n const targetInventories: OrderInventory[] = worksheetDetails.map((wsd: WorksheetDetail) => wsd.targetInventory)\n const pickedTargetInventories: OrderInventory[] = targetInventories.filter(\n targetInventory => targetInventory.status === ORDER_INVENTORY_STATUS.PICKED\n )\n\n await pickingWSCtrl.completePicking(releaseGoodNo)\n\n if (releaseGood.type == 'b2c') {\n const sellercraft: Sellercraft = await tx\n .getRepository(Sellercraft)\n .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })\n\n if (sellercraft) {\n const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)\n\n if (!releaseGood?.packageId) {\n const orderProducts: OrderProduct[] = await tx.getRepository(OrderProduct).find({\n where: { releaseGood },\n relations: ['product', 'product.productDetails']\n })\n releaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...releaseGood, orderProducts })\n }\n\n releaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)\n await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)\n }\n\n const companyDomain: Domain = releaseGood.bizplace.company.domain\n let marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({\n where: { orderNo: releaseGood.refNo, domain: companyDomain },\n relations: [\n 'marketplaceStore',\n 'marketplaceOrderItems',\n 'marketplaceOrderItems.marketplaceOrderShippingItems',\n 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'\n ]\n })\n\n if (!sellercraft && marketplaceOrder) {\n const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore\n let eTraxOption: boolean\n\n if (marketplaceStore.isAutoUpdateShipment) {\n const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)\n await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PACKING)\n }\n\n if (!marketplaceOrder)\n throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue')\n eTraxOption = marketplaceOrder?.marketplaceStore.eTrax\n\n // if eTrax option is true\n if (eTraxOption) {\n const marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems\n\n // access every marketplaceOrderItems for shipping information you need\n // trigger the controller from integration-lmd that trigger the API, build the parameters needed\n // for etrax didn't support multi awb per order\n const marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] =\n marketplaceOrderItems[0].marketplaceOrderShippingItems\n const marketplaceOrderShipping: MarketplaceOrderShipping =\n marketplaceOrderShippingItems[0].marketplaceOrderShipping\n const lmd: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({\n where: {\n domain,\n platform: 'eTrax'\n }\n })\n\n //Get which transporter to use\n const marketplaceTransporter: MarketplaceTransporter = await tx.getRepository(MarketplaceTransporter).findOne({\n where: { marketplaceStore: marketplaceOrder.marketplaceStore },\n relations: ['pickupTransporter', 'deliveryTransporter']\n })\n\n const resp = await LastMileAPI.createShipmentRequest(lmd, {\n orderNo: marketplaceOrder.orderNo,\n clientId: lmd.clientId,\n clientType: lmd.clientType,\n clientName: lmd.clientName,\n transporterId: marketplaceTransporter.pickupTransporter.transporterId,\n pickupName: warehouseContactPoint.name,\n pickupAddress1: warehouseContactPoint.address,\n pickupAddress2: warehouseContactPoint.address2,\n pickupPostcode: warehouseContactPoint.postCode,\n pickupState: warehouseContactPoint.state,\n pickupCity: warehouseContactPoint.city,\n pickupPhone: warehouseContactPoint.phone,\n pickupEmail: warehouseContactPoint.email,\n name: marketplaceOrderShipping?.attentionTo ? marketplaceOrderShipping.attentionTo.trim() : '',\n address1: marketplaceOrderShipping?.address1 ? marketplaceOrderShipping?.address1.trim() : '-',\n address2: marketplaceOrderShipping?.address2 ? marketplaceOrderShipping?.address2.trim() : '-',\n postCode: marketplaceOrderShipping?.postCode ? marketplaceOrderShipping?.postCode.trim() : '',\n city: marketplaceOrderShipping?.city ? marketplaceOrderShipping?.city.trim() : '',\n state: marketplaceOrderShipping?.state ? marketplaceOrderShipping?.state.trim() : '',\n phone: marketplaceOrderShipping.phone1 \|\| '',\n email: marketplaceOrderShipping.email \|\| '',\n attentionTo: marketplaceOrderShipping.attentionTo,\n quantity: marketplaceOrderItems.length\n })\n\n const delay = (ms: number) => {\n return new Promise(resolve => setTimeout(resolve, ms))\n }\n\n if (resp.Status === 'SUCCESS') {\n //Success\n let awbObtained = false\n let retry = 0\n while (!awbObtained) {\n const marketplaceOrder2: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({\n where: { releaseOrderId: releaseGood.id },\n relations: [\n 'marketplaceStore',\n 'marketplaceOrderItems',\n 'marketplaceOrderItems.marketplaceOrderShippingItems',\n 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'\n ]\n })\n const orderShipping =\n marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShippingItems[0].marketplaceOrderShipping\n if (orderShipping?.airwayBill) {\n awbObtained = true\n }\n await delay(5000)\n //Timeout after 15sec\n if (++retry > 3) {\n break\n }\n }\n } else {\n if (resp?.AWBurl && resp?.TrackingNo)\n await tx\n .getRepository(MarketplaceOrderShipping)\n .update({ id: marketplaceOrderShipping.id }, { airwayBill: resp.AWBurl, trackingNo: resp.TrackingNo })\n else throw resp\n }\n }\n }\n }\n\n if (releaseGood.packingOption) {\n const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)\n\n const directActivatePackingWorksheet: Setting = await tx.getRepository(Setting).findOne({\n where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-packing-worksheet' }\n })\n const partnerDirectActivatePackingWorksheetSetting: PartnerSetting = await tx\n .getRepository(PartnerSetting)\n .findOne({\n where: { setting: directActivatePackingWorksheet, domain: domain, partnerDomain: releaseGood.bizplace?.domain }\n })\n\n let packingWorksheet: Worksheet = await packingWSCtrl.generatePackingWorksheet(releaseGoodNo)\n\n if (directActivatePackingWorksheet != undefined && directActivatePackingWorksheet.value.toLowerCase() == 'true') {\n if (partnerDirectActivatePackingWorksheetSetting != undefined) {\n if (partnerDirectActivatePackingWorksheetSetting.value.toLowerCase() == 'true')\n await packingWSCtrl.activatePacking(packingWorksheet.name)\n } else {\n await packingWSCtrl.activatePacking(packingWorksheet.name)\n }\n }\n } else {\n // Find Existing Loading Worksheet if any\n let existLoadingWorksheet: Worksheet = await tx.getRepository(Worksheet).findOne({\n where: {\n releaseGood,\n type: WORKSHEET_TYPE.LOADING,\n status: WORKSHEET_STATUS.DEACTIVATED\n }\n })\n\n if (!existLoadingWorksheet && !releaseGood.courierOption && !releaseGood.packingOption) {\n if(pickedTargetInventories.length>0){\n const loadingWSCtrl: LoadingWorksheetController = new LoadingWorksheetController(tx, domain, user)\n let loadingWorksheet: Worksheet = await loadingWSCtrl.generateLoadingWorksheet(\n releaseGoodNo,\n pickedTargetInventories\n )\n \n if (!loadingWorksheet.worksheetDetails?.length) {\n loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id)\n }\n \n const loadingWorksheetDetails: WorksheetDetail[] = loadingWorksheet.worksheetDetails\n await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails)\n }\n } else {\n const loadingWSCtrl: LoadingWorksheetController = new LoadingWorksheetController(tx, domain, user)\n let loadingWorksheet: Worksheet = await loadingWSCtrl.updateLoadingWorksheet(\n releaseGoodNo,\n pickedTargetInventories,\n existLoadingWorksheet\n )\n\n if (!loadingWorksheet.worksheetDetails?.length) {\n loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id)\n }\n\n const loadingWorksheetDetails: WorksheetDetail[] = loadingWorksheet.worksheetDetails\n await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails)\n }\n }\n}\n"]}
1	+ {"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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","sourcesContent":["import { EntityManager, getManager } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { Bizplace, ContactPoint, getMyBizplace } from '@things-factory/biz-base'\nimport { LastMileAPI, LastMileDelivery } from '@things-factory/integration-lmd'\nimport { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integration-marketplace'\nimport { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'\nimport {\n MarketplaceOrder,\n MarketplaceOrderItem,\n MarketplaceOrderShipping,\n MarketplaceOrderShippingItem\n} from '@things-factory/marketplace-base'\nimport {\n ORDER_INVENTORY_STATUS,\n ORDER_STATUS,\n OrderInventory,\n OrderProduct,\n ReleaseGood\n} from '@things-factory/sales-base'\nimport { PartnerSetting, Setting } from '@things-factory/setting-base'\nimport { Domain } from '@things-factory/shell'\n\nimport { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../constants'\nimport {\n LoadingWorksheetController,\n PackingWorksheetController,\n PickingWorksheetController,\n SellercraftController\n} from '../../../../controllers/'\nimport { EcommerceController } from '../../../../controllers/ecommerce'\nimport { WorksheetController } from '../../../../controllers/worksheet-controller'\nimport { Worksheet, WorksheetDetail } from '../../../../entities'\n\nexport const completePickingResolver = {\n async completePicking(_: any, { releaseGoodNo }, context: ResolverContext) {\n const { tx, domain, user } = context.state\n\n await completePicking(tx, domain, user, releaseGoodNo)\n\n const bizplace: Bizplace = await getMyBizplace(domain, user)\n const worksheetController: WorksheetController = new WorksheetController(tx, domain, user)\n await worksheetController.notifyToCustomer(bizplace, {\n title: `Picking has been completed (${bizplace.name}, ${releaseGoodNo})`,\n body: `Items now are ready to be loaded`,\n url: context.header.referer,\n data: { url: context.header.referer }\n })\n }\n}\n\nexport async function completePicking(\n tx: EntityManager,\n domain: Domain,\n user: User,\n releaseGoodNo: string\n): Promise<void> {\n const pickingWSCtrl: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)\n let releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({\n where: { domain: { id: domain.id }, name: releaseGoodNo },\n relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']\n })\n\n const worksheet: Worksheet = await pickingWSCtrl.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.PICKING, [\n 'worksheetDetails',\n 'worksheetDetails.targetInventory'\n ])\n\n const warehouseContactPoint: ContactPoint = await tx.getRepository(ContactPoint).findOne({\n where: {\n domain: { id: domain.id },\n type: 'WAREHOUSE'\n }\n })\n\n const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails\n const targetInventories: OrderInventory[] = worksheetDetails.map((wsd: WorksheetDetail) => wsd.targetInventory)\n const pickedTargetInventories: OrderInventory[] = targetInventories.filter(\n targetInventory => targetInventory.status === ORDER_INVENTORY_STATUS.PICKED\n )\n\n await pickingWSCtrl.completePicking(releaseGoodNo)\n\n if (releaseGood.type == 'b2c') {\n const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOneBy({\n domain: {\n id: releaseGood.bizplace.domain.id\n },\n status: SellercraftStatus.ACTIVE\n })\n const initSCOrderShipment = async sellercraft => {\n if (sellercraft) {\n await getManager().transaction(async txMgr => {\n const sellercraftCtrl: SellercraftController = new SellercraftController(txMgr, domain, user)\n\n if (!releaseGood?.packageId) {\n const orderProducts: OrderProduct[] = await tx.getRepository(OrderProduct).find({\n where: { releaseGood },\n relations: ['product', 'product.productDetails']\n })\n releaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...releaseGood, orderProducts })\n\n if (releaseGood?.packageId) {\n await txMgr\n .getRepository(ReleaseGood)\n .update({ id: releaseGood.id }, { packageId: releaseGood.packageId, updater: releaseGood.updater })\n }\n }\n\n await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)\n })\n }\n }\n\n // asynchronouly call to initiate sellercraft order shipment/ RTS\n initSCOrderShipment(sellercraft)\n\n const companyDomain: Domain = releaseGood.bizplace.company.domain\n let marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({\n where: { orderNo: releaseGood.refNo, domain: companyDomain },\n relations: [\n 'marketplaceStore',\n 'marketplaceOrderItems',\n 'marketplaceOrderItems.marketplaceOrderShippingItems',\n 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'\n ]\n })\n\n if (!sellercraft && marketplaceOrder) {\n const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore\n let eTraxOption: boolean\n\n if (marketplaceStore.isAutoUpdateShipment) {\n const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)\n await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PACKING)\n }\n\n if (!marketplaceOrder)\n throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue')\n eTraxOption = marketplaceOrder?.marketplaceStore.eTrax\n\n // if eTrax option is true\n if (eTraxOption) {\n const marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems\n\n // access every marketplaceOrderItems for shipping information you need\n // trigger the controller from integration-lmd that trigger the API, build the parameters needed\n // for etrax didn't support multi awb per order\n const marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] =\n marketplaceOrderItems[0].marketplaceOrderShippingItems\n const marketplaceOrderShipping: MarketplaceOrderShipping =\n marketplaceOrderShippingItems[0].marketplaceOrderShipping\n const lmd: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({\n where: {\n domain: { id: domain.id },\n platform: 'eTrax'\n }\n })\n\n //Get which transporter to use\n const marketplaceTransporter: MarketplaceTransporter = await tx.getRepository(MarketplaceTransporter).findOne({\n where: { marketplaceStore: marketplaceOrder.marketplaceStore },\n relations: ['pickupTransporter', 'deliveryTransporter']\n })\n\n const resp = await LastMileAPI.createShipmentRequest(lmd, {\n orderNo: marketplaceOrder.orderNo,\n clientId: lmd.clientId,\n clientType: lmd.clientType,\n clientName: lmd.clientName,\n transporterId: marketplaceTransporter.pickupTransporter.transporterId,\n pickupName: warehouseContactPoint.name,\n pickupAddress1: warehouseContactPoint.address,\n pickupAddress2: warehouseContactPoint.address2,\n pickupPostcode: warehouseContactPoint.postCode,\n pickupState: warehouseContactPoint.state,\n pickupCity: warehouseContactPoint.city,\n pickupPhone: warehouseContactPoint.phone,\n pickupEmail: warehouseContactPoint.email,\n name: marketplaceOrderShipping?.attentionTo ? marketplaceOrderShipping.attentionTo.trim() : '',\n address1: marketplaceOrderShipping?.address1 ? marketplaceOrderShipping?.address1.trim() : '-',\n address2: marketplaceOrderShipping?.address2 ? marketplaceOrderShipping?.address2.trim() : '-',\n postCode: marketplaceOrderShipping?.postCode ? marketplaceOrderShipping?.postCode.trim() : '',\n city: marketplaceOrderShipping?.city ? marketplaceOrderShipping?.city.trim() : '',\n state: marketplaceOrderShipping?.state ? marketplaceOrderShipping?.state.trim() : '',\n phone: marketplaceOrderShipping.phone1 \|\| '',\n email: marketplaceOrderShipping.email \|\| '',\n attentionTo: marketplaceOrderShipping.attentionTo,\n quantity: marketplaceOrderItems.length\n })\n\n const delay = (ms: number) => {\n return new Promise(resolve => setTimeout(resolve, ms))\n }\n\n if (resp.Status === 'SUCCESS') {\n //Success\n let awbObtained = false\n let retry = 0\n while (!awbObtained) {\n const marketplaceOrder2: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({\n where: { releaseOrderId: releaseGood.id },\n relations: [\n 'marketplaceStore',\n 'marketplaceOrderItems',\n 'marketplaceOrderItems.marketplaceOrderShippingItems',\n 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'\n ]\n })\n const orderShipping =\n marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShippingItems[0].marketplaceOrderShipping\n if (orderShipping?.airwayBill) {\n awbObtained = true\n }\n await delay(5000)\n //Timeout after 15sec\n if (++retry > 3) {\n break\n }\n }\n } else {\n if (resp?.AWBurl && resp?.TrackingNo)\n await tx\n .getRepository(MarketplaceOrderShipping)\n .update({ id: marketplaceOrderShipping.id }, { airwayBill: resp.AWBurl, trackingNo: resp.TrackingNo })\n else throw resp\n }\n }\n }\n }\n\n if (releaseGood.packingOption) {\n const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)\n await packingWSCtrl.generatePackingWorksheet(releaseGoodNo)\n } else {\n // Find Existing Loading Worksheet if any\n let existLoadingWorksheet: Worksheet = await tx.getRepository(Worksheet).findOne({\n where: {\n releaseGood,\n type: WORKSHEET_TYPE.LOADING,\n status: WORKSHEET_STATUS.DEACTIVATED\n }\n })\n\n if (!existLoadingWorksheet && !releaseGood.courierOption && !releaseGood.packingOption) {\n if (pickedTargetInventories.length > 0) {\n const loadingWSCtrl: LoadingWorksheetController = new LoadingWorksheetController(tx, domain, user)\n let loadingWorksheet: Worksheet = await loadingWSCtrl.generateLoadingWorksheet(\n releaseGoodNo,\n pickedTargetInventories\n )\n\n if (!loadingWorksheet.worksheetDetails?.length) {\n loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id)\n }\n\n const loadingWorksheetDetails: WorksheetDetail[] = loadingWorksheet.worksheetDetails\n await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails)\n }\n } else {\n const loadingWSCtrl: LoadingWorksheetController = new LoadingWorksheetController(tx, domain, user)\n let loadingWorksheet: Worksheet = await loadingWSCtrl.updateLoadingWorksheet(\n releaseGoodNo,\n pickedTargetInventories,\n existLoadingWorksheet\n )\n\n if (!loadingWorksheet.worksheetDetails?.length) {\n loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id)\n }\n\n const loadingWorksheetDetails: WorksheetDetail[] = loadingWorksheet.worksheetDetails\n await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails)\n }\n }\n}\n"]}

package/dist-server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.js CHANGED Viewed

@@ -13,7 +13,10 @@ exports.fetchAndAssignPickingTaskResolver = {
     async fetchAndAssignPickingTask(_, {}, context) {
         try {
             const { tx, domain, user } = context.state;
-            const assignee = await tx.getRepository(auth_base_1.User).findOne(user.id, { relations: ['domains'] });
+            const assignee = await tx.getRepository(auth_base_1.User).findOne({
+                where: { id: user.id },
+                relations: ['domains']
+            });
             if (((assignee === null || assignee === void 0 ? void 0 : assignee.domains) || []).every((userDomain) => userDomain.id !== domain.id))
                 throw new Error('Target user is not belong to current domain');
             if (!assignee)
@@ -25,7 +28,7 @@ exports.fetchAndAssignPickingTaskResolver = {
                 .select('ws.id')
                 .addSelect('ws.name')
                 .addSelect('ws.status')
-                .addSelect('ws.release_good_id')
+                .innerJoinAndSelect('ws.releaseGood', 'rg')
                 .where('(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id =:assignee AND (ws.status = :status1 OR ws.status = :status2))', {
                 domain_id: domain.id,
                 type: constants_1.WORKSHEET_TYPE.PICKING,
@@ -44,49 +47,57 @@ exports.fetchAndAssignPickingTaskResolver = {
                     .having('COUNT(*) > 0')
                     .getQuery();
                 return 'NOT EXISTS ' + subQuery;
-            });
-            worksheet = await worksheetQb.getRawOne();
+            })
+                .orderBy('"rg"."created_at"', 'ASC');
+            worksheet = await worksheetQb.getOne();
             if (!worksheet) {
-                let worksheetQb = await tx
-                    .getRepository(entities_1.Worksheet)
-                    .createQueryBuilder('ws')
-                    .select('ws.id')
-                    .addSelect('ws.name')
-                    .addSelect('ws.status')
-                    .addSelect('ws.release_good_id')
-                    .where('(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id IS NULL AND (ws.status = :status1 OR ws.status = :status2))', {
-                    domain_id: domain.id,
-                    type: constants_1.WORKSHEET_TYPE.PICKING,
-                    status1: constants_1.WORKSHEET_STATUS.EXECUTING,
-                    status2: constants_1.WORKSHEET_STATUS.DEACTIVATED
-                })
-                    .andWhere(qb => {
-                    const subQuery = qb
-                        .subQuery()
-                        .select('COUNT(*) AS totalPS')
-                        .from(sales_base_1.OrderInventory, 'OrderInventory')
-                        .where('OrderInventory.release_good_id = ws.release_good_id')
-                        .andWhere(`OrderInventory.status = 'PENDING_SPLIT'`)
-                        .groupBy('OrderInventory.release_good_id')
-                        .having('COUNT(*) > 0')
-                        .getQuery();
-                    return 'NOT EXISTS ' + subQuery;
+                // update and return updated worksheet id
+                let updatedWorksheets = await (0, typeorm_1.getConnection)().transaction(async (tx2) => {
+                    let x = await tx2.getRepository(entities_1.Worksheet).query(`
+            UPDATE worksheets ws SET assignee_id = $2,
+            updated_at = NOW(),
+            updater_id = $2
+            FROM (
+              SELECT ws.id, ws.name, ws.status, ws.release_good_id FROM worksheets ws
+              INNER JOIN release_goods rg ON rg.id = ws.release_good_id
+              WHERE
+              ws.domain_id = $1 AND
+              ws.type = 'PICKING' AND
+              ws.assignee_id IS NULL AND
+              (ws.status = 'EXECUTING' OR ws.status = 'DEACTIVATED') AND
+              NOT EXISTS (
+                SELECT count(id) AS "totalPS"
+                FROM order_inventories oi
+                WHERE oi.release_good_id = ws.release_good_id AND
+                oi.status = 'PENDING_SPLIT'
+                GROUP BY oi.release_good_id
+                HAVING count(id) > 0
+              )
+              ORDER BY rg.release_date, rg.created_at LIMIT 1
+            ) src where src.id = ws.id
+            RETURNING ws.id;
+          `, [domain.id, assignee.id]);
+                    return x[0];
                 });
-                worksheet = await worksheetQb.getRawOne();
-                if (!worksheet)
+                if (updatedWorksheets.length == 0)
                     throw new Error('no suitable worksheet found');
-                await (0, typeorm_1.getRepository)(entities_1.Worksheet).update({ id: worksheet.ws_id }, { assignee: assignee });
+                // relace worksheet with newly assigned worksheet
+                worksheet = await tx
+                    .getRepository(entities_1.Worksheet)
+                    .findOne({ where: { id: updatedWorksheets[0].id }, relations: ['releaseGood'] });
             }
-            if (worksheet.ws_status == constants_1.WORKSHEET_STATUS.DEACTIVATED)
-                await (0, activate_picking_1.activatePicking)(tx, domain, user, worksheet.ws_name);
+            if (worksheet.status == constants_1.WORKSHEET_STATUS.DEACTIVATED)
+                await (0, activate_picking_1.activatePicking)(tx, domain, user, worksheet.name);
             const locationSortingRules = await tx.getRepository(setting_base_1.Setting).findOne({
-                where: { domain, name: 'rule-for-picking-product' }
+                where: { domain: { id: domain.id }, name: 'rule-for-picking-product' }
             });
             const sortingRule = JSON.parse(locationSortingRules.value);
             const locationSortingRule = Object.keys(sortingRule).map(field => {
                 return { name: field, desc: sortingRule[field] === 'DESC' };
             });
-            const releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne(worksheet.release_good_id);
+            const releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOneBy({
+                id: worksheet.releaseGood.id
+            });
             return await (0, picking_worksheet_1.pickingWorksheet)(domain, releaseGood.name, locationSortingRule, tx);
         }
         catch (error) {

package/dist-server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fetch-and-assign-picking-task.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AAEtD,yDAAgD;AAChD,2DAAwE;AACxE,+DAAsD;AAGtD,qDAAwE;AACxE,mDAAgD;AAChD,4DAAuD;AACvD,yDAAoD;AAEvC,QAAA,iCAAiC,GAAG;IAC/C,KAAK,CAAC,yBAAyB,CAAC,CAAM,EAAE,EAAE,EAAE,~~OAAY~~;~~QACtD~~,IAAI;YACF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,~~GAAsD~~,OAAO,CAAC,KAAK,CAAA;~~YAC7F~~,MAAM,QAAQ,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,~~EAAE,~~SAAS,EAAE,CAAC,SAAS,CAAC,~~EAAE,~~CAAC,CAAA;~~YAChG~~,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,KAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,UAAkB,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC;gBACtF,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;YAEhE,IAAI,CAAC,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;YAE5D,IAAI,~~SAAc~~,CAAA;~~YAClB~~,IAAI,WAAW,GAAG,MAAM,EAAE;iBACvB,aAAa,CAAC,oBAAS,CAAC;iBACxB,kBAAkB,CAAC,IAAI,CAAC;iBACxB,MAAM,CAAC,OAAO,CAAC;iBACf,SAAS,CAAC,SAAS,CAAC;iBACpB,SAAS,CAAC,WAAW,CAAC;iBACtB,~~SAAS~~,CAAC,~~oBAAoB~~,CAAC;~~iBAC/B~~,KAAK,CACJ,kIAAkI,EAClI;gBACE,SAAS,EAAE,MAAM,CAAC,EAAE;gBACpB,IAAI,EAAE,0BAAc,CAAC,OAAO;gBAC5B,QAAQ,EAAE,QAAQ,CAAC,EAAE;gBACrB,OAAO,EAAE,4BAAgB,CAAC,SAAS;gBACnC,OAAO,EAAE,4BAAgB,CAAC,WAAW;aACtC,CACF;iBACA,QAAQ,CAAC,EAAE,CAAC,EAAE;gBACb,MAAM,QAAQ,GAAG,EAAE;qBAChB,QAAQ,EAAE;qBACV,MAAM,CAAC,qBAAqB,CAAC;qBAC7B,IAAI,CAAC,2BAAc,EAAE,gBAAgB,CAAC;qBACtC,KAAK,CAAC,qDAAqD,CAAC;qBAC5D,QAAQ,CAAC,yCAAyC,CAAC;qBACnD,OAAO,CAAC,gCAAgC,CAAC;qBACzC,MAAM,CAAC,cAAc,CAAC;qBACtB,QAAQ,EAAE,CAAA;gBACb,OAAO,aAAa,GAAG,QAAQ,CAAA;YACjC,CAAC,CAAC,CAAA;~~YAEJ~~,SAAS,GAAG,MAAM,WAAW,CAAC,~~SAAS~~,EAAE,CAAA;~~YAEzC~~,IAAI,CAAC,SAAS,EAAE;gBACd,IAAI,~~WAAW~~,GAAG,MAAM,~~EAAE;qBACvB~~,~~aAAa~~,~~CAAC~~,~~oBAAS,~~CAAC~~;qBACxB~~,~~kBAAkB~~,CAAC,~~IAAI~~,~~CAAC;qBACxB~~,~~MAAM~~,~~CAAC~~,~~OAAO,CAAC~~;~~qBACf~~,~~SAAS~~,CAAC,~~SAAS~~,~~CAAC;qBACpB~~,~~SAAS~~,CAAC,~~WAAW~~,CAAC~~;qBACtB~~,~~SAAS~~,CAAC,~~oBAAoB,~~CAAC~~;qBAC/B~~,KAAK,~~CACJ,+HAA+H~~,~~EAC/H;oBACE~~,~~SAAS~~,~~EAAE,~~MAAM,CAAC,EAAE~~;oBACpB~~,~~IAAI,~~EAAE,~~0BAAc~~,CAAC,~~OAAO;oBAC5B,OAAO,~~EAAE,~~4BAAgB,~~CAAC,~~SAAS~~;~~oBACnC~~,OAAO,~~EAAE,4BAAgB,~~CAAC,~~WAAW;iBACtC,CACF;qBACA,QAAQ,~~CAAC,~~EAAE,~~CAAC,~~EAAE;oBACb,MAAM,QAAQ,GAAG,EAAE;yBAChB,QAAQ,EAAE;yBACV,MAAM,~~CAAC,~~qBAAqB,CAAC~~;~~yBAC7B~~,~~IAAI,~~CAAC,~~2BAAc,EAAE,gBAAgB,~~CAAC~~;yBACtC~~,~~KAAK,CAAC,qDAAqD,CAAC~~;~~yBAC5D~~,~~QAAQ~~,~~CAAC~~,~~yCAAyC,~~CAAC~~;yBACnD~~,~~OAAO~~,~~CAAC~~,~~gCAAgC,~~CAAC;~~yBACzC~~,MAAM,~~CAAC~~,~~cAAc~~,CAAC~~;yBACtB~~,~~QAAQ~~,~~EAAE~~,CAAA;~~oBACb~~,~~OAAO,aAAa,GAAG,QAAQ,CAAA~~;~~gBACjC~~,~~CAAC,CAAC,CAAA;gBAEJ,~~SAAS,GAAG,MAAM,~~WAAW,CAAC,SAAS,~~EAAE~~,CAAA~~;~~gBAEzC~~,~~IAAI~~,CAAC,~~SAAS~~;~~oBAAE~~,~~MAAM~~,~~IAAI,KAAK,~~CAAC,~~6BAA6B~~,~~CAAC~~,~~CAAA;gBAC9D~~,~~MAAM~~,~~IAAA~~,~~uBAAa~~,~~EAAC~~,~~oBAAS~~,CAAC,CAAC,~~MAAM,~~CAAC,EAAE,EAAE,EAAE,SAAS,~~CAAC,KAAK,~~EAAE,~~EAAE~~,~~EAAE~~,~~QAAQ~~,EAAE,~~QAAQ,EAAE,~~CAAC,CAAA;~~aACvF~~;YAED,IAAI,SAAS,CAAC,~~SAAS~~,IAAI,4BAAgB,CAAC,WAAW;~~gBACrD~~,MAAM,IAAA,kCAAe,EAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,~~OAAO~~,CAAC,CAAA;~~YAE5D~~,MAAM,oBAAoB,GAAY,MAAM,EAAE,CAAC,aAAa,CAAC,sBAAO,CAAC,CAAC,OAAO,CAAC;gBAC5E,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,0BAA0B,EAAE;~~aACpD~~,CAAC,CAAA;YAEF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAA;YAC1D,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBAC/D,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,KAAK,MAAM,EAAE,CAAA;YAC7D,CAAC,CAAC,CAAA;YAEF,MAAM,WAAW,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,~~OAAO~~,CAAC,SAAS,CAAC,~~eAAe~~,CAAC,CAAA;~~YAEvG~~,OAAO,MAAM,IAAA,oCAAgB,EAAC,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,mBAAmB,EAAE,EAAE,CAAC,CAAA;SACjF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA","sourcesContent":["import { EntityManager, ~~getRepository~~ } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { ~~ReleaseGood~~, ~~OrderInventory~~ } from '@things-factory/sales-base'\nimport { Setting } from '@things-factory/setting-base'\nimport { Domain } from '@things-factory/shell'\n\nimport { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../constants'\nimport { Worksheet } from '../../../../entities'\nimport { pickingWorksheet } from '../picking-worksheet'\nimport { activatePicking } from './activate-picking'\n\nexport const fetchAndAssignPickingTaskResolver = {\n async fetchAndAssignPickingTask(_: any, {}, context: ~~any~~) {\n try {\n const { tx, domain, user }: ~~{ tx: EntityManager; domain: Domain; user: User }~~ = context.state\n const assignee: User = await tx.getRepository(User).findOne(user.id, { relations: ['domains'] })\n if ((assignee?.domains \|\| []).every((userDomain: Domain) => userDomain.id !== domain.id))\n throw new Error('Target user is not belong to current domain')\n\n if (!assignee) throw new Error('failed to find target user')\n\n let worksheet: ~~any~~\n let worksheetQb = await tx\n .getRepository(Worksheet)\n .createQueryBuilder('ws')\n .select('ws.id')\n .addSelect('ws.name')\n .addSelect('ws.status')\n .~~addSelect~~('ws.~~release_good_id~~')\n .where(\n '(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id =:assignee AND (ws.status = :status1 OR ws.status = :status2))',\n {\n domain_id: domain.id,\n type: WORKSHEET_TYPE.PICKING,\n assignee: assignee.id,\n status1: WORKSHEET_STATUS.EXECUTING,\n status2: WORKSHEET_STATUS.DEACTIVATED\n }\n )\n .andWhere(qb => {\n const subQuery = qb\n .subQuery()\n .select('COUNT() AS totalPS')\n .from(OrderInventory, 'OrderInventory')\n .where('OrderInventory.release_good_id = ws.release_good_id')\n .andWhere(`OrderInventory.status = 'PENDING_SPLIT'`)\n .groupBy('OrderInventory.release_good_id')\n .having('COUNT() > 0')\n .getQuery()\n return 'NOT EXISTS ' + subQuery\n })\n\n worksheet = await worksheetQb.~~getRawOne~~()\n\n if (!worksheet) {\n let ~~worksheetQb~~ = await tx\n .getRepository(Worksheet)\n ~~.createQueryBuilder~~(~~'ws'~~)\n ~~.select~~('ws.id~~')\n .addSelect('~~ws.name~~')\n~~ .~~addSelect('~~ws.~~status')~~\n .~~addSelect('~~ws.release_good_id')\n ~~.where(~~\n '(ws.domain_id = ~~:domain_id~~ AND ws.type = ~~:type~~ AND ws.assignee_id IS NULL AND (ws.status = ~~:status1~~ OR ws.status = ~~:status2))~~'~~,\n {\n domain_id: domain.id,\n type: WORKSHEET_TYPE.PICKING,\n status1: WORKSHEET_STATUS.EXECUTING,\n status2: WORKSHEET_STATUS.~~DEACTIVATED~~\n }\n~~ )~~\n .andWhere(qb~~ ~~=> {~~\n ~~const~~ ~~subQuery~~ ~~= qb\n .subQuery~~()\n ~~.select~~('COUNT() AS totalPS')\n ~~.from(OrderInventory,~~ ~~'OrderInventory')~~\n .~~where('OrderInventory.~~release_good_id = ws.release_good_id')\n .~~andWhere(`OrderInventory.~~status = 'PENDING_SPLIT'`)\n .~~groupBy('OrderInventory.~~release_good_id')\n ~~.having~~('COUNT() > 0')\n .~~getQuery()~~\n ~~return~~ ~~'NOT~~ ~~EXISTS~~ ' + ~~subQuery~~\n })\n\n ~~worksheet = await worksheetQb.getRawOne(~~)\n\n if (~~!worksheet~~) throw new Error('no suitable worksheet found')\n await getRepository(Worksheet).~~update~~({ id: ~~worksheet~~.~~ws_id~~ }, ~~{ assignee~~: ~~assignee~~ })\n }\n\n if (worksheet.~~ws_status~~ == WORKSHEET_STATUS.DEACTIVATED)\n await activatePicking(tx, domain, user, worksheet.~~ws_name~~)\n\n const locationSortingRules: Setting = await tx.getRepository(Setting).findOne({\n where: { domain, name: 'rule-for-picking-product' }\n })\n\n const sortingRule = JSON.parse(locationSortingRules.value)\n const locationSortingRule = Object.keys(sortingRule).map(field => {\n return { name: field, desc: sortingRule[field] === 'DESC' }\n })\n\n const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).~~findOne~~(worksheet.~~release_good_id~~)\n\n return await pickingWorksheet(domain, releaseGood.name, locationSortingRule, tx)\n } catch (error) {\n throw error\n }\n }\n}\n"]}
1	+ {"version":3,"file":"fetch-and-assign-picking-task.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.ts"],"names":[],"mappings":"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","sourcesContent":["import { EntityManager, getConnection } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { OrderInventory, ReleaseGood } from '@things-factory/sales-base'\nimport { Setting } from '@things-factory/setting-base'\nimport { Domain } from '@things-factory/shell'\n\nimport { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../constants'\nimport { Worksheet } from '../../../../entities'\nimport { pickingWorksheet } from '../picking-worksheet'\nimport { activatePicking } from './activate-picking'\n\nexport const fetchAndAssignPickingTaskResolver = {\n async fetchAndAssignPickingTask(_: any, {}, context: ResolverContext) {\n try {\n const { tx, domain, user } = context.state\n const assignee: User = await tx.getRepository(User).findOne({\n where: { id: user.id },\n relations: ['domains']\n })\n if ((assignee?.domains \|\| []).every((userDomain: Domain) => userDomain.id !== domain.id))\n throw new Error('Target user is not belong to current domain')\n\n if (!assignee) throw new Error('failed to find target user')\n\n let worksheet: Worksheet\n let worksheetQb = await tx\n .getRepository(Worksheet)\n .createQueryBuilder('ws')\n .select('ws.id')\n .addSelect('ws.name')\n .addSelect('ws.status')\n .innerJoinAndSelect('ws.releaseGood', 'rg')\n .where(\n '(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id =:assignee AND (ws.status = :status1 OR ws.status = :status2))',\n {\n domain_id: domain.id,\n type: WORKSHEET_TYPE.PICKING,\n assignee: assignee.id,\n status1: WORKSHEET_STATUS.EXECUTING,\n status2: WORKSHEET_STATUS.DEACTIVATED\n }\n )\n .andWhere(qb => {\n const subQuery = qb\n .subQuery()\n .select('COUNT() AS totalPS')\n .from(OrderInventory, 'OrderInventory')\n .where('OrderInventory.release_good_id = ws.release_good_id')\n .andWhere(`OrderInventory.status = 'PENDING_SPLIT'`)\n .groupBy('OrderInventory.release_good_id')\n .having('COUNT() > 0')\n .getQuery()\n return 'NOT EXISTS ' + subQuery\n })\n .orderBy('\"rg\".\"created_at\"', 'ASC')\n\n worksheet = await worksheetQb.getOne()\n\n if (!worksheet) {\n // update and return updated worksheet id\n let updatedWorksheets = await getConnection().transaction(async (tx2: EntityManager) => {\n let x = await tx2.getRepository(Worksheet).query(\n `\n UPDATE worksheets ws SET assignee_id = $2,\n updated_at = NOW(),\n updater_id = $2\n FROM (\n SELECT ws.id, ws.name, ws.status, ws.release_good_id FROM worksheets ws\n INNER JOIN release_goods rg ON rg.id = ws.release_good_id\n WHERE \n ws.domain_id = $1 AND \n ws.type = 'PICKING' AND \n ws.assignee_id IS NULL AND \n (ws.status = 'EXECUTING' OR ws.status = 'DEACTIVATED') AND\n NOT EXISTS (\n SELECT count(id) AS \"totalPS\"\n FROM order_inventories oi \n WHERE oi.release_good_id = ws.release_good_id AND\n oi.status = 'PENDING_SPLIT'\n GROUP BY oi.release_good_id \n HAVING count(id) > 0\n )\n ORDER BY rg.release_date, rg.created_at LIMIT 1\n ) src where src.id = ws.id\n RETURNING ws.id;\n `,\n [domain.id, assignee.id]\n )\n return x[0]\n })\n\n if (updatedWorksheets.length == 0) throw new Error('no suitable worksheet found')\n\n // relace worksheet with newly assigned worksheet\n worksheet = await tx\n .getRepository(Worksheet)\n .findOne({ where: { id: updatedWorksheets[0].id }, relations: ['releaseGood'] })\n }\n\n if (worksheet.status == WORKSHEET_STATUS.DEACTIVATED) await activatePicking(tx, domain, user, worksheet.name)\n\n const locationSortingRules: Setting = await tx.getRepository(Setting).findOne({\n where: { domain: { id: domain.id }, name: 'rule-for-picking-product' }\n })\n\n const sortingRule = JSON.parse(locationSortingRules.value)\n const locationSortingRule = Object.keys(sortingRule).map(field => {\n return { name: field, desc: sortingRule[field] === 'DESC' }\n })\n\n const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOneBy({\n id: worksheet.releaseGood.id\n })\n\n return await pickingWorksheet(domain, releaseGood.name, locationSortingRule, tx)\n } catch (error) {\n throw error\n }\n }\n}\n"]}

package/dist-server/graphql/resolvers/worksheet/picking/my-picking-assignment-status.js CHANGED Viewed

@@ -2,13 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.myPickingAssignmentStatusResolver = void 0;
 const typeorm_1 = require("typeorm");
+const shell_1 = require("@things-factory/shell");
 const constants_1 = require("../../../../constants");
 const entities_1 = require("../../../../entities");
 exports.myPickingAssignmentStatusResolver = {
     async myPickingAssignmentStatus(_parentObj, _params, context) {
         const { domain, user } = context.state;
-        const pickingWorksheets = await (0, typeorm_1.getRepository)(entities_1.Worksheet).find({
-            where: { domain, assignee: user, status: (0, typeorm_1.In)([constants_1.WORKSHEET_STATUS.DEACTIVATED, constants_1.WORKSHEET_STATUS.EXECUTING]) }
+        const pickingWorksheets = await (0, shell_1.getRepository)(entities_1.Worksheet).find({
+            where: {
+                domain: { id: domain.id },
+                assignee: { id: user.id },
+                status: (0, typeorm_1.In)([constants_1.WORKSHEET_STATUS.DEACTIVATED, constants_1.WORKSHEET_STATUS.EXECUTING])
+            }
         });
         return (pickingWorksheets || []).reduce((assignmentStatus, worksheet) => {
             if (worksheet.status === constants_1.WORKSHEET_STATUS.DEACTIVATED)

package/dist-server/graphql/resolvers/worksheet/picking/my-picking-assignment-status.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"my-picking-assignment-status.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/my-picking-assignment-status.ts"],"names":[],"mappings":";;;~~AAEA~~,~~qCAA2C~~;~~AAC3C~~,qDAAwD;AACxD,mDAAgD;AAInC,QAAA,iCAAiC,GAAG;IAC/C,KAAK,CAAC,yBAAyB,~~CAAC~~,UAAgB,~~EAAE~~,OAAa,~~EAAE~~,~~OAAY~~;~~QAC3E~~,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,~~GAAmC~~,OAAO,CAAC,KAAK,CAAA;~~QAEtE~~,MAAM,iBAAiB,GAAgB,MAAM,IAAA,~~uBAAa~~,EAAC,oBAAS,CAAC,CAAC,IAAI,CAAC;YACzE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAA,YAAE,EAAC,CAAC,4BAAgB,CAAC,WAAW,EAAE,4BAAgB,CAAC,SAAS,CAAC,CAAC~~,EAAE~~;~~SAC1G~~,CAAC,CAAA;QAEF,OAAO,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,MAAM,CACrC,CAAC,gBAAsC,EAAE,SAAoB,EAAE,EAAE;YAC/D,IAAI,SAAS,CAAC,MAAM,KAAK,4BAAgB,CAAC,WAAW;gBAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAC/F,IAAI,SAAS,CAAC,MAAM,KAAK,4BAAgB,CAAC,SAAS;gBAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAC7F,OAAO,gBAAgB,CAAA;QACzB,CAAC,EACD,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAC9C,CAAA;IACH,CAAC;CACF,CAAA","sourcesContent":["import { ~~User~~ } from '~~@things-factory/auth-base~~'\nimport { ~~Domain~~ } from '@things-factory/shell'\~~nimport { getRepository, In } from 'typeorm'~~\nimport { WORKSHEET_STATUS } from '../../../../constants'\nimport { Worksheet } from '../../../../entities'\n\ntype AssignmentStatusType = { userId: string; pending?: Worksheet[]; picking: Worksheet[] }\n\nexport const myPickingAssignmentStatusResolver = {\n async myPickingAssignmentStatus(_parentObj: void, _params: void, context: ~~any~~): Promise<AssignmentStatusType> {\n const { domain, user }: ~~{ domain: Domain; user: User }~~ = context.state\n\n const pickingWorksheets: Worksheet[] = await getRepository(Worksheet).find({\n where: { domain, assignee: user, status: In([WORKSHEET_STATUS.DEACTIVATED, WORKSHEET_STATUS.EXECUTING]) }\n })\n\n return (pickingWorksheets \|\| []).reduce(\n (assignmentStatus: AssignmentStatusType, worksheet: Worksheet) => {\n if (worksheet.status === WORKSHEET_STATUS.DEACTIVATED) assignmentStatus.pending.push(worksheet)\n if (worksheet.status === WORKSHEET_STATUS.EXECUTING) assignmentStatus.picking.push(worksheet)\n return assignmentStatus\n },\n { userId: user.id, pending: [], picking: [] }\n )\n }\n}\n"]}
1	+ {"version":3,"file":"my-picking-assignment-status.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/my-picking-assignment-status.ts"],"names":[],"mappings":";;;AAAA,qCAA4B;AAE5B,iDAAqD;AAErD,qDAAwD;AACxD,mDAAgD;AAInC,QAAA,iCAAiC,GAAG;IAC/C,KAAK,CAAC,yBAAyB,CAC7B,UAAgB,EAChB,OAAa,EACb,OAAwB;QAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEtC,MAAM,iBAAiB,GAAgB,MAAM,IAAA,qBAAa,EAAC,oBAAS,CAAC,CAAC,IAAI,CAAC;YACzE,KAAK,EAAE;gBACL,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE;gBACzB,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE;gBACzB,MAAM,EAAE,IAAA,YAAE,EAAC,CAAC,4BAAgB,CAAC,WAAW,EAAE,4BAAgB,CAAC,SAAS,CAAC,CAAC;aACvE;SACF,CAAC,CAAA;QAEF,OAAO,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,MAAM,CACrC,CAAC,gBAAsC,EAAE,SAAoB,EAAE,EAAE;YAC/D,IAAI,SAAS,CAAC,MAAM,KAAK,4BAAgB,CAAC,WAAW;gBAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAC/F,IAAI,SAAS,CAAC,MAAM,KAAK,4BAAgB,CAAC,SAAS;gBAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAC7F,OAAO,gBAAgB,CAAA;QACzB,CAAC,EACD,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAC9C,CAAA;IACH,CAAC;CACF,CAAA","sourcesContent":["import { In } from 'typeorm'\n\nimport { getRepository } from '@things-factory/shell'\n\nimport { WORKSHEET_STATUS } from '../../../../constants'\nimport { Worksheet } from '../../../../entities'\n\ntype AssignmentStatusType = { userId: string; pending?: Worksheet[]; picking: Worksheet[] }\n\nexport const myPickingAssignmentStatusResolver = {\n async myPickingAssignmentStatus(\n _parentObj: void,\n _params: void,\n context: ResolverContext\n ): Promise<AssignmentStatusType> {\n const { domain, user } = context.state\n\n const pickingWorksheets: Worksheet[] = await getRepository(Worksheet).find({\n where: {\n domain: { id: domain.id },\n assignee: { id: user.id },\n status: In([WORKSHEET_STATUS.DEACTIVATED, WORKSHEET_STATUS.EXECUTING])\n }\n })\n\n return (pickingWorksheets \|\| []).reduce(\n (assignmentStatus: AssignmentStatusType, worksheet: Worksheet) => {\n if (worksheet.status === WORKSHEET_STATUS.DEACTIVATED) assignmentStatus.pending.push(worksheet)\n if (worksheet.status === WORKSHEET_STATUS.EXECUTING) assignmentStatus.picking.push(worksheet)\n return assignmentStatus\n },\n { userId: user.id, pending: [], picking: [] }\n )\n }\n}\n"]}

package/dist-server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.js CHANGED Viewed

@@ -1,34 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pickingAssignmentStatusByUsersResolver = void 0;
-const auth_base_1 = require("@things-factory/auth-base");
 const typeorm_1 = require("typeorm");
+const auth_base_1 = require("@things-factory/auth-base");
+const shell_1 = require("@things-factory/shell");
 const constants_1 = require("../../../../constants");
 const entities_1 = require("../../../../entities");
 exports.pickingAssignmentStatusByUsersResolver = {
     async pickingAssignmentStatusByUsers(_, params, context) {
         const { domain } = context.state;
-        const nameFilter = params.filters.find(p => { return p.name == "name"; });
-        const emailFilter = params.filters.find(p => { return p.name == "email"; });
-        const roleFilter = params.filters.find(p => { return p.name == 'roles'; });
-        const pendingSorter = params.sortings.find(p => { return p.name == 'pending'; });
-        const pickingSorter = params.sortings.find(p => { return p.name == 'picking'; });
-        const getUserInfoQb = await (0, typeorm_1.getRepository)(auth_base_1.User).createQueryBuilder('u');
+        const nameFilter = params.filters.find(p => {
+            return p.name == 'name';
+        });
+        const emailFilter = params.filters.find(p => {
+            return p.name == 'email';
+        });
+        const roleFilter = params.filters.find(p => {
+            return p.name == 'roles';
+        });
+        const pendingSorter = params.sortings.find(p => {
+            return p.name == 'pending';
+        });
+        const pickingSorter = params.sortings.find(p => {
+            return p.name == 'picking';
+        });
+        const getUserInfoQb = await (0, shell_1.getRepository)(auth_base_1.User).createQueryBuilder('u');
         getUserInfoQb.select('u.id');
         getUserInfoQb.addSelect('u.name');
         getUserInfoQb.addSelect('u.email');
         getUserInfoQb.addSelect("string_agg(r.name,', ') as roles");
         getUserInfoQb.innerJoin('u.roles', 'r');
         getUserInfoQb.where('r.domain_id = :domainId', { domainId: domain.id });
-        roleFilter ? getUserInfoQb.andWhere('r.name ilike :userRole', { userRole: `%${roleFilter.value}%` }) : "";
-        nameFilter ? getUserInfoQb.andWhere('u.name ilike :userName', { userName: `%${nameFilter.value}%` }) : "";
-        emailFilter ? getUserInfoQb.andWhere('u.email ilike :userEmail', { userEmail: `%${emailFilter.value}%` }) : "";
+        roleFilter ? getUserInfoQb.andWhere('r.name ilike :userRole', { userRole: `%${roleFilter.value}%` }) : '';
+        nameFilter ? getUserInfoQb.andWhere('u.name ilike :userName', { userName: `%${nameFilter.value}%` }) : '';
+        emailFilter ? getUserInfoQb.andWhere('u.email ilike :userEmail', { userEmail: `%${emailFilter.value}%` }) : '';
         getUserInfoQb.andWhere('r.name not ilike :userR', { userR: `%CLIENT%` });
-        getUserInfoQb.andWhere('u.user_type = :userType', { userType: "user" });
+        getUserInfoQb.andWhere('u.user_type = :userType', { userType: 'user' });
         getUserInfoQb.groupBy('u.id');
         getUserInfoQb.addGroupBy('u.name');
         getUserInfoQb.addGroupBy('u.email');
-        const getAssignedWSQb = await (0, typeorm_1.getRepository)(entities_1.Worksheet).createQueryBuilder('ws');
+        const getAssignedWSQb = await (0, shell_1.getRepository)(entities_1.Worksheet).createQueryBuilder('ws');
         getAssignedWSQb.select('ws.assignee_id');
         getAssignedWSQb.addSelect('u.name');
         getAssignedWSQb.addSelect("sum(case when ws.status='EXECUTING' then 1 else 0 end) as picking");
@@ -36,7 +47,9 @@ exports.pickingAssignmentStatusByUsersResolver = {
         getAssignedWSQb.innerJoin('ws.assignee', 'u');
         getAssignedWSQb.where('ws.domain_id = :id', { id: domain.id });
         getAssignedWSQb.andWhere('ws.type IN (:...type)', { type: [constants_1.WORKSHEET_TYPE.PICKING, constants_1.WORKSHEET_TYPE.BATCH_PICKING] });
-        getAssignedWSQb.andWhere('ws.status IN (:...status)', { status: [constants_1.WORKSHEET_STATUS.DEACTIVATED, constants_1.WORKSHEET_STATUS.EXECUTING] });
+        getAssignedWSQb.andWhere('ws.status IN (:...status)', {
+            status: [constants_1.WORKSHEET_STATUS.DEACTIVATED, constants_1.WORKSHEET_STATUS.EXECUTING]
+        });
         getAssignedWSQb.groupBy('ws.assignee_id');
         getAssignedWSQb.addGroupBy('u.name');
         (pendingSorter === null || pendingSorter === void 0 ? void 0 : pendingSorter.desc) ? getAssignedWSQb.orderBy('pending', 'DESC') : '';
@@ -50,12 +63,16 @@ exports.pickingAssignmentStatusByUsersResolver = {
         combineQb.select('u.*');
         combineQb.addSelect('coalesce(ws.picking, 0) as picking');
         combineQb.addSelect('coalesce(ws.pending, 0) as pending');
-        combineQb.from("(" + getUserInfoQb.getQuery() + ")", "u");
-        combineQb.leftJoin("(" + getAssignedWSQb.getQuery() + ")", "ws", ' ws.assignee_id = u.u_id');
+        combineQb.from('(' + getUserInfoQb.getQuery() + ')', 'u');
+        combineQb.leftJoin('(' + getAssignedWSQb.getQuery() + ')', 'ws', ' ws.assignee_id = u.u_id');
         combineQb.setParameters(combineParams);
         const combineInfo = await combineQb.getRawMany();
         return combineInfo.map(itm => {
-            return { user: { id: itm.u_id, email: itm.u_email, name: itm.u_name, description: itm.roles }, pending: itm.pending, picking: itm.picking };
+            return {
+                user: { id: itm.u_id, email: itm.u_email, name: itm.u_name, description: itm.roles },
+                pending: itm.pending,
+                picking: itm.picking
+            };
         });
     }
 };

package/dist-server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"picking-assignment-status-by-user.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.ts"],"names":[],"mappings":";;;AAAA,~~yDAAsE~~;~~AAEtE~~,~~qCAAkH~~;~~AAClH~~,qDAAwE;AACxE,mDAAgD;AAInC,QAAA,sCAAsC,GAAG;IACpD,KAAK,CAAC,8BAA8B,CAClC,CAAO,EACP,MAAiB,EACjB,OAAY;~~QAGZ~~,MAAM,EAAE,MAAM,EAAE,~~GAAuB~~,OAAO,CAAC,KAAK,CAAA;~~QAEpD~~,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,~~CAAA~~,EAAE,~~GAAC,~~OAAO,CAAC,CAAC,IAAI,IAAI,MAAM,CAAA,~~CAAA,~~CAAC,CAAC,~~CAAC~~;~~QACrE~~,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,~~CAAA~~,EAAE,~~GAAC,~~OAAO,CAAC,CAAC,IAAI,IAAI,OAAO,CAAA,~~CAAA,~~CAAC,CAAC,~~CAAC~~;~~QACvE~~,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,~~CAAA~~,EAAE,~~GAAC,~~OAAO,CAAC,CAAC,IAAI,IAAI,OAAO,CAAA,~~CAAA,~~CAAC,CAAC,~~CAAC~~;~~QAEtE~~,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,~~CAAA~~,EAAE,~~GAAC,~~OAAO,CAAC,CAAC,IAAI,IAAI,SAAS,CAAA,~~CAAA,~~CAAC,CAAC,~~CAAC~~;~~QAC5E~~,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,~~CAAA~~,EAAE,~~GAAC,~~OAAO,CAAC,CAAC,IAAI,IAAI,SAAS,CAAA,~~CAAA,~~CAAC,CAAC,~~CAAC~~;~~QAI5E~~,MAAM,aAAa,~~GAA4B~~,MAAM,IAAA,~~uBAAa~~,EAAC,gBAAI,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAA;~~QAEhG~~,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC5B,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QACjC,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;QAClC,aAAa,CAAC,SAAS,CAAC,kCAAkC,CAAC,CAAA;QAC3D,aAAa,CAAC,SAAS,CAAC,SAAS,~~EAAC~~,GAAG,CAAC,CAAA;~~QACtC~~,aAAa,CAAC,KAAK,CAAC,yBAAyB,~~EAAC~~,~~EAAC~~,QAAQ,~~EAAC~~,MAAM,CAAC,EAAE,~~EAAC~~,CAAC,CAAA;~~QACnE~~,UAAU,~~CAAA~~,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,IAAI,UAAU,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,~~CAAA~~,EAAE,CAAA;~~QACvG~~,UAAU,~~CAAA~~,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,IAAI,UAAU,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,~~CAAA~~,EAAE,CAAA;~~QACvG~~,WAAW,~~CAAA~~,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,0BAA0B,EAAE,EAAE,SAAS,EAAE,IAAI,WAAW,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,~~CAAA~~,EAAE,CAAA;~~QAC5G~~,aAAa,CAAC,QAAQ,CAAC,yBAAyB,~~EAAC~~,~~EAAC~~,KAAK,~~EAAC~~,UAAU,~~EAAC~~,CAAC,CAAA;~~QACpE~~,aAAa,CAAC,QAAQ,CAAC,yBAAyB,~~EAAC~~,~~EAAC~~,QAAQ,~~EAAC~~,MAAM,~~EAAC~~,CAAC,CAAA;~~QACnE~~,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAC7B,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;QAClC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;QAEnC,MAAM,eAAe,GAAG,MAAM,IAAA,~~uBAAa~~,EAAC,oBAAS,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;QAE/E,eAAe,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QACxC,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QACnC,eAAe,CAAC,SAAS,CAAC,mEAAmE,CAAC,CAAA;QAC9F,eAAe,CAAC,SAAS,CAAC,qEAAqE,CAAC,CAAA;QAChG,eAAe,CAAC,SAAS,CAAC,aAAa,~~EAAC~~,GAAG,CAAC,CAAA;~~QAC5C~~,eAAe,CAAC,KAAK,CAAC,oBAAoB,~~EAAC~~,~~EAAC~~,EAAE,~~EAAC~~,MAAM,CAAC,EAAE,~~EAAC~~,CAAC,CAAA;~~QAC1D~~,eAAe,CAAC,QAAQ,CAAC,uBAAuB,EAAE,~~EAAC~~,IAAI,EAAE,CAAC,0BAAc,CAAC,OAAO,EAAE,0BAAc,CAAC,aAAa,CAAC,~~EAAC~~,CAAC,CAAA;~~QACjH~~,eAAe,CAAC,QAAQ,CAAC,2BAA2B,EAAE,~~EAAC,~~MAAM,EAAE,CAAC,4BAAgB,CAAC,WAAW,EAAE,4BAAgB,CAAC,SAAS,CAAC,~~EAAC,~~CAAC,CAAA;~~QAC3H~~,eAAe,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA;QACzC,eAAe,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;QACpC,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,EAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,~~EAAC~~,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;~~QACpE~~,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,EAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,~~EAAC~~,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;~~QACpE~~,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,~~CAAA~~,eAAe,CAAC,OAAO,CAAC,SAAS,~~EAAC~~,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;~~QACtG~~,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,~~EAAC~~,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;~~QAGvG~~,MAAM,UAAU,~~GAAE~~,aAAa,CAAC,aAAa,EAAE,CAAA;~~QAC/C~~,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,EAAE,CAAA;QAElD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;QAE3D,MAAM,SAAS,GAAG,IAAA,oBAAU,GAAE,CAAC,kBAAkB,EAAE,CAAA;QAEnD,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACvB,SAAS,CAAC,SAAS,CAAC,oCAAoC,CAAC,CAAA;QACzD,SAAS,CAAC,SAAS,CAAC,oCAAoC,CAAC,CAAA;QACzD,SAAS,CAAC,IAAI,CAAC,GAAG,GAAG,aAAa,CAAC,QAAQ,EAAE,GAAG,GAAG,~~EAAC~~,GAAG,CAAC,CAAA;~~QACxD~~,SAAS,CAAC,QAAQ,CAAC,GAAG,GAAG,eAAe,CAAC,QAAQ,EAAE,GAAG,GAAG,~~EAAC~~,IAAI,~~EAAC~~,0BAA0B,CAAC,CAAA;~~QAC1F~~,SAAS,CAAC,aAAa,CAAC,aAAa,CAAC,CAAA;QAEtC,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,UAAU,EAAE,CAAA;QAEhD,OAAO,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC3B,OAAO,~~EAAE,~~IAAI,EAAE,EAAE,EAAE,~~EAAC~~,GAAG,CAAC,IAAI,~~EAAC~~,KAAK,~~EAAC~~,GAAG,CAAC,OAAO,~~EAAC~~,IAAI,~~EAAC~~,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,KAAK,EAAE,~~EAAC,~~OAAO,~~EAAC~~,GAAG,CAAC,OAAO,~~EAAC,~~OAAO,~~EAAC~~,GAAG,CAAC,OAAO,~~EAAE,~~CAAA;~~QACpI~~,CAAC,CAAC,CAAA;IACJ,CAAC;CACF,CAAA","sourcesContent":["import { ~~getDomainUsers~~, ~~User,~~ ~~Role~~ } from '~~@things-factory/auth-base~~'\nimport { ~~Domain,~~ ~~ListParam, buildQuery, Sorting~~} from '@things-factory/~~shell~~'\nimport { ~~FindManyOptions,~~ getRepository, ~~ILike,~~ ~~In, EntityManager, getManager, SelectQueryBuilder~~ } from '~~typeorm~~'\nimport { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../constants'\nimport { Worksheet } from '../../../../entities'\n\ntype AssignmentStatusByUserType = { user: User; pending?: String; picking?: String }\n\nexport const pickingAssignmentStatusByUsersResolver = {\n async pickingAssignmentStatusByUsers(\n _: void,\n params: ListParam,\n context: any\n ): Promise<AssignmentStatusByUserType[]> {\n \n const { domain }: ~~{ domain: Domain }~~ = context.state\n\n const nameFilter = params.filters.find(p=>{return p.name == \"name\"});\n const emailFilter = params.filters.find(p=>{return p.name == \"email\"});\n const roleFilter = params.filters.find(p=>{return p.name == 'roles'});\n\n const pendingSorter = params.sortings.find(p=>{return p.name == 'pending'});\n const pickingSorter = params.sortings.find(p=>{return p.name == 'picking'})~~;\n~~\n\n\n const getUserInfoQb:SelectQueryBuilder<User> = await getRepository(User).createQueryBuilder('u')\n\n getUserInfoQb.select('u.id')\n getUserInfoQb.addSelect('u.name')\n getUserInfoQb.addSelect('u.email')\n getUserInfoQb.addSelect(\"string_agg(r.name,', ') as roles\")\n getUserInfoQb.innerJoin('u.roles','r')\n getUserInfoQb.where('r.domain_id = :domainId',{domainId:domain.id})\n roleFilter? getUserInfoQb.andWhere('r.name ilike :userRole', { userRole: `%${roleFilter.value}%` }) ~~:\"~~\"\n nameFilter? getUserInfoQb.andWhere('u.name ilike :userName', { userName: `%${nameFilter.value}%` }) ~~:\"~~\"\n emailFilter? getUserInfoQb.andWhere('u.email ilike :userEmail', { userEmail: `%${emailFilter.value}%` }) ~~:\"~~\"\n getUserInfoQb.andWhere('r.name not ilike :userR',{userR~~:`%~~CLIENT%`})\n getUserInfoQb.andWhere('u.user_type = :userType',{userType~~:\"~~user\"})\n getUserInfoQb.groupBy('u.id')\n getUserInfoQb.addGroupBy('u.name')\n getUserInfoQb.addGroupBy('u.email')\n\n const getAssignedWSQb = await getRepository(Worksheet).createQueryBuilder('ws')\n\n getAssignedWSQb.select('ws.assignee_id')\n getAssignedWSQb.addSelect('u.name')\n getAssignedWSQb.addSelect(\"sum(case when ws.status='EXECUTING' then 1 else 0 end) as picking\")\n getAssignedWSQb.addSelect(\"sum(case when ws.status='DEACTIVATED' then 1 else 0 end) as pending\")\n getAssignedWSQb.innerJoin('ws.assignee','u')\n getAssignedWSQb.where('ws.domain_id = :id',{id:domain.id})\n getAssignedWSQb.andWhere('ws.type IN (:...type)', {type: [WORKSHEET_TYPE.PICKING, WORKSHEET_TYPE.BATCH_PICKING]})\n getAssignedWSQb.andWhere('ws.status IN (:...status)', {status: [WORKSHEET_STATUS.DEACTIVATED, WORKSHEET_STATUS.EXECUTING]})\n getAssignedWSQb.groupBy('ws.assignee_id')\n getAssignedWSQb.addGroupBy('u.name')\n pendingSorter?.desc ? getAssignedWSQb.orderBy('pending','DESC') : ''\n pickingSorter?.desc ? getAssignedWSQb.orderBy('picking','DESC') : ''\n pickingSorter && Object.keys(pickingSorter).length == 1 ?getAssignedWSQb.orderBy('picking','ASC') : ''\n pendingSorter && Object.keys(pendingSorter).length == 1 ? getAssignedWSQb.orderBy('pending','ASC') : ''\n\n\n const parameter1= getUserInfoQb.getParameters()\n const parameter2 = getAssignedWSQb.getParameters()\n\n const combineParams = Object.assign(parameter1, parameter2)\n \n const combineQb = getManager().createQueryBuilder()\n\n combineQb.select('u.*')\n combineQb.addSelect('coalesce(ws.picking, 0) as picking')\n combineQb.addSelect('coalesce(ws.pending, 0) as pending')\n combineQb.from(\"(\" + getUserInfoQb.getQuery() + \")~~\",\"~~u\")\n combineQb.leftJoin(\"(\" + getAssignedWSQb.getQuery() + \")~~\",\"~~ws\",' ws.assignee_id = u.u_id')\n combineQb.setParameters(combineParams)\n \n const combineInfo = await combineQb.getRawMany()\n\n return combineInfo.map(itm => {\n return { user: { id:itm.u_id,email:itm.u_email,name:itm.u_name, description: itm.roles },pending:itm.pending,picking:itm.picking }\n })\n }\n}\n"]}
1	+ {"version":3,"file":"picking-assignment-status-by-user.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.ts"],"names":[],"mappings":"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","sourcesContent":["import { getManager, SelectQueryBuilder } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { getRepository, ListParam } from '@things-factory/shell'\n\nimport { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../constants'\nimport { Worksheet } from '../../../../entities'\n\ntype AssignmentStatusByUserType = { user: User; pending?: String; picking?: String }\n\nexport const pickingAssignmentStatusByUsersResolver = {\n async pickingAssignmentStatusByUsers(\n _: void,\n params: ListParam,\n context: any\n ): Promise<AssignmentStatusByUserType[]> {\n const { domain } = context.state\n\n const nameFilter = params.filters.find(p => {\n return p.name == 'name'\n })\n const emailFilter = params.filters.find(p => {\n return p.name == 'email'\n })\n const roleFilter = params.filters.find(p => {\n return p.name == 'roles'\n })\n\n const pendingSorter = params.sortings.find(p => {\n return p.name == 'pending'\n })\n const pickingSorter = params.sortings.find(p => {\n return p.name == 'picking'\n })\n\n const getUserInfoQb: SelectQueryBuilder<User> = await getRepository(User).createQueryBuilder('u')\n\n getUserInfoQb.select('u.id')\n getUserInfoQb.addSelect('u.name')\n getUserInfoQb.addSelect('u.email')\n getUserInfoQb.addSelect(\"string_agg(r.name,', ') as roles\")\n getUserInfoQb.innerJoin('u.roles', 'r')\n getUserInfoQb.where('r.domain_id = :domainId', { domainId: domain.id })\n roleFilter ? getUserInfoQb.andWhere('r.name ilike :userRole', { userRole: `%${roleFilter.value}%` }) : ''\n nameFilter ? getUserInfoQb.andWhere('u.name ilike :userName', { userName: `%${nameFilter.value}%` }) : ''\n emailFilter ? getUserInfoQb.andWhere('u.email ilike :userEmail', { userEmail: `%${emailFilter.value}%` }) : ''\n getUserInfoQb.andWhere('r.name not ilike :userR', { userR: `%CLIENT%` })\n getUserInfoQb.andWhere('u.user_type = :userType', { userType: 'user' })\n getUserInfoQb.groupBy('u.id')\n getUserInfoQb.addGroupBy('u.name')\n getUserInfoQb.addGroupBy('u.email')\n\n const getAssignedWSQb = await getRepository(Worksheet).createQueryBuilder('ws')\n\n getAssignedWSQb.select('ws.assignee_id')\n getAssignedWSQb.addSelect('u.name')\n getAssignedWSQb.addSelect(\"sum(case when ws.status='EXECUTING' then 1 else 0 end) as picking\")\n getAssignedWSQb.addSelect(\"sum(case when ws.status='DEACTIVATED' then 1 else 0 end) as pending\")\n getAssignedWSQb.innerJoin('ws.assignee', 'u')\n getAssignedWSQb.where('ws.domain_id = :id', { id: domain.id })\n getAssignedWSQb.andWhere('ws.type IN (:...type)', { type: [WORKSHEET_TYPE.PICKING, WORKSHEET_TYPE.BATCH_PICKING] })\n getAssignedWSQb.andWhere('ws.status IN (:...status)', {\n status: [WORKSHEET_STATUS.DEACTIVATED, WORKSHEET_STATUS.EXECUTING]\n })\n getAssignedWSQb.groupBy('ws.assignee_id')\n getAssignedWSQb.addGroupBy('u.name')\n pendingSorter?.desc ? getAssignedWSQb.orderBy('pending', 'DESC') : ''\n pickingSorter?.desc ? getAssignedWSQb.orderBy('picking', 'DESC') : ''\n pickingSorter && Object.keys(pickingSorter).length == 1 ? getAssignedWSQb.orderBy('picking', 'ASC') : ''\n pendingSorter && Object.keys(pendingSorter).length == 1 ? getAssignedWSQb.orderBy('pending', 'ASC') : ''\n\n const parameter1 = getUserInfoQb.getParameters()\n const parameter2 = getAssignedWSQb.getParameters()\n\n const combineParams = Object.assign(parameter1, parameter2)\n\n const combineQb = getManager().createQueryBuilder()\n\n combineQb.select('u.*')\n combineQb.addSelect('coalesce(ws.picking, 0) as picking')\n combineQb.addSelect('coalesce(ws.pending, 0) as pending')\n combineQb.from('(' + getUserInfoQb.getQuery() + ')', 'u')\n combineQb.leftJoin('(' + getAssignedWSQb.getQuery() + ')', 'ws', ' ws.assignee_id = u.u_id')\n combineQb.setParameters(combineParams)\n\n const combineInfo = await combineQb.getRawMany()\n\n return combineInfo.map(itm => {\n return {\n user: { id: itm.u_id, email: itm.u_email, name: itm.u_name, description: itm.roles },\n pending: itm.pending,\n picking: itm.picking\n } as any\n })\n }\n}\n"]}

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

	@@ -1 +1 @@
1	- {"version":3,"file":"picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/picking.ts"],"names":[],"mappings":";;;~~AAGA~~,yDAAoE;AAEvD,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CACX,CAAM,EACN,EAAE,mBAAmB,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,EAC7G,OAAY;QAEZ,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,~~GAAsD~~,OAAO,CAAC,KAAK,CAAA;~~QAC7F~~,MAAM,OAAO,CACX,EAAE,EACF,MAAM,EACN,IAAI,EACJ,mBAAmB,EACnB,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,WAAW,EACX,YAAY,EACZ,MAAM,CACP,CAAA;IACH,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAC3B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,aAAqB,EACrB,QAAgB,EAChB,YAAoB,EACpB,UAAkB,EAClB,WAAoB,EACpB,YAAqB,EACrB,MAAe;IAEf,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,OAAO,CAC/B,mBAAmB,EACnB,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,WAAW,EACX,YAAY,EACZ,MAAM,CACP,CAAA;AACH,CAAC;AAxBD,0BAwBC","sourcesContent":["import { ~~User~~ } from '~~@things-factory/auth-base~~'\nimport { ~~Domain~~ } from '@things-factory/~~shell~~'\nimport { ~~EntityManager~~ } from '~~typeorm~~'\nimport { PickingWorksheetController } from '../../../../controllers'\n\nexport const pickingResolver = {\n async picking(\n _: any,\n { worksheetDetailName, worksheetType, palletId, locationName, releaseQty, binLocation, serialNumber, toteNo },\n context: any\n ) {\n const { tx, domain, user }: ~~{ tx: EntityManager; domain: Domain; user: User }~~ = context.state\n await picking(\n tx,\n domain,\n user,\n worksheetDetailName,\n worksheetType,\n palletId,\n locationName,\n releaseQty,\n binLocation,\n serialNumber,\n toteNo\n )\n }\n}\n\nexport async function picking(\n tx: EntityManager,\n domain: Domain,\n user: User,\n worksheetDetailName: string,\n worksheetType: string,\n palletId: string,\n locationName: string,\n releaseQty: number,\n binLocation?: string,\n serialNumber?: string,\n toteNo?: string\n) {\n const worksheetController: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)\n await worksheetController.picking(\n worksheetDetailName,\n worksheetType,\n palletId,\n locationName,\n releaseQty,\n binLocation,\n serialNumber,\n toteNo\n )\n}\n"]}
1	+ {"version":3,"file":"picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/picking.ts"],"names":[],"mappings":";;;AAKA,yDAAoE;AAEvD,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CACX,CAAM,EACN,EAAE,mBAAmB,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,EAC7G,OAAY;QAEZ,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAC1C,MAAM,OAAO,CACX,EAAE,EACF,MAAM,EACN,IAAI,EACJ,mBAAmB,EACnB,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,WAAW,EACX,YAAY,EACZ,MAAM,CACP,CAAA;IACH,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAC3B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,aAAqB,EACrB,QAAgB,EAChB,YAAoB,EACpB,UAAkB,EAClB,WAAoB,EACpB,YAAqB,EACrB,MAAe;IAEf,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,OAAO,CAC/B,mBAAmB,EACnB,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,WAAW,EACX,YAAY,EACZ,MAAM,CACP,CAAA;AACH,CAAC;AAxBD,0BAwBC","sourcesContent":["import { EntityManager } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { Domain } from '@things-factory/shell'\n\nimport { PickingWorksheetController } from '../../../../controllers'\n\nexport const pickingResolver = {\n async picking(\n _: any,\n { worksheetDetailName, worksheetType, palletId, locationName, releaseQty, binLocation, serialNumber, toteNo },\n context: any\n ) {\n const { tx, domain, user } = context.state\n await picking(\n tx,\n domain,\n user,\n worksheetDetailName,\n worksheetType,\n palletId,\n locationName,\n releaseQty,\n binLocation,\n serialNumber,\n toteNo\n )\n }\n}\n\nexport async function picking(\n tx: EntityManager,\n domain: Domain,\n user: User,\n worksheetDetailName: string,\n worksheetType: string,\n palletId: string,\n locationName: string,\n releaseQty: number,\n binLocation?: string,\n serialNumber?: string,\n toteNo?: string\n) {\n const worksheetController: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)\n await worksheetController.picking(\n worksheetDetailName,\n worksheetType,\n palletId,\n locationName,\n releaseQty,\n binLocation,\n serialNumber,\n toteNo\n )\n}\n"]}