From c15b3977da04e89366291bf33b9a77197435dd7a Mon Sep 17 00:00:00 2001 From: joseph le Date: Fri, 27 Oct 2023 08:32:36 +0700 Subject: [PATCH] update send SN to ERP --- app/utils/checkIndexSN.ts | 10 +++------- start/routes.ts | 9 +++++++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/utils/checkIndexSN.ts b/app/utils/checkIndexSN.ts index 1132f11..3281a1b 100644 --- a/app/utils/checkIndexSN.ts +++ b/app/utils/checkIndexSN.ts @@ -21,11 +21,7 @@ export const checkIndexSN = async (content, beginLine, nameF) => { arrayLine[i].search("PID:") !== -1 && arrayLine[i].search("SN:") !== -1 && arrayLine[i].search("%") === -1 && - arrayLine[i] - ?.split(",")[2] - ?.split(":")[1] - ?.replace("\r", "") - .trim() !== "" && + SN !== "" && SN !== "N/A" && SN.length > 4 && i >= beginLine @@ -171,7 +167,7 @@ export const checkIndexSN = async (content, beginLine, nameF) => { } } // console.log(nameF+" output\n", output); - if (output.filter((i) => i.PID !== "").length > 0) { + if (output.filter((i) => i.PID !== "" && i.PID.includes("\\")===false).length > 0) { let token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczovL2FwaS5uc3d0ZWFtLm5ldC9hcGkvbG9naW4iLCJpYXQiOjE2ODkzOTEyMDMsImV4cCI6MTcyMDkyNzIwMywibmJmIjoxNjg5MzkxMjAzLCJqdGkiOiJreFA1MW9jck5rdEYzSzY3Iiwic3ViIjozNjkwLCJwcnYiOiJjOGVlMWZjODllNzc1ZWM0YzczODY2N2U1YmUxN2E1OTBiNmQ0MGZjIn0.p-aE0oWkKmdrcKWD94oSmMd_CMbY_4MoqADIwYIhIKw"; @@ -179,7 +175,7 @@ export const checkIndexSN = async (content, beginLine, nameF) => { "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczovL2ludC5pcHN1cHBseS5jb20uYXUvYXBpL2xvZ2luIiwiaWF0IjoxNjg5ODYyNjAxLCJleHAiOjE3MjEzOTg2MDEsIm5iZiI6MTY4OTg2MjYwMSwianRpIjoiUElZVjNBM3ZPQVlMQ081SyIsInN1YiI6MSwicHJ2IjoiYzhlZTFmYzg5ZTc3NWVjNGM3Mzg2NjdlNWJlMTdhNTkwYjZkNDBmYyJ9.UcybIKMBjTAY9i0PfIDQMtqHyN72Ul0jC03ZDGLGpMI"; let data = { - data: output.filter((i) => i.PID !== ""), + data: output.filter((i) => i.PID !== "" && i.PID.includes("\\")===false), urlAPI: "/api/test-log-serial-number/save-data", }; diff --git a/start/routes.ts b/start/routes.ts index daa7724..e058adb 100644 --- a/start/routes.ts +++ b/start/routes.ts @@ -26,6 +26,7 @@ import { sendMessToZulip } from "App/utils/sendMessToZulip"; import moment from "moment"; import Product from "App/Models/Product"; import { sendDeviceInfora } from "App/utils/sendDeviceInfor"; +import InfoDevice from "App/Models/InfoDevice"; runtimeCheckLogs(Env.get("FOLDER_LOGS")); @@ -297,3 +298,11 @@ Route.post("/api/sendMailInforDevice", async () => { "writeLog" ); +// Route.post("/api/test", async () => { +// try { +// let abc = await InfoDevice.findBy('SN', 'FHK0935F0Z3') +// console.log(abc) +// } catch (error) { +// console.log(error) +// } +// }) \ No newline at end of file