diff --git a/LogisticsSupportTool_API_DOCS/LstV2/ocp/Logs.bru b/LogisticsSupportTool_API_DOCS/LstV2/ocp/Logs.bru index 5c0e462..5bc1682 100644 --- a/LogisticsSupportTool_API_DOCS/LstV2/ocp/Logs.bru +++ b/LogisticsSupportTool_API_DOCS/LstV2/ocp/Logs.bru @@ -5,11 +5,22 @@ meta { } get { - url: + url: {{url}}/lst/old/api/logger/logs?service=ocp&service=rfid&service=dyco&level=error&level=info&level=warn&hours=12 body: none auth: inherit } +params:query { + service: ocp + service: rfid + service: dyco + level: error + level: info + level: warn + hours: 12 +} + settings { encodeUrl: true + timeout: 0 } diff --git a/lstV2/server/services/logistics/controller/materials/consumeMaterial.ts b/lstV2/server/services/logistics/controller/materials/consumeMaterial.ts index 89cd69c..68ab8ac 100644 --- a/lstV2/server/services/logistics/controller/materials/consumeMaterial.ts +++ b/lstV2/server/services/logistics/controller/materials/consumeMaterial.ts @@ -1,78 +1,78 @@ import axios from "axios"; -import { labelData } from "../../../sqlServer/querys/materialHelpers/labelInfo.js"; - -import { query } from "../../../sqlServer/prodSqlServer.js"; -import { createLog } from "../../../logger/logger.js"; - -import { prodEndpointCreation } from "../../../../globalUtils/createUrl.js"; -import { tryCatch } from "../../../../globalUtils/tryCatch.js"; import { db } from "../../../../../database/dbclient.js"; import { commandLog } from "../../../../../database/schema/commandLog.js"; +import { prodEndpointCreation } from "../../../../globalUtils/createUrl.js"; +import { tryCatch } from "../../../../globalUtils/tryCatch.js"; +import { createLog } from "../../../logger/logger.js"; +import { query } from "../../../sqlServer/prodSqlServer.js"; +import { labelData } from "../../../sqlServer/querys/materialHelpers/labelInfo.js"; +import { labelInfo } from "../../../sqlServer/querys/warehouse/labelInfo.js"; type Data = { - runningNr: string; - lotNum: number; + runningNr: string; + lotNum: number; }; export const consumeMaterial = async (data: Data) => { - const { runningNr, lotNum } = data; - // replace the rn + const { runningNr, lotNum } = data; + // replace the rn - console.log(data); + // console.log(data); - const rnReplace = labelData.replaceAll("[rn]", runningNr); + const rnReplace = labelInfo.replaceAll("[runningNr]", runningNr); - let barcode; - // get the barcode from the running number - try { - const r: any = await query(rnReplace, "labelData"); - barcode = r?.data; - } catch (error) { - console.log(error); - createLog("error", "", "logistics", `Error getting barcode: ${error}`); - } + let barcode; + // get the barcode from the running number + try { + const r: any = await query(rnReplace, "labelData"); + //console.log(r); + barcode = r?.data; + } catch (error) { + console.log(error); + createLog("error", "", "logistics", `Error getting barcode: ${error}`); + } - if (barcode.length === 0) { - return { - success: false, - message: "The running number you've entered not on stock.", - }; - //throw Error("The provided runningNr is not in stock"); - } - // create the url to post - const url = await prodEndpointCreation( - "/public/v1.0/IssueMaterial/ConsumeNonPreparedManualMaterial" - ); + if (barcode.length === 0) { + return { + success: false, + message: "The running number you've entered not on stock.", + }; + //throw Error("The provided runningNr is not in stock"); + } + // create the url to post + const url = await prodEndpointCreation( + "/public/v1.0/IssueMaterial/ConsumeNonPreparedManualMaterial", + ); - const consumeSomething = { - productionLot: lotNum, - barcode: barcode[0]?.barcode, - }; + const consumeSomething = { + productionLot: lotNum, + barcode: barcode[0]?.barcode, + }; - try { - const results = await axios.post(url, consumeSomething, { - headers: { - "X-API-Key": process.env.TEC_API_KEY || "", - "Content-Type": "application/json", - }, - }); + try { + const results = await axios.post(url, consumeSomething, { + headers: { + "X-API-Key": process.env.TEC_API_KEY || "", + "Content-Type": "application/json", + }, + }); - const { data: commandL, error: ce } = await tryCatch( - db.insert(commandLog).values({ - commandUsed: "consumeMaterial", - bodySent: data, - }) - ); - return { - success: true, - message: "Material was consumed", - status: results.status, - }; - } catch (error: any) { - console.log(error); - return { - success: false, - status: 200, - message: error.response?.data.errors[0].message, - }; - } + const { data: commandL, error: ce } = await tryCatch( + db.insert(commandLog).values({ + commandUsed: "consumeMaterial", + bodySent: data, + }), + ); + return { + success: true, + message: "Material was consumed", + status: results.status, + }; + } catch (error: any) { + console.log(error); + return { + success: false, + status: 200, + message: error.response?.data.errors[0].message, + }; + } }; diff --git a/lstV2/server/services/ocp/controller/materials/lotTransfer.ts b/lstV2/server/services/ocp/controller/materials/lotTransfer.ts index 1247a58..c3872cf 100644 --- a/lstV2/server/services/ocp/controller/materials/lotTransfer.ts +++ b/lstV2/server/services/ocp/controller/materials/lotTransfer.ts @@ -168,6 +168,7 @@ export const lotMaterialTransfer = async (data: NewLotData) => { ), )) as any; + console.log(label); if (labelError) { createLog( "error", @@ -274,7 +275,7 @@ export const lotMaterialTransfer = async (data: NewLotData) => { // return the label back to fm1 lane id 10001 const matReturnData = { - barcode: label?.data[0].Barcode, + barcode: label?.data[0].barcode, laneId: 10001, }; @@ -300,7 +301,7 @@ export const lotMaterialTransfer = async (data: NewLotData) => { // consume to the lot provided. const consumeLot = { productionLot: data.lotNumber, - barcode: label?.data[0].Barcode, + barcode: label?.data[0].barcode, }; const delayTimer = diff --git a/lstV2/server/services/sqlServer/querys/warehouse/labelInfo.ts b/lstV2/server/services/sqlServer/querys/warehouse/labelInfo.ts index 5881637..5e7ab36 100644 --- a/lstV2/server/services/sqlServer/querys/warehouse/labelInfo.ts +++ b/lstV2/server/services/sqlServer/querys/warehouse/labelInfo.ts @@ -1,7 +1,7 @@ export const labelInfo = ` declare @runningNumber nvarchar(max) = [runningNr] -select e.Barcode, +select e.barcode, e.RunningNumber as runnungNumber, externalRunningNumber= null, e.ArticleHumanReadableId as av,