@things-factory/operato-hub 4.3.318 → 4.3.321

package/openapi/v1/product.yaml

@@ -372,21 +372,21 @@ paths:
                     sku:
                       type: 'string'
                       required: true
-                      example: 'LB-18'
+                      example: 'LB-18''(MANDATORY)'
                     brandSku:
                       type: 'string'
                       example: 'string'
                     name:
                       type: 'string'
                       required: true
-                      example: '50PCS PLASTIC LUNCH BOX'
+                      example: '50PCS PLASTIC LUNCH BOX''(MANDATORY)'
                     description:
                       type: 'string'
                       example: 'Lid 5 Compartments HIRO Sekat Disposable Paper Recyclable biodegradable Microwavable'
                     type:
                       type: 'string'
                       required: true
-                      example: 'PLASTIC'
+                      example: 'PLASTIC''(MANDATORY)'
                     brand:
                       type: 'string'
                       example: 'COLGATE-PALMOLIVE'
@@ -426,31 +426,31 @@ paths:
                           isDefault:
                             type: 'boolean'
                             required: true
-                            example: true
+                            example: true '(MANDATORY)'
                           gtin:
                             type: 'string'
                             required: true
-                            example: 'string'
+                            example: 'string''(MANDATORY)'
                           refCode:
                             type: 'string'
                             example: 'string'
                           packingType:
                             type: 'string'
                             required: true
-                            example: CARTON
+                            example: CARTON'(MANDATORY)'
                           packingSize:
                             type: 'integer'
                             required: true
-                            example: 24
+                            example: 24'(MANDATORY)'
                           uom:
                             type: 'string'
                             required: true
-                            example: UNIT
+                            example: UNIT'(MANDATORY)'
                           uomValue:
                             type: 'integer'
                             format: 'double'
                             required: true
-                            example: 24
+                            example: 24 '(MANDATORY)'
                           costPrice:
                             type: 'integer'
                             format: 'double'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.318",
+  "version": "4.3.321",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -84,7 +84,7 @@
     "@things-factory/integration-pos": "^4.3.310",
     "@things-factory/integration-powrup": "^4.3.310",
     "@things-factory/integration-sellercraft": "^4.3.310",
-    "@things-factory/integration-sftp": "^4.3.310",
+    "@things-factory/integration-sftp": "^4.3.319",
     "@things-factory/lite-menu": "^4.3.281",
     "@things-factory/marketplace-base": "^4.3.318",
     "@things-factory/more-ui": "^4.3.281",
@@ -92,7 +92,7 @@
     "@things-factory/pdf": "^4.3.281",
     "@things-factory/product-ui": "^4.3.318",
     "@things-factory/resource-ui": "^4.3.281",
-    "@things-factory/sales-base": "^4.3.318",
+    "@things-factory/sales-base": "^4.3.321",
     "@things-factory/scene-data-transform": "^4.3.281",
     "@things-factory/scene-excel": "^4.3.281",
     "@things-factory/scene-firebase": "^4.3.281",
@@ -108,7 +108,7 @@
     "@things-factory/shell": "^4.3.281",
     "@things-factory/system-ui": "^4.3.281",
     "@things-factory/warehouse-base": "^4.3.318",
-    "@things-factory/worksheet-base": "^4.3.318",
+    "@things-factory/worksheet-base": "^4.3.321",
     "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": "e9cb9910147c1f9eb4e353a1491392fe29828ae5"
+  "gitHead": "58660eeeb3fb4edcd3992c67b1e20e26d7a5dde2"
 }

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

@@ -427,6 +427,7 @@ export const params = {
 // Required Params
 export const reqParams = {
   'get-contact-point-list': ['bizplaceId'],
+  'get-partner-list': ['bizplaceId'],
   'get-product-list': ['bizplaceId'],
   'get-marketplace-order-shipping-list': ['storeId'],
   'get-inbound-order-list': ['bizplaceId'],

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

@@ -1,12 +1,11 @@
-import { getConnection, EntityManager, In, Brackets } from 'typeorm'
+import { EntityManager, getConnection } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
-import { DeliveryOrder, ShippingOrder, OrderNoGenerator, ReleaseGood, OrderInventory } from '@things-factory/sales-base'
+import { DeliveryOrder, OrderInventory, OrderNoGenerator, ReleaseGood, ShippingOrder } from '@things-factory/sales-base'
 import { TransportDriver, TransportVehicle } from '@things-factory/transport-base'
-import { ContactPoint } from '@things-factory/biz-base'
 
-import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
 import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
+import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
 
 router.post(
   '/v1/warehouse/dispatch-delivery-order',
@@ -177,29 +176,34 @@ router.post(
         )
 
         // update OrderInventories remark
+        if (data?.orderInventories && data?.orderInventories?.length) {
+          for (let i = 0; i < data.orderInventories.length; i++) {
+            const oi: OrderInventory = data.orderInventories[i]
+            if (!oi?.id) {
+              throw new ApiError('E03', 'id is missing in orderInventories')
+            }
 
-        const foundOIs: OrderInventory[] = await tx.getRepository(OrderInventory).find({
-          where: {
-            id: In(data.orderInventories.map(oi => oi.id)),
-            domain: domain,
-            releaseGood: foundDeliveryOrder.releaseGood.id
-          }
-        })
-        if (foundOIs.length > 0) {
-          await Promise.all(
-            foundOIs.map(async orderInventory => {
-              await tx.getRepository(OrderInventory).update(
-                { id: orderInventory.id },
-                {
-                  remark: data.orderInventories.find(dOi => dOi.id === orderInventory.id)?.remark,
-                  updater: user,
-                  updatedAt: new Date()
-                }
-              )
+            const foundOI: OrderInventory = await tx.getRepository(OrderInventory).findOne({
+              where: {
+                id: oi.id,
+                domain: domain,
+                releaseGood: foundDeliveryOrder.releaseGood.id
+              }
             })
-          )
-        } else {
-          throw new ApiError('E04', `Unable to find orderInventory`)
+
+            if (!foundOI) {
+              throw new ApiError('E04', `Unable to find orderInventory with id: ${oi.id}`)
+            }
+
+            await tx.getRepository(OrderInventory).update(
+              { id: oi.id },
+              {
+                remark: oi?.remark,
+                updater: user,
+                updatedAt: new Date()
+              }
+            )
+          }
         }
 
         // update release Good

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

@@ -2,8 +2,8 @@ import _ from 'lodash'
 import { getRepository } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
-import { ReleaseGood, DeliveryOrder } from '@things-factory/sales-base'
 import { Attachment } from '@things-factory/attachment-base'
+import { DeliveryOrder, ReleaseGood } from '@things-factory/sales-base'
 
 import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
@@ -110,8 +110,9 @@ router.get(
             transportVehicle: deliveryOrder.transportVehicle
               ? { id: deliveryOrder.transportVehicle.id, name: deliveryOrder.transportVehicle.name }
               : null,
-            orderInventories: deliveryOrder.orderInventories.map(oi=>{
-              return{
+            orderInventories: deliveryOrder.orderInventories.map(oi => {
+              return {
+                id: oi.id,
                 releaseQty: oi.releaseQty,
                 releaseUomValue: oi.releaseUomValue,
                 packingType: oi.packingType,
@@ -121,12 +122,12 @@ router.get(
                   id: oi.product.id,
                   name: oi.product.name,
                   description: oi.product.description,
-                  sku: oi.product.sku,
+                  sku: oi.product.sku
                 },
-                productDetail: { refCode: oi.productDetail.refCode ? oi.productDetail.refCode : null 
+                productDetail: { refCode: oi.productDetail.refCode ? oi.productDetail.refCode : null }
               }
-            }}) 
-            
+            })
+
             // {
             //   product: deliveryOrder.orderInventories.map(oi => {
             //     return {
@@ -147,12 +148,11 @@ router.get(
         where: { refBy: releaseGood.id }
       })
 
-      if(attachments.length >0){
+      if (attachments.length > 0) {
         attachments = attachments.map(attachment => {
-           
-          return{
+          return {
             name: attachment.name,
-            fullpath:  `${context.origin}/attachment/${attachment.path}`
+            fullpath: `${context.origin}/attachment/${attachment.path}`
           }
         })
       }
@@ -206,7 +206,7 @@ router.get(
           email: releaseGood.email
         },
         orderInventories,
-        orderPackages: orderPackages.length > 0 ? orderPackages: null,
+        orderPackages: orderPackages.length > 0 ? orderPackages : null,
         deliveryOrders: deliveryOrders.length > 0 ? deliveryOrders : null,
         attachment: attachments.length > 0 ? attachments : null
       }