Compare commits

...

8 Commits

6 changed files with 16 additions and 5 deletions

1
.gitignore vendored
View File

@@ -156,3 +156,4 @@ dist
backend-0.1.3.zip backend-0.1.3.zip
BulkForecastTemplate BulkForecastTemplate
BulkOrdersTemplate BulkOrdersTemplate
check.json

View File

@@ -36,7 +36,7 @@
} }
}, },
"admConfig": { "admConfig": {
"build": 465, "build": 469,
"oldBuild": "backend-0.1.3.zip" "oldBuild": "backend-0.1.3.zip"
}, },
"devDependencies": { "devDependencies": {

View File

@@ -3,6 +3,7 @@ import { manualPrinting } from "../../../../../database/schema/ocpManualPrint.js
import { tryCatch } from "../../../../globalUtils/tryCatch.js"; import { tryCatch } from "../../../../globalUtils/tryCatch.js";
import { manualTag } from "../../../rfid/controller/tags/manualTag.js"; import { manualTag } from "../../../rfid/controller/tags/manualTag.js";
import { labelingProcess } from "./labelProcess.js"; import { labelingProcess } from "./labelProcess.js";
import { manualLabelCreated } from "./labelRatio.js";
export const manualPrint = async (manualPrint: any) => { export const manualPrint = async (manualPrint: any) => {
/** /**
@@ -36,7 +37,7 @@ export const manualPrint = async (manualPrint: any) => {
} }
let label = await labelingProcess({ line: manualPrint.line }); let label = await labelingProcess({ line: manualPrint.line });
manualLabelCreated();
if (manualPrint.rfidTag) { if (manualPrint.rfidTag) {
manualTag( manualTag(
manualPrint.rfidTag, manualPrint.rfidTag,

View File

@@ -49,8 +49,6 @@ export const palletSendTag = async (tagData: any) => {
Date.now() - tagTime <= 5000 && Date.now() - tagTime <= 5000 &&
!tagData.value !tagData.value
) { ) {
setTimeout(() => { await pickedup({ runningNr: 1234, all: true, areaFrom: "wrapper_1" });
pickedup({ runningNr: 1234, all: true, areaFrom: "wrapper_1" });
}, 5000);
} }
}; };

View File

@@ -97,4 +97,8 @@ deleteLabels();
setInterval(() => { setInterval(() => {
deleteLabels(); deleteLabels();
}, 60 * 60 * 24 * 1000); }, 60 * 60 * 24 * 1000);
setInterval(() => {
updatePrinters();
}, 1000 * 60 * 60 * 24);
export default app; export default app;

View File

@@ -32,6 +32,13 @@ export const manualTag = async (
runningNumber: runningNr ? runningNr : rfidTags.runningNumber, runningNumber: runningNr ? runningNr : rfidTags.runningNumber,
counts: rfidTags.counts, counts: rfidTags.counts,
lastareaIn: rfidTags.lastareaIn, lastareaIn: rfidTags.lastareaIn,
})
.onConflictDoUpdate({
target: rfidTags.tagHex,
set: {
lastRead: new Date(Date.now()),
lastareaIn: area,
},
}); });
createLog( createLog(
"info", "info",