npm - @things-factory/operato-hub - Versions diffs - 4.3.366 → 4.3.368 - Mend

@things-factory/operato-hub 4.3.366 → 4.3.368

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

package/dist-server/routers/api/restful-apis/v1/warehouse/get-manifest-details.js ADDED Viewed

@@ -0,0 +1,138 @@
+"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");
+// import { OrderPackage } from '@things-factory/sales-base'
+const middlewares_1 = require("../middlewares");
+const error_util_1 = require("../utils/error-util");
+api_1.restfulApiRouter.get('/v1/warehouse/get-manifest-details', 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;
+        if (lodash_1.default.has(filter, 'id')) {
+            filter['id'] = filter['id'];
+            delete filter['name'];
+        }
+        else if (lodash_1.default.has(filter, 'name')) {
+            filter['name'] = filter['name'];
+            delete filter['id'];
+        }
+        else {
+            throw new error_util_1.ApiError('E03', 'id or name');
+        }
+        const rb = (0, typeorm_1.getRepository)(sales_base_1.Manifest)
+            .createQueryBuilder('mf')
+            .innerJoinAndSelect('mf.orderPackages', 'op')
+            .innerJoinAndSelect('op.releaseGood', 'rg')
+            .innerJoinAndSelect('op.bizplace', 'bz')
+            .innerJoinAndSelect('op.orderPackageItems', 'opi')
+            .innerJoinAndSelect('opi.orderProduct', 'opr')
+            .innerJoinAndSelect('opr.productDetail', 'pd')
+            .innerJoinAndSelect('pd.product', 'p')
+            .where(`op.bizplace_id = :bizplaceId`, { bizplaceId: filter.bizplaceId });
+        if (filter.id) {
+            rb.andWhere(`mf.id = :id`, { id: filter.id });
+        }
+        else if (filter.name) {
+            rb.andWhere(`mf.name = :name`, { name: filter.name });
+        }
+        const result = await rb.getOne();
+        let data;
+        if (result) {
+            data = {
+                id: result.id,
+                name: result.name,
+                dispatchedAt: result.dispatchedAt,
+                dispatcherIdentity: result.dispatcherIdentity,
+                dispatcherName: result.dispatcherName,
+                shippingProvider: result.shippingProvider,
+                totalOrderPackages: result.orderPackages.length,
+                orderPackages: result.orderPackages.map(op => {
+                    return {
+                        airwayBill: op.airwayBill,
+                        dispatchmentStatus: op.dispatchmentStatus,
+                        id: op.id,
+                        lastMileDeliveryId: op.lastMileDeliveryId,
+                        lmdOption: op.lmdOption,
+                        manifestId: op.manifestId,
+                        manifestedAt: op.manifestedAt,
+                        name: op.name,
+                        packageId: op.packageId,
+                        parcelId: op.parcelId,
+                        status: op.status,
+                        trackingNo: op.trackingNo,
+                        transporter: op.transporter,
+                        orderPackageItems: op.orderPackageItems.map(opi => {
+                            return {
+                                name: opi.name,
+                                id: opi.id,
+                                packedQty: opi.packedQty,
+                                releaseQty: opi.releaseQty,
+                                orderProduct: {
+                                    packingSize: opi.orderProduct.packingSize,
+                                    packingType: opi.orderProduct.packingType,
+                                    releaseQty: opi.orderProduct.releaseQty,
+                                    releaseUomValue: opi.orderProduct.releaseUomValue,
+                                    uom: opi.orderProduct.uom,
+                                    uomValue: opi.orderProduct.uomValue,
+                                    packedQty: opi.orderProduct.packedQty,
+                                    productDetail: {
+                                        id: opi.orderProduct.productDetail.id,
+                                        name: opi.orderProduct.productDetail.name,
+                                        grossWeight: opi.orderProduct.productDetail.grossWeight,
+                                        nettWeight: opi.orderProduct.productDetail.nettWeight,
+                                        weightUnit: opi.orderProduct.productDetail.weightUnit,
+                                        uom: opi.orderProduct.productDetail.uom,
+                                        uomValue: opi.orderProduct.productDetail.uomValue,
+                                        packingSize: opi.orderProduct.productDetail.packingSize,
+                                        packingType: opi.orderProduct.productDetail.packingType,
+                                        product: {
+                                            id: opi.orderProduct.productDetail.product.id,
+                                            name: opi.orderProduct.productDetail.product.name,
+                                            sku: opi.orderProduct.productDetail.product.sku,
+                                            weight: opi.orderProduct.productDetail.product.weight,
+                                            weightUnit: opi.orderProduct.productDetail.product.weightUnit
+                                        }
+                                    }
+                                }
+                            };
+                        }),
+                        releaseGood: {
+                            id: op.releaseGood.id,
+                            name: op.releaseGood.name,
+                            refNo: op.releaseGood.refNo,
+                            refNo2: op.releaseGood.refNo2,
+                            refNo3: op.releaseGood.refNo3,
+                            shippingFee: op.releaseGood.shippingFee,
+                            transporter: op.releaseGood.transporter
+                        },
+                        bizplace: {
+                            id: op.bizplace.id,
+                            name: op.bizplace.name
+                        }
+                    };
+                })
+            };
+        }
+        else {
+            data = {};
+        }
+        context.body = {
+            data
+        };
+    }
+    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-manifest-details.js.map

package/dist-server/routers/api/restful-apis/v1/warehouse/get-manifest-details.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/dist-server/routers/api/restful-apis/v1/warehouse/get-onhand-inventory-list.js CHANGED Viewed

@@ -56,6 +56,8 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-onhand-inventory-list', middleware
                 packingType: inventory.packingType,
                 packingSize: inventory.packingSize,
                 qty: inventory.qty,
+                uom: inventory.uom,
+                uomValue: inventory.uomValue,
                 reservedQty: inventory.lockedQty,
                 expirationDate: inventory.expirationDate,
                 weight: inventory.product.weight

package/dist-server/routers/api/restful-apis/v1/warehouse/get-onhand-inventory-list.js.map CHANGED Viewed

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

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

@@ -20,4 +20,5 @@ require("./get-do-document");
 require("./dispatch-delivery-order");
 require("./update-gan-to-arrived");
 require("./complete-delivery-order");
+require("./get-manifest-details");
 //# sourceMappingURL=index.js.map

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

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

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.366",
+  "version": "4.3.368",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -77,22 +77,22 @@
     "@things-factory/i18n-base": "^4.3.281",
     "@things-factory/import-ui": "^4.3.281",
     "@things-factory/import-ui-excel": "^4.3.281",
-    "@things-factory/integration-accounting": "^4.3.357",
-    "@things-factory/integration-fulfillment": "^4.3.344",
-    "@things-factory/integration-lmd": "^4.3.366",
-    "@things-factory/integration-marketplace": "^4.3.366",
-    "@things-factory/integration-pos": "^4.3.344",
-    "@things-factory/integration-powrup": "^4.3.366",
-    "@things-factory/integration-sellercraft": "^4.3.366",
-    "@things-factory/integration-sftp": "^4.3.344",
+    "@things-factory/integration-accounting": "^4.3.367",
+    "@things-factory/integration-fulfillment": "^4.3.367",
+    "@things-factory/integration-lmd": "^4.3.367",
+    "@things-factory/integration-marketplace": "^4.3.367",
+    "@things-factory/integration-pos": "^4.3.367",
+    "@things-factory/integration-powrup": "^4.3.367",
+    "@things-factory/integration-sellercraft": "^4.3.367",
+    "@things-factory/integration-sftp": "^4.3.367",
     "@things-factory/lite-menu": "^4.3.344",
-    "@things-factory/marketplace-base": "^4.3.366",
+    "@things-factory/marketplace-base": "^4.3.367",
     "@things-factory/more-ui": "^4.3.281",
     "@things-factory/notification": "^4.3.281",
     "@things-factory/pdf": "^4.3.281",
     "@things-factory/product-ui": "^4.3.357",
     "@things-factory/resource-ui": "^4.3.281",
-    "@things-factory/sales-base": "^4.3.366",
+    "@things-factory/sales-base": "^4.3.367",
     "@things-factory/scene-data-transform": "^4.3.281",
     "@things-factory/scene-excel": "^4.3.281",
     "@things-factory/scene-firebase": "^4.3.281",
@@ -107,8 +107,8 @@
     "@things-factory/setting-ui": "^4.3.281",
     "@things-factory/shell": "^4.3.281",
     "@things-factory/system-ui": "^4.3.281",
-    "@things-factory/warehouse-base": "^4.3.366",
-    "@things-factory/worksheet-base": "^4.3.366",
+    "@things-factory/warehouse-base": "^4.3.367",
+    "@things-factory/worksheet-base": "^4.3.368",
     "cron-parser": "^4.7.0",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
@@ -120,5 +120,5 @@
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "b6e42a97a2f2f249fc6be0d2026690c309f8bfe7"
+  "gitHead": "179ea4bed69193b67379d92b8cc0c6ef8311e55f"
 }

package/server/routers/api/restful-apis/v1/company/index.ts CHANGED Viewed

@@ -4,3 +4,4 @@ import './get-bizplace-list'
 import './get-contact-point-list'
 import './get-partner-list'
 import './get-product-list'
+import './upsert-product'

package/server/routers/api/restful-apis/v1/company/upsert-product.ts ADDED Viewed

@@ -0,0 +1,322 @@
+import _ from 'lodash'
+import {
+  EntityManager,
+  getConnection,
+  getRepository,
+  In
+} from 'typeorm'
+import { restfulApiRouter as router } from '@things-factory/api'
+import { Bizplace } from '@things-factory/biz-base'
+import {
+  Product,
+  ProductBarcode,
+  ProductDetail
+} from '@things-factory/product-base'
+import {
+  businessMiddleware,
+  loggingMiddleware,
+  validationMiddleware
+} from '../middlewares'
+import {
+  ApiError,
+  ApiErrorHandler,
+  throwInternalServerError
+} from '../utils/error-util'
+router.post(
+  '/v1/company/upsert-product',
+  businessMiddleware,
+  validationMiddleware,
+  loggingMiddleware,
+  async (context, next) => {
+    try {
+      await getConnection().transaction(async (tx: EntityManager) => {
+        if (!Array.isArray(context.request.body.data)) throw new ApiError('E01', 'data field is not an array')
+        let params = { ...context.query }
+        let productInfo = context.request.body.data
+        const skus = productInfo.map(p => p.sku)
+        const { user, domain } = context.state
+        let response = []
+        let newSku = []
+        let existingSku = []
+        let checkSku
+        if (!skus) {
+          throw new ApiError('E03', 'sku')
+        }
+        let duplicateSku = skus.filter((item, index) => skus.indexOf(item) != index)
+        if (duplicateSku?.length > 0) {
+          throw new ApiError('E05', `duplicated products found: ${[...new Set(duplicateSku)]}`)
+        }
+        //get bizplace
+        let bizplace = await getRepository(Bizplace).findOne({
+          where: {
+            domain
+          }
+        })
+        //check Existing sku
+        checkSku = await getRepository(Product).find({
+          where: {
+            sku: In(skus),
+            bizplace
+          },
+          relations: ['productDetails', 'productDetails.productBarcodes']
+        })
+        //separate between existingSku and newSku
+        for (const product of productInfo) {
+          const skuExists = checkSku.some(existingProduct => existingProduct.sku === product.sku)
+          if (!(product?.productDetails?.length > 0)) {
+            throw new ApiError('E01', 'missing product detail')
+          }
+          if (skuExists) {
+            existingSku.push(product)
+          } else {
+            newSku.push(product)
+          }
+        }
+        if (existingSku.length > 0) {
+          //update product
+          await Promise.all(
+            existingSku.map(async p => {
+              let product = p
+              let matchingSku = checkSku.find(itm => itm.sku == p.sku)
+              const productDetails = p.productDetails
+              product.id = matchingSku.id
+              product.domain = domain
+              product.bizplace = bizplace
+              product.updater = user
+              delete product.productDetails
+              let result = await tx.getRepository(Product).save(product)
+              let pds = await Promise.all(
+                productDetails.map(async pd => {
+                  let productBarcodes = pd.productBarcodes
+                  delete pd.productBarcodes
+                  if (pd.packingSize < 0) throw new ApiError('E01', `${pd.gtin}: packing size cannot be negative`)
+                  const productDetail = pd
+                  const matchingPd = checkSku.map(itm => {
+                    const matchingProductDetail = itm.productDetails.find(prodDetail => {
+                      return (
+                        prodDetail.packingSize === pd.packingSize &&
+                        prodDetail.packingType === pd.packingType &&
+                        prodDetail.uom === pd.uom
+                      )
+                    })
+                    return { matchingProductDetail }
+                  })
+                  let pdResult: ProductDetail
+                  const foundIndex = matchingPd.findIndex(itm => itm.matchingProductDetail)
+                  if (foundIndex != -1) {
+                    pdResult = await tx.getRepository(ProductDetail).save({
+                      ...productDetail,
+                      id: matchingPd[foundIndex].matchingProductDetail.id,
+                      name: productDetail.gtin,
+                      product: result,
+                      childProductDetail: null,
+                      childQty: 0,
+                      creatorId: matchingPd[foundIndex].matchingProductDetail.creatorId,
+                      domain: domain,
+                      updater: user
+                    })
+                  } else {
+                    pdResult = await tx.getRepository(ProductDetail).save({
+                      ...productDetail,
+                      name: productDetail.gtin,
+                      product: result,
+                      childProductDetail: null,
+                      childQty: 0,
+                      creator: user,
+                      domain: domain,
+                      updater: user
+                    })
+                  }
+                  delete pdResult.creator
+                  delete pdResult.updater
+                  delete pdResult.product
+                  delete pdResult.domain
+                  let pbs: ProductBarcode[]
+                  productBarcodes = productBarcodes.filter(barcode => Object.keys(barcode).length > 0)
+                  if (productBarcodes.length > 0) {
+                    pbs = await Promise.all(
+                      productBarcodes.map(async pb => {
+                        let existingPb: ProductBarcode
+                        existingPb = await tx.getRepository(ProductBarcode).findOne({
+                          where: {
+                            gtin: pb.gtin,
+                            productDetail: pdResult.id
+                          }
+                        })
+                        if (existingPb) {
+                          // Update existing productBarcode
+                          pdResult.productBarcodes = pdResult.productBarcodes || []
+                          pdResult.productBarcodes.push(pb.gtin)
+                          return tx.getRepository(ProductBarcode).update(existingPb.id, {
+                            ...pb,
+                            product: result,
+                            productDetail: pdResult.id,
+                            updater: user
+                          })
+                        } else {
+                          // Create a new productBarcode
+                          pdResult.productBarcodes = pdResult.productBarcodes || []
+                          pdResult.productBarcodes.push(pb.gtin)
+                          return tx.getRepository(ProductBarcode).save({
+                            gtin: pb.gtin ? pb.gtin : result.sku,
+                            product: result,
+                            productDetail: pdResult,
+                            domain,
+                            creator: user,
+                            updater: user
+                          })
+                        }
+                      })
+                    )
+                  } else {
+                    let existingPb: ProductBarcode
+                    existingPb = await tx.getRepository(ProductBarcode).findOne({
+                      where: {
+                        gtin: result.sku,
+                        productDetail: pdResult.id
+                      }
+                    })
+                    if (!existingPb) {
+                      pbs = [
+                        {
+                          gtin: result.sku,
+                          product,
+                          productDetail: pdResult,
+                          domain,
+                          creator: user,
+                          updater: user
+                        }
+                      ]
+                      await tx.getRepository(ProductBarcode).save(pbs)
+                      pdResult.productBarcodes = pbs.map(pb => pb.gtin)
+                    }
+                    if (existingPb) {
+                      pdResult.productBarcodes = [existingPb.gtin]
+                    }
+                  }
+                  return pdResult
+                })
+              )
+              delete result.creator
+              delete result.updater
+              delete result.bizplace
+              delete result.domain
+              response.push({ ...result, productDetails: pds })
+            })
+          )
+        }
+        //add new product
+        if (newSku.length > 0) {
+          await Promise.all(
+            newSku.map(async p => {
+              let product = p
+              const productDetails = p.productDetails
+              product.domain = domain
+              product.bizplace = bizplace
+              product.creator = user
+              product.updater = user
+              delete product.productDetails
+              let result = await tx.getRepository(Product).save(product)
+              // save product details
+              let pds = await Promise.all(
+                productDetails.map(async pd => {
+                  if (pd.packingSize < 0) throw new ApiError('E01', `${pd.gtin}: packing size cannot be negative`)
+                  const productDetail = pd
+                  const productBarcodes = productDetail.productBarcodes
+                  let pdResult = await tx.getRepository(ProductDetail).save({
+                    ...productDetail,
+                    name: productDetail.gtin,
+                    product: result,
+                    childProductDetail: null,
+                    childQty: 0,
+                    domain: domain,
+                    creator: user,
+                    updater: user
+                  })
+                  delete pdResult.creator
+                  delete pdResult.updater
+                  delete pdResult.product
+                  delete pdResult.domain
+                  let pbs: ProductBarcode[]
+                  if (productBarcodes) {
+                    pbs = productBarcodes.map(pb => {
+                      return {
+                        ...pb,
+                        gtin: pb.gtin ? pb.gtin : result.sku,
+                        product,
+                        productDetail: pdResult,
+                        domain,
+                        creator: user,
+                        updater: user
+                      }
+                    })
+                    pdResult.productBarcodes = pbs.map(pb => pb.gtin)
+                  } else {
+                    pbs = [
+                      {
+                        gtin: result.sku,
+                        product: result,
+                        productDetail: pdResult,
+                        domain,
+                        creator: user,
+                        updater: user
+                      }
+                    ]
+                    pdResult.productBarcodes = pbs.map(pb => pb.gtin)
+                  }
+                  await tx.getRepository(ProductBarcode).save(pbs)
+                  return pdResult
+                })
+              )
+              delete result.creator
+              delete result.updater
+              delete result.bizplace
+              delete result.domain
+              response.push({ ...result, productDetails: pds })
+            })
+          )
+        }
+        //set up response body
+        context.body = {
+          data: response
+        }
+      })
+    } catch (e) {
+      if (e instanceof ApiError) ApiErrorHandler(context, e)
+      else throwInternalServerError(context, e)
+    }
+  }
+)