@things-factory/sales-base 4.3.364 → 4.3.367
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/manifest/manifest-mutation.js +10 -1
- package/dist-server/service/manifest/manifest-mutation.js.map +1 -1
- package/dist-server/service/manifest/manifest.js +6 -0
- package/dist-server/service/manifest/manifest.js.map +1 -1
- package/package.json +7 -6
- package/server/service/manifest/manifest-mutation.ts +38 -7
- package/server/service/manifest/manifest.ts +15 -3
|
@@ -19,6 +19,7 @@ exports.ManifestMutation = void 0;
|
|
|
19
19
|
const i18next_1 = __importDefault(require("i18next"));
|
|
20
20
|
const type_graphql_1 = require("type-graphql");
|
|
21
21
|
const typeorm_1 = require("typeorm");
|
|
22
|
+
const integration_base_1 = require("@things-factory/integration-base");
|
|
22
23
|
const constants_1 = require("../../constants");
|
|
23
24
|
const utils_1 = require("../../utils");
|
|
24
25
|
const order_package_1 = require("../order-package/order-package");
|
|
@@ -161,7 +162,15 @@ let ManifestMutation = class ManifestMutation {
|
|
|
161
162
|
return Object.assign(Object.assign({}, releaseGood), { dispatchmentStatus: constants_1.DISPATCHMENT_STATUS.DISPATCHED, updater: user });
|
|
162
163
|
});
|
|
163
164
|
await tx.getRepository(release_good_1.ReleaseGood).save(releaseGoods);
|
|
164
|
-
|
|
165
|
+
const bizplaceIds = [...new Set(orderPackages.map(itm => itm.bizplaceId))];
|
|
166
|
+
const savedManifest = await tx.getRepository(manifest_1.Manifest).save(Object.assign(Object.assign(Object.assign({}, manifest), patch), { status: manifest_1.ManifestStatus.CLOSED, dispatchedAt: new Date(), updater: user }));
|
|
167
|
+
try {
|
|
168
|
+
(0, integration_base_1.triggerWebhook)(manifest.id, bizplaceIds, 'Dispatch Manifest', context);
|
|
169
|
+
}
|
|
170
|
+
catch (e) {
|
|
171
|
+
console.log(e);
|
|
172
|
+
}
|
|
173
|
+
return savedManifest;
|
|
165
174
|
}
|
|
166
175
|
};
|
|
167
176
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest-mutation.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,sDAA6B;AAC7B,+
|
|
1
|
+
{"version":3,"file":"manifest-mutation.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-mutation.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ const typeorm_1 = require("typeorm");
|
|
|
16
16
|
const auth_base_1 = require("@things-factory/auth-base");
|
|
17
17
|
const env_1 = require("@things-factory/env");
|
|
18
18
|
const shell_1 = require("@things-factory/shell");
|
|
19
|
+
const order_package_1 = require("../order-package/order-package");
|
|
19
20
|
const manifest_type_1 = require("./manifest-type");
|
|
20
21
|
const ORMCONFIG = env_1.config.get('ormconfig', {});
|
|
21
22
|
const DATABASE_TYPE = ORMCONFIG.type;
|
|
@@ -101,6 +102,11 @@ __decorate([
|
|
|
101
102
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
102
103
|
__metadata("design:type", Date)
|
|
103
104
|
], Manifest.prototype, "updatedAt", void 0);
|
|
105
|
+
__decorate([
|
|
106
|
+
(0, typeorm_1.OneToMany)(type => order_package_1.OrderPackage, orderPackage => orderPackage.manifest, { nullable: true }),
|
|
107
|
+
(0, type_graphql_1.Field)(type => [order_package_1.OrderPackage], { nullable: true }),
|
|
108
|
+
__metadata("design:type", Array)
|
|
109
|
+
], Manifest.prototype, "orderPackages", void 0);
|
|
104
110
|
__decorate([
|
|
105
111
|
(0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
|
|
106
112
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/sales-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.367",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -27,15 +27,16 @@
|
|
|
27
27
|
"@things-factory/auth-base": "^4.3.281",
|
|
28
28
|
"@things-factory/biz-base": "^4.3.344",
|
|
29
29
|
"@things-factory/code-base": "^4.3.281",
|
|
30
|
-
"@things-factory/integration-accounting": "^4.3.
|
|
31
|
-
"@things-factory/integration-
|
|
32
|
-
"@things-factory/integration-
|
|
30
|
+
"@things-factory/integration-accounting": "^4.3.367",
|
|
31
|
+
"@things-factory/integration-base": "^4.3.367",
|
|
32
|
+
"@things-factory/integration-powrup": "^4.3.367",
|
|
33
|
+
"@things-factory/integration-sftp": "^4.3.367",
|
|
33
34
|
"@things-factory/notification": "^4.3.281",
|
|
34
35
|
"@things-factory/product-base": "^4.3.357",
|
|
35
36
|
"@things-factory/setting-base": "^4.3.281",
|
|
36
37
|
"@things-factory/shell": "^4.3.281",
|
|
37
38
|
"@things-factory/transport-base": "^4.3.344",
|
|
38
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
39
|
+
"@things-factory/warehouse-base": "^4.3.367"
|
|
39
40
|
},
|
|
40
|
-
"gitHead": "
|
|
41
|
+
"gitHead": "7ca4aeb73080cd52d7058fe97e6cbb2cc431a80d"
|
|
41
42
|
}
|
|
@@ -1,13 +1,34 @@
|
|
|
1
1
|
import i18next from 'i18next'
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
import {
|
|
3
|
+
Arg,
|
|
4
|
+
Ctx,
|
|
5
|
+
Directive,
|
|
6
|
+
Mutation,
|
|
7
|
+
Resolver
|
|
8
|
+
} from 'type-graphql'
|
|
9
|
+
import {
|
|
10
|
+
In,
|
|
11
|
+
IsNull,
|
|
12
|
+
Not
|
|
13
|
+
} from 'typeorm'
|
|
14
|
+
|
|
15
|
+
import { triggerWebhook } from '@things-factory/integration-base'
|
|
16
|
+
|
|
17
|
+
import {
|
|
18
|
+
DISPATCHMENT_STATUS,
|
|
19
|
+
MANIFEST_STATUS
|
|
20
|
+
} from '../../constants'
|
|
6
21
|
import { OrderNoGenerator } from '../../utils'
|
|
7
22
|
import { OrderPackage } from '../order-package/order-package'
|
|
8
23
|
import { ReleaseGood } from '../release-good/release-good'
|
|
9
|
-
import {
|
|
10
|
-
|
|
24
|
+
import {
|
|
25
|
+
Manifest,
|
|
26
|
+
ManifestStatus
|
|
27
|
+
} from './manifest'
|
|
28
|
+
import {
|
|
29
|
+
ManifestPatch,
|
|
30
|
+
NewManifest
|
|
31
|
+
} from './manifest-type'
|
|
11
32
|
|
|
12
33
|
@Resolver(Manifest)
|
|
13
34
|
export class ManifestMutation {
|
|
@@ -234,12 +255,22 @@ export class ManifestMutation {
|
|
|
234
255
|
})
|
|
235
256
|
await tx.getRepository(ReleaseGood).save(releaseGoods)
|
|
236
257
|
|
|
237
|
-
|
|
258
|
+
const bizplaceIds = [...new Set(orderPackages.map(itm => itm.bizplaceId))]
|
|
259
|
+
|
|
260
|
+
const savedManifest = await tx.getRepository(Manifest).save({
|
|
238
261
|
...manifest,
|
|
239
262
|
...patch,
|
|
240
263
|
status: ManifestStatus.CLOSED,
|
|
241
264
|
dispatchedAt: new Date(),
|
|
242
265
|
updater: user
|
|
243
266
|
})
|
|
267
|
+
|
|
268
|
+
try {
|
|
269
|
+
triggerWebhook(manifest.id, bizplaceIds, 'Dispatch Manifest', context)
|
|
270
|
+
} catch (e) {
|
|
271
|
+
console.log(e)
|
|
272
|
+
}
|
|
273
|
+
|
|
274
|
+
return savedManifest
|
|
244
275
|
}
|
|
245
276
|
}
|
|
@@ -1,10 +1,17 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
Field,
|
|
3
|
+
ID,
|
|
4
|
+
Int,
|
|
5
|
+
ObjectType,
|
|
6
|
+
registerEnumType
|
|
7
|
+
} from 'type-graphql'
|
|
2
8
|
import {
|
|
3
9
|
Column,
|
|
4
10
|
CreateDateColumn,
|
|
5
11
|
Entity,
|
|
6
12
|
Index,
|
|
7
13
|
ManyToOne,
|
|
14
|
+
OneToMany,
|
|
8
15
|
PrimaryGeneratedColumn,
|
|
9
16
|
RelationId,
|
|
10
17
|
UpdateDateColumn
|
|
@@ -14,6 +21,7 @@ import { User } from '@things-factory/auth-base'
|
|
|
14
21
|
import { config } from '@things-factory/env'
|
|
15
22
|
import { Domain } from '@things-factory/shell'
|
|
16
23
|
|
|
24
|
+
import { OrderPackage } from '../order-package/order-package'
|
|
17
25
|
import { TrackingNo } from './manifest-type'
|
|
18
26
|
|
|
19
27
|
const ORMCONFIG = config.get('ormconfig', {})
|
|
@@ -70,8 +78,8 @@ export class Manifest {
|
|
|
70
78
|
DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
|
71
79
|
? 'enum'
|
|
72
80
|
: DATABASE_TYPE == 'oracle'
|
|
73
|
-
|
|
74
|
-
|
|
81
|
+
? 'varchar2'
|
|
82
|
+
: 'smallint',
|
|
75
83
|
enum: ManifestStatus,
|
|
76
84
|
default: ManifestStatus.OPEN
|
|
77
85
|
})
|
|
@@ -92,6 +100,10 @@ export class Manifest {
|
|
|
92
100
|
@Field({ nullable: true })
|
|
93
101
|
updatedAt?: Date
|
|
94
102
|
|
|
103
|
+
@OneToMany(type => OrderPackage, orderPackage => orderPackage.manifest, { nullable: true })
|
|
104
|
+
@Field(type => [OrderPackage], { nullable: true })
|
|
105
|
+
orderPackages: OrderPackage[]
|
|
106
|
+
|
|
95
107
|
@ManyToOne(type => User, { nullable: true })
|
|
96
108
|
@Field({ nullable: true })
|
|
97
109
|
creator?: User
|