@things-factory/worksheet-base 4.3.86 → 4.3.89
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/delivery-order-by-worksheet.js +7 -4
- package/dist-server/graphql/resolvers/worksheet/delivery-order-by-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.js +38 -36
- package/dist-server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.js.map +1 -1
- package/dist-server/graphql/types/worksheet/delivery-order-info.js +1 -0
- package/dist-server/graphql/types/worksheet/delivery-order-info.js.map +1 -1
- package/package.json +7 -7
- package/server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts +7 -6
- package/server/graphql/resolvers/worksheet/packing-worksheet.ts +1 -1
- package/server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.ts +42 -41
- package/server/graphql/types/worksheet/delivery-order-info.ts +1 -0
|
@@ -7,6 +7,7 @@ const transport_base_1 = require("@things-factory/transport-base");
|
|
|
7
7
|
const env_1 = require("@things-factory/env");
|
|
8
8
|
exports.deliveryOrderByWorksheetResolver = {
|
|
9
9
|
async deliveryOrderByWorksheet(_, { name }, context) {
|
|
10
|
+
var _a;
|
|
10
11
|
const { domain, tx } = context.state;
|
|
11
12
|
try {
|
|
12
13
|
const foundDO = await tx.getRepository(sales_base_1.DeliveryOrder).findOne({
|
|
@@ -18,7 +19,9 @@ exports.deliveryOrderByWorksheetResolver = {
|
|
|
18
19
|
});
|
|
19
20
|
if (!foundDO)
|
|
20
21
|
throw new Error('Delivery order not found!');
|
|
21
|
-
const foundOI = await tx
|
|
22
|
+
const foundOI = await tx
|
|
23
|
+
.getRepository(sales_base_1.OrderInventory)
|
|
24
|
+
.createQueryBuilder('oi')
|
|
22
25
|
.select('p.name', 'name')
|
|
23
26
|
.addSelect('p.sku', 'sku')
|
|
24
27
|
.addSelect('p.type', 'type')
|
|
@@ -69,8 +72,8 @@ exports.deliveryOrderByWorksheetResolver = {
|
|
|
69
72
|
reusablePallet: foundDO.reusablePallet || '',
|
|
70
73
|
createdDate: foundDO.createdAt.toISOString().split('T')[0],
|
|
71
74
|
isManualDo: foundDO.releaseGood ? false : true,
|
|
72
|
-
attentionTo: foundDO.attentionTo,
|
|
73
|
-
releaseGood: Object.assign(Object.assign({}, foundDO.releaseGood), { attentionTo: foundDO.attentionTo || foundDO.releaseGood.attentionTo, bizplace: partnerBiz }),
|
|
75
|
+
attentionTo: foundDO.attentionTo || '',
|
|
76
|
+
releaseGood: Object.assign(Object.assign({}, foundDO.releaseGood), { attentionTo: foundDO.attentionTo || ((_a = foundDO.releaseGood) === null || _a === void 0 ? void 0 : _a.attentionTo), bizplace: partnerBiz }),
|
|
74
77
|
productList: foundOI
|
|
75
78
|
},
|
|
76
79
|
contactPointInfo: partnerContactPoint.map(async (cp) => {
|
|
@@ -82,7 +85,7 @@ exports.deliveryOrderByWorksheetResolver = {
|
|
|
82
85
|
phone: cp.phone || '',
|
|
83
86
|
contactName: cp.name || ''
|
|
84
87
|
};
|
|
85
|
-
})
|
|
88
|
+
})
|
|
86
89
|
};
|
|
87
90
|
}
|
|
88
91
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-order-by-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts"],"names":[],"mappings":";;;AAAA,uDAAiE;AACjE,2DAA0E;AAG1E,mEAAgE;AAChE,6CAA4C;AAE/B,QAAA,gCAAgC,GAAG;IAC9C,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY
|
|
1
|
+
{"version":3,"file":"delivery-order-by-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -180,7 +180,7 @@ exports.packingWorksheetResolver = {
|
|
|
180
180
|
marketplaceStatus: marketplaceStatus ? marketplaceStatus : '',
|
|
181
181
|
marketplaceOrder: marketplaceOrder ? marketplaceOrder : ''
|
|
182
182
|
},
|
|
183
|
-
worksheetDetailInfos: worksheet.worksheetDetails.map(
|
|
183
|
+
worksheetDetailInfos: worksheet.worksheetDetails.map((packingWSD) => {
|
|
184
184
|
const targetInventory = packingWSD.targetInventory;
|
|
185
185
|
const inventory = targetInventory.inventory;
|
|
186
186
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,8 +25,7 @@ exports.fetchAndAssignPickingTaskResolver = {
|
|
|
25
25
|
.select('ws.id')
|
|
26
26
|
.addSelect('ws.name')
|
|
27
27
|
.addSelect('ws.status')
|
|
28
|
-
.
|
|
29
|
-
.innerJoin('ws.releaseGood', 'rg')
|
|
28
|
+
.innerJoinAndSelect('ws.releaseGood', 'rg')
|
|
30
29
|
.where('(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id =:assignee AND (ws.status = :status1 OR ws.status = :status2))', {
|
|
31
30
|
domain_id: domain.id,
|
|
32
31
|
type: constants_1.WORKSHEET_TYPE.PICKING,
|
|
@@ -47,42 +46,45 @@ exports.fetchAndAssignPickingTaskResolver = {
|
|
|
47
46
|
return 'NOT EXISTS ' + subQuery;
|
|
48
47
|
})
|
|
49
48
|
.orderBy('"rg"."created_at"', 'ASC');
|
|
50
|
-
worksheet = await worksheetQb.
|
|
49
|
+
worksheet = await worksheetQb.getOne();
|
|
51
50
|
if (!worksheet) {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
.
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
if (
|
|
51
|
+
// update and return updated worksheet id
|
|
52
|
+
let updatedWorksheets = await (0, typeorm_1.getConnection)().transaction(async (tx2) => {
|
|
53
|
+
let x = await tx2.getRepository(entities_1.Worksheet).query(`
|
|
54
|
+
UPDATE worksheets ws SET assignee_id = $2,
|
|
55
|
+
updated_at = NOW(),
|
|
56
|
+
updater_id = $2
|
|
57
|
+
FROM (
|
|
58
|
+
SELECT ws.id, ws.name, ws.status, ws.release_good_id FROM worksheets ws
|
|
59
|
+
INNER JOIN release_goods rg ON rg.id = ws.release_good_id
|
|
60
|
+
WHERE
|
|
61
|
+
ws.domain_id = $1 AND
|
|
62
|
+
ws.type = 'PICKING' AND
|
|
63
|
+
ws.assignee_id IS NULL AND
|
|
64
|
+
(ws.status = 'EXECUTING' OR ws.status = 'DEACTIVATED') AND
|
|
65
|
+
NOT EXISTS (
|
|
66
|
+
SELECT count(id) AS "totalPS"
|
|
67
|
+
FROM order_inventories oi
|
|
68
|
+
WHERE oi.release_good_id = ws.release_good_id AND
|
|
69
|
+
oi.status = 'PENDING_SPLIT'
|
|
70
|
+
GROUP BY oi.release_good_id
|
|
71
|
+
HAVING count(id) > 0
|
|
72
|
+
)
|
|
73
|
+
ORDER BY rg.release_date, rg.created_at LIMIT 1
|
|
74
|
+
) src where src.id = ws.id
|
|
75
|
+
RETURNING ws.id;
|
|
76
|
+
`, [domain.id, assignee.id]);
|
|
77
|
+
return x[0];
|
|
78
|
+
});
|
|
79
|
+
if (updatedWorksheets.length == 0)
|
|
81
80
|
throw new Error('no suitable worksheet found');
|
|
82
|
-
|
|
81
|
+
// relace worksheet with newly assigned worksheet
|
|
82
|
+
worksheet = await tx
|
|
83
|
+
.getRepository(entities_1.Worksheet)
|
|
84
|
+
.findOne({ where: { id: updatedWorksheets[0].id }, relations: ['releaseGood'] });
|
|
83
85
|
}
|
|
84
|
-
if (worksheet.
|
|
85
|
-
await (0, activate_picking_1.activatePicking)(tx, domain, user, worksheet.
|
|
86
|
+
if (worksheet.status == constants_1.WORKSHEET_STATUS.DEACTIVATED)
|
|
87
|
+
await (0, activate_picking_1.activatePicking)(tx, domain, user, worksheet.name);
|
|
86
88
|
const locationSortingRules = await tx.getRepository(setting_base_1.Setting).findOne({
|
|
87
89
|
where: { domain, name: 'rule-for-picking-product' }
|
|
88
90
|
});
|
|
@@ -90,7 +92,7 @@ exports.fetchAndAssignPickingTaskResolver = {
|
|
|
90
92
|
const locationSortingRule = Object.keys(sortingRule).map(field => {
|
|
91
93
|
return { name: field, desc: sortingRule[field] === 'DESC' };
|
|
92
94
|
});
|
|
93
|
-
const releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne(worksheet.
|
|
95
|
+
const releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne(worksheet.releaseGood.id);
|
|
94
96
|
return await (0, picking_worksheet_1.pickingWorksheet)(domain, releaseGood.name, locationSortingRule, tx);
|
|
95
97
|
}
|
|
96
98
|
catch (error) {
|
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,EAAE,EAAE,OAAY;QACtD,IAAI;YACF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;YAC7F,MAAM,QAAQ,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;YAChG,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,KAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,UAAkB,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC;gBACtF,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;YAEhE,IAAI,CAAC,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;YAE5D,IAAI,
|
|
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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-order-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/delivery-order-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,iBAAiB,GAAG,IAAA,uBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"delivery-order-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/delivery-order-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,iBAAiB,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;CAsBnC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worksheet-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.89",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -29,16 +29,16 @@
|
|
|
29
29
|
"@things-factory/document-template-base": "^4.3.86",
|
|
30
30
|
"@things-factory/id-rule-base": "^4.3.86",
|
|
31
31
|
"@things-factory/integration-lmd": "^4.3.86",
|
|
32
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
33
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
32
|
+
"@things-factory/integration-marketplace": "^4.3.89",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^4.3.89",
|
|
34
34
|
"@things-factory/integration-sftp": "^4.3.86",
|
|
35
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
35
|
+
"@things-factory/marketplace-base": "^4.3.89",
|
|
36
36
|
"@things-factory/notification": "^4.3.86",
|
|
37
|
-
"@things-factory/sales-base": "^4.3.
|
|
37
|
+
"@things-factory/sales-base": "^4.3.89",
|
|
38
38
|
"@things-factory/setting-base": "^4.3.86",
|
|
39
39
|
"@things-factory/shell": "^4.3.86",
|
|
40
40
|
"@things-factory/transport-base": "^4.3.86",
|
|
41
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
41
|
+
"@things-factory/warehouse-base": "^4.3.89"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "7bcc26bb32589c622ab05813a6b5012729aa3b9e"
|
|
44
44
|
}
|
|
@@ -7,7 +7,7 @@ import { logger } from '@things-factory/env'
|
|
|
7
7
|
|
|
8
8
|
export const deliveryOrderByWorksheetResolver = {
|
|
9
9
|
async deliveryOrderByWorksheet(_: any, { name }, context: any) {
|
|
10
|
-
const { domain, tx }: { domain: Domain
|
|
10
|
+
const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
|
|
11
11
|
try {
|
|
12
12
|
const foundDO: DeliveryOrder = await tx.getRepository(DeliveryOrder).findOne({
|
|
13
13
|
where: {
|
|
@@ -19,7 +19,9 @@ export const deliveryOrderByWorksheetResolver = {
|
|
|
19
19
|
|
|
20
20
|
if (!foundDO) throw new Error('Delivery order not found!')
|
|
21
21
|
|
|
22
|
-
const foundOI: any = await tx
|
|
22
|
+
const foundOI: any = await tx
|
|
23
|
+
.getRepository(OrderInventory)
|
|
24
|
+
.createQueryBuilder('oi')
|
|
23
25
|
.select('p.name', 'name')
|
|
24
26
|
.addSelect('p.sku', 'sku')
|
|
25
27
|
.addSelect('p.type', 'type')
|
|
@@ -74,10 +76,10 @@ export const deliveryOrderByWorksheetResolver = {
|
|
|
74
76
|
reusablePallet: foundDO.reusablePallet || '',
|
|
75
77
|
createdDate: foundDO.createdAt.toISOString().split('T')[0],
|
|
76
78
|
isManualDo: foundDO.releaseGood ? false : true,
|
|
77
|
-
attentionTo: foundDO.attentionTo,
|
|
79
|
+
attentionTo: foundDO.attentionTo || '',
|
|
78
80
|
releaseGood: {
|
|
79
81
|
...foundDO.releaseGood,
|
|
80
|
-
attentionTo: foundDO.attentionTo || foundDO.releaseGood
|
|
82
|
+
attentionTo: foundDO.attentionTo || foundDO.releaseGood?.attentionTo,
|
|
81
83
|
bizplace: partnerBiz
|
|
82
84
|
},
|
|
83
85
|
productList: foundOI
|
|
@@ -91,12 +93,11 @@ export const deliveryOrderByWorksheetResolver = {
|
|
|
91
93
|
phone: cp.phone || '',
|
|
92
94
|
contactName: cp.name || ''
|
|
93
95
|
}
|
|
94
|
-
})
|
|
96
|
+
})
|
|
95
97
|
}
|
|
96
98
|
} catch (error) {
|
|
97
99
|
logger.error(`delivery-order-by-worksheet:(data:${JSON.stringify({ name, domain })}) ${error} `)
|
|
98
100
|
throw new Error('Something went wrong. Please contact support.')
|
|
99
101
|
}
|
|
100
|
-
|
|
101
102
|
}
|
|
102
103
|
}
|
|
@@ -213,7 +213,7 @@ export const packingWorksheetResolver = {
|
|
|
213
213
|
marketplaceStatus: marketplaceStatus ? marketplaceStatus : '',
|
|
214
214
|
marketplaceOrder: marketplaceOrder ? marketplaceOrder : ''
|
|
215
215
|
},
|
|
216
|
-
worksheetDetailInfos: worksheet.worksheetDetails.map(
|
|
216
|
+
worksheetDetailInfos: worksheet.worksheetDetails.map((packingWSD: WorksheetDetail) => {
|
|
217
217
|
const targetInventory: OrderInventory = packingWSD.targetInventory
|
|
218
218
|
const inventory: Inventory = targetInventory.inventory
|
|
219
219
|
return {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { EntityManager,
|
|
1
|
+
import { EntityManager, getConnection } from 'typeorm'
|
|
2
2
|
|
|
3
3
|
import { User } from '@things-factory/auth-base'
|
|
4
|
-
import {
|
|
4
|
+
import { OrderInventory, ReleaseGood } from '@things-factory/sales-base'
|
|
5
5
|
import { Setting } from '@things-factory/setting-base'
|
|
6
6
|
import { Domain } from '@things-factory/shell'
|
|
7
7
|
|
|
@@ -20,15 +20,14 @@ export const fetchAndAssignPickingTaskResolver = {
|
|
|
20
20
|
|
|
21
21
|
if (!assignee) throw new Error('failed to find target user')
|
|
22
22
|
|
|
23
|
-
let worksheet:
|
|
23
|
+
let worksheet: Worksheet
|
|
24
24
|
let worksheetQb = await tx
|
|
25
25
|
.getRepository(Worksheet)
|
|
26
26
|
.createQueryBuilder('ws')
|
|
27
27
|
.select('ws.id')
|
|
28
28
|
.addSelect('ws.name')
|
|
29
29
|
.addSelect('ws.status')
|
|
30
|
-
.
|
|
31
|
-
.innerJoin('ws.releaseGood', 'rg')
|
|
30
|
+
.innerJoinAndSelect('ws.releaseGood', 'rg')
|
|
32
31
|
.where(
|
|
33
32
|
'(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id =:assignee AND (ws.status = :status1 OR ws.status = :status2))',
|
|
34
33
|
{
|
|
@@ -53,48 +52,50 @@ export const fetchAndAssignPickingTaskResolver = {
|
|
|
53
52
|
})
|
|
54
53
|
.orderBy('"rg"."created_at"', 'ASC')
|
|
55
54
|
|
|
56
|
-
worksheet = await worksheetQb.
|
|
55
|
+
worksheet = await worksheetQb.getOne()
|
|
57
56
|
|
|
58
57
|
if (!worksheet) {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
.
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
domain_id
|
|
71
|
-
type
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
58
|
+
// update and return updated worksheet id
|
|
59
|
+
let updatedWorksheets = await getConnection().transaction(async (tx2: EntityManager) => {
|
|
60
|
+
let x = await tx2.getRepository(Worksheet).query(
|
|
61
|
+
`
|
|
62
|
+
UPDATE worksheets ws SET assignee_id = $2,
|
|
63
|
+
updated_at = NOW(),
|
|
64
|
+
updater_id = $2
|
|
65
|
+
FROM (
|
|
66
|
+
SELECT ws.id, ws.name, ws.status, ws.release_good_id FROM worksheets ws
|
|
67
|
+
INNER JOIN release_goods rg ON rg.id = ws.release_good_id
|
|
68
|
+
WHERE
|
|
69
|
+
ws.domain_id = $1 AND
|
|
70
|
+
ws.type = 'PICKING' AND
|
|
71
|
+
ws.assignee_id IS NULL AND
|
|
72
|
+
(ws.status = 'EXECUTING' OR ws.status = 'DEACTIVATED') AND
|
|
73
|
+
NOT EXISTS (
|
|
74
|
+
SELECT count(id) AS "totalPS"
|
|
75
|
+
FROM order_inventories oi
|
|
76
|
+
WHERE oi.release_good_id = ws.release_good_id AND
|
|
77
|
+
oi.status = 'PENDING_SPLIT'
|
|
78
|
+
GROUP BY oi.release_good_id
|
|
79
|
+
HAVING count(id) > 0
|
|
80
|
+
)
|
|
81
|
+
ORDER BY rg.release_date, rg.created_at LIMIT 1
|
|
82
|
+
) src where src.id = ws.id
|
|
83
|
+
RETURNING ws.id;
|
|
84
|
+
`,
|
|
85
|
+
[domain.id, assignee.id]
|
|
75
86
|
)
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
.subQuery()
|
|
79
|
-
.select('COUNT(*) AS totalPS')
|
|
80
|
-
.from(OrderInventory, 'OrderInventory')
|
|
81
|
-
.where('OrderInventory.release_good_id = ws.release_good_id')
|
|
82
|
-
.andWhere(`OrderInventory.status = 'PENDING_SPLIT'`)
|
|
83
|
-
.groupBy('OrderInventory.release_good_id')
|
|
84
|
-
.having('COUNT(*) > 0')
|
|
85
|
-
.getQuery()
|
|
86
|
-
return 'NOT EXISTS ' + subQuery
|
|
87
|
-
})
|
|
88
|
-
.orderBy('"rg"."created_at"', 'ASC')
|
|
87
|
+
return x[0]
|
|
88
|
+
})
|
|
89
89
|
|
|
90
|
-
|
|
90
|
+
if (updatedWorksheets.length == 0) throw new Error('no suitable worksheet found')
|
|
91
91
|
|
|
92
|
-
|
|
93
|
-
|
|
92
|
+
// relace worksheet with newly assigned worksheet
|
|
93
|
+
worksheet = await tx
|
|
94
|
+
.getRepository(Worksheet)
|
|
95
|
+
.findOne({ where: { id: updatedWorksheets[0].id }, relations: ['releaseGood'] })
|
|
94
96
|
}
|
|
95
97
|
|
|
96
|
-
if (worksheet.
|
|
97
|
-
await activatePicking(tx, domain, user, worksheet.ws_name)
|
|
98
|
+
if (worksheet.status == WORKSHEET_STATUS.DEACTIVATED) await activatePicking(tx, domain, user, worksheet.name)
|
|
98
99
|
|
|
99
100
|
const locationSortingRules: Setting = await tx.getRepository(Setting).findOne({
|
|
100
101
|
where: { domain, name: 'rule-for-picking-product' }
|
|
@@ -105,7 +106,7 @@ export const fetchAndAssignPickingTaskResolver = {
|
|
|
105
106
|
return { name: field, desc: sortingRule[field] === 'DESC' }
|
|
106
107
|
})
|
|
107
108
|
|
|
108
|
-
const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne(worksheet.
|
|
109
|
+
const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne(worksheet.releaseGood.id)
|
|
109
110
|
|
|
110
111
|
return await pickingWorksheet(domain, releaseGood.name, locationSortingRule, tx)
|
|
111
112
|
} catch (error) {
|