diff --git a/temp/legacy.importFromCSV.js b/temp/legacy.importFromCSV.js index 0496e1b4..2f92a990 100644 --- a/temp/legacy.importFromCSV.js +++ b/temp/legacy.importFromCSV.js @@ -137,7 +137,10 @@ function buildLotName(lotNamePieces) { (lotNamePieces.block === "" ? "" : "B" + lotNamePieces.block + "-") + (lotNamePieces.range1 === "0" && lotNamePieces.range2 === "" ? "" - : "R" + lotNamePieces.range1 + lotNamePieces.range2 + "-") + + : "R" + + (lotNamePieces.range1 === "0" ? "" : lotNamePieces.range1) + + lotNamePieces.range2 + + "-") + (lotNamePieces.lot1 === "0" && lotNamePieces.lot2 === "" ? "" : "L" + lotNamePieces.lot1 + lotNamePieces.lot2 + "-") + diff --git a/temp/legacy.importFromCSV.ts b/temp/legacy.importFromCSV.ts index 07899260..d74a685d 100644 --- a/temp/legacy.importFromCSV.ts +++ b/temp/legacy.importFromCSV.ts @@ -364,7 +364,10 @@ function buildLotName(lotNamePieces: { (lotNamePieces.block === "" ? "" : "B" + lotNamePieces.block + "-") + (lotNamePieces.range1 === "0" && lotNamePieces.range2 === "" ? "" - : "R" + lotNamePieces.range1 + lotNamePieces.range2 + "-") + + : "R" + + (lotNamePieces.range1 === "0" ? "" : lotNamePieces.range1) + + lotNamePieces.range2 + + "-") + (lotNamePieces.lot1 === "0" && lotNamePieces.lot2 === "" ? "" : "L" + lotNamePieces.lot1 + lotNamePieces.lot2 + "-") + @@ -1286,7 +1289,6 @@ function importFromWorkOrderCSV() { try { for (workOrderRow of cmwkordr.data) { - const workOrderNumber = ("000000" + workOrderRow.WO_WORK_ORDER).slice(-6); let workOrder = getWorkOrderByWorkOrderNumber(workOrderNumber);