@things-factory/operato-hub 4.3.366 → 4.3.368

package/server/routers/api/restful-apis/v1/utils/params.ts

@@ -25,6 +25,7 @@ export const params = {
   'get-delivery-order-list': ['bizplaceId', 'doNo', 'vehicleNo', ...fromToDate, ...limitOffset],
   'get-onhand-inventory-list': ['bizplaceId', 'sku', 'batchId', 'fromDate', 'toDate', ...limitOffset],
   'get-inventory-product-group-list': ['bizplaceId', 'sku', 'batchId', ...fromToDate, ...limitOffset],
+  'get-manifest-details': ['bizplaceId', 'name', 'id'],
   'add-contact-points': [
     'bizplaceId',
     'name',
@@ -425,7 +426,55 @@ export const params = {
   ],
   'complete-delivery-order': ['remark', 'bizplaceId', 'name'],
   'update-gan-to-arrived': ['ganNo', 'bizplaceId'],
-  'get-warehouse-bizplace-onhand-inventories': ['bizplaceId']
+  'get-warehouse-bizplace-onhand-inventories': ['bizplaceId'],
+  'upsert-product': [
+    'sku',
+    'brandSku',
+    'name',
+    'description',
+    'type',
+    'brand',
+    'subBrand',
+    'isRequiredCheckExpiry',
+    'isRequireSerialNumberScanning',
+    'isRequireSerialNumberScanningInbound',
+    'isRequireSerialNumberScanningOutbound',
+    'pickingStrategy',
+    'minInboundShelfLife',
+    'productDetails',
+    'productDetails.isDefault',
+    'productDetails.gtin',
+    'productDetails.refCode',
+    'productDetails.packingType',
+    'productDetails.packingSize',
+    'productDetails.uom',
+    'productDetails.uomValue',
+    'productDetails.costPrice',
+    'productDetails.minQty',
+    'productDetails.maxQty',
+    'productDetails.bufferQty',
+    'productDetails.weightUnit',
+    'productDetails.movement',
+    'productDetails.nettWeight',
+    'productDetails.grossWeight',
+    'productDetails.lengthUnit',
+    'productDetails.width',
+    'productDetails.depth',
+    'productDetails.height',
+    'productDetails.volume',
+    'productDetails.auxUnit1',
+    'productDetails.auxValue1',
+    'productDetails.auxUnit2',
+    'productDetails.auxValue2',
+    'productDetails.auxUnit3',
+    'productDetails.auxValue3',
+    'productDetails.auxUnit4',
+    'productDetails.auxValue4',
+    'productDetails.auxUnit5',
+    'productDetails.auxValue5',
+    'productDetails.childProductDetail',
+    'productDetails.productBarcodes.gtin'
+  ]
 }
 
 // Required Params
@@ -442,7 +491,38 @@ export const reqParams = {
   'get-delivery-order-list': ['bizplaceId'],
   'get-onhand-inventory-list': ['bizplaceId'],
   'get-inventory-product-group-list': ['bizplaceId'],
+  'get-manifest-details': ['bizplaceId'],
   'get-warehouse-bizplace-onhand-inventories': ['bizplaceId'],
+  'upsert-product': [
+    {
+      name: 'sku',
+      required: true,
+      type: 'field'
+    },
+    {
+      name: 'name',
+      required: true,
+      type: 'field'
+    },
+    {
+      name: 'type',
+      required: true,
+      type: 'field'
+    },
+    {
+      name: 'productDetails',
+      required: true,
+      type: 'array',
+      data: [
+        { name: 'isDefault', required: true, type: 'field' },
+        { name: 'gtin', required: true, type: 'field' },
+        { name: 'packingType', required: true, type: 'field' },
+        { name: 'packingSize', required: true, type: 'field' },
+        { name: 'uom', required: true, type: 'field' },
+        { name: 'uomValue', required: true, type: 'field' }
+      ]
+    }
+  ],
   'add-contact-points': [
     {
       name: 'name',

package/server/routers/api/restful-apis/v1/warehouse/dispatch-delivery-order.ts

@@ -61,11 +61,7 @@ router.post(
         }
 
         // Drive and Vehicle Validation
-        if (
-          !data.transportDriver?.name ||
-          !data.transportDriver ||
-          (!data.transportDriver?.driverCode && !ownTransport)
-        ) {
+        if (!data.transportDriver?.name || !data.transportDriver) {
           throw new ApiError('E03', 'transportDriver')
         } else if (!data.transportVehicle?.name || !data.transportVehicle) {
           throw new ApiError('E03', 'transportVehicle')
@@ -76,12 +72,16 @@ router.post(
           transportVehicle = { name: data.transportVehicle?.name }
         } else {
           // find transportDriver & transportVehicle
+          let transportDriverFilter: any = {
+            domain: domain,
+            name: data?.transportDriver?.name
+          }
+
+          if (data?.transportDriver?.driverCode) {
+            transportDriverFilter.driverCode = data.transportDriver.driverCode
+          }
           const foundTransportDriver: TransportDriver = await tx.getRepository(TransportDriver).findOne({
-            where: {
-              domain: domain,
-              name: data.transportDriver?.name,
-              driverCode: data.transportDriver?.driverCode
-            }
+            where: transportDriverFilter
           })
 
           const foundTransportVehicle: TransportVehicle = await tx.getRepository(TransportVehicle).findOne({

package/server/routers/api/restful-apis/v1/warehouse/get-manifest-details.ts

@@ -0,0 +1,140 @@
+import _ from 'lodash'
+import { getRepository, SelectQueryBuilder } from 'typeorm'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+import { Manifest } from '@things-factory/sales-base'
+
+// import { OrderPackage } from '@things-factory/sales-base'
+import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
+import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
+
+router.get(
+  '/v1/warehouse/get-manifest-details',
+  businessMiddleware,
+  validationMiddleware,
+  loggingMiddleware,
+  async (context, next) => {
+    try {
+      // get contact points for that bizplace
+      // optional query parameter filter
+      let filter = { ...context.query }
+      const { fromDate, toDate, offset, limit } = filter
+
+      if (_.has(filter, 'id')) {
+        filter['id'] = filter['id']
+        delete filter['name']
+      } else if (_.has(filter, 'name')) {
+        filter['name'] = filter['name']
+        delete filter['id']
+      } else {
+        throw new ApiError('E03', 'id or name')
+      }
+
+      const rb: SelectQueryBuilder<Manifest> = getRepository(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 ApiError) ApiErrorHandler(context, e)
+      else throwInternalServerError(context, e)
+    }
+  }
+)

package/server/routers/api/restful-apis/v1/warehouse/get-onhand-inventory-list.ts

@@ -73,6 +73,8 @@ router.get(
           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/server/routers/api/restful-apis/v1/warehouse/index.ts

@@ -18,3 +18,4 @@ import './get-do-document'
 import './dispatch-delivery-order'
 import './update-gan-to-arrived'
 import './complete-delivery-order'
+import './get-manifest-details'