@machinemetrics/mm-erp-sdk 0.1.6-beta.2 → 0.1.7-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/{config-WKwu1mMo.js → config-qat9zgOl.js} +2 -2
- package/dist/{config-WKwu1mMo.js.map → config-qat9zgOl.js.map} +1 -1
- package/dist/{connector-factory-DHmMYsRs.js → connector-factory-C2czCs9v.js} +2 -2
- package/dist/{connector-factory-DHmMYsRs.js.map → connector-factory-C2czCs9v.js.map} +1 -1
- package/dist/{hashed-cache-manager-CtDhFqj6.js → hashed-cache-manager-CzyFSt2B.js} +4 -4
- package/dist/{hashed-cache-manager-CtDhFqj6.js.map → hashed-cache-manager-CzyFSt2B.js.map} +1 -1
- package/dist/{index-aci_wdcn.js → index-B9wo8pld.js} +2 -2
- package/dist/{index-aci_wdcn.js.map → index-B9wo8pld.js.map} +1 -1
- package/dist/index.d.ts +5 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/{logger-hqtl8hFM.js → logger-Db8CkwR6.js} +924 -966
- package/dist/logger-Db8CkwR6.js.map +1 -0
- package/dist/mm-erp-sdk.js +275 -17
- package/dist/mm-erp-sdk.js.map +1 -1
- package/dist/services/data-sync-service/data-sync-service.d.ts.map +1 -1
- package/dist/services/data-sync-service/jobs/clean-up-expired-cache.js +4 -4
- package/dist/services/data-sync-service/jobs/from-erp.d.ts.map +1 -1
- package/dist/services/data-sync-service/jobs/from-erp.js +25 -8
- package/dist/services/data-sync-service/jobs/from-erp.js.map +1 -1
- package/dist/services/data-sync-service/jobs/retry-failed-labor-tickets.js +3 -3
- package/dist/services/data-sync-service/jobs/run-migrations.js +1 -1
- package/dist/services/data-sync-service/jobs/to-erp.d.ts.map +1 -1
- package/dist/services/data-sync-service/jobs/to-erp.js +24 -7
- package/dist/services/data-sync-service/jobs/to-erp.js.map +1 -1
- package/dist/services/psql-erp-service/configuration.d.ts +10 -0
- package/dist/services/psql-erp-service/configuration.d.ts.map +1 -0
- package/dist/services/psql-erp-service/index.d.ts +19 -0
- package/dist/services/psql-erp-service/index.d.ts.map +1 -0
- package/dist/services/psql-erp-service/internal/psql-config.d.ts +28 -0
- package/dist/services/psql-erp-service/internal/psql-config.d.ts.map +1 -0
- package/dist/services/psql-erp-service/internal/psql-labor-ticket-operations.d.ts +40 -0
- package/dist/services/psql-erp-service/internal/psql-labor-ticket-operations.d.ts.map +1 -0
- package/dist/services/psql-erp-service/internal/types/psql-types.d.ts +15 -0
- package/dist/services/psql-erp-service/internal/types/psql-types.d.ts.map +1 -0
- package/dist/services/psql-erp-service/psql-helpers.d.ts +32 -0
- package/dist/services/psql-erp-service/psql-helpers.d.ts.map +1 -0
- package/dist/services/psql-erp-service/psql-service.d.ts +36 -0
- package/dist/services/psql-erp-service/psql-service.d.ts.map +1 -0
- package/dist/types/erp-types.d.ts +2 -1
- package/dist/types/erp-types.d.ts.map +1 -1
- package/dist/utils/standard-process-drivers/labor-ticket-erp-synchronizer.d.ts.map +1 -1
- package/package.json +3 -1
- package/src/index.ts +27 -5
- package/src/services/data-sync-service/data-sync-service.ts +43 -3
- package/src/services/data-sync-service/jobs/from-erp.ts +35 -6
- package/src/services/data-sync-service/jobs/to-erp.ts +35 -5
- package/src/services/psql-erp-service/configuration.ts +9 -0
- package/src/services/psql-erp-service/index.ts +28 -0
- package/src/services/psql-erp-service/internal/psql-config.ts +13 -0
- package/src/services/psql-erp-service/internal/psql-labor-ticket-operations.ts +58 -0
- package/src/services/psql-erp-service/internal/types/psql-types.ts +17 -0
- package/src/services/psql-erp-service/psql-helpers.ts +90 -0
- package/src/services/psql-erp-service/psql-service.ts +178 -0
- package/src/types/erp-types.ts +1 -0
- package/src/utils/standard-process-drivers/labor-ticket-erp-synchronizer.ts +1 -2
- package/dist/logger-hqtl8hFM.js.map +0 -1
package/dist/mm-erp-sdk.js
CHANGED
|
@@ -1,19 +1,20 @@
|
|
|
1
|
-
import { C as CoreConfiguration, H as HashedCacheManager } from "./hashed-cache-manager-
|
|
2
|
-
import { E, g, a } from "./hashed-cache-manager-
|
|
3
|
-
import { l as logger } from "./logger-
|
|
4
|
-
import { g as getCachedMMToken, s as setCachedMMToken, a as setTimezoneOffsetInCache, b as getCachedTimezoneOffset, S as SQLiteCoordinator } from "./index-
|
|
5
|
-
import { c, d } from "./index-
|
|
1
|
+
import { C as CoreConfiguration, H as HashedCacheManager } from "./hashed-cache-manager-CzyFSt2B.js";
|
|
2
|
+
import { E, g, a } from "./hashed-cache-manager-CzyFSt2B.js";
|
|
3
|
+
import { l as logger } from "./logger-Db8CkwR6.js";
|
|
4
|
+
import { g as getCachedMMToken, s as setCachedMMToken, a as setTimezoneOffsetInCache, b as getCachedTimezoneOffset, S as SQLiteCoordinator } from "./index-B9wo8pld.js";
|
|
5
|
+
import { c, d } from "./index-B9wo8pld.js";
|
|
6
6
|
import axios, { AxiosError } from "axios";
|
|
7
7
|
import knex from "knex";
|
|
8
8
|
import { c as config } from "./knexfile-1qKKIORB.js";
|
|
9
9
|
import fs from "fs";
|
|
10
10
|
import path from "path";
|
|
11
|
-
import "./connector-factory-
|
|
11
|
+
import "./connector-factory-C2czCs9v.js";
|
|
12
12
|
import Bree from "bree";
|
|
13
13
|
import Graceful from "@ladjs/graceful";
|
|
14
14
|
import { fileURLToPath } from "url";
|
|
15
15
|
import sql from "mssql";
|
|
16
16
|
import { z } from "zod";
|
|
17
|
+
import odbc from "odbc";
|
|
17
18
|
var ERPType = /* @__PURE__ */ ((ERPType2) => {
|
|
18
19
|
ERPType2["INVALID"] = "INVALID";
|
|
19
20
|
ERPType2["D365"] = "D365";
|
|
@@ -22,6 +23,7 @@ var ERPType = /* @__PURE__ */ ((ERPType2) => {
|
|
|
22
23
|
ERPType2["PROSHOP"] = "PROSHOP";
|
|
23
24
|
ERPType2["SYTELINE"] = "SYTELINE";
|
|
24
25
|
ERPType2["TEMPLATE"] = "TEMPLATE";
|
|
26
|
+
ERPType2["GLOBALSHOP"] = "GLOBALSHOP";
|
|
25
27
|
return ERPType2;
|
|
26
28
|
})(ERPType || {});
|
|
27
29
|
var ERPObjType = /* @__PURE__ */ ((ERPObjType2) => {
|
|
@@ -1685,8 +1687,7 @@ class LaborTicketERPSynchronizer {
|
|
|
1685
1687
|
);
|
|
1686
1688
|
const mostRecentUpdate = laborTicketsUpdates.reduce(
|
|
1687
1689
|
(latest, ticket) => {
|
|
1688
|
-
if (!ticket.updatedAt) return latest;
|
|
1689
|
-
if (!latest) return ticket.updatedAt;
|
|
1690
|
+
if (!latest || !ticket.updatedAt) return latest;
|
|
1690
1691
|
return new Date(ticket.updatedAt) > new Date(latest) ? ticket.updatedAt : latest;
|
|
1691
1692
|
},
|
|
1692
1693
|
null
|
|
@@ -3606,6 +3607,8 @@ const runDataSyncService = async (connectorPath) => {
|
|
|
3606
3607
|
const bree = new Bree({
|
|
3607
3608
|
root: jobsPath,
|
|
3608
3609
|
logger,
|
|
3610
|
+
// Enable worker metadata for debugging
|
|
3611
|
+
outputWorkerMetadata: true,
|
|
3609
3612
|
worker: {
|
|
3610
3613
|
env: {
|
|
3611
3614
|
CONNECTOR_PATH: connectorPath,
|
|
@@ -3620,7 +3623,12 @@ const runDataSyncService = async (connectorPath) => {
|
|
|
3620
3623
|
CACHE_TTL: process.env.CACHE_TTL,
|
|
3621
3624
|
// Pass through all other environment variables that might be needed
|
|
3622
3625
|
...process.env
|
|
3623
|
-
}
|
|
3626
|
+
},
|
|
3627
|
+
// Add worker options for better isolation and cleanup
|
|
3628
|
+
execArgv: [
|
|
3629
|
+
"--expose-gc"
|
|
3630
|
+
// Allow manual garbage collection
|
|
3631
|
+
]
|
|
3624
3632
|
},
|
|
3625
3633
|
jobs: [
|
|
3626
3634
|
// {
|
|
@@ -3629,20 +3637,25 @@ const runDataSyncService = async (connectorPath) => {
|
|
|
3629
3637
|
{
|
|
3630
3638
|
name: "from-erp",
|
|
3631
3639
|
timeout: "10s",
|
|
3632
|
-
interval: config2.fromErpInterval
|
|
3640
|
+
interval: config2.fromErpInterval,
|
|
3641
|
+
// Ensure worker terminates completely after execution
|
|
3642
|
+
closeWorkerAfterMs: 1e3
|
|
3633
3643
|
},
|
|
3634
3644
|
{
|
|
3635
3645
|
name: "to-erp",
|
|
3636
3646
|
//timeout: '3s', // Use timeout during development to see the job in action quickly
|
|
3637
|
-
interval: config2.toErpInterval
|
|
3647
|
+
interval: config2.toErpInterval,
|
|
3648
|
+
closeWorkerAfterMs: 1e3
|
|
3638
3649
|
},
|
|
3639
3650
|
{
|
|
3640
3651
|
name: "retry-failed-labor-tickets",
|
|
3641
|
-
interval: config2.retryLaborTicketsInterval
|
|
3652
|
+
interval: config2.retryLaborTicketsInterval,
|
|
3653
|
+
closeWorkerAfterMs: 1e3
|
|
3642
3654
|
},
|
|
3643
3655
|
{
|
|
3644
3656
|
name: "clean-up-expired-cache",
|
|
3645
|
-
interval: config2.cacheExpirationCheckInterval
|
|
3657
|
+
interval: config2.cacheExpirationCheckInterval,
|
|
3658
|
+
closeWorkerAfterMs: 1e3
|
|
3646
3659
|
}
|
|
3647
3660
|
]
|
|
3648
3661
|
});
|
|
@@ -3652,14 +3665,34 @@ const runDataSyncService = async (connectorPath) => {
|
|
|
3652
3665
|
const jobsConfig = bree.config.jobs.map((job) => ({
|
|
3653
3666
|
name: job.name,
|
|
3654
3667
|
interval: job.interval,
|
|
3655
|
-
timeout: job.timeout
|
|
3668
|
+
timeout: job.timeout,
|
|
3669
|
+
closeWorkerAfterMs: job.closeWorkerAfterMs
|
|
3656
3670
|
}));
|
|
3657
3671
|
logger.info("JOBS CONFIGURATION:", { jobs: jobsConfig });
|
|
3658
3672
|
const graceful = new Graceful({ brees: [bree] });
|
|
3659
3673
|
graceful.listen();
|
|
3660
|
-
(
|
|
3661
|
-
|
|
3662
|
-
})
|
|
3674
|
+
bree.on("worker created", (name) => {
|
|
3675
|
+
logger.debug(`Worker created for job: ${name}`);
|
|
3676
|
+
});
|
|
3677
|
+
bree.on("worker online", (name) => {
|
|
3678
|
+
logger.debug(`Worker online for job: ${name}`);
|
|
3679
|
+
});
|
|
3680
|
+
bree.on("worker message", (name, message) => {
|
|
3681
|
+
logger.debug(`Worker message from ${name}:`, message);
|
|
3682
|
+
});
|
|
3683
|
+
bree.on("worker deleted", (name) => {
|
|
3684
|
+
logger.debug(`Worker deleted for job: ${name}`);
|
|
3685
|
+
});
|
|
3686
|
+
bree.on("worker exit", (name, code, signal) => {
|
|
3687
|
+
if (code !== 0) {
|
|
3688
|
+
logger.error(
|
|
3689
|
+
`Worker ${name} exited with code ${code}, signal ${signal}`
|
|
3690
|
+
);
|
|
3691
|
+
} else {
|
|
3692
|
+
logger.debug(`Worker ${name} exited successfully`);
|
|
3693
|
+
}
|
|
3694
|
+
});
|
|
3695
|
+
await bree.start();
|
|
3663
3696
|
bree.on("jobStarted", (job) => {
|
|
3664
3697
|
console.log("Job " + job.name + " started");
|
|
3665
3698
|
});
|
|
@@ -3966,6 +3999,224 @@ class SqlServerHelper {
|
|
|
3966
3999
|
logger.info("----------------------------------------");
|
|
3967
4000
|
}
|
|
3968
4001
|
}
|
|
4002
|
+
class PsqlService {
|
|
4003
|
+
config;
|
|
4004
|
+
constructor(config2) {
|
|
4005
|
+
this.config = config2;
|
|
4006
|
+
}
|
|
4007
|
+
// REMOVED: dispose() method - not needed anymore
|
|
4008
|
+
// REMOVED: connection property - not needed anymore
|
|
4009
|
+
// REMOVED: openConnection() method - not needed anymore
|
|
4010
|
+
// REMOVED: closeConnection() method - not needed anymore
|
|
4011
|
+
/**
|
|
4012
|
+
* Build PSQL ODBC connection string
|
|
4013
|
+
* CRITICAL: ServerName must use IP.PORT format (e.g., 10.4.0.11.1583)
|
|
4014
|
+
*/
|
|
4015
|
+
buildConnectionString() {
|
|
4016
|
+
const serverName = `${this.config.host}.${this.config.port}`;
|
|
4017
|
+
return [
|
|
4018
|
+
"Driver={Pervasive ODBC Interface}",
|
|
4019
|
+
`ServerName=${serverName}`,
|
|
4020
|
+
`DBQ=${this.config.database}`,
|
|
4021
|
+
`UID=${this.config.username}`,
|
|
4022
|
+
`PWD=${this.config.password}`,
|
|
4023
|
+
"AutoDoubleQuote=0"
|
|
4024
|
+
].join(";") + ";";
|
|
4025
|
+
}
|
|
4026
|
+
/**
|
|
4027
|
+
* Execute a query and return the results
|
|
4028
|
+
* Creates a fresh connection for each query to avoid handle corruption
|
|
4029
|
+
*
|
|
4030
|
+
* @param query The SQL query to execute
|
|
4031
|
+
* @param params Query parameters (currently unused for PSQL read operations)
|
|
4032
|
+
* @param paging Optional paging parameters
|
|
4033
|
+
* @returns The entities fetched from the database, along with paging information
|
|
4034
|
+
*/
|
|
4035
|
+
async executePreparedStatement(query, params = {}, paging) {
|
|
4036
|
+
let connection = null;
|
|
4037
|
+
try {
|
|
4038
|
+
const connStr = this.buildConnectionString();
|
|
4039
|
+
logger.debug("Creating fresh PSQL connection for query");
|
|
4040
|
+
connection = await odbc.connect(connStr);
|
|
4041
|
+
if (Object.keys(params).length > 0) {
|
|
4042
|
+
logger.warn(
|
|
4043
|
+
"PsqlService: Query parameters provided but parameter binding not yet implemented. Using direct query execution. This is acceptable for Phase 1 read operations."
|
|
4044
|
+
);
|
|
4045
|
+
}
|
|
4046
|
+
const records = await connection.query(query);
|
|
4047
|
+
const allRecords = PsqlService.recordsetToRecords(records);
|
|
4048
|
+
const rowsFetched = allRecords.length;
|
|
4049
|
+
const pagedData = paging?.offset !== void 0 || paging?.limit !== void 0 ? allRecords.slice(
|
|
4050
|
+
paging.offset || 0,
|
|
4051
|
+
(paging.offset || 0) + (paging.limit || allRecords.length)
|
|
4052
|
+
) : allRecords;
|
|
4053
|
+
return {
|
|
4054
|
+
data: pagedData,
|
|
4055
|
+
paging: {
|
|
4056
|
+
count: rowsFetched,
|
|
4057
|
+
limit: paging?.limit || 0,
|
|
4058
|
+
offset: paging?.offset || 0,
|
|
4059
|
+
nextPage: paging?.limit && (paging.offset || 0) + paging.limit < rowsFetched ? String((paging.offset || 0) + paging.limit) : void 0,
|
|
4060
|
+
previousPage: paging?.offset ? String(Math.max(0, (paging.offset || 0) - (paging.limit || 10))) : void 0
|
|
4061
|
+
}
|
|
4062
|
+
};
|
|
4063
|
+
} catch (error) {
|
|
4064
|
+
const errorInfo = error;
|
|
4065
|
+
logger.error("Error fetching data from PSQL", {
|
|
4066
|
+
error: errorInfo.message,
|
|
4067
|
+
odbcErrors: errorInfo.odbcErrors,
|
|
4068
|
+
query: query.substring(0, 200)
|
|
4069
|
+
// Log first 200 chars of query
|
|
4070
|
+
});
|
|
4071
|
+
throw this.handleOdbcError(errorInfo);
|
|
4072
|
+
} finally {
|
|
4073
|
+
if (connection) {
|
|
4074
|
+
try {
|
|
4075
|
+
await connection.close();
|
|
4076
|
+
logger.debug("PSQL connection closed successfully");
|
|
4077
|
+
} catch (err) {
|
|
4078
|
+
logger.warn("Error closing PSQL connection (non-fatal)", {
|
|
4079
|
+
error: err
|
|
4080
|
+
});
|
|
4081
|
+
}
|
|
4082
|
+
}
|
|
4083
|
+
}
|
|
4084
|
+
}
|
|
4085
|
+
/**
|
|
4086
|
+
* Transform ODBC result set to array of Record<string, string> instances.
|
|
4087
|
+
* IMPORTANT: PSQL CHAR fields are often padded with spaces - we trim them
|
|
4088
|
+
*/
|
|
4089
|
+
static recordsetToRecords(recordset) {
|
|
4090
|
+
if (!Array.isArray(recordset)) {
|
|
4091
|
+
return [];
|
|
4092
|
+
}
|
|
4093
|
+
const data = recordset.map((row) => {
|
|
4094
|
+
const transformedRow = {};
|
|
4095
|
+
Object.keys(row).forEach((key) => {
|
|
4096
|
+
const value = row[key];
|
|
4097
|
+
transformedRow[key] = value !== null && value !== void 0 ? String(value).trim() : "";
|
|
4098
|
+
});
|
|
4099
|
+
return transformedRow;
|
|
4100
|
+
});
|
|
4101
|
+
return data;
|
|
4102
|
+
}
|
|
4103
|
+
/**
|
|
4104
|
+
* Handle ODBC errors and provide meaningful messages
|
|
4105
|
+
*/
|
|
4106
|
+
handleOdbcError(error) {
|
|
4107
|
+
const odbcError = error.odbcErrors?.[0];
|
|
4108
|
+
const errorCode = odbcError?.state;
|
|
4109
|
+
const message = odbcError?.message || error.message;
|
|
4110
|
+
switch (errorCode) {
|
|
4111
|
+
case "08S01":
|
|
4112
|
+
return new Error(
|
|
4113
|
+
`PSQL connection failed. Check: 1) PVSW environment variable set to /usr/local/psql/etc/pvsw.ini, 2) Network connectivity to ports 1583/3351, 3) ODBC configuration files in /usr/local/psql/etc/ and /etc/. Original error: ${message}`
|
|
4114
|
+
);
|
|
4115
|
+
case "28000":
|
|
4116
|
+
return new Error(
|
|
4117
|
+
`PSQL authentication failed. Check username/password. Original error: ${message}`
|
|
4118
|
+
);
|
|
4119
|
+
case "42000":
|
|
4120
|
+
return new Error(`PSQL SQL syntax error. Original error: ${message}`);
|
|
4121
|
+
case "42S02":
|
|
4122
|
+
return new Error(
|
|
4123
|
+
`PSQL table or view not found. Check table names in query. Original error: ${message}`
|
|
4124
|
+
);
|
|
4125
|
+
default:
|
|
4126
|
+
return new Error(`PSQL error (${errorCode || "unknown"}): ${message}`);
|
|
4127
|
+
}
|
|
4128
|
+
}
|
|
4129
|
+
}
|
|
4130
|
+
class PsqlLaborTicketOperations {
|
|
4131
|
+
constructor(service) {
|
|
4132
|
+
this.service = service;
|
|
4133
|
+
}
|
|
4134
|
+
/**
|
|
4135
|
+
* Create labor ticket in START_LABOR table
|
|
4136
|
+
*
|
|
4137
|
+
* Phase 2 Implementation Notes:
|
|
4138
|
+
* - Will use prepared statements with parameter binding
|
|
4139
|
+
* - Insert into START_LABOR table
|
|
4140
|
+
* - Return GUID as erpUid
|
|
4141
|
+
*
|
|
4142
|
+
* @param laborTicket Labor ticket from MachineMetrics
|
|
4143
|
+
* @returns Labor ticket and ERP unique ID
|
|
4144
|
+
*/
|
|
4145
|
+
async createLaborTicket(laborTicket) {
|
|
4146
|
+
logger.warn(
|
|
4147
|
+
"PsqlLaborTicketOperations.createLaborTicket not yet implemented (Phase 2)"
|
|
4148
|
+
);
|
|
4149
|
+
throw new Error(
|
|
4150
|
+
"Labor ticket creation not implemented for PSQL. This is a Phase 2 feature."
|
|
4151
|
+
);
|
|
4152
|
+
}
|
|
4153
|
+
/**
|
|
4154
|
+
* Update labor ticket (move from START_LABOR to COMPLETED_LABOR)
|
|
4155
|
+
*
|
|
4156
|
+
* Phase 2 Implementation Notes:
|
|
4157
|
+
* - Insert into COMPLETED_LABOR
|
|
4158
|
+
* - Delete from START_LABOR
|
|
4159
|
+
* - Should be done in a transaction
|
|
4160
|
+
*
|
|
4161
|
+
* @param laborTicket Labor ticket to update
|
|
4162
|
+
* @returns Updated labor ticket
|
|
4163
|
+
*/
|
|
4164
|
+
async updateLaborTicket(laborTicket) {
|
|
4165
|
+
logger.warn(
|
|
4166
|
+
"PsqlLaborTicketOperations.updateLaborTicket not yet implemented (Phase 2)"
|
|
4167
|
+
);
|
|
4168
|
+
throw new Error(
|
|
4169
|
+
"Labor ticket update not implemented for PSQL. This is a Phase 2 feature."
|
|
4170
|
+
);
|
|
4171
|
+
}
|
|
4172
|
+
}
|
|
4173
|
+
function formatPsqlDate(psqlDate) {
|
|
4174
|
+
if (!psqlDate || psqlDate === "000000" || psqlDate.trim() === "") {
|
|
4175
|
+
return null;
|
|
4176
|
+
}
|
|
4177
|
+
try {
|
|
4178
|
+
const year = parseInt(psqlDate.substring(0, 2), 10);
|
|
4179
|
+
const month = parseInt(psqlDate.substring(2, 4), 10);
|
|
4180
|
+
const day = parseInt(psqlDate.substring(4, 6), 10);
|
|
4181
|
+
const fullYear = year + 2e3;
|
|
4182
|
+
if (month < 1 || month > 12 || day < 1 || day > 31) {
|
|
4183
|
+
return null;
|
|
4184
|
+
}
|
|
4185
|
+
const date = new Date(fullYear, month - 1, day);
|
|
4186
|
+
return date.toISOString().split("T")[0];
|
|
4187
|
+
} catch (error) {
|
|
4188
|
+
return null;
|
|
4189
|
+
}
|
|
4190
|
+
}
|
|
4191
|
+
function formatPsqlTime(psqlTime) {
|
|
4192
|
+
if (!psqlTime || psqlTime.trim() === "") {
|
|
4193
|
+
return null;
|
|
4194
|
+
}
|
|
4195
|
+
try {
|
|
4196
|
+
const hours = psqlTime.substring(0, 2);
|
|
4197
|
+
const minutes = psqlTime.substring(2, 4);
|
|
4198
|
+
return `${hours}:${minutes}:00`;
|
|
4199
|
+
} catch (error) {
|
|
4200
|
+
return null;
|
|
4201
|
+
}
|
|
4202
|
+
}
|
|
4203
|
+
function combinePsqlDateTime(psqlDate, psqlTime) {
|
|
4204
|
+
const date = formatPsqlDate(psqlDate);
|
|
4205
|
+
const time = formatPsqlTime(psqlTime);
|
|
4206
|
+
if (!date || !time) {
|
|
4207
|
+
return null;
|
|
4208
|
+
}
|
|
4209
|
+
return `${date}T${time}`;
|
|
4210
|
+
}
|
|
4211
|
+
function isPsqlDateEmpty(psqlDate) {
|
|
4212
|
+
return !psqlDate || psqlDate === "000000" || psqlDate.trim() === "";
|
|
4213
|
+
}
|
|
4214
|
+
function cleanPsqlCharField(value) {
|
|
4215
|
+
if (value === null || value === void 0) {
|
|
4216
|
+
return "";
|
|
4217
|
+
}
|
|
4218
|
+
return String(value).trim();
|
|
4219
|
+
}
|
|
3969
4220
|
export {
|
|
3970
4221
|
ApplicationInitializer,
|
|
3971
4222
|
BatchCacheManager,
|
|
@@ -3993,6 +4244,8 @@ export {
|
|
|
3993
4244
|
MMSendWorkOrder,
|
|
3994
4245
|
MMSendWorkOrderOperation,
|
|
3995
4246
|
OAuthClient,
|
|
4247
|
+
PsqlLaborTicketOperations,
|
|
4248
|
+
PsqlService,
|
|
3996
4249
|
RecordTrackingManager,
|
|
3997
4250
|
RestAPIService,
|
|
3998
4251
|
SqlServerHelper,
|
|
@@ -4002,9 +4255,13 @@ export {
|
|
|
4002
4255
|
addNewFieldFromLookupField,
|
|
4003
4256
|
applyTimezoneOffsetsToFields,
|
|
4004
4257
|
buildLogicalCondition,
|
|
4258
|
+
cleanPsqlCharField,
|
|
4005
4259
|
cleanupNumbers,
|
|
4260
|
+
combinePsqlDateTime,
|
|
4006
4261
|
convertToLocalTime,
|
|
4007
4262
|
formatDateWithTZOffset,
|
|
4263
|
+
formatPsqlDate,
|
|
4264
|
+
formatPsqlTime,
|
|
4008
4265
|
getCachedTimezoneOffset,
|
|
4009
4266
|
g as getErpApiConnectionParams,
|
|
4010
4267
|
getErrorType,
|
|
@@ -4012,6 +4269,7 @@ export {
|
|
|
4012
4269
|
getPayloadWithoutIDField,
|
|
4013
4270
|
a as getSQLServerConfiguration,
|
|
4014
4271
|
getUniqueRows,
|
|
4272
|
+
isPsqlDateEmpty,
|
|
4015
4273
|
config as knexDatabaseConfig,
|
|
4016
4274
|
logger,
|
|
4017
4275
|
removeExtraneousFields,
|