@things-factory/transport-base 4.3.131 → 4.3.142
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-server/service/transport-driver/transport-driver-mutation.js +34 -18
- package/dist-server/service/transport-driver/transport-driver-mutation.js.map +1 -1
- package/dist-server/service/transport-driver/transport-driver.js +1 -1
- package/dist-server/service/transport-driver/transport-driver.js.map +1 -1
- package/dist-server/service/transport-vehicle/transport-vehicle-mutation.js +31 -16
- package/dist-server/service/transport-vehicle/transport-vehicle-mutation.js.map +1 -1
- package/package.json +3 -3
- package/server/service/transport-driver/transport-driver-mutation.ts +39 -23
- package/server/service/transport-driver/transport-driver.ts +1 -1
- package/server/service/transport-vehicle/transport-vehicle-mutation.ts +35 -18
- package/translations/en.json +2 -0
- package/translations/ko.json +2 -0
- package/translations/ms.json +2 -0
- package/translations/zh.json +2 -0
|
@@ -11,6 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
15
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
16
|
+
};
|
|
14
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
18
|
exports.deleteTransportDrivers = exports.deleteTransportDriver = exports.updateTransportDriver = exports.createTransportDriver = exports.TransportDriverMutation = void 0;
|
|
16
19
|
const type_graphql_1 = require("type-graphql");
|
|
@@ -18,6 +21,7 @@ const typeorm_1 = require("typeorm");
|
|
|
18
21
|
const auth_base_1 = require("@things-factory/auth-base");
|
|
19
22
|
const __1 = require("../");
|
|
20
23
|
const transport_driver_1 = require("./transport-driver");
|
|
24
|
+
const i18next_1 = __importDefault(require("i18next"));
|
|
21
25
|
const debug = require('debug')('things-factory:operato-wms:addTransportDriver');
|
|
22
26
|
let TransportDriverMutation = class TransportDriverMutation {
|
|
23
27
|
async createTransportDriver(transportDriver, context) {
|
|
@@ -36,25 +40,37 @@ let TransportDriverMutation = class TransportDriverMutation {
|
|
|
36
40
|
return await deleteTransportDrivers(ids, context);
|
|
37
41
|
}
|
|
38
42
|
async updateMultipleTransportDriver(patches, context) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
43
|
+
try {
|
|
44
|
+
const { tx, domain, user } = context.state;
|
|
45
|
+
for (let patch of patches) {
|
|
46
|
+
let foundDriver;
|
|
47
|
+
if (patch.id) {
|
|
48
|
+
foundDriver = await tx.getRepository(transport_driver_1.TransportDriver).findOne({
|
|
49
|
+
domain,
|
|
50
|
+
id: patch.id
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
else if (patch.name) {
|
|
54
|
+
foundDriver = await tx.getRepository(transport_driver_1.TransportDriver).findOne({
|
|
55
|
+
domain,
|
|
56
|
+
driverCode: patch.driverCode
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
if (!foundDriver) {
|
|
60
|
+
patch === null || patch === void 0 ? true : delete patch.id;
|
|
61
|
+
await tx.getRepository(transport_driver_1.TransportDriver).save(Object.assign(Object.assign({}, patch), { domain, creator: user, updater: user }));
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
if (patch.cuFlag === '+') {
|
|
65
|
+
throw new Error(i18next_1.default.t('error.driver code (x) already exists', { x: patch.name }));
|
|
66
|
+
}
|
|
67
|
+
delete patch.cuFlag;
|
|
68
|
+
await tx.getRepository(transport_driver_1.TransportDriver).update({ id: foundDriver.id }, Object.assign(Object.assign({}, patch), { updater: user }));
|
|
69
|
+
}
|
|
48
70
|
}
|
|
71
|
+
return true;
|
|
49
72
|
}
|
|
50
|
-
|
|
51
|
-
for (let i = 0; i < _updateRecords.length; i++) {
|
|
52
|
-
const patch = _updateRecords[i];
|
|
53
|
-
const result = await updateTransportDriver(patch.id, patch, domain, user, tx);
|
|
54
|
-
results.push(Object.assign(Object.assign({}, result), { cuFlag: 'M' }));
|
|
55
|
-
}
|
|
56
|
-
}
|
|
57
|
-
return results;
|
|
73
|
+
catch (e) { }
|
|
58
74
|
}
|
|
59
75
|
};
|
|
60
76
|
__decorate([
|
|
@@ -101,7 +117,7 @@ __decorate([
|
|
|
101
117
|
__decorate([
|
|
102
118
|
(0, type_graphql_1.Directive)('@privilege(category: "transport", privilege: "mutation")'),
|
|
103
119
|
(0, type_graphql_1.Directive)('@transaction'),
|
|
104
|
-
(0, type_graphql_1.Mutation)(returns =>
|
|
120
|
+
(0, type_graphql_1.Mutation)(returns => Boolean),
|
|
105
121
|
__param(0, (0, type_graphql_1.Arg)('patches', type => [__1.TransportDriverPatch])),
|
|
106
122
|
__param(1, (0, type_graphql_1.Ctx)()),
|
|
107
123
|
__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport-driver-mutation.js","sourceRoot":"","sources":["../../../server/service/transport-driver/transport-driver-mutation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transport-driver-mutation.js","sourceRoot":"","sources":["../../../server/service/transport-driver/transport-driver-mutation.ts"],"names":[],"mappings":"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"}
|
|
@@ -132,7 +132,7 @@ __decorate([
|
|
|
132
132
|
], TransportDriver.prototype, "deletedAt", void 0);
|
|
133
133
|
TransportDriver = __decorate([
|
|
134
134
|
(0, typeorm_1.Entity)(),
|
|
135
|
-
(0, typeorm_1.Index)('ix_transport-driver_0', (transportDriver) => [transportDriver.domain, transportDriver.driverCode, transportDriver.
|
|
135
|
+
(0, typeorm_1.Index)('ix_transport-driver_0', (transportDriver) => [transportDriver.domain, transportDriver.driverCode, transportDriver.name], {
|
|
136
136
|
unique: true
|
|
137
137
|
}),
|
|
138
138
|
(0, type_graphql_1.ObjectType)()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport-driver.js","sourceRoot":"","sources":["../../../server/service/transport-driver/transport-driver.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"transport-driver.js","sourceRoot":"","sources":["../../../server/service/transport-driver/transport-driver.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
15
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
16
|
+
};
|
|
14
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
18
|
exports.deleteTransportVehicles = exports.deleteTransportVehicle = exports.updateTransportVehicle = exports.createTransportVehicle = exports.TransportVehicleMutation = void 0;
|
|
16
19
|
const type_graphql_1 = require("type-graphql");
|
|
@@ -18,6 +21,7 @@ const typeorm_1 = require("typeorm");
|
|
|
18
21
|
const __1 = require("../");
|
|
19
22
|
const transport_driver_1 = require("../transport-driver/transport-driver");
|
|
20
23
|
const transport_vehicle_1 = require("./transport-vehicle");
|
|
24
|
+
const i18next_1 = __importDefault(require("i18next"));
|
|
21
25
|
const debug = require('debug')('things-factory:operato-wms:addTransportVehicle');
|
|
22
26
|
let TransportVehicleMutation = class TransportVehicleMutation {
|
|
23
27
|
async createTransportVehicle(transportVehicle, context) {
|
|
@@ -30,24 +34,35 @@ let TransportVehicleMutation = class TransportVehicleMutation {
|
|
|
30
34
|
}
|
|
31
35
|
async updateMultipleTransportVehicle(patches, context) {
|
|
32
36
|
const { tx, domain, user } = context.state;
|
|
33
|
-
let
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
results.push(Object.assign(Object.assign({}, result), { cuFlag: '+' }));
|
|
37
|
+
for (let patch of patches) {
|
|
38
|
+
let foundVehicle;
|
|
39
|
+
if (patch === null || patch === void 0 ? void 0 : patch.id) {
|
|
40
|
+
foundVehicle = await tx.getRepository(transport_vehicle_1.TransportVehicle).findOne({
|
|
41
|
+
domain,
|
|
42
|
+
id: patch.id
|
|
43
|
+
});
|
|
41
44
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
45
|
+
else if (patch === null || patch === void 0 ? void 0 : patch.name) {
|
|
46
|
+
foundVehicle = await tx.getRepository(transport_vehicle_1.TransportVehicle).findOne({
|
|
47
|
+
domain,
|
|
48
|
+
name: patch.name
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
if (!foundVehicle) {
|
|
52
|
+
patch === null || patch === void 0 ? true : delete patch.id;
|
|
53
|
+
await tx
|
|
54
|
+
.getRepository(transport_vehicle_1.TransportVehicle)
|
|
55
|
+
.save(Object.assign(Object.assign({}, patch), { regNumber: patch.name, domain, creator: user, updater: user }));
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
if (patch.cuFlag === '+') {
|
|
59
|
+
throw new Error(i18next_1.default.t('error.vehicle name (x) already exists', { x: patch.name }));
|
|
60
|
+
}
|
|
61
|
+
delete patch.cuFlag;
|
|
62
|
+
await tx.getRepository(transport_vehicle_1.TransportVehicle).update({ id: foundVehicle.id }, Object.assign(Object.assign({}, patch), { regNumber: (patch === null || patch === void 0 ? void 0 : patch.name) ? patch.name : foundVehicle.name, updater: user }));
|
|
48
63
|
}
|
|
49
64
|
}
|
|
50
|
-
return
|
|
65
|
+
return true;
|
|
51
66
|
}
|
|
52
67
|
async deleteTransportVehicle(id, context) {
|
|
53
68
|
const { tx } = context.state;
|
|
@@ -111,7 +126,7 @@ __decorate([
|
|
|
111
126
|
__decorate([
|
|
112
127
|
(0, type_graphql_1.Directive)('@transaction'),
|
|
113
128
|
(0, type_graphql_1.Directive)('@privilege(category: "transport", privilege: "mutation")'),
|
|
114
|
-
(0, type_graphql_1.Mutation)(returns =>
|
|
129
|
+
(0, type_graphql_1.Mutation)(returns => Boolean),
|
|
115
130
|
__param(0, (0, type_graphql_1.Arg)('patches', type => [__1.TransportVehiclePatch])),
|
|
116
131
|
__param(1, (0, type_graphql_1.Ctx)()),
|
|
117
132
|
__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport-vehicle-mutation.js","sourceRoot":"","sources":["../../../server/service/transport-vehicle/transport-vehicle-mutation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transport-vehicle-mutation.js","sourceRoot":"","sources":["../../../server/service/transport-vehicle/transport-vehicle-mutation.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/transport-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.142",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@things-factory/biz-base": "^4.3.
|
|
26
|
+
"@things-factory/biz-base": "^4.3.142"
|
|
27
27
|
},
|
|
28
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "1698c58d948310a02ad506564f90e71d776943f4"
|
|
29
29
|
}
|
|
@@ -6,6 +6,7 @@ import { Domain } from '@things-factory/shell'
|
|
|
6
6
|
|
|
7
7
|
import { NewTransportDriver, TransportDriverPatch } from '../'
|
|
8
8
|
import { TransportDriver } from './transport-driver'
|
|
9
|
+
import i18next from 'i18next'
|
|
9
10
|
|
|
10
11
|
const debug = require('debug')('things-factory:operato-wms:addTransportDriver')
|
|
11
12
|
|
|
@@ -53,34 +54,49 @@ export class TransportDriverMutation {
|
|
|
53
54
|
|
|
54
55
|
@Directive('@privilege(category: "transport", privilege: "mutation")')
|
|
55
56
|
@Directive('@transaction')
|
|
56
|
-
@Mutation(returns =>
|
|
57
|
+
@Mutation(returns => Boolean)
|
|
57
58
|
async updateMultipleTransportDriver(
|
|
58
59
|
@Arg('patches', type => [TransportDriverPatch]) patches: TransportDriverPatch[],
|
|
59
60
|
@Ctx() context: any
|
|
60
|
-
)
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
61
|
+
) {
|
|
62
|
+
try {
|
|
63
|
+
const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
|
|
64
|
+
|
|
65
|
+
for (let patch of patches) {
|
|
66
|
+
let foundDriver: TransportDriver
|
|
67
|
+
|
|
68
|
+
if (patch.id) {
|
|
69
|
+
foundDriver = await tx.getRepository(TransportDriver).findOne({
|
|
70
|
+
domain,
|
|
71
|
+
id: patch.id
|
|
72
|
+
})
|
|
73
|
+
} else if (patch.name) {
|
|
74
|
+
foundDriver = await tx.getRepository(TransportDriver).findOne({
|
|
75
|
+
domain,
|
|
76
|
+
driverCode: patch.driverCode
|
|
77
|
+
})
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
if (!foundDriver) {
|
|
81
|
+
delete patch?.id
|
|
82
|
+
await tx.getRepository(TransportDriver).save({ ...patch, domain, creator: user, updater: user })
|
|
83
|
+
} else {
|
|
84
|
+
if (patch.cuFlag === '+') {
|
|
85
|
+
throw new Error(i18next.t('error.driver code (x) already exists', { x: patch.name }))
|
|
86
|
+
}
|
|
87
|
+
delete patch.cuFlag
|
|
88
|
+
await tx.getRepository(TransportDriver).update(
|
|
89
|
+
{ id: foundDriver.id },
|
|
90
|
+
{
|
|
91
|
+
...patch,
|
|
92
|
+
updater: user
|
|
93
|
+
}
|
|
94
|
+
)
|
|
95
|
+
}
|
|
80
96
|
}
|
|
81
|
-
}
|
|
82
97
|
|
|
83
|
-
|
|
98
|
+
return true
|
|
99
|
+
} catch (e) {}
|
|
84
100
|
}
|
|
85
101
|
}
|
|
86
102
|
|
|
@@ -21,7 +21,7 @@ import { TransportVehicle } from '../transport-vehicle/transport-vehicle'
|
|
|
21
21
|
@Entity()
|
|
22
22
|
@Index(
|
|
23
23
|
'ix_transport-driver_0',
|
|
24
|
-
(transportDriver: TransportDriver) => [transportDriver.domain, transportDriver.driverCode, transportDriver.
|
|
24
|
+
(transportDriver: TransportDriver) => [transportDriver.domain, transportDriver.driverCode, transportDriver.name],
|
|
25
25
|
{
|
|
26
26
|
unique: true
|
|
27
27
|
}
|
|
@@ -7,6 +7,7 @@ import { Domain } from '@things-factory/shell'
|
|
|
7
7
|
import { NewTransportVehicle, TransportVehiclePatch } from '../'
|
|
8
8
|
import { TransportDriver } from '../transport-driver/transport-driver'
|
|
9
9
|
import { TransportVehicle } from './transport-vehicle'
|
|
10
|
+
import i18next from 'i18next'
|
|
10
11
|
|
|
11
12
|
const debug = require('debug')('things-factory:operato-wms:addTransportVehicle')
|
|
12
13
|
|
|
@@ -38,34 +39,50 @@ export class TransportVehicleMutation {
|
|
|
38
39
|
|
|
39
40
|
@Directive('@transaction')
|
|
40
41
|
@Directive('@privilege(category: "transport", privilege: "mutation")')
|
|
41
|
-
@Mutation(returns =>
|
|
42
|
+
@Mutation(returns => Boolean)
|
|
42
43
|
async updateMultipleTransportVehicle(
|
|
43
44
|
@Arg('patches', type => [TransportVehiclePatch]) patches: TransportVehiclePatch[],
|
|
44
45
|
@Ctx() context: any
|
|
45
|
-
)
|
|
46
|
+
) {
|
|
46
47
|
const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
|
|
47
48
|
|
|
48
|
-
let
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
49
|
+
for (let patch of patches) {
|
|
50
|
+
let foundVehicle: TransportVehicle
|
|
51
|
+
|
|
52
|
+
if (patch?.id) {
|
|
53
|
+
foundVehicle = await tx.getRepository(TransportVehicle).findOne({
|
|
54
|
+
domain,
|
|
55
|
+
id: patch.id
|
|
56
|
+
})
|
|
57
|
+
} else if (patch?.name) {
|
|
58
|
+
foundVehicle = await tx.getRepository(TransportVehicle).findOne({
|
|
59
|
+
domain,
|
|
60
|
+
name: patch.name
|
|
61
|
+
})
|
|
57
62
|
}
|
|
58
|
-
}
|
|
59
63
|
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
64
|
+
if (!foundVehicle) {
|
|
65
|
+
delete patch?.id
|
|
66
|
+
await tx
|
|
67
|
+
.getRepository(TransportVehicle)
|
|
68
|
+
.save({ ...patch, regNumber: patch.name, domain, creator: user, updater: user })
|
|
69
|
+
} else {
|
|
70
|
+
if (patch.cuFlag === '+') {
|
|
71
|
+
throw new Error(i18next.t('error.vehicle name (x) already exists', { x: patch.name }))
|
|
72
|
+
}
|
|
73
|
+
delete patch.cuFlag
|
|
74
|
+
await tx.getRepository(TransportVehicle).update(
|
|
75
|
+
{ id: foundVehicle.id },
|
|
76
|
+
{
|
|
77
|
+
...patch,
|
|
78
|
+
regNumber: patch?.name ? patch.name : foundVehicle.name,
|
|
79
|
+
updater: user
|
|
80
|
+
}
|
|
81
|
+
)
|
|
65
82
|
}
|
|
66
83
|
}
|
|
67
84
|
|
|
68
|
-
return
|
|
85
|
+
return true
|
|
69
86
|
}
|
|
70
87
|
|
|
71
88
|
@Directive('@transaction')
|
package/translations/en.json
CHANGED
package/translations/ko.json
CHANGED
package/translations/ms.json
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
{
|
|
2
|
+
"error.driver code (x) already exists": "[ms] Driver code ({x}) already exists",
|
|
3
|
+
"error.vehicle name (x) already exists": "[ms] Vehicle Name ({x}) already exists",
|
|
2
4
|
"field.transport_order": "pesanan pengangkutan",
|
|
3
5
|
"field.from": "daripada",
|
|
4
6
|
"field.to": "kepada",
|
package/translations/zh.json
CHANGED