@things-factory/operato-hub 4.3.575 → 4.3.576
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/reports/receiving-report.js +16 -6
- package/dist-server/graphql/resolvers/reports/receiving-report.js.map +1 -1
- package/dist-server/graphql/types/reports/receiving-report.js +1 -0
- package/dist-server/graphql/types/reports/receiving-report.js.map +1 -1
- package/dist-server/routers/internal/powrup-router.js +31 -0
- package/dist-server/routers/internal/powrup-router.js.map +1 -1
- package/package.json +4 -4
- package/server/graphql/resolvers/reports/receiving-report.ts +16 -6
- package/server/graphql/types/reports/receiving-report.ts +1 -0
- package/server/routers/internal/powrup-router.ts +40 -0
|
@@ -8,7 +8,13 @@ exports.receivingReport = {
|
|
|
8
8
|
// Create temporary table for report
|
|
9
9
|
await tx.query(`
|
|
10
10
|
create temp table temp_inbound_order_report on commit drop as (
|
|
11
|
-
select "arrived_date", "receipt_id", "receipt_id_type", "batch", "mfg_date", "exp_date", "item", "item_desc", sum(quantity) as quantity, "qty_um"
|
|
11
|
+
select "arrived_date", "receipt_id", "receipt_id_type", "batch", "mfg_date", "exp_date", "item", "item_desc", sum(quantity) as quantity, "qty_um",
|
|
12
|
+
case
|
|
13
|
+
when client = 'f0848540-9d8f-4835-b744-2407db36a14e' then 'MALAYSIA'
|
|
14
|
+
when client = '157a9653-9f2b-4568-b245-ab8791db98ce' then 'SINGAPORE'
|
|
15
|
+
when client = '226c9c9d-9685-403d-8f05-89b7d3b8691e' then 'MANUFACTURING MALAYSIA'
|
|
16
|
+
end as client
|
|
17
|
+
from(
|
|
12
18
|
select
|
|
13
19
|
to_char(grn.created_at + interval '8 hours','dd/mm/yyyy') as "arrived_date",
|
|
14
20
|
COALESCE(an.container_no,'') as "receipt_id",
|
|
@@ -19,7 +25,8 @@ exports.receivingReport = {
|
|
|
19
25
|
p.sku as "item",
|
|
20
26
|
p.name as "item_desc",
|
|
21
27
|
oi.actual_pack_qty as "quantity",
|
|
22
|
-
oi.packing_type as "qty_um"
|
|
28
|
+
oi.packing_type as "qty_um",
|
|
29
|
+
an.bizplace_id as client
|
|
23
30
|
from arrival_notices an
|
|
24
31
|
inner join goods_receival_notes grn ON an.id = grn.arrival_notice_id
|
|
25
32
|
inner join order_products op on an.id = op.arrival_notice_id
|
|
@@ -38,8 +45,9 @@ exports.receivingReport = {
|
|
|
38
45
|
to_char(i.expiration_date,'dd/mm/yyyy') as "exp_date",
|
|
39
46
|
p.sku as "item",
|
|
40
47
|
p.name as "item_desc",
|
|
41
|
-
|
|
42
|
-
oi.packing_type as "qty_um"
|
|
48
|
+
oi.actual_pack_qty as "quantity",
|
|
49
|
+
oi.packing_type as "qty_um",
|
|
50
|
+
ro.bizplace_id as client
|
|
43
51
|
from return_orders ro
|
|
44
52
|
inner join order_inventories oi on ro.id = oi.return_order_id
|
|
45
53
|
inner join inventories i on i.id = oi.inventory_id
|
|
@@ -48,7 +56,8 @@ exports.receivingReport = {
|
|
|
48
56
|
and oi."type" = 'RETURN_ORDER'
|
|
49
57
|
and ro.created_at::date = (NOW()::date - interval '1 day')
|
|
50
58
|
order by arrived_date, batch, item desc
|
|
51
|
-
)foo group by "arrived_date", "receipt_id", "receipt_id_type", "batch", "mfg_date", "exp_date", "item", "item_desc", "qty_um"
|
|
59
|
+
)foo group by "arrived_date", "receipt_id", "receipt_id_type", "batch", "mfg_date", "exp_date", "item", "item_desc", "qty_um", "client"
|
|
60
|
+
order by "client"
|
|
52
61
|
)
|
|
53
62
|
`);
|
|
54
63
|
// Fetch detailed results
|
|
@@ -67,7 +76,8 @@ exports.receivingReport = {
|
|
|
67
76
|
item: itm.item,
|
|
68
77
|
itemDesc: itm.item_desc,
|
|
69
78
|
quantity: itm.quantity,
|
|
70
|
-
qtyUm: itm.qty_um
|
|
79
|
+
qtyUm: itm.qty_um,
|
|
80
|
+
client: itm.client
|
|
71
81
|
}));
|
|
72
82
|
// Return the modified items with inserted totals
|
|
73
83
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receiving-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/receiving-report.ts"],"names":[],"mappings":";;;AAIa,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC3D,IAAI;YACF,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;YAEnD,oCAAoC;YACpC,MAAM,EAAE,CAAC,KAAK,CACZ
|
|
1
|
+
{"version":3,"file":"receiving-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/receiving-report.ts"],"names":[],"mappings":";;;AAIa,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC3D,IAAI;YACF,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;YAEnD,oCAAoC;YACpC,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAqDC,CACF,CAAA;YAED,yBAAyB;YACzB,MAAM,MAAM,GAAQ,MAAM,EAAE,CAAC,KAAK,CAAC;;;OAGlC,CAAC,CAAA;YAEF,uBAAuB;YACvB,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC7B,WAAW,EAAE,GAAG,CAAC,YAAY;gBAC7B,SAAS,EAAE,GAAG,CAAC,UAAU;gBACzB,aAAa,EAAE,GAAG,CAAC,eAAe;gBAClC,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,OAAO,EAAE,GAAG,CAAC,QAAQ;gBACrB,OAAO,EAAE,GAAG,CAAC,QAAQ;gBACrB,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,QAAQ,EAAE,GAAG,CAAC,SAAS;gBACvB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,KAAK,EAAE,GAAG,CAAC,MAAM;gBACjB,MAAM,EAAE,GAAG,CAAC,MAAM;aACnB,CAAC,CAAC,CAAA;YAEH,iDAAiD;YACjD,OAAO;gBACL,KAAK;aACN,CAAA;SACF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receiving-report.js","sourceRoot":"","sources":["../../../../server/graphql/types/reports/receiving-report.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,eAAe,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"receiving-report.js","sourceRoot":"","sources":["../../../../server/graphql/types/reports/receiving-report.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,eAAe,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;CAcjC,CAAA"}
|
|
@@ -31,6 +31,7 @@ const koa_router_1 = __importDefault(require("koa-router"));
|
|
|
31
31
|
const typeorm_1 = require("typeorm");
|
|
32
32
|
const integration_powrup_1 = require("@things-factory/integration-powrup");
|
|
33
33
|
const shell_1 = require("@things-factory/shell");
|
|
34
|
+
const sales_base_1 = require("@things-factory/sales-base");
|
|
34
35
|
const API = __importStar(require("./apis"));
|
|
35
36
|
const validation_middleware_1 = require("./middlewares/validation-middleware");
|
|
36
37
|
const error_util_1 = require("./utils/error-util");
|
|
@@ -246,6 +247,36 @@ exports.powrupRouter.get('/warehouse/get', async (context, next) => {
|
|
|
246
247
|
(0, error_util_1.throwInternalServerError)(context, e);
|
|
247
248
|
}
|
|
248
249
|
});
|
|
250
|
+
exports.powrupRouter.post('/internal/order/pack-order', async (context, next) => {
|
|
251
|
+
try {
|
|
252
|
+
await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
253
|
+
const { body } = context.request;
|
|
254
|
+
const { apiKey } = context.query;
|
|
255
|
+
await getPowrup(context, apiKey, tx);
|
|
256
|
+
const releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
257
|
+
where: { id: body.id }
|
|
258
|
+
});
|
|
259
|
+
if (!releaseGood) {
|
|
260
|
+
throw new Error('order not found');
|
|
261
|
+
}
|
|
262
|
+
const orderProducts = await tx.getRepository(sales_base_1.OrderProduct).find({
|
|
263
|
+
where: { releaseGood },
|
|
264
|
+
relations: ['productDetail', 'bizplace', 'domain']
|
|
265
|
+
});
|
|
266
|
+
const powrupController = new sales_base_1.PowrupController();
|
|
267
|
+
let data = await powrupController.packOrder(context.state.powrup, Object.assign(Object.assign({}, releaseGood), { orderProducts }), null, null, tx);
|
|
268
|
+
context.body = {
|
|
269
|
+
result: { data }
|
|
270
|
+
};
|
|
271
|
+
});
|
|
272
|
+
}
|
|
273
|
+
catch (e) {
|
|
274
|
+
if (e instanceof error_util_1.ApiError)
|
|
275
|
+
(0, error_util_1.ApiErrorHandler)(context, e);
|
|
276
|
+
else
|
|
277
|
+
(0, error_util_1.throwInternalServerError)(context, e);
|
|
278
|
+
}
|
|
279
|
+
});
|
|
249
280
|
async function getPowrup(context, apiKey, tx) {
|
|
250
281
|
const powrup = await tx.getRepository(integration_powrup_1.Powrup).findOne({
|
|
251
282
|
where: { apiKey: apiKey || context.request.body.apiKey }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"powrup-router.js","sourceRoot":"","sources":["../../../server/routers/internal/powrup-router.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA+B;AAC/B,qCAAsD;AAEtD,2EAA2D;AAC3D,iDAA8C;
|
|
1
|
+
{"version":3,"file":"powrup-router.js","sourceRoot":"","sources":["../../../server/routers/internal/powrup-router.ts"],"names":[],"mappings":"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"}
|
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.576",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
"@things-factory/pdf": "^4.3.534",
|
|
93
93
|
"@things-factory/product-ui": "^4.3.563",
|
|
94
94
|
"@things-factory/resource-ui": "^4.3.563",
|
|
95
|
-
"@things-factory/sales-base": "^4.3.
|
|
95
|
+
"@things-factory/sales-base": "^4.3.576",
|
|
96
96
|
"@things-factory/scene-data-transform": "^4.3.534",
|
|
97
97
|
"@things-factory/scene-excel": "^4.3.534",
|
|
98
98
|
"@things-factory/scene-firebase": "^4.3.534",
|
|
@@ -109,7 +109,7 @@
|
|
|
109
109
|
"@things-factory/system-ui": "^4.3.535",
|
|
110
110
|
"@things-factory/transport-base": "^4.3.563",
|
|
111
111
|
"@things-factory/warehouse-base": "^4.3.567",
|
|
112
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
112
|
+
"@things-factory/worksheet-base": "^4.3.576",
|
|
113
113
|
"cron-parser": "^4.7.0",
|
|
114
114
|
"koa2-swagger-ui": "^5.0.2",
|
|
115
115
|
"swagger-jsdoc": "^5.0.0",
|
|
@@ -122,5 +122,5 @@
|
|
|
122
122
|
"resolutions": {
|
|
123
123
|
"core-js": "^3.16.0"
|
|
124
124
|
},
|
|
125
|
-
"gitHead": "
|
|
125
|
+
"gitHead": "3d86963fea8f1f4dd05f30f316250bc493cb10ad"
|
|
126
126
|
}
|
|
@@ -11,7 +11,13 @@ export const receivingReport = {
|
|
|
11
11
|
await tx.query(
|
|
12
12
|
`
|
|
13
13
|
create temp table temp_inbound_order_report on commit drop as (
|
|
14
|
-
select "arrived_date", "receipt_id", "receipt_id_type", "batch", "mfg_date", "exp_date", "item", "item_desc", sum(quantity) as quantity, "qty_um"
|
|
14
|
+
select "arrived_date", "receipt_id", "receipt_id_type", "batch", "mfg_date", "exp_date", "item", "item_desc", sum(quantity) as quantity, "qty_um",
|
|
15
|
+
case
|
|
16
|
+
when client = 'f0848540-9d8f-4835-b744-2407db36a14e' then 'MALAYSIA'
|
|
17
|
+
when client = '157a9653-9f2b-4568-b245-ab8791db98ce' then 'SINGAPORE'
|
|
18
|
+
when client = '226c9c9d-9685-403d-8f05-89b7d3b8691e' then 'MANUFACTURING MALAYSIA'
|
|
19
|
+
end as client
|
|
20
|
+
from(
|
|
15
21
|
select
|
|
16
22
|
to_char(grn.created_at + interval '8 hours','dd/mm/yyyy') as "arrived_date",
|
|
17
23
|
COALESCE(an.container_no,'') as "receipt_id",
|
|
@@ -22,7 +28,8 @@ export const receivingReport = {
|
|
|
22
28
|
p.sku as "item",
|
|
23
29
|
p.name as "item_desc",
|
|
24
30
|
oi.actual_pack_qty as "quantity",
|
|
25
|
-
oi.packing_type as "qty_um"
|
|
31
|
+
oi.packing_type as "qty_um",
|
|
32
|
+
an.bizplace_id as client
|
|
26
33
|
from arrival_notices an
|
|
27
34
|
inner join goods_receival_notes grn ON an.id = grn.arrival_notice_id
|
|
28
35
|
inner join order_products op on an.id = op.arrival_notice_id
|
|
@@ -41,8 +48,9 @@ export const receivingReport = {
|
|
|
41
48
|
to_char(i.expiration_date,'dd/mm/yyyy') as "exp_date",
|
|
42
49
|
p.sku as "item",
|
|
43
50
|
p.name as "item_desc",
|
|
44
|
-
|
|
45
|
-
oi.packing_type as "qty_um"
|
|
51
|
+
oi.actual_pack_qty as "quantity",
|
|
52
|
+
oi.packing_type as "qty_um",
|
|
53
|
+
ro.bizplace_id as client
|
|
46
54
|
from return_orders ro
|
|
47
55
|
inner join order_inventories oi on ro.id = oi.return_order_id
|
|
48
56
|
inner join inventories i on i.id = oi.inventory_id
|
|
@@ -51,7 +59,8 @@ export const receivingReport = {
|
|
|
51
59
|
and oi."type" = 'RETURN_ORDER'
|
|
52
60
|
and ro.created_at::date = (NOW()::date - interval '1 day')
|
|
53
61
|
order by arrived_date, batch, item desc
|
|
54
|
-
)foo group by "arrived_date", "receipt_id", "receipt_id_type", "batch", "mfg_date", "exp_date", "item", "item_desc", "qty_um"
|
|
62
|
+
)foo group by "arrived_date", "receipt_id", "receipt_id_type", "batch", "mfg_date", "exp_date", "item", "item_desc", "qty_um", "client"
|
|
63
|
+
order by "client"
|
|
55
64
|
)
|
|
56
65
|
`
|
|
57
66
|
)
|
|
@@ -73,7 +82,8 @@ export const receivingReport = {
|
|
|
73
82
|
item: itm.item,
|
|
74
83
|
itemDesc: itm.item_desc,
|
|
75
84
|
quantity: itm.quantity,
|
|
76
|
-
qtyUm: itm.qty_um
|
|
85
|
+
qtyUm: itm.qty_um,
|
|
86
|
+
client: itm.client
|
|
77
87
|
}))
|
|
78
88
|
|
|
79
89
|
// Return the modified items with inserted totals
|
|
@@ -3,6 +3,7 @@ import { EntityManager, getConnection } from 'typeorm'
|
|
|
3
3
|
|
|
4
4
|
import { Powrup } from '@things-factory/integration-powrup'
|
|
5
5
|
import { Domain } from '@things-factory/shell'
|
|
6
|
+
import { ReleaseGood, OrderProduct, PowrupController } from '@things-factory/sales-base'
|
|
6
7
|
|
|
7
8
|
import * as API from './apis'
|
|
8
9
|
import { validationMiddleware } from './middlewares/validation-middleware'
|
|
@@ -232,6 +233,45 @@ powrupRouter.get('/warehouse/get', async (context, next) => {
|
|
|
232
233
|
}
|
|
233
234
|
})
|
|
234
235
|
|
|
236
|
+
powrupRouter.post('/internal/order/pack-order', async (context, next) => {
|
|
237
|
+
try {
|
|
238
|
+
await getConnection().transaction(async (tx: EntityManager) => {
|
|
239
|
+
const { body } = context.request
|
|
240
|
+
const { apiKey } = context.query
|
|
241
|
+
await getPowrup(context, apiKey, tx)
|
|
242
|
+
|
|
243
|
+
const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
|
|
244
|
+
where: { id: body.id }
|
|
245
|
+
})
|
|
246
|
+
|
|
247
|
+
if (!releaseGood) {
|
|
248
|
+
throw new Error('order not found')
|
|
249
|
+
}
|
|
250
|
+
|
|
251
|
+
const orderProducts = await tx.getRepository(OrderProduct).find({
|
|
252
|
+
where: { releaseGood },
|
|
253
|
+
relations: ['productDetail', 'bizplace', 'domain']
|
|
254
|
+
})
|
|
255
|
+
|
|
256
|
+
const powrupController: PowrupController = new PowrupController()
|
|
257
|
+
let data = await powrupController.packOrder(
|
|
258
|
+
context.state.powrup,
|
|
259
|
+
{ ...releaseGood, orderProducts },
|
|
260
|
+
null,
|
|
261
|
+
null,
|
|
262
|
+
tx
|
|
263
|
+
)
|
|
264
|
+
|
|
265
|
+
context.body = {
|
|
266
|
+
result: { data }
|
|
267
|
+
}
|
|
268
|
+
})
|
|
269
|
+
} catch (e) {
|
|
270
|
+
if (e instanceof ApiError) ApiErrorHandler(context, e)
|
|
271
|
+
else throwInternalServerError(context, e)
|
|
272
|
+
}
|
|
273
|
+
})
|
|
274
|
+
|
|
235
275
|
async function getPowrup(context, apiKey, tx) {
|
|
236
276
|
const powrup: Powrup = await tx.getRepository(Powrup).findOne({
|
|
237
277
|
where: { apiKey: apiKey || context.request.body.apiKey }
|