@things-factory/operato-hub 4.3.770 → 4.3.771

package/config.development.js

@@ -4,15 +4,46 @@ module.exports = {
   useVirtualHostBasedDomain: false,
   fallbackRoute: '/',
   subdomainOffset: 2,
-  port: 4445,
+  port: 3000,
   inspect: '9260',
-  storage: {
-    type: 's3',
-    accessKeyId: 'AKIAUQEOPWEJHCE4MTH4',
-    secretAccessKey: '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',
-    bucketName: 'opa-one',
-    region: 'ap-southeast-1'
+  //postgres
+  ormconfig: {
+    name: 'default',
+    type: 'postgres',
+    database: 'postgres',
+    username: 'postgres',
+    password: 't62dgT#Ns*GerhuZ9wnzm^',
+    host: 'my-operato-pg.cjcso4qmeuq0.ap-southeast-5.rds.amazonaws.com',
+    port: 55432,
+    synchronize: false,
+    logging: ['query', 'error'],
+    logger: 'advanced-console'
   },
+  //operato
+  // ormconfig: {
+  //   name: 'default',
+  //   type: 'postgres',
+  //   database: 'operato',
+  //   username: 'postgres',
+  //   password: 'hatio',
+  //   host: '192.168.0.151',
+  //   port: 15432,
+  //   synchronize: false,
+  //   logging: true
+  // },
+  //eric2
+  // ormconfig: {
+  //   name: 'default',
+  //   type: 'postgres',
+  //   database: 'eric2',
+  //   username: 'postgres',
+  //   password: 'hatio',
+  //   host: '192.168.0.153',
+  //   port: 15432,
+  //   synchronize: false,
+  //   logging: true
+  // },
+  // arif's
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
@@ -24,47 +55,30 @@ module.exports = {
   //   synchronize: false,
   //   logging: true
   // },
-
-  // STAGING DATABASE
-  ormconfig: {
-    name: 'default',
-    type: 'postgres',
-    database: 'staging',
-    username: 'postgres',
-    password: 't62dgT#Ns*GerhuZ9wnzm^',
-    host: 'my-operato-pg.cjcso4qmeuq0.ap-southeast-5.rds.amazonaws.com',
-    port: 55432,
-    synchronize: false,
-    logging: true
-  },
-
+  //EMS
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'operato',
+  //   database: 'EMS',
   //   username: 'postgres',
   //   password: 'hatio',
-  //   host: '192.168.0.153',
+  //   host: '192.168.0.161',
   //   port: 15432,
   //   synchronize: false,
   //   logging: true
   // },
-
-  //db izzah
+  //db nora
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: '06072023',
+  //   database: 'postgres',
   //   username: 'postgres',
   //   password: 'hatio',
-  //   host: '192.168.0.153',
+  //   host: '192.168.0.36',
   //   port: 15432,
   //   synchronize: true,
   //   logging: true
   // },
-  //postgres
-
-  // //ERIC
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
@@ -76,20 +90,18 @@ module.exports = {
   //   synchronize: true,
   //   logging: true
   // },
-
-  //eric2
+  //db izzah
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'eric2',
+  //   database: '06072023',
   //   username: 'postgres',
   //   password: 'hatio',
   //   host: '192.168.0.153',
   //   port: 15432,
-  //   synchronize: false,
+  //   synchronize: true,
   //   logging: true
   // },
-
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
@@ -103,6 +115,7 @@ module.exports = {
   //   connectTimeoutMS: 30000,
   //   extra: { poolSize: 30 }
   // },
+
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
@@ -116,6 +129,7 @@ module.exports = {
   //   connectTimeoutMS: 30000,
   //   extra: { poolSize: 30 }
   // },
+
   password: {
     lowerCase: true,
     upperCase: false,
@@ -130,10 +144,23 @@ module.exports = {
   },
   sftpFileStorage: {
     type: 's3',
-    accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
-    secretAccessKey: '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',
-    bucketName: 'operato-sftp'
+    accessKeyId: 'AKIAUQEOPWEJAMXCXGB4',
+    secretAccessKey: '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',
+    bucketName: 'operato-sftp',
+    region: 'ap-southeast-1'
   },
+
+  // SFTP Configuration for external server
+  // sftpExternal: {
+  //   type: 'sftp',
+  //   host: '103.4.6.168',
+  //   port: 2211,
+  //   username: 'hatio_admin',
+  //   password: 'Yltc@2025!',
+  //   basePath: '/Staging',
+  //   timeout: 30000,
+  //   retries: 3
+  // },
   // storage: {
   //   type: 's3',
   //   accessKeyId: 'AKIAUQEOPWEJCDH6AR5H',
@@ -167,11 +194,6 @@ module.exports = {
       ciphers: 'SSLv3'
     }
   },
-  jobQueue: {
-    // For JobQueueService/JobWorker (FIFO queue is supported)
-    queueUrl: 'https://sqs.ap-southeast-5.amazonaws.com/309536469266/operato-job-queue.fifo',
-    sqsRegion: 'ap-southeast-5'
-  },
   sender: 'noreply@hatiolab.com',
   notification: {
     // fcm: {
@@ -205,12 +227,20 @@ module.exports = {
     appSecret: '1c385935dc131c4b902b9bbf6a4798af',
     callback: 'http://192.168.0.161:5000/callback-operato'
   },
+
+  // Job queue (AWS SQS)
+  jobQueue: {
+    // For JobQueueService/JobWorker (FIFO queue is supported)
+    queueUrl: 'https://sqs.ap-southeast-5.amazonaws.com/309536469266/operato-job-queue.fifo',
+    sqsRegion: 'ap-southeast-5'
+  },
   marketplaceIntegrationShopee: {
     platform: 'shopee',
     isUAT: false,
     application: 'Operato MMS',
     partnerId: 846025,
-    partnerKey: 'd34cfd85a603f196a0d74ebe08043280c1a27788bb36bdffd61e7e0bb1c90b64'
+    partnerKey: 'd34cfd85a603f196a0d74ebe08043280c1a27788bb36bdffd61e7e0bb1c90b64',
+    v2: true
   },
   marketplaceIntegrationLazada: {
     platform: 'lazada',
@@ -219,6 +249,16 @@ module.exports = {
     appSecret: 'HB3RTNEXHlVSlBr9SmWF8AjbSUT7a825',
     callback: 'https://maybank.operato-m.com/lazada-callback'
   },
+
+  //testinglazada
+  // marketplaceIntegrationLazada: {
+  //   platform: 'lazada',
+  //   application: 'powrup_bi',
+  //   appKey: '117890',
+  //   appSecret: 'tQVllnUa7irAHoNxAwXEVxoP1we1bUjE',
+  //   callback: 'https://73c5-175-141-30-142.ngrok-free.app/lazada-callback'
+  // },
+
   accountingIntegrationXero: {
     platform: 'xero',
     application: 'Operato WMS',
@@ -227,21 +267,36 @@ module.exports = {
     callback: 'http://operato-h.com:3000/callback-xero',
     hostname: 'http://operato-h.com:3000/'
   },
-  lambda: {
-    region: 'ap-southeast-1',
-    accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
-    secretAccessKey: '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'
+  lmdIntegrationNinjavan: {
+    clientId: 'P8WCEwMo0FHNlPECwTLetwN3diAmt5KF',
+    secretKey: '1D0yNZGseOjhxnwri29xmuZiiuRp131L',
+    refreshThreshold: 43200
   },
+
+  lmdIntegrationEms: { refreshThreshold: 43200 },
+
+  lmdIntegrationCitylink: { refreshThreshold: 172800000 },
   awbFileStorage: {
     type: 's3',
-    accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
-    secretAccessKey: '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',
+    accessKeyId: 'AKIAUQEOPWEJPXIVER74',
+    secretAccessKey: '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',
     bucketName: 'operato-awb',
     region: 'ap-southeast-1'
   },
+  lambda: {
+    region: 'ap-southeast-1',
+    accessKeyId: 'AKIAUQEOPWEJPXIVER74',
+    secretAccessKey: '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'
+  },
+  lmdIntegrationConfig: {
+    version: {
+      v1: 'lmdMiddleware',
+      v2: 'lmdMiddlewareV2'
+    }
+  },
   awsSesEmail: {
-    accessKeyId: 'AKIAUQEOPWEJKQDJSEOG',
-    secretAccessKey: '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',
+    accessKeyId: 'AKIAUQEOPWEJPXIVER74',
+    secretAccessKey: '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',
     email: 'support@hatio.asia'
   },
   reportApiUrl:

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

@@ -816,6 +816,7 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
     }
 }
 async function assignToInventory(releaseGood, orderProducts, customerBizplace, context, tx, worksheetPickingAssignment) {
+    var _a;
     const { client, domain, user } = context.state;
     const pickingProductSetting = await tx.getRepository(setting_base_1.Setting).findOne({
         where: { domain, name: 'rule-for-picking-product' }
@@ -890,7 +891,7 @@ async function assignToInventory(releaseGood, orderProducts, customerBizplace, c
                 switch (itm === null || itm === void 0 ? void 0 : itm.operator) {
                     case 'notin':
                     case 'in':
-                        acc.query.push(`${itm.query} ${itm.operator == 'notin' ? 'NOT IN' : 'IN'} (${itm.filtes
+                        acc.query.push(`${itm.query} ${itm.operator == 'notin' ? 'NOT IN' : 'IN'} (${itm.filters
                             .map((itm, idx) => {
                             return `$${acc.values.length + 1}`;
                         })
@@ -900,7 +901,7 @@ async function assignToInventory(releaseGood, orderProducts, customerBizplace, c
                         acc.query.push(`${itm.query} ${(itm === null || itm === void 0 ? void 0 : itm.operator) ? itm.operator : '='} $${acc.values.length + 1}`);
                         break;
                 }
-                acc.query.push(`${itm.query} ${(itm === null || itm === void 0 ? void 0 : itm.operator) ? itm.operator : '='} $${acc.values.length + 1}`);
+                return acc;
             }, {
                 query: [],
                 values: []
@@ -926,16 +927,25 @@ async function assignToInventory(releaseGood, orderProducts, customerBizplace, c
                 params.push(orderInventory.batchId);
             }
             params = [...params, ...queryStrings.values];
-            let updatedInventories = await tx.getRepository(warehouse_base_1.Inventory).query(`
-        update inventories tgt set locked_qty = coalesce(locked_qty,0) + src.reserve_qty, 
+            // Add seed row parameters to avoid SQL injection
+            const seedUomIdx = params.length + 1;
+            const seedPackingTypeIdx = params.length + 2;
+            const seedPackingSizeIdx = params.length + 3;
+            const seedReleaseQtyIdx = params.length + 4;
+            const seedReleaseUomValueIdx = params.length + 5;
+            params.push(orderInventory.uom, orderInventory.packingType, orderInventory.packingSize, orderInventory.releaseQty, orderInventory.releaseUomValue);
+            const MAX_ASSIGN_RETRIES = 3;
+            const RETRY_DELAY_MS = 10;
+            const assignQuery = `
+        update inventories tgt set locked_qty = coalesce(locked_qty,0) + src.reserve_qty,
         locked_uom_value = coalesce(locked_uom_value,0) + src.reserve_uom_value,
         updated_at = NOW(),
         updater_id = $1
         from (
           select "id", "pallet_id","carton_id", "batch_id", "batch_id_ref", "unit", "uom", "packing_type", "packing_size", "manufacture_year",
-          "reserve_qty", (("uom_value"/"qty") * "reserve_qty") as "reserve_uom_value" from (	
-            select "sort_seq", "id", "pallet_id", "batch_id", "batch_id_ref", "unit", "uom", "packing_type", "packing_size", "manufacture_year", "carton_id", "uom_value", "locked_uom_value", "qty", "locked_qty", "created_at", 
-            "release_qty", "release_uom_value", lock_amount, 
+          "reserve_qty", (("uom_value"/"qty") * "reserve_qty") as "reserve_uom_value" from (
+            select "sort_seq", "id", "pallet_id", "batch_id", "batch_id_ref", "unit", "uom", "packing_type", "packing_size", "manufacture_year", "carton_id", "uom_value", "locked_uom_value", "qty", "locked_qty", "created_at",
+            "release_qty", "release_uom_value", lock_amount,
             case when "lock_amount" < 0 then "available_qty" else "available_qty" - "lock_amount" end as "reserve_qty"
             from (
               select *,
@@ -945,57 +955,81 @@ async function assignToInventory(releaseGood, orderProducts, customerBizplace, c
               ) as available_qty,
               sum(qty - locked_qty - release_qty - unassigned_qty) over (order by sort_seq asc rows between unbounded preceding and current row) as lock_amount
               from (
-                SELECT 0 as sort_seq, null as id, null as pallet_id, null as batch_id, null as batch_id_ref, 
-                null as unit, '${orderInventory.uom}' as uom, '${orderInventory.packingType}' as packing_type, '${orderInventory.packingSize}' as packing_size,
+                SELECT 0 as sort_seq, null as id, null as pallet_id, null as batch_id, null as batch_id_ref,
+                null as unit, $${seedUomIdx} as uom, $${seedPackingTypeIdx} as packing_type, $${seedPackingSizeIdx} as packing_size,
                 null as manufacture_year, null as carton_id, 0 as uom_value, 0 as locked_uom_value, 0 as qty, 0 as locked_qty, 0 as unassigned_uom_value, 0 as unassigned_qty, null as created_at,
-                '${orderInventory.releaseQty}' as release_qty, '${orderInventory.releaseUomValue}' as release_uom_value
+                $${seedReleaseQtyIdx}::numeric as release_qty, $${seedReleaseUomValueIdx}::numeric as release_uom_value
                 UNION
                 (
-                  SELECT ROW_NUMBER() OVER(PARTITION BY iv.domain_id ORDER BY wiar.rank ${sortQuery ? ', ' + sortQuery : ''}) as sort_seq, 
-                  iv.id, iv.pallet_id, iv.batch_id, iv.batch_id_ref, 
-                  iv.unit, iv.uom, iv.packing_type, iv.packing_size, 
-                  iv.manufacture_year, iv.carton_id, iv.uom_value, 
+                  SELECT ROW_NUMBER() OVER(PARTITION BY iv.domain_id ORDER BY wiar.rank ${sortQuery ? ', ' + sortQuery : ''}) as sort_seq,
+                  iv.id, iv.pallet_id, iv.batch_id, iv.batch_id_ref,
+                  iv.unit, iv.uom, iv.packing_type, iv.packing_size,
+                  iv.manufacture_year, iv.carton_id, iv.uom_value,
                   coalesce(iv.locked_uom_value,0) as locked_uom_value, iv.qty, greatest(coalesce(iv.locked_qty,0),0) as locked_qty, coalesce(pds.unassigned_uom_value,0) as unassigned_uom_value, greatest(coalesce(pds.unassigned_qty,0),0) as unassigned_qty, iv.created_at,
                   0 as release_qty, 0 as release_uom_value
-                  FROM "inventories" "iv" 
+                  FROM "inventories" "iv"
                   LEFT JOIN "product_detail_stocks" "pds" ON "pds"."product_detail_id" = "iv"."product_detail_id"
-                  INNER JOIN "locations" "loc" ON "loc"."id"="iv"."location_id" 
-                  INNER JOIN "products" "p" ON "p"."id"="iv"."product_id" 
+                  INNER JOIN "locations" "loc" ON "loc"."id"="iv"."location_id"
+                  INNER JOIN "products" "p" ON "p"."id"="iv"."product_id"
                   INNER JOIN "warehouse_inventory_assignment_rankings" "wiar" ON "wiar"."location_type"="loc"."type"
-                  WHERE case when coalesce("iv"."locked_qty",0) < 0 then 0 else ("iv"."qty" - coalesce("iv"."locked_qty",0)) end > 0 AND 
+                  WHERE case when coalesce("iv"."locked_qty",0) < 0 then 0 else ("iv"."qty" - coalesce("iv"."locked_qty",0)) end > 0 AND
                    "iv"."domain_id" = $2 AND "iv"."bizplace_id" = $3 AND "iv"."packing_type" = $4 AND "iv"."packing_size" = $5 AND  "iv"."product_id" = $6 AND "iv"."status" = $7 AND "loc"."type" NOT IN ($8, $9, $10)
                    AND ${orderInventory.batchId ? `"iv"."batch_id" = $11` : `1=1`}
                    AND "iv"."obsolete" = false AND case when "iv"."expiration_date" is not null and "p"."min_outbound_shelf_life" is not null then CURRENT_DATE < "iv"."expiration_date" - "p"."min_outbound_shelf_life" else true end
-                  ${queryStrings.query.length > 0 ? `AND ${queryStrings.join(' AND ')}` : ''}
+                  ${queryStrings.query.length > 0 ? `AND ${queryStrings.query.join(' AND ')}` : ''}
                   ORDER BY wiar.rank ${sortQuery ? ', ' + sortQuery : ''}
                 )
               ) dt1
-            ) dt2 where case when "lock_amount" < 0 then "available_qty" else "available_qty" - "lock_amount" end > 0		
+            ) dt2 where case when "lock_amount" < 0 then "available_qty" else "available_qty" - "lock_amount" end > 0
           ) dt3 where sort_seq > 0
-        ) src where src.id = tgt.id
-        returning 
-          tgt."id", tgt."qty", tgt."pallet_id", tgt."carton_id", tgt."batch_id", tgt."batch_id_ref", tgt."unit", 
-          tgt."uom", tgt."packing_type", tgt."packing_size", tgt."manufacture_year", 
-          tgt."locked_qty", tgt."uom_value", tgt."locked_uom_value", src."reserve_qty", src."reserve_uom_value";`, params);
-            let totalAssigned = updatedInventories[0].reduce((acc, inv) => {
-                return acc + inv.reserve_qty;
-            }, 0);
-            if (orderProduct.releaseQty != totalAssigned) {
-                throw new index_1.ValidationError({
-                    errorCode: 'INSUFFICIENT_STOCK',
-                    message: 'insufficient stock',
-                    detail: JSON.stringify({
-                        code: 'insufficient stock',
-                        sku: orderProduct.product.sku,
-                        packingType: orderProduct.packingType,
-                        packingSize: orderProduct.packingSize,
-                        uom: orderProduct.uom,
-                        qty: orderProduct.releaseQty,
-                        uom_value: orderProduct.releaseUomValue
-                    })
-                });
+        ) src where src.id = tgt.id AND tgt.qty >= coalesce(tgt.locked_qty, 0) + src.reserve_qty
+        returning
+          tgt."id", tgt."qty", tgt."pallet_id", tgt."carton_id", tgt."batch_id", tgt."batch_id_ref", tgt."unit",
+          tgt."uom", tgt."packing_type", tgt."packing_size", tgt."manufacture_year",
+          tgt."locked_qty", tgt."uom_value", tgt."locked_uom_value", src."reserve_qty", src."reserve_uom_value";`;
+            let updatedInventories;
+            for (let attempt = 1; attempt <= MAX_ASSIGN_RETRIES; attempt++) {
+                await tx.query('SAVEPOINT assign_retry');
+                updatedInventories = await tx.getRepository(warehouse_base_1.Inventory).query(assignQuery, params);
+                const assignedRows = (updatedInventories === null || updatedInventories === void 0 ? void 0 : updatedInventories[0]) || [];
+                let totalAssigned = assignedRows.reduce((acc, inv) => {
+                    return acc + Number(inv.reserve_qty);
+                }, 0);
+                // Use epsilon comparison for floating-point tolerance
+                let opReleaseQty = orderProduct.releaseQty;
+                if (!((_a = orderInventory.product) === null || _a === void 0 ? void 0 : _a.isInventoryDecimal)) {
+                    opReleaseQty = Math.round(opReleaseQty);
+                    totalAssigned = Math.round(totalAssigned);
+                }
+                else {
+                    opReleaseQty = Math.round(opReleaseQty * 1000) / 1000;
+                    totalAssigned = Math.round(totalAssigned * 1000) / 1000;
+                }
+                if (Math.abs(opReleaseQty - totalAssigned) > 0.001) {
+                    await tx.query('ROLLBACK TO SAVEPOINT assign_retry');
+                    if (attempt < MAX_ASSIGN_RETRIES) {
+                        await new Promise(resolve => setTimeout(resolve, RETRY_DELAY_MS));
+                        continue;
+                    }
+                    throw new index_1.ValidationError({
+                        errorCode: 'INSUFFICIENT_STOCK',
+                        message: 'insufficient stock',
+                        detail: JSON.stringify({
+                            code: 'insufficient stock',
+                            sku: orderProduct.product.sku,
+                            packingType: orderProduct.packingType,
+                            packingSize: orderProduct.packingSize,
+                            uom: orderProduct.uom,
+                            qty: orderProduct.releaseQty,
+                            uom_value: orderProduct.releaseUomValue
+                        })
+                    });
+                }
+                await tx.query('RELEASE SAVEPOINT assign_retry');
+                break;
             }
-            updatedInventories[0].forEach(inv => {
+            ;
+            ((updatedInventories === null || updatedInventories === void 0 ? void 0 : updatedInventories[0]) || []).forEach(inv => {
                 let oi = Object.assign(Object.assign({}, orderInventory), { inventory: { id: inv.id }, uom: inv.uom, packingType: inv.packing_type, batchId: inv.batch_id, releaseQty: inv.reserve_qty, releaseUomValue: inv.reserve_uom_value, pickedQty: 0, packedQty: 0, type: sales_base_1.ORDER_TYPES.RELEASE_OF_GOODS, status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_WORKSHEET, domain: { id: domain.id }, bizplace: { id: customerBizplace.id } });
                 assignedOrderInventories.push(oi);
             });
@@ -1007,9 +1041,11 @@ async function assignToInventory(releaseGood, orderProducts, customerBizplace, c
                 .createQueryBuilder()
                 .update(warehouse_base_1.ProductDetailStock)
                 .set({
-                unassignedQty: () => `"unassigned_qty" + ${orderInventory.releaseQty}`,
-                unassignedUomValue: () => `"unassigned_uom_value" + ${orderInventory.releaseUomValue}`
+                unassignedQty: () => `"unassigned_qty" + :releaseQty::numeric`,
+                unassignedUomValue: () => `"unassigned_uom_value" + :releaseUomValue::numeric`
             })
+                .setParameter('releaseQty', orderInventory.releaseQty)
+                .setParameter('releaseUomValue', orderInventory.releaseUomValue)
                 .where({ productDetail: orderInventory.productDetail.id })
                 .execute();
         }