@things-factory/worksheet-base 3.8.30 → 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/complete-picking.js +6 -13
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- 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/complete-picking.ts +13 -14
- package/server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.ts +31 -9
|
@@ -33,18 +33,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
33
33
|
const pickingWSCtrl = new controllers_1.PickingWorksheetController(tx, domain, user);
|
|
34
34
|
let releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
35
35
|
where: { domain, name: releaseGoodNo },
|
|
36
|
-
relations: [
|
|
37
|
-
'bizplace',
|
|
38
|
-
'bizplace.domain',
|
|
39
|
-
'bizplace.company',
|
|
40
|
-
'bizplace.company.domain',
|
|
41
|
-
'orderInventories',
|
|
42
|
-
'orderInventories.inventory',
|
|
43
|
-
'orderInventories.product',
|
|
44
|
-
'orderProducts',
|
|
45
|
-
'orderProducts.product',
|
|
46
|
-
'orderProducts.product.productDetails'
|
|
47
|
-
]
|
|
36
|
+
relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
|
|
48
37
|
});
|
|
49
38
|
const worksheet = await pickingWSCtrl.findWorksheetByRefOrder(releaseGood, constants_1.WORKSHEET_TYPE.PICKING, [
|
|
50
39
|
'worksheetDetails',
|
|
@@ -67,7 +56,11 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
67
56
|
if (sellercraft) {
|
|
68
57
|
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
69
58
|
if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packageId)) {
|
|
70
|
-
|
|
59
|
+
const orderProducts = await tx.getRepository(sales_base_1.OrderProduct).find({
|
|
60
|
+
where: { releaseGood },
|
|
61
|
+
relations: ['product', 'product.productDetails']
|
|
62
|
+
});
|
|
63
|
+
releaseGood = await sellercraftCtrl.packOrder(sellercraft, Object.assign(Object.assign({}, releaseGood), { orderProducts }));
|
|
71
64
|
}
|
|
72
65
|
releaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
|
|
73
66
|
await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":";;;AAGA,uDAAgF;AAChF,qEAA+E;AAC/E,qFAAkG;AAClG,qFAAwF;AACxF,uEAAuF;AACvF,uEAAmH;AACnH,
|
|
1
|
+
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
}
|
|
@@ -7,7 +7,13 @@ import { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integr
|
|
|
7
7
|
import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
|
|
8
8
|
import { COMPLETEDATAPATH, generateFile, Sftp } from '@things-factory/integration-sftp'
|
|
9
9
|
import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
|
|
10
|
-
import {
|
|
10
|
+
import {
|
|
11
|
+
ORDER_INVENTORY_STATUS,
|
|
12
|
+
ORDER_STATUS,
|
|
13
|
+
OrderInventory,
|
|
14
|
+
OrderProduct,
|
|
15
|
+
ReleaseGood
|
|
16
|
+
} from '@things-factory/sales-base'
|
|
11
17
|
import { PartnerSetting, Setting } from '@things-factory/setting-base'
|
|
12
18
|
import { Domain } from '@things-factory/shell'
|
|
13
19
|
|
|
@@ -48,18 +54,7 @@ export async function completePicking(
|
|
|
48
54
|
const pickingWSCtrl: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
|
|
49
55
|
let releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
|
|
50
56
|
where: { domain, name: releaseGoodNo },
|
|
51
|
-
relations: [
|
|
52
|
-
'bizplace',
|
|
53
|
-
'bizplace.domain',
|
|
54
|
-
'bizplace.company',
|
|
55
|
-
'bizplace.company.domain',
|
|
56
|
-
'orderInventories',
|
|
57
|
-
'orderInventories.inventory',
|
|
58
|
-
'orderInventories.product',
|
|
59
|
-
'orderProducts',
|
|
60
|
-
'orderProducts.product',
|
|
61
|
-
'orderProducts.product.productDetails'
|
|
62
|
-
]
|
|
57
|
+
relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
|
|
63
58
|
})
|
|
64
59
|
|
|
65
60
|
const worksheet: Worksheet = await pickingWSCtrl.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.PICKING, [
|
|
@@ -91,7 +86,11 @@ export async function completePicking(
|
|
|
91
86
|
const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
92
87
|
|
|
93
88
|
if (!releaseGood?.packageId) {
|
|
94
|
-
|
|
89
|
+
const orderProducts: OrderProduct[] = await tx.getRepository(OrderProduct).find({
|
|
90
|
+
where: { releaseGood },
|
|
91
|
+
relations: ['product', 'product.productDetails']
|
|
92
|
+
})
|
|
93
|
+
releaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...releaseGood, orderProducts })
|
|
95
94
|
}
|
|
96
95
|
|
|
97
96
|
releaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
|
|
@@ -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' }
|