@things-factory/operato-hub 4.3.120 → 4.3.123

package/dist-server/routers/api/restful-apis/v1/warehouse/get-release-order-list.js

@@ -0,0 +1,110 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const lodash_1 = __importDefault(require("lodash"));
+const typeorm_1 = require("typeorm");
+const api_1 = require("@things-factory/api");
+const sales_base_1 = require("@things-factory/sales-base");
+const error_util_1 = require("../utils/error-util");
+const middlewares_1 = require("../middlewares");
+api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-list', middlewares_1.businessMiddleware, middlewares_1.validationMiddleware, middlewares_1.loggingMiddleware, async (context, next) => {
+    try {
+        // get contact points for that bizplace
+        // optional query parameter filter
+        let filter = Object.assign({}, context.query);
+        const { fromDate, toDate, offset, limit } = filter;
+        filter['bizplace'] = filter['bizplaceId'];
+        delete filter['bizplaceId'];
+        if (lodash_1.default.has(filter, 'roNo')) {
+            filter['name'] = filter['roNo'];
+            delete filter['roNo'];
+        }
+        filter['createdAt'] = (0, typeorm_1.Between)(fromDate, toDate);
+        delete filter['fromDate'];
+        delete filter['toDate'];
+        delete filter['limit'];
+        delete filter['offset'];
+        const [releaseGoods, totalCount] = await (0, typeorm_1.getRepository)(sales_base_1.ReleaseGood).findAndCount({
+            where: filter,
+            relations: ['orderInventories', 'orderInventories.product'],
+            skip: offset,
+            take: limit,
+            order: { createdAt: 'DESC' }
+        });
+        // create and format data response
+        let data = [];
+        for (const releaseGood of releaseGoods) {
+            let orderInventories = [];
+            for (const orderInventory of releaseGood.orderInventories) {
+                const orderInventoriesDataPoint = {
+                    product: {
+                        sku: orderInventory.product.sku,
+                        refCode: orderInventory.product.refCode
+                    },
+                    batchId: orderInventory.batchId,
+                    packingType: orderInventory.packingType,
+                    releaseQty: orderInventory.releaseQty,
+                    packingSize: orderInventory.packingSize
+                };
+                orderInventories.push(orderInventoriesDataPoint);
+            }
+            const datapoint = {
+                id: releaseGood.id,
+                roNo: releaseGood.roNo,
+                refNo: releaseGood.refNo,
+                refNo2: releaseGood.refNo2,
+                refNo3: releaseGood.refNo3,
+                type: releaseGood.type,
+                releaseDate: releaseGood.releaseDate,
+                collectionOrderNo: releaseGood.collectionOrderNo,
+                ownTransport: releaseGood.ownTransport,
+                exportOption: releaseGood.exportOption,
+                transporter: releaseGood.transporter,
+                trackingNo: releaseGood.trackingNo,
+                marketplaceOrderStatus: releaseGood.marketplaceOrderStatus,
+                airwayBill: releaseGood.airwayBill,
+                invoice: releaseGood.invoice,
+                storeName: releaseGood.storeName,
+                storeId: releaseGood.storeId,
+                routeId: releaseGood.routeId,
+                stopId: releaseGood.stopId,
+                billTo: {
+                    billingAddress: releaseGood.billingAddress
+                },
+                deliverTo: {
+                    deliveryAddress1: releaseGood.deliveryAddress1,
+                    deliveryAddress2: releaseGood.deliveryAddress2,
+                    deliveryAddress3: releaseGood.deliveryAddress3,
+                    deliveryAddress4: releaseGood.deliveryAddress4,
+                    deliveryAddress5: releaseGood.deliveryAddress5,
+                    attentionTo: releaseGood.attentionTo,
+                    attentionCompany: releaseGood.attentionCompany,
+                    city: releaseGood.city,
+                    state: releaseGood.state,
+                    postalCode: releaseGood.postalCode,
+                    country: releaseGood.country,
+                    phone1: releaseGood.phone1,
+                    phone2: releaseGood.phone2,
+                    email: releaseGood.email
+                },
+                orderInventories
+            };
+            data.push(datapoint);
+        }
+        context.body = {
+            data,
+            totalCount,
+            limit,
+            offset
+        };
+    }
+    catch (e) {
+        if (e instanceof error_util_1.ApiError)
+            (0, error_util_1.ApiErrorHandler)(context, e);
+        else
+            (0, error_util_1.throwInternalServerError)(context, e);
+    }
+});
+//# sourceMappingURL=get-release-order-list.js.map

package/dist-server/routers/api/restful-apis/v1/warehouse/get-release-order-list.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-release-order-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-release-order-list.ts"],"names":[],"mappings":"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"}

package/dist-server/routers/api/restful-apis/v1/warehouse/index.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("./cancel-inbound-order");
+require("./get-delivery-order-list");
+require("./get-goods-received-note-list");
+require("./get-inbound-order-details");
+require("./get-inbound-order-list");
+require("./get-inventory-product-group-list");
+require("./get-onhand-inventory-list");
+require("./get-release-order-details");
+require("./get-release-order-list");
+require("./add-release-order");
+require("./cancel-release-order");
+require("./update-release-order-details");
+require("./add-inbound-order");
+//# sourceMappingURL=index.js.map

package/dist-server/routers/api/restful-apis/v1/warehouse/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/index.ts"],"names":[],"mappings":";;AAAA,kCAA+B;AAC/B,qCAAkC;AAClC,0CAAuC;AACvC,uCAAoC;AACpC,oCAAiC;AACjC,8CAA2C;AAC3C,uCAAoC;AACpC,uCAAoC;AACpC,oCAAiC;AACjC,+BAA4B;AAC5B,kCAA+B;AAC/B,0CAAuC;AACvC,+BAA4B"}

package/dist-server/routers/api/restful-apis/v1/warehouse/update-release-order-details.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const typeorm_1 = require("typeorm");
+const api_1 = require("@things-factory/api");
+const sales_base_1 = require("@things-factory/sales-base");
+const middlewares_1 = require("../middlewares");
+const error_util_1 = require("../utils/error-util");
+const sales_base_2 = require("@things-factory/sales-base");
+const biz_base_1 = require("@things-factory/biz-base");
+const debug = require('debug')('things-factory:operato-hub:restful-api:v1:update-release-order-details');
+api_1.restfulApiRouter.post('/v1/warehouse/update-release-order-details', middlewares_1.businessMiddleware, middlewares_1.validationMiddleware, middlewares_1.loggingMiddleware, async (context, next) => {
+    try {
+        const { domain } = context.state;
+        const bodyReq = context.request.body.data;
+        const { bizplaceId: customerBizplaceId } = bodyReq;
+        const { user } = context.state;
+        await (0, typeorm_1.getConnection)().transaction(async (tx) => {
+            if (!customerBizplaceId)
+                throw new error_util_1.ApiError('E04', 'warehouse id not found');
+            let patch = {};
+            patch.releaseGood = bodyReq.releaseGood;
+            if (bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.shippingOrder)
+                patch.shippingOrder = bodyReq.shippingOrder;
+            else
+                patch.shippingOrder = null;
+            context.body = await updateReleaseGoodDetails(tx, domain, patch, user);
+        });
+    }
+    catch (e) {
+        if (e instanceof error_util_1.ApiError)
+            (0, error_util_1.ApiErrorHandler)(context, e);
+        else
+            (0, error_util_1.throwInternalServerError)(context, e);
+    }
+});
+async function updateReleaseGoodDetails(tx, domain, patch, user) {
+    let { releaseGood, shippingOrder } = patch;
+    let status = [sales_base_1.ORDER_STATUS.DONE, sales_base_1.ORDER_STATUS.CANCELLED, sales_base_1.ORDER_STATUS.REJECTED];
+    let foundReleaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
+        where: {
+            id: releaseGood.roId,
+            domain
+        },
+        relations: ['shippingOrder']
+    });
+    if (!foundReleaseGood) {
+        throw new error_util_1.ApiError('E04', `release order: ${releaseGood.roId}`);
+    }
+    if (status.indexOf(foundReleaseGood.status) !== -1) {
+        throw new error_util_1.ApiError('E04', `release order status: ${foundReleaseGood.status}`);
+    }
+    // case to update existing shippingOrder
+    if (shippingOrder !== null) {
+        shippingOrder.remark = shippingOrder.exportRemark;
+        shippingOrder.containerClosureDateTime = shippingOrder.containerClosureDate
+            ? new Date(shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.containerClosureDate)
+            : null;
+        delete shippingOrder.exportRemark;
+    }
+    if (foundReleaseGood.shippingOrder && shippingOrder) {
+        await tx.getRepository(sales_base_1.ShippingOrder).update(foundReleaseGood.shippingOrder.id, shippingOrder);
+    }
+    // case for new shippingOrder
+    else if (!foundReleaseGood.shippingOrder && shippingOrder) {
+        let newShippingOrder = await tx.getRepository(sales_base_1.ShippingOrder).save(Object.assign(Object.assign({}, shippingOrder), { name: sales_base_2.OrderNoGenerator.shippingOrder(), domain, bizplace: await (0, biz_base_1.getMyBizplace)(domain, user), status: sales_base_1.ORDER_STATUS.PENDING, creator: user, updater: user }));
+        releaseGood.shippingOrder = newShippingOrder;
+    }
+    foundReleaseGood = await tx.getRepository(sales_base_1.ReleaseGood).save(Object.assign(Object.assign(Object.assign({}, foundReleaseGood), releaseGood), { remark: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.remark) ? releaseGood.remark : null }));
+    return foundReleaseGood;
+}
+//# sourceMappingURL=update-release-order-details.js.map

package/dist-server/routers/api/restful-apis/v1/warehouse/update-release-order-details.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-release-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/update-release-order-details.ts"],"names":[],"mappings":"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"}

package/openapi/v1/inbound.yaml

@@ -72,7 +72,7 @@ definitions:
                 packingSize:
                   type: 'integer'
                   example: 24
-                packQty:
+                qty:
                   type: 'integer'
                   example: 1
                 palletQty:
@@ -184,7 +184,7 @@ definitions:
                   packingSize:
                     type: 'integer'
                     example: 24
-                  packQty:
+                  qty:
                     type: 'integer'
                     example: 1
                   palletQty:
@@ -290,7 +290,7 @@ definitions:
                 packingSize:
                   type: 'integer'
                   example: 24
-                packQty:
+                qty:
                   type: 'integer'
                   example: 1
                 palletQty:
@@ -509,7 +509,7 @@ paths:
                       required:
                         - 'product'
                         - 'batchId'
-                        - 'packQty'
+                        - 'qty'
                       properties:
                         product:
                           type: 'object'
@@ -539,7 +539,7 @@ paths:
                         packingSize:
                           type: 'integer'
                           example: 24
-                        packQty:
+                        qty:
                           type: 'integer'
                           example: 1
                           required: true

package/openapi/v1/inventory.yaml

@@ -32,6 +32,9 @@ definitions:
             qty:
               type: 'integer'
               example: 0
+            reservedQty:
+              type: 'integer'
+              example: 0
             expirationDate:
               type: 'date'
               example: ' '
@@ -144,6 +147,9 @@ definitions:
             qty:
               type: 'integer'
               example: 0
+            reservedQty:
+              type: 'integer'
+              example: 0
             uomValue:
               type: 'integer'
               format: 'double'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.120",
+  "version": "4.3.123",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -56,67 +56,67 @@
     "@operato/scene-tab": "^0.1.8",
     "@operato/scene-table": "^0.1.8",
     "@operato/scene-wheel-sorter": "^0.1.8",
-    "@things-factory/api": "^4.3.114",
-    "@things-factory/apptool-ui": "^4.3.114",
-    "@things-factory/attachment-base": "^4.3.114",
-    "@things-factory/auth-base": "^4.3.114",
-    "@things-factory/auth-ui": "^4.3.114",
-    "@things-factory/biz-base": "^4.3.114",
-    "@things-factory/biz-ui": "^4.3.114",
-    "@things-factory/board-service": "^4.3.114",
-    "@things-factory/board-ui": "^4.3.115",
-    "@things-factory/code-ui": "^4.3.114",
-    "@things-factory/component-ui": "^4.3.114",
-    "@things-factory/context-ui": "^4.3.114",
-    "@things-factory/document-template-ui": "^4.3.114",
-    "@things-factory/export-ui": "^4.3.114",
-    "@things-factory/export-ui-csv": "^4.3.114",
-    "@things-factory/export-ui-excel": "^4.3.114",
-    "@things-factory/geography": "^4.3.116",
-    "@things-factory/grist-ui": "^4.3.114",
-    "@things-factory/help": "^4.3.114",
-    "@things-factory/i18n-base": "^4.3.114",
-    "@things-factory/import-ui": "^4.3.114",
-    "@things-factory/import-ui-excel": "^4.3.114",
-    "@things-factory/integration-accounting": "^4.3.114",
-    "@things-factory/integration-fulfillment": "^4.3.114",
-    "@things-factory/integration-lmd": "^4.3.114",
-    "@things-factory/integration-marketplace": "^4.3.114",
-    "@things-factory/integration-pos": "^4.3.114",
-    "@things-factory/integration-sellercraft": "^4.3.114",
-    "@things-factory/integration-sftp": "^4.3.114",
-    "@things-factory/lite-menu": "^4.3.115",
-    "@things-factory/more-ui": "^4.3.114",
-    "@things-factory/notification": "^4.3.114",
-    "@things-factory/pdf": "^4.3.114",
-    "@things-factory/product-ui": "^4.3.114",
-    "@things-factory/resource-ui": "^4.3.114",
-    "@things-factory/sales-base": "^4.3.120",
-    "@things-factory/scene-data-transform": "^4.3.114",
-    "@things-factory/scene-excel": "^4.3.114",
-    "@things-factory/scene-firebase": "^4.3.114",
-    "@things-factory/scene-form": "^4.3.114",
-    "@things-factory/scene-google-map": "^4.3.114",
-    "@things-factory/scene-graphql": "^4.3.114",
-    "@things-factory/scene-label": "^4.3.117",
-    "@things-factory/scene-marker": "^4.3.114",
-    "@things-factory/scene-mqtt": "^4.3.114",
-    "@things-factory/scene-restful": "^4.3.114",
-    "@things-factory/scene-visualizer": "^4.3.114",
-    "@things-factory/setting-ui": "^4.3.114",
-    "@things-factory/shell": "^4.3.114",
-    "@things-factory/system-ui": "^4.3.114",
-    "@things-factory/warehouse-base": "^4.3.120",
-    "@things-factory/worksheet-base": "^4.3.120",
+    "@things-factory/api": "^4.3.122",
+    "@things-factory/apptool-ui": "^4.3.122",
+    "@things-factory/attachment-base": "^4.3.122",
+    "@things-factory/auth-base": "^4.3.122",
+    "@things-factory/auth-ui": "^4.3.122",
+    "@things-factory/biz-base": "^4.3.122",
+    "@things-factory/biz-ui": "^4.3.123",
+    "@things-factory/board-service": "^4.3.122",
+    "@things-factory/board-ui": "^4.3.123",
+    "@things-factory/code-ui": "^4.3.123",
+    "@things-factory/component-ui": "^4.3.122",
+    "@things-factory/context-ui": "^4.3.122",
+    "@things-factory/document-template-ui": "^4.3.123",
+    "@things-factory/export-ui": "^4.3.122",
+    "@things-factory/export-ui-csv": "^4.3.122",
+    "@things-factory/export-ui-excel": "^4.3.123",
+    "@things-factory/geography": "^4.3.122",
+    "@things-factory/grist-ui": "^4.3.123",
+    "@things-factory/help": "^4.3.122",
+    "@things-factory/i18n-base": "^4.3.122",
+    "@things-factory/import-ui": "^4.3.123",
+    "@things-factory/import-ui-excel": "^4.3.123",
+    "@things-factory/integration-accounting": "^4.3.123",
+    "@things-factory/integration-fulfillment": "^4.3.123",
+    "@things-factory/integration-lmd": "^4.3.123",
+    "@things-factory/integration-marketplace": "^4.3.123",
+    "@things-factory/integration-pos": "^4.3.123",
+    "@things-factory/integration-sellercraft": "^4.3.123",
+    "@things-factory/integration-sftp": "^4.3.123",
+    "@things-factory/lite-menu": "^4.3.123",
+    "@things-factory/more-ui": "^4.3.122",
+    "@things-factory/notification": "^4.3.122",
+    "@things-factory/pdf": "^4.3.122",
+    "@things-factory/product-ui": "^4.3.123",
+    "@things-factory/resource-ui": "^4.3.123",
+    "@things-factory/sales-base": "^4.3.123",
+    "@things-factory/scene-data-transform": "^4.3.122",
+    "@things-factory/scene-excel": "^4.3.122",
+    "@things-factory/scene-firebase": "^4.3.122",
+    "@things-factory/scene-form": "^4.3.122",
+    "@things-factory/scene-google-map": "^4.3.122",
+    "@things-factory/scene-graphql": "^4.3.122",
+    "@things-factory/scene-label": "^4.3.122",
+    "@things-factory/scene-marker": "^4.3.122",
+    "@things-factory/scene-mqtt": "^4.3.122",
+    "@things-factory/scene-restful": "^4.3.122",
+    "@things-factory/scene-visualizer": "^4.3.122",
+    "@things-factory/setting-ui": "^4.3.123",
+    "@things-factory/shell": "^4.3.122",
+    "@things-factory/system-ui": "^4.3.122",
+    "@things-factory/warehouse-base": "^4.3.123",
+    "@things-factory/worksheet-base": "^4.3.123",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
     "yamljs": "^0.3.0"
   },
   "devDependencies": {
-    "@things-factory/builder": "^4.3.114"
+    "@things-factory/builder": "^4.3.122"
   },
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "c69e060b001e275ada79ba358989930fc197fda6"
+  "gitHead": "4b257504bfc8c0a626dd90dc0216abb7ca30d8d3"
 }

package/server/routers/api/index.ts

@@ -1,3 +1,2 @@
 import './restful-apis/v1'
-import './restful-apis/v2'
 import './restful-apis/unstable'

package/server/routers/api/restful-apis/unstable/add-release-order.ts

@@ -109,7 +109,7 @@ router.post(
           storeId: bodyReq?.storeId,
           routeId: bodyReq?.routeId,
           stopId: bodyReq?.stopId,
-          source: application?.type,
+          source: bodyReq?.source == 'MMS' ? bodyReq?.source : application?.type,
           platformCode: bodyReq?.platformCode,
           platformCountry: bodyReq?.platformCountry,
           platformName: bodyReq?.platformName,

package/server/routers/api/restful-apis/v1/company/add-contact-points.ts

@@ -0,0 +1,111 @@
+import { getConnection, EntityManager, In, Brackets } from 'typeorm'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+import { ContactPoint } from '@things-factory/biz-base'
+import { Bizplace } from '@things-factory/biz-base'
+
+import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
+import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
+
+router.post(
+  '/v1/company/add-contact-points',
+  businessMiddleware,
+  validationMiddleware,
+  loggingMiddleware,
+  async (context, next) => {
+    try {
+      if (!Array.isArray(context.request.body.data)) throw new ApiError('E01', 'data field is not an array')
+      if (!context.request.body.hasOwnProperty('bizplaceId')) throw new ApiError('E03', 'bizplaceId')
+      if (!context.request.body.bizplaceId) throw new ApiError('E01', 'bizplaceId')
+      await getConnection().transaction(async (tx: EntityManager) => {
+        // create and format values to be inserted
+        const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+          where: { id: context.request.body.bizplaceId }
+        })
+
+        // check if phone or email already belongs in bizplace
+        const phones = []
+        const emails = []
+        let values = []
+        for (const datapoint of context.request.body.data) {
+          phones.push(datapoint.phone)
+          emails.push(datapoint.email)
+          const value = {
+            name: datapoint.name,
+            description: datapoint.description,
+            companyName: datapoint.companyName,
+            email: datapoint.email,
+            fax: datapoint.fax,
+            phone: datapoint.phone,
+            billingAddress: datapoint.billingAddress,
+            accountNo: datapoint.accountNo,
+            address: datapoint.address,
+            address2: datapoint.address2,
+            city: datapoint.city,
+            state: datapoint.state,
+            postCode: datapoint.postCode,
+            type: datapoint.type,
+            domain: context.state.domain,
+            bizplace: bizplace,
+            creator: context.state.user,
+            updater: context.state.user
+          }
+          values.push(value)
+        }
+
+        const checkDuplicateEmailPhone: ContactPoint = await tx
+          .getRepository(ContactPoint)
+          .createQueryBuilder('cp')
+          .where('cp.bizplace_id = :bizplaceId', { bizplaceId: context.request.body.bizplaceId })
+          .andWhere(
+            new Brackets(qb => {
+              qb.where('cp.email in(:email)', { email: emails.toString() })
+              qb.orWhere('cp.phone in(:phone)', { phone: phones.toString() })
+            })
+          )
+          .getOne()
+        if (checkDuplicateEmailPhone) throw new ApiError('E05', 'email or phone number')
+
+        // insert values to DB
+        const result = await tx
+          .getRepository(ContactPoint)
+          .createQueryBuilder()
+          .insert()
+          .into(ContactPoint)
+          .values(values)
+          .returning('*')
+          .execute()
+
+        // create and format response
+        let data = []
+        for (const contactPoint of result.generatedMaps) {
+          const datapoint = {
+            name: contactPoint.name,
+            description: contactPoint.description,
+            companyName: contactPoint.companyName,
+            email: contactPoint.email,
+            fax: contactPoint.fax,
+            phone: contactPoint.phone,
+            billingAddress: contactPoint.billingAddress,
+            accountNo: contactPoint.accountNo,
+            address: contactPoint.address,
+            address2: contactPoint.address2,
+            city: contactPoint.city,
+            state: contactPoint.state,
+            postCode: contactPoint.postCode,
+            type: contactPoint.type,
+            createdAt: contactPoint.createdAt
+          }
+          data.push(datapoint)
+        }
+
+        context.body = {
+          data
+        }
+      })
+    } catch (e) {
+      if (e instanceof ApiError) ApiErrorHandler(context, e)
+      else throwInternalServerError(context, e)
+    }
+  }
+)