@things-factory/sales-base 4.0.0-alpha.8 → 4.0.0-beta.2

package/dist-server/graphql/resolvers/arrival-notice/add-edit-arrival-notice-products.js

@@ -26,7 +26,7 @@ exports.addEditArrivalNoticeProductsResolver = {
         if ((existingOrderProducts === null || existingOrderProducts === void 0 ? void 0 : existingOrderProducts.length) > 0)
             await editArrivalNoticeProducts(existingOrderProducts, user, tx);
         // notification logics
-        const users = await biz_base_1.getDomainUsers(arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.bizplace, tx);
+        const users = await (0, biz_base_1.getDomainUsers)(arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.bizplace, tx);
         debug('users', users);
         if (users === null || users === void 0 ? void 0 : users.length) {
             const receivers = users.map(user => user.id);
@@ -36,7 +36,7 @@ exports.addEditArrivalNoticeProductsResolver = {
                 url: context.header.referer,
                 data: { url: context.header.referer }
             };
-            await notification_1.sendNotification({
+            await (0, notification_1.sendNotification)({
                 receivers,
                 message: Object.assign({}, msg)
             });
@@ -45,8 +45,8 @@ exports.addEditArrivalNoticeProductsResolver = {
 };
 async function addArrivalNoticeProducts(domain, arrivalNotice, newOrderProducts, user, tx) {
     var _a;
-    const productRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(product_base_1.Product)) || typeorm_1.getRepository(product_base_1.Product);
-    const orderProductRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.OrderProduct)) || typeorm_1.getRepository(entities_1.OrderProduct);
+    const productRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(product_base_1.Product)) || (0, typeorm_1.getRepository)(product_base_1.Product);
+    const orderProductRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.OrderProduct)) || (0, typeorm_1.getRepository)(entities_1.OrderProduct);
     if (!(arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.bizplace) || !((_a = arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.orderProducts) === null || _a === void 0 ? void 0 : _a.length)) {
         arrivalNotice = await tx.getRepository(entities_1.ArrivalNotice).findOne({
             where: { domain, name: arrivalNotice.name },
@@ -61,7 +61,7 @@ async function addArrivalNoticeProducts(domain, arrivalNotice, newOrderProducts,
 }
 exports.addArrivalNoticeProducts = addArrivalNoticeProducts;
 async function editArrivalNoticeProducts(existingOrderProducts, user, tx) {
-    const orderProductRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.OrderProduct)) || typeorm_1.getRepository(entities_1.OrderProduct);
+    const orderProductRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.OrderProduct)) || (0, typeorm_1.getRepository)(entities_1.OrderProduct);
     const updatedOrderProducts = await Promise.all(existingOrderProducts.map(async (op) => {
         return Object.assign(Object.assign({}, op), { status: constants_1.ORDER_PRODUCT_STATUS.EDITED, updater: user });
     }));

package/dist-server/graphql/resolvers/arrival-notice/add-edit-arrival-notice-products.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-edit-arrival-notice-products.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/add-edit-arrival-notice-products.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-edit-arrival-notice-products.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/add-edit-arrival-notice-products.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/arrival-notice/arrival-notice-requests.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.arrivalNoticeRequestsResolver = void 0;
+const typeorm_1 = require("typeorm");
 const biz_base_1 = require("@things-factory/biz-base");
 const shell_1 = require("@things-factory/shell");
-const typeorm_1 = require("typeorm");
 const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
 exports.arrivalNoticeRequestsResolver = {
@@ -24,27 +24,50 @@ exports.arrivalNoticeRequestsResolver = {
                 params.filters.push({
                     name: 'bizplaceId',
                     operator: 'in',
-                    value: await biz_base_1.getPermittedBizplaceIds(domain, user),
+                    value: await (0, biz_base_1.getPermittedBizplaceIds)(domain, user),
                     relation: false
                 });
             }
-            const qb = typeorm_1.getRepository(entities_1.ArrivalNotice).createQueryBuilder('an');
-            shell_1.buildQuery(qb, params, context);
-            qb.addSelect(subQuery => {
-                return subQuery
-                    .select('COALESCE("ccd".rank, 99999)', 'rank')
-                    .from('common_code_details', 'ccd')
-                    .innerJoin('ccd.commonCode', 'cc')
-                    .where('"ccd"."name" = "an"."status"')
-                    .andWhere('"ccd"."domain_id" = "an"."domain_id"')
-                    .andWhere('"cc"."name" = \'ORDER_STATUS\'');
-            }, 'rank');
+            const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
+            if (fromDateParamIdx >= 0) {
+                let fromDateVal = new Date(params.filters[fromDateParamIdx].value);
+                params.filters.splice(fromDateParamIdx, 1);
+                params.filters.push({
+                    name: 'createdAt',
+                    operator: 'gte',
+                    value: fromDateVal.toISOString(),
+                    relation: false
+                });
+            }
+            const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate');
+            if (toDateParamIdx >= 0) {
+                let toDateVal = new Date(params.filters[toDateParamIdx].value);
+                params.filters.splice(toDateParamIdx, 1);
+                params.filters.push({
+                    name: 'createdAt',
+                    operator: 'lt',
+                    value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+                    relation: false
+                });
+            }
+            const qb = (0, typeorm_1.getRepository)(entities_1.ArrivalNotice).createQueryBuilder('an');
+            (0, shell_1.buildQuery)(qb, params, context);
+            qb.addSelect('COALESCE("cc".rank, 9999)', 'rank');
             qb.leftJoinAndSelect('an.domain', 'domain');
             qb.leftJoinAndSelect('an.bizplace', 'bizplace');
-            qb.leftJoinAndSelect('an.releaseGood', 'rg');
+            qb.leftJoinAndSelect('an.releaseGood', 'ro');
             qb.leftJoinAndSelect('an.creator', 'creator');
             qb.leftJoinAndSelect('an.updater', 'updater');
-            qb.leftJoinAndSelect('an.acceptedBy', 'acceptedBy');
+            qb.leftJoinAndSelect('an.acceptedBy', 'accepter');
+            qb.leftJoin(subQuery => {
+                return subQuery
+                    .select(`ccd.rank`, 'rank')
+                    .addSelect(`ccd.name`, 'status')
+                    .from(`common_code_details`, 'ccd')
+                    .innerJoin(`ccd.commonCode`, 'cc')
+                    .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+                    .andWhere(`cc.name = 'ORDER_STATUS'`);
+            }, 'cc', 'cc.status = an.status');
             const arrChildSortData = ['bizplace'];
             const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'an.' + sort.name]: sort.desc
                     ? 'DESC'

package/dist-server/graphql/resolvers/arrival-notice/arrival-notice-requests.js.map

@@ -1 +1 @@
-{"version":3,"file":"arrival-notice-requests.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notice-requests.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"arrival-notice-requests.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notice-requests.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/arrival-notice/arrival-notice.js

@@ -1,23 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.arrivalNoticeResolver = void 0;
+const typeorm_1 = require("typeorm");
 const attachment_base_1 = require("@things-factory/attachment-base");
 const biz_base_1 = require("@things-factory/biz-base");
-const typeorm_1 = require("typeorm");
 const attachment_type_1 = require("../../../constants/attachment-type");
 const entities_1 = require("../../../entities");
 exports.arrivalNoticeResolver = {
-    async arrivalNotice(_, { name }, context) {
-        var _a, _b;
+    async arrivalNotice(_, { name, refNo }, context) {
+        var _a, _b, _c;
         const { domain, user, bizplace } = context.state;
         let foundGAN;
         if ((_a = context === null || context === void 0 ? void 0 : context.state) === null || _a === void 0 ? void 0 : _a.bizplace) {
-            foundGAN = await typeorm_1.getRepository(entities_1.ArrivalNotice).findOne({
-                where: {
-                    domain,
-                    name,
-                    bizplace
-                },
+            let param;
+            if (name)
+                param = { domain, name, bizplace };
+            else
+                param = { domain, refNo, bizplace };
+            foundGAN = await (0, typeorm_1.getRepository)(entities_1.ArrivalNotice).findOne({
+                where: Object.assign({}, param),
                 relations: [
                     'domain',
                     'bizplace',
@@ -26,6 +27,10 @@ exports.arrivalNoticeResolver = {
                     'purchaseOrder.bufferLocation',
                     'orderProducts',
                     'orderProducts.product',
+                    'orderInventories',
+                    'orderInventories.inventory',
+                    'orderInventories.inventory.product',
+                    'orderInventories.inventory.location',
                     'orderVass',
                     'orderVass.vas',
                     'orderVass.targetProduct',
@@ -36,12 +41,13 @@ exports.arrivalNoticeResolver = {
             });
         }
         else {
-            foundGAN = await typeorm_1.getRepository(entities_1.ArrivalNotice).findOne({
-                where: {
-                    domain,
-                    name,
-                    bizplace: typeorm_1.In(await biz_base_1.getPermittedBizplaceIds(domain, user))
-                },
+            let param;
+            if (name)
+                param = { domain, name, bizplace: (0, typeorm_1.In)(await (0, biz_base_1.getPermittedBizplaceIds)(domain, user)) };
+            else
+                param = { domain, refNo, bizplace: (0, typeorm_1.In)(await (0, biz_base_1.getPermittedBizplaceIds)(domain, user)) };
+            foundGAN = await (0, typeorm_1.getRepository)(entities_1.ArrivalNotice).findOne({
+                where: Object.assign({}, param),
                 relations: [
                     'domain',
                     'bizplace',
@@ -50,6 +56,10 @@ exports.arrivalNoticeResolver = {
                     'purchaseOrder.bufferLocation',
                     'orderProducts',
                     'orderProducts.product',
+                    'orderInventories',
+                    'orderInventories.inventory',
+                    'orderInventories.inventory.product',
+                    'orderInventories.inventory.location',
                     'orderVass',
                     'orderVass.vas',
                     'orderVass.targetProduct',
@@ -58,22 +68,24 @@ exports.arrivalNoticeResolver = {
                 ]
             });
         }
-        if (!(foundGAN === null || foundGAN === void 0 ? void 0 : foundGAN.id))
+        if (name && !foundGAN)
             throw new Error(`Failed to find arrival notice with ${name}`);
-        const foundAttachments = await typeorm_1.getRepository(attachment_base_1.Attachment).find({
+        const foundAttachments = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).find({
             where: {
                 domain,
-                refBy: foundGAN.id,
+                refBy: foundGAN === null || foundGAN === void 0 ? void 0 : foundGAN.id,
                 category: attachment_type_1.ATTACHMENT_TYPE.GAN
             }
         });
-        const foundPOAttachments = ((_b = foundGAN === null || foundGAN === void 0 ? void 0 : foundGAN.purchaseOrder) === null || _b === void 0 ? void 0 : _b.id) ? await typeorm_1.getRepository(attachment_base_1.Attachment).find({
-            where: {
-                domain,
-                refBy: foundGAN.purchaseOrder.id,
-                category: attachment_type_1.ATTACHMENT_TYPE.PO
-            }
-        }) : [];
+        const foundPOAttachments = ((_b = foundGAN === null || foundGAN === void 0 ? void 0 : foundGAN.purchaseOrder) === null || _b === void 0 ? void 0 : _b.id)
+            ? await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).find({
+                where: {
+                    domain,
+                    refBy: (_c = foundGAN.purchaseOrder) === null || _c === void 0 ? void 0 : _c.id,
+                    category: attachment_type_1.ATTACHMENT_TYPE.PO
+                }
+            })
+            : [];
         return Object.assign(Object.assign({}, foundGAN), { attachment: [...foundPOAttachments, ...foundAttachments] });
     }
 };

package/dist-server/graphql/resolvers/arrival-notice/arrival-notice.js.map

@@ -1 +1 @@
-{"version":3,"file":"arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notice.ts"],"names":[],"mappings":";;;AAAA,qEAA4D;AAE5D,uDAA4E;AAE5E,qCAA2C;AAC3C,wEAAoE;AACpE,gDAAiD;AAEpC,QAAA,qBAAqB,GAAG;IACnC,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;;QAChD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAuD,OAAO,CAAC,KAAK,CAAA;QAEpG,IAAI,QAAuB,CAAA;QAE3B,UAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,QAAQ,EAAE;YAC5B,QAAQ,GAAG,MAAM,uBAAa,CAAC,wBAAa,CAAC,CAAC,OAAO,CAAC;gBACpD,KAAK,EAAE;oBACL,MAAM;oBACN,IAAI;oBACJ,QAAQ;iBACT;gBACD,SAAS,EAAE;oBACT,QAAQ;oBACR,UAAU;oBACV,aAAa;oBACb,eAAe;oBACf,8BAA8B;oBAC9B,eAAe;oBACf,uBAAuB;oBACvB,WAAW;oBACX,eAAe;oBACf,yBAAyB;oBACzB,UAAU;oBACV,SAAS;oBACT,SAAS;iBACV;aACF,CAAC,CAAA;SACH;aAAM;YACL,QAAQ,GAAG,MAAM,uBAAa,CAAC,wBAAa,CAAC,CAAC,OAAO,CAAC;gBACpD,KAAK,EAAE;oBACL,MAAM;oBACN,IAAI;oBACJ,QAAQ,EAAE,YAAE,CAAC,MAAM,kCAAuB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;iBAC1D;gBACD,SAAS,EAAE;oBACT,QAAQ;oBACR,UAAU;oBACV,aAAa;oBACb,eAAe;oBACf,8BAA8B;oBAC9B,eAAe;oBACf,uBAAuB;oBACvB,WAAW;oBACX,eAAe;oBACf,yBAAyB;oBACzB,SAAS;oBACT,SAAS;iBACV;aACF,CAAC,CAAA;SACH;QAED,IAAI,EAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,EAAE,CAAA;YAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,EAAE,CAAC,CAAA;QAEhF,MAAM,gBAAgB,GAAiB,MAAM,uBAAa,CAAC,4BAAU,CAAC,CAAC,IAAI,CAAC;YAC1E,KAAK,EAAE;gBACL,MAAM;gBACN,KAAK,EAAE,QAAQ,CAAC,EAAE;gBAClB,QAAQ,EAAE,iCAAe,CAAC,GAAG;aAC9B;SACF,CAAC,CAAA;QAEF,MAAM,kBAAkB,GAAiB,OAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,aAAa,0CAAE,EAAE,EAAC,CAAC,CAAC,MAAM,uBAAa,CAAC,4BAAU,CAAC,CAAC,IAAI,CAAC;YACxG,KAAK,EAAE;gBACL,MAAM;gBACN,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,EAAE;gBAChC,QAAQ,EAAE,iCAAe,CAAC,EAAE;aAC7B;SACF,CAAC,CAAA,CAAC,CAAC,EAAE,CAAA;QAGR,uCACK,QAAQ,KACX,UAAU,EAAE,CAAC,GAAG,kBAAkB,EAAE,GAAG,gBAAgB,CAAC,IACzD;IACH,CAAC;CACF,CAAA"}
+{"version":3,"file":"arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notice.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/arrival-notice/arrival-notices.js

@@ -1,19 +1,65 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.arrivalNoticesResolver = void 0;
+const typeorm_1 = require("typeorm");
 const biz_base_1 = require("@things-factory/biz-base");
 const shell_1 = require("@things-factory/shell");
-const typeorm_1 = require("typeorm");
 const entities_1 = require("../../../entities");
 exports.arrivalNoticesResolver = {
     async arrivalNotices(_, params, context) {
         const { domain, user } = context.state;
-        const convertedParams = shell_1.convertListParams(params);
         if (!params.filters.find((filter) => filter.name === 'bizplace')) {
-            convertedParams.where.bizplace = typeorm_1.In(await biz_base_1.getPermittedBizplaceIds(domain, user));
-            convertedParams.where.domain = domain;
+            params.filters.push({
+                name: 'bizplaceId',
+                operator: 'in',
+                value: await (0, biz_base_1.getPermittedBizplaceIds)(domain, user),
+                relation: false
+            });
+        }
+        const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
+        if (fromDateParamIdx >= 0) {
+            let fromDateVal = new Date(params.filters[fromDateParamIdx].value);
+            params.filters.splice(fromDateParamIdx, 1);
+            params.filters.push({
+                name: 'createdAt',
+                operator: 'gte',
+                value: fromDateVal.toISOString(),
+                relation: false
+            });
+        }
+        const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate');
+        if (toDateParamIdx >= 0) {
+            let toDateVal = new Date(params.filters[toDateParamIdx].value);
+            params.filters.splice(toDateParamIdx, 1);
+            params.filters.push({
+                name: 'createdAt',
+                operator: 'lt',
+                value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+                relation: false
+            });
         }
-        const [items, total] = await typeorm_1.getRepository(entities_1.ArrivalNotice).findAndCount(Object.assign(Object.assign({}, convertedParams), { relations: ['domain', 'bizplace', 'releaseGood', 'orderProducts', 'orderVass', 'creator', 'updater', 'acceptedBy'] }));
+        const qb = (0, typeorm_1.getRepository)(entities_1.ArrivalNotice).createQueryBuilder('an');
+        (0, shell_1.buildQuery)(qb, params, context);
+        qb.addSelect('COALESCE("cc".rank, 9999)', 'rank');
+        qb.leftJoinAndSelect('an.domain', 'domain');
+        qb.leftJoinAndSelect('an.bizplace', 'bizplace');
+        qb.leftJoinAndSelect('an.releaseGood', 'ro');
+        qb.leftJoinAndSelect('an.creator', 'creator');
+        qb.leftJoinAndSelect('an.updater', 'updater');
+        qb.leftJoinAndSelect('an.acceptedBy', 'accepter');
+        qb.leftJoin(subQuery => {
+            return subQuery
+                .select(`ccd.rank`, 'rank')
+                .addSelect(`ccd.name`, 'status')
+                .from(`common_code_details`, 'ccd')
+                .innerJoin(`ccd.commonCode`, 'cc')
+                .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+                .andWhere(`cc.name = 'ORDER_STATUS'`);
+        }, 'cc', 'cc.status = an.status');
+        const arrChildSortData = ['bizplace'];
+        const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'an.' + sort.name]: sort.desc ? 'DESC' : 'ASC' })), !params.sortings.some(e => e.name === 'status') ? { rank: 'ASC' } : {});
+        qb.orderBy(sort);
+        const [items, total] = await qb.getManyAndCount();
         return { items, total };
     }
 };

package/dist-server/graphql/resolvers/arrival-notice/arrival-notices.js.map

@@ -1 +1 @@
-{"version":3,"file":"arrival-notices.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notices.ts"],"names":[],"mappings":";;;AACA,uDAAkE;AAClE,iDAA4E;AAC5E,qCAA2C;AAC3C,gDAAiD;AAEpC,QAAA,sBAAsB,GAAG;IACpC,KAAK,CAAC,cAAc,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC1D,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;QAEtE,MAAM,eAAe,GAAG,yBAAiB,CAAC,MAAM,CAAC,CAAA;QAEjD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,EAAE;YACrE,eAAe,CAAC,KAAK,CAAC,QAAQ,GAAG,YAAE,CAAC,MAAM,kCAAuB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;YAChF,eAAe,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAA;SACtC;QAED,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,uBAAa,CAAC,wBAAa,CAAC,CAAC,YAAY,iCACjE,eAAe,KAClB,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC,IAClH,CAAA;QAEF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
+{"version":3,"file":"arrival-notices.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notices.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/arrival-notice/check-arrived-notice.js

@@ -48,7 +48,7 @@ async function checkArrivedNoticeFunction(name, context, tx) {
         // 4. Update status of arrival notice (INTRANSIT => ARRIVED)
         await tx.getRepository(entities_1.ArrivalNotice).save(Object.assign(Object.assign({}, foundArrivalNotice), { status: constants_1.ORDER_STATUS.ARRIVED, updater: user }));
         // notification logics
-        const users = await biz_base_1.getDomainUsers(foundArrivalNotice === null || foundArrivalNotice === void 0 ? void 0 : foundArrivalNotice.bizplace, tx);
+        const users = await (0, biz_base_1.getDomainUsers)(foundArrivalNotice === null || foundArrivalNotice === void 0 ? void 0 : foundArrivalNotice.bizplace, tx);
         if (users === null || users === void 0 ? void 0 : users.length) {
             const receivers = users.map(user => user.id);
             const msg = {
@@ -57,7 +57,7 @@ async function checkArrivedNoticeFunction(name, context, tx) {
                 url: context.header.referer,
                 data: { url: context.header.referer }
             };
-            await notification_1.sendNotification({
+            await (0, notification_1.sendNotification)({
                 receivers,
                 message: Object.assign({}, msg)
             });

package/dist-server/graphql/resolvers/arrival-notice/check-arrived-notice.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-arrived-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/check-arrived-notice.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"check-arrived-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/check-arrived-notice.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/arrival-notice/confirm-arrival-notice.js

@@ -17,7 +17,7 @@ exports.confirmArrivalNoticeResolver = {
             });
             // If status of related RO is not equal to PENDING_RECEIVE (i.e. Wasn't confirmed yet.)
             if (releaseGood.status !== constants_1.ORDER_STATUS.PENDING_RECEIVE) {
-                await confirm_release_good_1.confirmReleaseGood(releaseGood.name, context);
+                await (0, confirm_release_good_1.confirmReleaseGood)(releaseGood.name, context);
             }
         }
         return arrivalNotice;
@@ -84,7 +84,7 @@ async function confirmArrivalNoticeFunction(name, context, tx) {
                 url: context.header.referer,
                 data: { url: context.header.referer }
             };
-            await notification_1.sendNotification({
+            await (0, notification_1.sendNotification)({
                 receivers,
                 message: Object.assign({}, msg)
             });

package/dist-server/graphql/resolvers/arrival-notice/confirm-arrival-notice.js.map

@@ -1 +1 @@
-{"version":3,"file":"confirm-arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/confirm-arrival-notice.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"confirm-arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/confirm-arrival-notice.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/arrival-notice/delete-arrival-notice.js

@@ -31,12 +31,12 @@ async function deleteArrivalNotice(tx, name, user, domain) {
     // 1. delete order products
     const productIds = foundOPs.map((product) => product.id);
     if (productIds.length) {
-        await tx.getRepository(entities_1.OrderProduct).delete({ id: typeorm_1.In(productIds) });
+        await tx.getRepository(entities_1.OrderProduct).delete({ id: (0, typeorm_1.In)(productIds) });
     }
     // 2. delete order vass
     const vasIds = foundOVs.map((vas) => vas.id);
     if (vasIds.length) {
-        await tx.getRepository(entities_1.OrderVas).delete({ id: typeorm_1.In(vasIds) });
+        await tx.getRepository(entities_1.OrderVas).delete({ id: (0, typeorm_1.In)(vasIds) });
     }
     await tx.getRepository(entities_1.ArrivalNotice).save(Object.assign(Object.assign({}, foundArrivalNotice), { updater: user }));
     // 4. Remove relation with RO if it's cross docking
@@ -45,7 +45,7 @@ async function deleteArrivalNotice(tx, name, user, domain) {
         releaseGood.arrivalNotice = null;
         releaseGood = await tx.getRepository(entities_1.ReleaseGood).save(releaseGood);
         await tx.getRepository(entities_1.ArrivalNotice).delete({ domain, name });
-        await delete_release_good_1.deleteReleaseGood(tx, releaseGood.name, user, domain);
+        await (0, delete_release_good_1.deleteReleaseGood)(tx, releaseGood.name, user, domain);
     }
     else {
         // 5. delete GAN

package/dist-server/graphql/resolvers/arrival-notice/delete-arrival-notice.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete-arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/delete-arrival-notice.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"delete-arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/delete-arrival-notice.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/arrival-notice/generate-arrival-notice.js

@@ -14,39 +14,39 @@ const order_no_generator_1 = require("../../../utils/order-no-generator");
 const generate_job_sheet_1 = require("../job-sheet/generate-job-sheet");
 const add_edit_arrival_notice_products_1 = require("./add-edit-arrival-notice-products");
 exports.generateArrivalNotice = {
-    async generateArrivalNotice(_, { arrivalNotice, file }, context) {
+    async generateArrivalNotice(_, { arrivalNotice, files }, context) {
         const { tx } = context.state;
-        const createdArrivalNotice = await generateArrivalNoticeFunction(_, arrivalNotice, file, context, tx);
+        const createdArrivalNotice = await generateArrivalNoticeFunction(_, arrivalNotice, files, context, tx);
         return createdArrivalNotice;
     }
 };
-async function generateArrivalNoticeFunction(_, arrivalNotice, file, context, tx) {
+async function generateArrivalNoticeFunction(_, arrivalNotice, files, context, tx) {
     const { domain, user } = context.state;
     let orderProducts = arrivalNotice.orderProducts;
     let orderVass = arrivalNotice.orderVass;
     let myBizplace;
     let orderNo = '';
-    const settingRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(setting_base_1.Setting)) || typeorm_1.getRepository(setting_base_1.Setting);
+    const settingRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(setting_base_1.Setting)) || (0, typeorm_1.getRepository)(setting_base_1.Setting);
     if (arrivalNotice.bizplaceId)
         myBizplace = context.state.bizplace;
     else if (arrivalNotice.customerBizplaceId) {
-        const permittedBizplaces = await biz_base_1.getPermittedBizplaces(domain, user);
+        const permittedBizplaces = await (0, biz_base_1.getPermittedBizplaces)(domain, user);
         let foundPermittedBizplace = permittedBizplaces.find(biz => biz.id == arrivalNotice.customerBizplaceId);
         if (!foundPermittedBizplace)
             throw new Error(`This user does not permitted for this company`);
         myBizplace = arrivalNotice.customerBizplaceId;
     }
     else if (arrivalNotice.partnerBizplaceId) {
-        const permittedBizplaces = await biz_base_1.getPermittedBizplaces(domain, user);
+        const permittedBizplaces = await (0, biz_base_1.getPermittedBizplaces)(domain, user);
         let foundPermittedBizplace = permittedBizplaces.find(biz => biz.id == arrivalNotice.partnerBizplaceId);
         if (!foundPermittedBizplace)
             throw new Error(`This user does not permitted for this company`);
         myBizplace = arrivalNotice.partnerBizplaceId;
     }
     else if (arrivalNotice.warehouseId)
-        myBizplace = await biz_base_1.getOutletBizplace(arrivalNotice.warehouseId);
+        myBizplace = await (0, biz_base_1.getOutletBizplace)(arrivalNotice.warehouseId);
     else
-        myBizplace = await biz_base_1.getMyBizplace(domain, user);
+        myBizplace = await (0, biz_base_1.getMyBizplace)(domain, user);
     // find GAN number rule setting
     const ganNoSetting = await settingRepo.findOne({
         where: {
@@ -55,7 +55,7 @@ async function generateArrivalNoticeFunction(_, arrivalNotice, file, context, tx
         }
     });
     if (ganNoSetting) {
-        orderNo = await id_rule_base_1.generateId({ domain, type: constants_1.ORDER_NUMBER_RULE_TYPE.GAN_NUMBER, seed: {} });
+        orderNo = await (0, id_rule_base_1.generateId)({ domain, type: constants_1.ORDER_NUMBER_RULE_TYPE.GAN_NUMBER, seed: {} });
     }
     else {
         orderNo = order_no_generator_1.OrderNoGenerator.arrivalNotice();
@@ -63,10 +63,10 @@ async function generateArrivalNoticeFunction(_, arrivalNotice, file, context, tx
     // 1. Create arrival notice
     const createdArrivalNotice = await tx.getRepository(entities_1.ArrivalNotice).save(Object.assign(Object.assign({}, arrivalNotice), { name: orderNo, domain, bizplace: myBizplace, looseItem: (arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.looseItem) ? arrivalNotice.looseItem : false, status: constants_1.ORDER_STATUS.PENDING, creator: user, updater: user }));
     // 2. Create arrival notice product
-    await add_edit_arrival_notice_products_1.addArrivalNoticeProducts(domain, createdArrivalNotice, orderProducts.map((op) => {
+    await (0, add_edit_arrival_notice_products_1.addArrivalNoticeProducts)(domain, createdArrivalNotice, orderProducts.map((op) => {
         return Object.assign(Object.assign({}, op), { status: constants_1.ORDER_PRODUCT_STATUS.PENDING });
     }), user, tx);
-    await generate_job_sheet_1.generateJobSheet(domain, user, createdArrivalNotice, tx);
+    await (0, generate_job_sheet_1.generateJobSheet)(domain, user, createdArrivalNotice, tx);
     // 3. Create arrival notice vas
     if (orderVass === null || orderVass === void 0 ? void 0 : orderVass.length) {
         orderVass = await Promise.all(orderVass.map(async (ov) => {
@@ -77,15 +77,15 @@ async function generateArrivalNoticeFunction(_, arrivalNotice, file, context, tx
         }));
         await tx.getRepository(entities_1.OrderVas).save(orderVass);
     }
-    if (file === null || file === void 0 ? void 0 : file.length) {
-        const attachments = file.map(attachment => {
+    if (files === null || files === void 0 ? void 0 : files.length) {
+        const attachments = files.map(attachment => {
             return {
                 file: attachment,
                 refBy: createdArrivalNotice.id,
                 category: attachment_type_1.ATTACHMENT_TYPE.GAN
             };
         });
-        await attachment_base_1.createAttachments(_, { attachments }, context);
+        await (0, attachment_base_1.createAttachments)(_, { attachments }, context);
     }
     return createdArrivalNotice;
 }

package/dist-server/graphql/resolvers/arrival-notice/generate-arrival-notice.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/generate-arrival-notice.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate-arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/generate-arrival-notice.ts"],"names":[],"mappings":";;;AAAA,qEAA+E;AAE/E,uDAA4G;AAC5G,+DAAyD;AACzD,+DAAsD;AACtD,+DAAsD;AAGtD,qCAAkE;AAClE,kDAO2B;AAC3B,wEAAoE;AACpE,gDAA8E;AAC9E,0EAAoE;AACpE,wEAAkE;AAClE,yFAA6E;AAEhE,QAAA,qBAAqB,GAAG;IACnC,KAAK,CAAC,qBAAqB,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,OAAY;QACxE,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;QACnD,MAAM,oBAAoB,GAAkB,MAAM,6BAA6B,CAC7E,CAAC,EACD,aAAa,EACb,KAAK,EACL,OAAO,EACP,EAAE,CACH,CAAA;QAED,OAAO,oBAAoB,CAAA;IAC7B,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,6BAA6B,CACjD,CAAM,EACN,aAAkB,EAClB,KAAmB,EACnB,OAAY,EACZ,EAAkB;IAElB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;IACtE,IAAI,aAAa,GAAmB,aAAa,CAAC,aAAa,CAAA;IAC/D,IAAI,SAAS,GAAe,aAAa,CAAC,SAAS,CAAA;IACnD,IAAI,UAAoB,CAAA;IACxB,IAAI,OAAO,GAAW,EAAE,CAAA;IAExB,MAAM,WAAW,GAAwB,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,CAAC,sBAAO,CAAC,KAAI,IAAA,uBAAa,EAAC,sBAAO,CAAC,CAAA;IAE7F,IAAI,aAAa,CAAC,UAAU;QAAE,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAA;SAC5D,IAAI,aAAa,CAAC,kBAAkB,EAAE;QACzC,MAAM,kBAAkB,GAAe,MAAM,IAAA,gCAAqB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAChF,IAAI,sBAAsB,GAAa,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,aAAa,CAAC,kBAAkB,CAAC,CAAA;QAEjH,IAAI,CAAC,sBAAsB;YAAE,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;QAE7F,UAAU,GAAG,aAAa,CAAC,kBAAkB,CAAA;KAC9C;SAAM,IAAI,aAAa,CAAC,iBAAiB,EAAE;QAC1C,MAAM,kBAAkB,GAAe,MAAM,IAAA,gCAAqB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAChF,IAAI,sBAAsB,GAAa,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,aAAa,CAAC,iBAAiB,CAAC,CAAA;QAEhH,IAAI,CAAC,sBAAsB;YAAE,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;QAE7F,UAAU,GAAG,aAAa,CAAC,iBAAiB,CAAA;KAC7C;SAAM,IAAI,aAAa,CAAC,WAAW;QAAE,UAAU,GAAG,MAAM,IAAA,4BAAiB,EAAC,aAAa,CAAC,WAAW,CAAC,CAAA;;QAChG,UAAU,GAAG,MAAM,IAAA,wBAAa,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAEnD,+BAA+B;IAC/B,MAAM,YAAY,GAAY,MAAM,WAAW,CAAC,OAAO,CAAC;QACtD,KAAK,EAAE;YACL,MAAM;YACN,IAAI,EAAE,oCAAwB,CAAC,eAAe;SAC/C;KACF,CAAC,CAAA;IAEF,IAAI,YAAY,EAAE;QAChB,OAAO,GAAG,MAAM,IAAA,yBAAU,EAAC,EAAE,MAAM,EAAE,IAAI,EAAE,kCAAsB,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;KAC1F;SAAM;QACL,OAAO,GAAG,qCAAgB,CAAC,aAAa,EAAE,CAAA;KAC3C;IAED,2BAA2B;IAC3B,MAAM,oBAAoB,GAAkB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAa,CAAC,CAAC,IAAI,iCACjF,aAAa,KAChB,IAAI,EAAE,OAAO,EACb,MAAM,EACN,QAAQ,EAAE,UAAU,EACpB,SAAS,EAAE,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,EAAC,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EACrE,MAAM,EAAE,wBAAY,CAAC,OAAO,EAC5B,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACb,CAAA;IAEF,mCAAmC;IACnC,MAAM,IAAA,2DAAwB,EAC5B,MAAM,EACN,oBAAoB,EACpB,aAAa,CAAC,GAAG,CAAC,CAAC,EAAgB,EAAE,EAAE;QACrC,uCAAY,EAAE,KAAE,MAAM,EAAE,gCAAoB,CAAC,OAAO,IAAE;IACxD,CAAC,CAAC,EACF,IAAI,EACJ,EAAE,CACH,CAAA;IAED,MAAM,IAAA,qCAAgB,EAAC,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,EAAE,CAAC,CAAA;IAE9D,+BAA+B;IAC/B,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,EAAE;QACrB,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CAC3B,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,EAAY,EAAE,EAAE;YACnC,IAAI,EAAE,CAAC,aAAa,EAAE;gBACpB,EAAE,CAAC,aAAa,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,sBAAO,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;aAChF;YAED,uCACK,EAAE,KACL,MAAM,EACN,QAAQ,EAAE,UAAU,EACpB,IAAI,EAAE,qCAAgB,CAAC,QAAQ,EAAE,EACjC,GAAG,EAAE,MAAM,EAAE,CAAC,aAAa,CAAC,cAAG,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,EACnE,IAAI,EAAE,uBAAW,CAAC,cAAc,EAChC,aAAa,EAAE,oBAAoB,EACnC,MAAM,EAAE,4BAAgB,CAAC,OAAO,EAChC,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACd;QACH,CAAC,CAAC,CACH,CAAA;QACD,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;KACjD;IAED,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,EAAE;QACjB,MAAM,WAAW,GAAiB,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YACvD,OAAO;gBACL,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,oBAAoB,CAAC,EAAE;gBAC9B,QAAQ,EAAE,iCAAe,CAAC,GAAG;aAC9B,CAAA;QACH,CAAC,CAAC,CAAA;QACF,MAAM,IAAA,mCAAiB,EAAC,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,OAAO,CAAC,CAAA;KACrD;IAED,OAAO,oBAAoB,CAAA;AAC7B,CAAC;AA7GD,sEA6GC"}