@things-factory/operato-hub 4.3.572 → 4.3.574
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/synchronization/powrup-get-airway-bill.js +1 -1
- package/dist-server/graphql/resolvers/synchronization/powrup-get-airway-bill.js.map +1 -1
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-inbound-order-details.js +58 -0
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-inbound-order-details.js.map +1 -1
- package/openapi/v1/inbound.yaml +71 -0
- package/package.json +2 -2
- package/server/graphql/resolvers/synchronization/powrup-get-airway-bill.ts +2 -2
- package/server/routers/api/restful-apis/v1/warehouse/get-inbound-order-details.ts +62 -2
|
@@ -27,7 +27,7 @@ exports.powrupGetAirwayBillResolver = {
|
|
|
27
27
|
.andWhere(`rg.ref_order_id NOTNULL`)
|
|
28
28
|
.andWhere(`(rg.lmd_option = false or rg.lmd_option ISNULL)`)
|
|
29
29
|
.andWhere(`rg.status NOT IN (:...status) `, {
|
|
30
|
-
status: [sales_base_1.ORDER_STATUS.CANCELLED, sales_base_1.ORDER_STATUS.PENDING_CANCEL, sales_base_1.ORDER_STATUS.DONE]
|
|
30
|
+
status: [sales_base_1.ORDER_STATUS.PACKING, sales_base_1.ORDER_STATUS.CANCELLED, sales_base_1.ORDER_STATUS.PENDING_CANCEL, sales_base_1.ORDER_STATUS.DONE]
|
|
31
31
|
})
|
|
32
32
|
.andWhere(`opk.airway_bill ISNULL`)
|
|
33
33
|
.orderBy(`rg.created_at`)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"powrup-get-airway-bill.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/powrup-get-airway-bill.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,yDAA2D;AAC3D,6CAA4C;AAC5C,2EAAgF;AAChF,2DAAuE;AAEvE,MAAM,EAAE,mBAAmB,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAE1D,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CAAC,CAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"powrup-get-airway-bill.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/powrup-get-airway-bill.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,57 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-inbound-order-details', middleware
|
|
|
31
31
|
if (!arrivalNotice) {
|
|
32
32
|
throw new error_util_1.ApiError('E04', 'arrival notice');
|
|
33
33
|
}
|
|
34
|
+
const goodsReceivedNote = await (0, typeorm_1.getRepository)(sales_base_1.GoodsReceivalNote).findOne({
|
|
35
|
+
where: { arrivalNotice },
|
|
36
|
+
relations: [
|
|
37
|
+
'bizplace',
|
|
38
|
+
'domain',
|
|
39
|
+
'arrivalNotice',
|
|
40
|
+
'arrivalNotice.orderInventories',
|
|
41
|
+
'arrivalNotice.orderInventories.product',
|
|
42
|
+
'arrivalNotice.orderInventories.productDetail',
|
|
43
|
+
'arrivalNotice.orderInventories.inventory'
|
|
44
|
+
]
|
|
45
|
+
});
|
|
46
|
+
let grnOrderInventories = goodsReceivedNote === null || goodsReceivedNote === void 0 ? void 0 : goodsReceivedNote.arrivalNotice.orderInventories.reduce((acc, orderInventory) => {
|
|
47
|
+
// let key = `${orderInventory.productDetail.id}_${orderInventory.batchId}_${orderInventory.packingType}_${orderInventory.uom}_${orderInventory.inventory.expirationDate}`
|
|
48
|
+
var _a, _b, _c;
|
|
49
|
+
let existingItem = acc.find(item => {
|
|
50
|
+
var _a;
|
|
51
|
+
return item.product.id === orderInventory.product.id &&
|
|
52
|
+
item.batchId === orderInventory.batchId &&
|
|
53
|
+
item.packingType === orderInventory.packingType &&
|
|
54
|
+
item.uom === orderInventory.uom &&
|
|
55
|
+
item.expirationDate === ((_a = orderInventory.inventory) === null || _a === void 0 ? void 0 : _a.expirationDate);
|
|
56
|
+
});
|
|
57
|
+
if (!existingItem) {
|
|
58
|
+
acc.push({
|
|
59
|
+
product: {
|
|
60
|
+
id: orderInventory.product.id,
|
|
61
|
+
sku: orderInventory.product.sku,
|
|
62
|
+
brandSku: orderInventory.product.brandSku,
|
|
63
|
+
name: orderInventory.product.name,
|
|
64
|
+
description: orderInventory.product.description,
|
|
65
|
+
refCode: orderInventory.productDetail.refCode,
|
|
66
|
+
packingType: orderInventory.productDetail.packingType,
|
|
67
|
+
packingSize: orderInventory.productDetail.packingSize,
|
|
68
|
+
uom: orderInventory.productDetail.uom
|
|
69
|
+
},
|
|
70
|
+
batchId: orderInventory.batchId,
|
|
71
|
+
packingType: orderInventory.packingType,
|
|
72
|
+
packingSize: orderInventory.packingSize,
|
|
73
|
+
status: orderInventory.status,
|
|
74
|
+
qty: ((_a = orderInventory.inventory) === null || _a === void 0 ? void 0 : _a.qty) || 0,
|
|
75
|
+
uom: orderInventory.uom,
|
|
76
|
+
uomValue: orderInventory.uomValue,
|
|
77
|
+
expirationDate: (_b = orderInventory.inventory) === null || _b === void 0 ? void 0 : _b.expirationDate
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
existingItem.qty += ((_c = orderInventory.inventory) === null || _c === void 0 ? void 0 : _c.qty) || 0;
|
|
82
|
+
}
|
|
83
|
+
return acc;
|
|
84
|
+
}, []);
|
|
34
85
|
// create and format data response
|
|
35
86
|
let orderProducts = [];
|
|
36
87
|
for (const orderProduct of arrivalNotice.orderProducts) {
|
|
@@ -72,6 +123,13 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-inbound-order-details', middleware
|
|
|
72
123
|
companyName: ((_b = arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.supplier) === null || _b === void 0 ? void 0 : _b.companyName) || null,
|
|
73
124
|
email: ((_c = arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.supplier) === null || _c === void 0 ? void 0 : _c.email) || null,
|
|
74
125
|
accountNo: ((_d = arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.supplier) === null || _d === void 0 ? void 0 : _d.accountNo) || null
|
|
126
|
+
},
|
|
127
|
+
grn: {
|
|
128
|
+
id: goodsReceivedNote.id,
|
|
129
|
+
grnNo: goodsReceivedNote.grnNo,
|
|
130
|
+
refNo: goodsReceivedNote.refNo,
|
|
131
|
+
status: goodsReceivedNote.status,
|
|
132
|
+
orderProducts: grnOrderInventories
|
|
75
133
|
}
|
|
76
134
|
};
|
|
77
135
|
context.body = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-inbound-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-inbound-order-details.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,qCAAuC;AAEvC,6CAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"get-inbound-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-inbound-order-details.ts"],"names":[],"mappings":"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"}
|
package/openapi/v1/inbound.yaml
CHANGED
|
@@ -337,6 +337,77 @@ definitions:
|
|
|
337
337
|
accountNo:
|
|
338
338
|
type: 'string'
|
|
339
339
|
example: 'COMPANY-ACODE'
|
|
340
|
+
grn:
|
|
341
|
+
type: 'object'
|
|
342
|
+
properties:
|
|
343
|
+
id:
|
|
344
|
+
type: 'string'
|
|
345
|
+
example: 'uuid2669-646f-42a0-8364-56f670fuuid'
|
|
346
|
+
refNo:
|
|
347
|
+
type: 'string'
|
|
348
|
+
example: 'GAN-xxxxxxxx'
|
|
349
|
+
status:
|
|
350
|
+
type: 'string'
|
|
351
|
+
example: 'PENDING_RECEIVE'
|
|
352
|
+
orderProducts:
|
|
353
|
+
type: 'array'
|
|
354
|
+
items:
|
|
355
|
+
type: 'object'
|
|
356
|
+
properties:
|
|
357
|
+
product:
|
|
358
|
+
type: 'object'
|
|
359
|
+
properties:
|
|
360
|
+
id:
|
|
361
|
+
type: 'string'
|
|
362
|
+
example: 'uuid2669-646f-42a0-8364-56f670fuuid'
|
|
363
|
+
sku:
|
|
364
|
+
type: 'string'
|
|
365
|
+
example: 'xxxxxxxx'
|
|
366
|
+
brandSku:
|
|
367
|
+
type: 'string'
|
|
368
|
+
example: 'string'
|
|
369
|
+
name:
|
|
370
|
+
type: 'string'
|
|
371
|
+
example: 'xxxxxxxx'
|
|
372
|
+
description:
|
|
373
|
+
type: 'string'
|
|
374
|
+
example: 'xxxxxxxx'
|
|
375
|
+
refCode:
|
|
376
|
+
type: 'string'
|
|
377
|
+
example: 'xxxxxxxx'
|
|
378
|
+
packingType:
|
|
379
|
+
type: 'string'
|
|
380
|
+
example: 'DRUM'
|
|
381
|
+
packingSize:
|
|
382
|
+
type: 'integer'
|
|
383
|
+
example: 1
|
|
384
|
+
uom:
|
|
385
|
+
type: 'string'
|
|
386
|
+
example: 'kg'
|
|
387
|
+
type:
|
|
388
|
+
type: 'string'
|
|
389
|
+
example: 'ARRIVAL_NOTICE'
|
|
390
|
+
batchId:
|
|
391
|
+
type: 'string'
|
|
392
|
+
example: '24090487'
|
|
393
|
+
packingType:
|
|
394
|
+
type: 'string'
|
|
395
|
+
example: 'DRUM'
|
|
396
|
+
packingSize:
|
|
397
|
+
type: 'integer'
|
|
398
|
+
example: 1
|
|
399
|
+
status:
|
|
400
|
+
type: 'string'
|
|
401
|
+
example: 'TERMINATED'
|
|
402
|
+
qty:
|
|
403
|
+
type: 'integer'
|
|
404
|
+
example: 4
|
|
405
|
+
uom:
|
|
406
|
+
type: 'string'
|
|
407
|
+
example: 'kg'
|
|
408
|
+
expirationDate:
|
|
409
|
+
type: 'string'
|
|
410
|
+
example: 'utc 0 date'
|
|
340
411
|
xml:
|
|
341
412
|
name: 'GetInboundOrderDetails'
|
|
342
413
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-hub",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.574",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -122,5 +122,5 @@
|
|
|
122
122
|
"resolutions": {
|
|
123
123
|
"core-js": "^3.16.0"
|
|
124
124
|
},
|
|
125
|
-
"gitHead": "
|
|
125
|
+
"gitHead": "e16e67d0683a0762a602d2ae8a910fd3eefc7a0f"
|
|
126
126
|
}
|
|
@@ -8,7 +8,7 @@ import { ORDER_STATUS, OrderPackage } from '@things-factory/sales-base'
|
|
|
8
8
|
const { PerformanceObserver, performance } = require('node:perf_hooks')
|
|
9
9
|
|
|
10
10
|
export const powrupGetAirwayBillResolver = {
|
|
11
|
-
async powrupGetAirwayBill(_: void, {}, context: any): Promise<void> {
|
|
11
|
+
async powrupGetAirwayBill(_: void, { }, context: any): Promise<void> {
|
|
12
12
|
try {
|
|
13
13
|
await getConnection().transaction(async tx => {
|
|
14
14
|
try {
|
|
@@ -28,7 +28,7 @@ export const powrupGetAirwayBillResolver = {
|
|
|
28
28
|
.andWhere(`rg.ref_order_id NOTNULL`)
|
|
29
29
|
.andWhere(`(rg.lmd_option = false or rg.lmd_option ISNULL)`)
|
|
30
30
|
.andWhere(`rg.status NOT IN (:...status) `, {
|
|
31
|
-
status: [ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL, ORDER_STATUS.DONE]
|
|
31
|
+
status: [ORDER_STATUS.PACKING, ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL, ORDER_STATUS.DONE]
|
|
32
32
|
})
|
|
33
33
|
.andWhere(`opk.airway_bill ISNULL`)
|
|
34
34
|
.orderBy(`rg.created_at`)
|
|
@@ -2,8 +2,7 @@ import _ from 'lodash'
|
|
|
2
2
|
import { getRepository } from 'typeorm'
|
|
3
3
|
|
|
4
4
|
import { restfulApiRouter as router } from '@things-factory/api'
|
|
5
|
-
import { ArrivalNotice } from '@things-factory/sales-base'
|
|
6
|
-
|
|
5
|
+
import { ArrivalNotice, GoodsReceivalNote } from '@things-factory/sales-base'
|
|
7
6
|
import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
|
|
8
7
|
import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
|
|
9
8
|
|
|
@@ -36,6 +35,60 @@ router.get(
|
|
|
36
35
|
if (!arrivalNotice) {
|
|
37
36
|
throw new ApiError('E04', 'arrival notice')
|
|
38
37
|
}
|
|
38
|
+
|
|
39
|
+
const goodsReceivedNote: GoodsReceivalNote = await getRepository(GoodsReceivalNote).findOne({
|
|
40
|
+
where: { arrivalNotice },
|
|
41
|
+
relations: [
|
|
42
|
+
'bizplace',
|
|
43
|
+
'domain',
|
|
44
|
+
'arrivalNotice',
|
|
45
|
+
'arrivalNotice.orderInventories',
|
|
46
|
+
'arrivalNotice.orderInventories.product',
|
|
47
|
+
'arrivalNotice.orderInventories.productDetail',
|
|
48
|
+
'arrivalNotice.orderInventories.inventory'
|
|
49
|
+
]
|
|
50
|
+
})
|
|
51
|
+
|
|
52
|
+
let grnOrderInventories = goodsReceivedNote?.arrivalNotice.orderInventories.reduce((acc, orderInventory) => {
|
|
53
|
+
// let key = `${orderInventory.productDetail.id}_${orderInventory.batchId}_${orderInventory.packingType}_${orderInventory.uom}_${orderInventory.inventory.expirationDate}`
|
|
54
|
+
|
|
55
|
+
let existingItem = acc.find(item =>
|
|
56
|
+
item.product.id === orderInventory.product.id &&
|
|
57
|
+
item.batchId === orderInventory.batchId &&
|
|
58
|
+
item.packingType === orderInventory.packingType &&
|
|
59
|
+
item.uom === orderInventory.uom &&
|
|
60
|
+
item.expirationDate === orderInventory.inventory?.expirationDate
|
|
61
|
+
)
|
|
62
|
+
|
|
63
|
+
if (!existingItem) {
|
|
64
|
+
acc.push({
|
|
65
|
+
product: {
|
|
66
|
+
id: orderInventory.product.id,
|
|
67
|
+
sku: orderInventory.product.sku,
|
|
68
|
+
brandSku: orderInventory.product.brandSku,
|
|
69
|
+
name: orderInventory.product.name,
|
|
70
|
+
description: orderInventory.product.description,
|
|
71
|
+
refCode: orderInventory.productDetail.refCode,
|
|
72
|
+
packingType: orderInventory.productDetail.packingType,
|
|
73
|
+
packingSize: orderInventory.productDetail.packingSize,
|
|
74
|
+
uom: orderInventory.productDetail.uom
|
|
75
|
+
},
|
|
76
|
+
batchId: orderInventory.batchId,
|
|
77
|
+
packingType: orderInventory.packingType,
|
|
78
|
+
packingSize: orderInventory.packingSize,
|
|
79
|
+
status: orderInventory.status,
|
|
80
|
+
qty: orderInventory.inventory?.qty || 0,
|
|
81
|
+
uom: orderInventory.uom,
|
|
82
|
+
uomValue: orderInventory.uomValue,
|
|
83
|
+
expirationDate: orderInventory.inventory?.expirationDate
|
|
84
|
+
})
|
|
85
|
+
} else {
|
|
86
|
+
existingItem.qty += orderInventory.inventory?.qty || 0
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
return acc
|
|
90
|
+
}, [])
|
|
91
|
+
|
|
39
92
|
// create and format data response
|
|
40
93
|
let orderProducts = []
|
|
41
94
|
for (const orderProduct of arrivalNotice.orderProducts) {
|
|
@@ -77,6 +130,13 @@ router.get(
|
|
|
77
130
|
companyName: arrivalNotice?.supplier?.companyName || null,
|
|
78
131
|
email: arrivalNotice?.supplier?.email || null,
|
|
79
132
|
accountNo: arrivalNotice?.supplier?.accountNo || null
|
|
133
|
+
},
|
|
134
|
+
grn: {
|
|
135
|
+
id: goodsReceivedNote.id,
|
|
136
|
+
grnNo: goodsReceivedNote.grnNo,
|
|
137
|
+
refNo: goodsReceivedNote.refNo,
|
|
138
|
+
status: goodsReceivedNote.status,
|
|
139
|
+
orderProducts: grnOrderInventories
|
|
80
140
|
}
|
|
81
141
|
}
|
|
82
142
|
|