@things-factory/operato-hub 4.3.698 → 4.3.700

package/openapi/v1/return-order.yaml

@@ -251,6 +251,93 @@ definitions:
       updatedAt:
         type: string
         example: '2025-05-05T12:00:00Z'
+      newInventories:
+        type: array
+        description: 'New inventories from return order'
+        items:
+          type: object
+          properties:
+            batchId:
+              type: string
+              example: 'batch-001'
+            refItemId:
+              type: string
+              example: 'EXT-ITEM-123'
+            product:
+              type: object
+              properties:
+                id:
+                  type: string
+                  example: 'product-uuid'
+                sku:
+                  type: string
+                  example: '1234567890'
+                brandSku:
+                  type: string
+                  example: '1234567890'
+                brand:
+                  type: string
+                  example: 'Brand A'
+                subBrand:
+                  type: string
+                  example: 'Sub Brand A'
+            productDetail:
+              type: object
+              properties:
+                id:
+                  type: string
+                  example: 'product-detail-uuid'
+                refCode:
+                  type: string
+                  example: '1234567890'
+                packingType:
+                  type: string
+                  example: 'box'
+                packingSize:
+                  type: integer
+                  example: 24
+                uom:
+                  type: string
+                  example: 'PCS'
+                uomValue:
+                  type: number
+                  example: 10.0
+            qty:
+              type: integer
+              example: 10
+            status:
+              type: string
+              example: 'PUTTING_AWAY'
+            remark:
+              type: string
+              example: 'Putaway in progress'
+            location:
+              type: object
+              properties:
+                id:
+                  type: string
+                  example: 'location-uuid'
+                name:
+                  type: string
+                  example: 'A-01-01'
+                type:
+                  type: string
+                  example: 'STORAGE'
+                zone:
+                  type: string
+                  example: 'A'
+                warehouse:
+                  type: object
+                  properties:
+                    id:
+                      type: string
+                      example: 'warehouse-uuid'
+                    name:
+                      type: string
+                      example: 'Main Warehouse'
+                    description:
+                      type: string
+                      example: 'Primary storage facility'
       itemInfos:
         type: array
         items:
@@ -334,33 +421,6 @@ definitions:
             status:
               type: string
               example: 'PENDING'
-            location:
-              type: object
-              properties:
-                id:
-                  type: string
-                  example: 'location-uuid'
-                name:
-                  type: string
-                  example: 'A-01-01'
-                type:
-                  type: string
-                  example: 'STORAGE'
-                zone:
-                  type: string
-                  example: 'A'
-                warehouse:
-                  type: object
-                  properties:
-                    id:
-                      type: string
-                      example: 'warehouse-uuid'
-                    name:
-                      type: string
-                      example: 'Main Warehouse'
-                    description:
-                      type: string
-                      example: 'Primary storage facility'
     xml:
       name: 'ReturnOrderDetail'
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.698",
+  "version": "4.3.700",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -60,8 +60,8 @@
     "@things-factory/attachment-base": "^4.3.695",
     "@things-factory/auth-base": "^4.3.695",
     "@things-factory/auth-ui": "^4.3.695",
-    "@things-factory/biz-base": "^4.3.695",
-    "@things-factory/biz-ui": "^4.3.695",
+    "@things-factory/biz-base": "^4.3.700",
+    "@things-factory/biz-ui": "^4.3.700",
     "@things-factory/board-service": "^4.3.695",
     "@things-factory/board-ui": "^4.3.695",
     "@things-factory/code-ui": "^4.3.695",
@@ -76,23 +76,23 @@
     "@things-factory/help": "^4.3.695",
     "@things-factory/i18n-base": "^4.3.695",
     "@things-factory/import-ui": "^4.3.695",
-    "@things-factory/import-ui-excel": "^4.3.695",
-    "@things-factory/integration-accounting": "^4.3.695",
-    "@things-factory/integration-fulfillment": "^4.3.695",
-    "@things-factory/integration-lmd": "^4.3.695",
-    "@things-factory/integration-marketplace": "^4.3.695",
-    "@things-factory/integration-pos": "^4.3.695",
-    "@things-factory/integration-powrup": "^4.3.695",
-    "@things-factory/integration-sellercraft": "^4.3.695",
-    "@things-factory/integration-sftp": "^4.3.695",
+    "@things-factory/import-ui-excel": "^4.3.700",
+    "@things-factory/integration-accounting": "^4.3.700",
+    "@things-factory/integration-fulfillment": "^4.3.700",
+    "@things-factory/integration-lmd": "^4.3.700",
+    "@things-factory/integration-marketplace": "^4.3.700",
+    "@things-factory/integration-pos": "^4.3.700",
+    "@things-factory/integration-powrup": "^4.3.700",
+    "@things-factory/integration-sellercraft": "^4.3.700",
+    "@things-factory/integration-sftp": "^4.3.700",
     "@things-factory/lite-menu": "^4.3.695",
-    "@things-factory/marketplace-base": "^4.3.695",
+    "@things-factory/marketplace-base": "^4.3.700",
     "@things-factory/more-ui": "^4.3.695",
     "@things-factory/notification": "^4.3.695",
     "@things-factory/pdf": "^4.3.591",
-    "@things-factory/product-ui": "^4.3.695",
+    "@things-factory/product-ui": "^4.3.700",
     "@things-factory/resource-ui": "^4.3.695",
-    "@things-factory/sales-base": "^4.3.697",
+    "@things-factory/sales-base": "^4.3.700",
     "@things-factory/scene-data-transform": "^4.3.591",
     "@things-factory/scene-excel": "^4.3.591",
     "@things-factory/scene-firebase": "^4.3.591",
@@ -107,9 +107,9 @@
     "@things-factory/setting-ui": "^4.3.695",
     "@things-factory/shell": "^4.3.695",
     "@things-factory/system-ui": "^4.3.695",
-    "@things-factory/transport-base": "^4.3.695",
-    "@things-factory/warehouse-base": "^4.3.695",
-    "@things-factory/worksheet-base": "^4.3.697",
+    "@things-factory/transport-base": "^4.3.700",
+    "@things-factory/warehouse-base": "^4.3.700",
+    "@things-factory/worksheet-base": "^4.3.700",
     "cron-parser": "^4.7.0",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
@@ -122,5 +122,5 @@
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "1a0a2828c1aa397acb656eea3ceb4d29ddc9d6ad"
+  "gitHead": "f1b712fc8f3a7b7b5136204e4c4fd6bfad0e766e"
 }

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

@@ -26,11 +26,15 @@ router.post(
         // check if phone or email already belongs in bizplace
         const phones = []
         const emails = []
+        const ids = []
         let values = []
         for (const datapoint of context.request.body.data) {
           phones.push(datapoint.phone)
           emails.push(datapoint.email)
-          const value = {
+          if (datapoint.id) {
+            ids.push(datapoint.id)
+          }
+          const value: any = {
             name: datapoint.name,
             description: datapoint.description,
             companyName: datapoint.companyName,
@@ -43,6 +47,8 @@ router.post(
             address2: datapoint.address2,
             city: datapoint.city,
             state: datapoint.state,
+            country: datapoint.country,
+            releaseShelfLife: datapoint.releaseShelfLife,
             postCode: datapoint.postCode,
             type: datapoint.type,
             domain: context.state.domain,
@@ -50,9 +56,28 @@ router.post(
             creator: context.state.user,
             updater: context.state.user
           }
+          // Add id if provided by external system
+          if (datapoint.id) {
+            value.id = datapoint.id
+          }
           values.push(value)
         }
 
+        // Check for duplicate IDs if provided
+        if (ids.length > 0) {
+          const checkDuplicateIds: ContactPoint[] = await tx
+            .getRepository(ContactPoint)
+            .createQueryBuilder('cp')
+            .where('cp.id IN (:...ids)', { ids })
+            .getMany()
+          if (checkDuplicateIds.length > 0) {
+            throw new ApiError(
+              'E05',
+              `Contact point ID(s) already exist: ${checkDuplicateIds.map(cp => cp.id).join(', ')}`
+            )
+          }
+        }
+
         const checkDuplicateEmailPhone: ContactPoint = await tx
           .getRepository(ContactPoint)
           .createQueryBuilder('cp')
@@ -80,6 +105,7 @@ router.post(
         let data = []
         for (const contactPoint of result.generatedMaps) {
           const datapoint = {
+            id: contactPoint.id,
             name: contactPoint.name,
             description: contactPoint.description,
             companyName: contactPoint.companyName,
@@ -92,6 +118,8 @@ router.post(
             address2: contactPoint.address2,
             city: contactPoint.city,
             state: contactPoint.state,
+            country: contactPoint.country,
+            releaseShelfLife: contactPoint.releaseShelfLife,
             postCode: contactPoint.postCode,
             type: contactPoint.type,
             createdAt: contactPoint.createdAt

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

@@ -83,6 +83,7 @@ export const params = {
   'get-webhook-details': ['warehouseBizplaceId', 'webhookId'],
   'add-contact-points': [
     'bizplaceId',
+    'id',
     'name',
     'companyName',
     'description',
@@ -95,6 +96,8 @@ export const params = {
     'address2',
     'city',
     'state',
+    'country',
+    'releaseShelfLife',
     'postCode',
     'type'
   ],
@@ -358,6 +361,7 @@ export const params = {
     'refNo2',
     'refNo3',
     'refOrderId',
+    'contactPointId',
     'type',
     'transporter',
     'trackingNo',
@@ -1112,6 +1116,11 @@ export const reqParams = {
       required: true,
       type: 'field'
     },
+    {
+      name: 'contactPointId',
+      required: false,
+      type: 'field'
+    },
     {
       name: 'shippingOrder',
       required: false,