@things-factory/worksheet-base 3.8.34 → 3.8.35
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/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.js +20 -5
- package/dist-server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.js.map +1 -1
- package/package.json +5 -5
- package/server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.ts +31 -9
|
@@ -19,12 +19,20 @@ exports.fetchAndAssignPickingTaskResolver = {
|
|
|
19
19
|
if (!assignee)
|
|
20
20
|
throw new Error('failed to find target user');
|
|
21
21
|
let worksheet;
|
|
22
|
-
let worksheetQb = await tx
|
|
22
|
+
let worksheetQb = await tx
|
|
23
|
+
.getRepository(entities_1.Worksheet)
|
|
24
|
+
.createQueryBuilder('ws')
|
|
23
25
|
.select('ws.id')
|
|
24
26
|
.addSelect('ws.name')
|
|
25
27
|
.addSelect('ws.status')
|
|
26
28
|
.addSelect('ws.release_good_id')
|
|
27
|
-
.where('(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id =:assignee AND (ws.status = :status1 OR ws.status = :status2))', {
|
|
29
|
+
.where('(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id =:assignee AND (ws.status = :status1 OR ws.status = :status2))', {
|
|
30
|
+
domain_id: domain.id,
|
|
31
|
+
type: constants_1.WORKSHEET_TYPE.PICKING,
|
|
32
|
+
assignee: assignee.id,
|
|
33
|
+
status1: constants_1.WORKSHEET_STATUS.EXECUTING,
|
|
34
|
+
status2: constants_1.WORKSHEET_STATUS.DEACTIVATED
|
|
35
|
+
})
|
|
28
36
|
.andWhere(qb => {
|
|
29
37
|
const subQuery = qb
|
|
30
38
|
.subQuery()
|
|
@@ -39,12 +47,19 @@ exports.fetchAndAssignPickingTaskResolver = {
|
|
|
39
47
|
});
|
|
40
48
|
worksheet = await worksheetQb.getRawOne();
|
|
41
49
|
if (!worksheet) {
|
|
42
|
-
let worksheetQb = await tx
|
|
50
|
+
let worksheetQb = await tx
|
|
51
|
+
.getRepository(entities_1.Worksheet)
|
|
52
|
+
.createQueryBuilder('ws')
|
|
43
53
|
.select('ws.id')
|
|
44
54
|
.addSelect('ws.name')
|
|
45
55
|
.addSelect('ws.status')
|
|
46
56
|
.addSelect('ws.release_good_id')
|
|
47
|
-
.where('(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id IS NULL AND (ws.status = :status1 OR ws.status = :status2))', {
|
|
57
|
+
.where('(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id IS NULL AND (ws.status = :status1 OR ws.status = :status2))', {
|
|
58
|
+
domain_id: domain.id,
|
|
59
|
+
type: constants_1.WORKSHEET_TYPE.PICKING,
|
|
60
|
+
status1: constants_1.WORKSHEET_STATUS.EXECUTING,
|
|
61
|
+
status2: constants_1.WORKSHEET_STATUS.DEACTIVATED
|
|
62
|
+
})
|
|
48
63
|
.andWhere(qb => {
|
|
49
64
|
const subQuery = qb
|
|
50
65
|
.subQuery()
|
|
@@ -60,7 +75,7 @@ exports.fetchAndAssignPickingTaskResolver = {
|
|
|
60
75
|
worksheet = await worksheetQb.getRawOne();
|
|
61
76
|
if (!worksheet)
|
|
62
77
|
throw new Error('no suitable worksheet found');
|
|
63
|
-
await (0, typeorm_1.getRepository)(entities_1.Worksheet).update({ id: worksheet.
|
|
78
|
+
await (0, typeorm_1.getRepository)(entities_1.Worksheet).update({ id: worksheet.ws_id }, { assignee: assignee });
|
|
64
79
|
}
|
|
65
80
|
if (worksheet.ws_status == constants_1.WORKSHEET_STATUS.DEACTIVATED)
|
|
66
81
|
await (0, activate_picking_1.activatePicking)(tx, domain, user, worksheet.ws_name);
|
package/dist-server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-and-assign-picking-task.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AAEtD,yDAAgD;AAChD,2DAAwE;AACxE,+DAAsD;AAGtD,qDAAwE;AACxE,mDAAgD;AAChD,4DAAuD;AACvD,yDAAoD;AAEvC,QAAA,iCAAiC,GAAG;IAC/C,KAAK,CAAC,yBAAyB,CAAC,CAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"fetch-and-assign-picking-task.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worksheet-base",
|
|
3
|
-
"version": "3.8.
|
|
3
|
+
"version": "3.8.35",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -32,13 +32,13 @@
|
|
|
32
32
|
"@things-factory/integration-marketplace": "^3.8.29",
|
|
33
33
|
"@things-factory/integration-sellercraft": "^3.8.29",
|
|
34
34
|
"@things-factory/integration-sftp": "^3.8.29",
|
|
35
|
-
"@things-factory/marketplace-base": "^3.8.
|
|
35
|
+
"@things-factory/marketplace-base": "^3.8.35",
|
|
36
36
|
"@things-factory/notification": "^3.8.0",
|
|
37
|
-
"@things-factory/sales-base": "^3.8.
|
|
37
|
+
"@things-factory/sales-base": "^3.8.35",
|
|
38
38
|
"@things-factory/setting-base": "^3.8.0",
|
|
39
39
|
"@things-factory/shell": "^3.8.0",
|
|
40
40
|
"@things-factory/transport-base": "^3.8.29",
|
|
41
|
-
"@things-factory/warehouse-base": "^3.8.
|
|
41
|
+
"@things-factory/warehouse-base": "^3.8.35"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "58cb1444f84b1e70df2546d8c2a9b3a9b4da91b2"
|
|
44
44
|
}
|
|
@@ -11,7 +11,7 @@ import { pickingWorksheet } from '../picking-worksheet'
|
|
|
11
11
|
import { activatePicking } from './activate-picking'
|
|
12
12
|
|
|
13
13
|
export const fetchAndAssignPickingTaskResolver = {
|
|
14
|
-
async fetchAndAssignPickingTask(_: any, {
|
|
14
|
+
async fetchAndAssignPickingTask(_: any, {}, context: any) {
|
|
15
15
|
try {
|
|
16
16
|
const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
|
|
17
17
|
const assignee: User = await tx.getRepository(User).findOne(user.id, { relations: ['domains'] })
|
|
@@ -21,12 +21,23 @@ export const fetchAndAssignPickingTaskResolver = {
|
|
|
21
21
|
if (!assignee) throw new Error('failed to find target user')
|
|
22
22
|
|
|
23
23
|
let worksheet: any
|
|
24
|
-
let worksheetQb = await tx
|
|
24
|
+
let worksheetQb = await tx
|
|
25
|
+
.getRepository(Worksheet)
|
|
26
|
+
.createQueryBuilder('ws')
|
|
25
27
|
.select('ws.id')
|
|
26
28
|
.addSelect('ws.name')
|
|
27
29
|
.addSelect('ws.status')
|
|
28
30
|
.addSelect('ws.release_good_id')
|
|
29
|
-
.where(
|
|
31
|
+
.where(
|
|
32
|
+
'(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id =:assignee AND (ws.status = :status1 OR ws.status = :status2))',
|
|
33
|
+
{
|
|
34
|
+
domain_id: domain.id,
|
|
35
|
+
type: WORKSHEET_TYPE.PICKING,
|
|
36
|
+
assignee: assignee.id,
|
|
37
|
+
status1: WORKSHEET_STATUS.EXECUTING,
|
|
38
|
+
status2: WORKSHEET_STATUS.DEACTIVATED
|
|
39
|
+
}
|
|
40
|
+
)
|
|
30
41
|
.andWhere(qb => {
|
|
31
42
|
const subQuery = qb
|
|
32
43
|
.subQuery()
|
|
@@ -40,15 +51,25 @@ export const fetchAndAssignPickingTaskResolver = {
|
|
|
40
51
|
return 'NOT EXISTS ' + subQuery
|
|
41
52
|
})
|
|
42
53
|
|
|
43
|
-
worksheet = await worksheetQb.getRawOne()
|
|
54
|
+
worksheet = await worksheetQb.getRawOne()
|
|
44
55
|
|
|
45
56
|
if (!worksheet) {
|
|
46
|
-
let worksheetQb = await tx
|
|
57
|
+
let worksheetQb = await tx
|
|
58
|
+
.getRepository(Worksheet)
|
|
59
|
+
.createQueryBuilder('ws')
|
|
47
60
|
.select('ws.id')
|
|
48
61
|
.addSelect('ws.name')
|
|
49
62
|
.addSelect('ws.status')
|
|
50
63
|
.addSelect('ws.release_good_id')
|
|
51
|
-
.where(
|
|
64
|
+
.where(
|
|
65
|
+
'(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id IS NULL AND (ws.status = :status1 OR ws.status = :status2))',
|
|
66
|
+
{
|
|
67
|
+
domain_id: domain.id,
|
|
68
|
+
type: WORKSHEET_TYPE.PICKING,
|
|
69
|
+
status1: WORKSHEET_STATUS.EXECUTING,
|
|
70
|
+
status2: WORKSHEET_STATUS.DEACTIVATED
|
|
71
|
+
}
|
|
72
|
+
)
|
|
52
73
|
.andWhere(qb => {
|
|
53
74
|
const subQuery = qb
|
|
54
75
|
.subQuery()
|
|
@@ -62,13 +83,14 @@ export const fetchAndAssignPickingTaskResolver = {
|
|
|
62
83
|
return 'NOT EXISTS ' + subQuery
|
|
63
84
|
})
|
|
64
85
|
|
|
65
|
-
worksheet = await worksheetQb.getRawOne()
|
|
86
|
+
worksheet = await worksheetQb.getRawOne()
|
|
66
87
|
|
|
67
88
|
if (!worksheet) throw new Error('no suitable worksheet found')
|
|
68
|
-
await getRepository(Worksheet).update({ id: worksheet.
|
|
89
|
+
await getRepository(Worksheet).update({ id: worksheet.ws_id }, { assignee: assignee })
|
|
69
90
|
}
|
|
70
91
|
|
|
71
|
-
if (worksheet.ws_status == WORKSHEET_STATUS.DEACTIVATED)
|
|
92
|
+
if (worksheet.ws_status == WORKSHEET_STATUS.DEACTIVATED)
|
|
93
|
+
await activatePicking(tx, domain, user, worksheet.ws_name)
|
|
72
94
|
|
|
73
95
|
const locationSortingRules: Setting = await tx.getRepository(Setting).findOne({
|
|
74
96
|
where: { domain, name: 'rule-for-picking-product' }
|