@things-factory/operato-wms 3.6.28 → 3.6.34
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/client/pages/order/arrival-notice/create-arrival-notice.js +1 -1
- package/client/pages/order/release-order/b2b/b2b-order-list.js +19 -7
- package/client/pages/order/release-order/b2b/b2b-order-requests.js +2 -0
- package/client/pages/order/release-order/create-release-order.js +1 -0
- package/client/pages/report/inbound-order-details-report.js +5 -5
- package/client/pages/report/outbound-order-details-report.js +1 -1
- package/dist-server/graphql/resolvers/custom/elccl/elccl-inventory-history-summary-report.js +1 -1
- package/dist-server/graphql/resolvers/reports/inbound-order-details-report.js +1 -1
- package/dist-server/graphql/resolvers/reports/outbound-order-details-report.js +4 -2
- package/dist-server/graphql/resolvers/reports/outbound-order-details-report.js.map +1 -1
- package/dist-server/graphql/types/reports/inbound-order-details-report.js +1 -1
- package/dist-server/graphql/types/reports/index.js +2 -2
- package/package.json +67 -67
- package/server/graphql/resolvers/custom/elccl/elccl-inventory-history-summary-report.ts +1 -1
- package/server/graphql/resolvers/reports/inbound-order-details-report.ts +1 -1
- package/server/graphql/resolvers/reports/outbound-order-details-report.ts +4 -2
- package/server/graphql/types/reports/inbound-order-details-report.ts +1 -1
- package/server/graphql/types/reports/index.ts +2 -2
|
@@ -1254,7 +1254,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
1254
1254
|
batchIdRef: record?.batchIdRef ? record.batchIdRef : null,
|
|
1255
1255
|
product: { id: record.product.id },
|
|
1256
1256
|
packingType: record.packingType,
|
|
1257
|
-
packingSize: record.product.packingSize,
|
|
1257
|
+
packingSize: record.packingSize || record.product.packingSize,
|
|
1258
1258
|
uomValue: record?.uomValue ? record.uomValue : 0,
|
|
1259
1259
|
uom: record.uom,
|
|
1260
1260
|
packQty: record.packQty,
|
|
@@ -346,19 +346,22 @@ class B2bOrderList extends localize(i18next)(PageView) {
|
|
|
346
346
|
async fetchHandler({ page, limit, sorters = [{ name: 'createdAt', desc: true }] }) {
|
|
347
347
|
const response = await client.query({
|
|
348
348
|
query: gql`
|
|
349
|
-
query
|
|
350
|
-
|
|
349
|
+
query releaseGoodRequests($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
|
|
350
|
+
releaseGoodRequests(filters: $filters, pagination: $pagination, sortings: $sortings) {
|
|
351
351
|
items {
|
|
352
352
|
id
|
|
353
353
|
name
|
|
354
354
|
bizplace {
|
|
355
355
|
id
|
|
356
356
|
name
|
|
357
|
+
description
|
|
357
358
|
}
|
|
358
359
|
ownTransport
|
|
359
360
|
crossDocking
|
|
360
361
|
arrivalNotice {
|
|
362
|
+
id
|
|
361
363
|
name
|
|
364
|
+
description
|
|
362
365
|
}
|
|
363
366
|
refNo
|
|
364
367
|
refNo2
|
|
@@ -373,24 +376,33 @@ class B2bOrderList extends localize(i18next)(PageView) {
|
|
|
373
376
|
name
|
|
374
377
|
description
|
|
375
378
|
}
|
|
379
|
+
acceptedBy {
|
|
380
|
+
id
|
|
381
|
+
name
|
|
382
|
+
description
|
|
383
|
+
}
|
|
376
384
|
}
|
|
377
385
|
total
|
|
378
386
|
}
|
|
379
387
|
}
|
|
380
388
|
`,
|
|
381
389
|
variables: {
|
|
382
|
-
filters: [
|
|
390
|
+
filters: [
|
|
391
|
+
...(await this.searchForm.getQueryFilters()),
|
|
392
|
+
{ name: 'type', operator: 'eq', value: 'b2b' },
|
|
393
|
+
{ name: 'status', operator: 'notin', value: '' }
|
|
394
|
+
],
|
|
383
395
|
pagination: { page, limit },
|
|
384
396
|
sortings: sorters
|
|
385
397
|
}
|
|
386
398
|
})
|
|
387
399
|
|
|
388
400
|
if (!response.errors) {
|
|
389
|
-
this._ownTransport = response.data.
|
|
390
|
-
this._exportOption = response.data.
|
|
401
|
+
this._ownTransport = response.data.releaseGoodRequests.ownTransport
|
|
402
|
+
this._exportOption = response.data.releaseGoodRequests.exportOption
|
|
391
403
|
return {
|
|
392
|
-
total: response.data.
|
|
393
|
-
records: response.data.
|
|
404
|
+
total: response.data.releaseGoodRequests.total || 0,
|
|
405
|
+
records: response.data.releaseGoodRequests.items || []
|
|
394
406
|
}
|
|
395
407
|
}
|
|
396
408
|
}
|
|
@@ -281,6 +281,7 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
|
|
|
281
281
|
?hidden="${!this._checkTransport}"
|
|
282
282
|
name="packingOption"
|
|
283
283
|
.checked="${this._packingOption}"
|
|
284
|
+
disabled
|
|
284
285
|
/>
|
|
285
286
|
<label for="packingOption" ?hidden="${!this._checkTransport}">${i18next.t('label.packing')}</label>
|
|
286
287
|
|
|
@@ -211,7 +211,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
|
|
|
211
211
|
},
|
|
212
212
|
{
|
|
213
213
|
type: 'string',
|
|
214
|
-
name: '
|
|
214
|
+
name: 'contactPoint|companyName',
|
|
215
215
|
header: i18next.t('field.supplier'),
|
|
216
216
|
width: 170
|
|
217
217
|
},
|
|
@@ -472,7 +472,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
|
|
|
472
472
|
'grnNo',
|
|
473
473
|
'deliveryOrderNo',
|
|
474
474
|
'purchaseOrder|name',
|
|
475
|
-
'
|
|
475
|
+
'contactPoint|companyName',
|
|
476
476
|
'refNo1',
|
|
477
477
|
'refNo2',
|
|
478
478
|
'refNo3',
|
|
@@ -570,7 +570,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
|
|
|
570
570
|
|
|
571
571
|
const response = await client.query({
|
|
572
572
|
query: gql`
|
|
573
|
-
query inboundOrderDetailsReport($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
|
|
573
|
+
query inboundOrderDetailsReport($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
|
|
574
574
|
inboundOrderDetailsReport(filters: $filters, pagination: $pagination, sortings: $sortings) {
|
|
575
575
|
items {
|
|
576
576
|
bizplace {
|
|
@@ -606,7 +606,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
|
|
|
606
606
|
id
|
|
607
607
|
name
|
|
608
608
|
}
|
|
609
|
-
|
|
609
|
+
contactPoint {
|
|
610
610
|
id
|
|
611
611
|
name
|
|
612
612
|
}
|
|
@@ -735,7 +735,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
|
|
|
735
735
|
{ header: i18next.t('field.grn_no'), key: 'grnNo', width: 30, type: 'string' },
|
|
736
736
|
{ header: i18next.t('field.do_no'), key: 'deliveryOrderNo', width: 30, type: 'string' },
|
|
737
737
|
{ header: i18next.t('field.po_no'), key: 'purchaseOrder|name', width: 30, type: 'string' },
|
|
738
|
-
{ header: i18next.t('field.supplier'), key: '
|
|
738
|
+
{ header: i18next.t('field.supplier'), key: 'contactPoint|companyName', width: 30, type: 'string' },
|
|
739
739
|
{ header: i18next.t('field.ref_no'), key: 'refNo1', width: 60, type: 'string' },
|
|
740
740
|
{ header: i18next.t('field.ref_no_2'), key: 'refNo2', width: 60, type: 'string' },
|
|
741
741
|
{ header: i18next.t('field.ref_no_3'), key: 'refNo3', width: 60, type: 'string' },
|
|
@@ -527,7 +527,7 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
|
|
|
527
527
|
|
|
528
528
|
const response = await client.query({
|
|
529
529
|
query: gql`
|
|
530
|
-
query outboundOrderDetailsReport($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
|
|
530
|
+
query outboundOrderDetailsReport($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
|
|
531
531
|
outboundOrderDetailsReport(filters: $filters, pagination: $pagination, sortings: $sortings) {
|
|
532
532
|
items {
|
|
533
533
|
bizplace {
|
package/dist-server/graphql/resolvers/custom/elccl/elccl-inventory-history-summary-report.js
CHANGED
|
@@ -47,7 +47,7 @@ exports.elcclInventoryHistorySummaryReport = {
|
|
|
47
47
|
sum(case when ih.created_at > $1 then case when ih.qty > 0 and ih.transaction_type <> 'ADJUSTMENT' and ih.transaction_type <> 'RETURN' and rtn.id is null then ih.qty else 0 end else 0 end) as total_in_qty,
|
|
48
48
|
sum(case when ih.created_at > $1 then case when (ih.qty < 0 and ih.transaction_type <> 'ADJUSTMENT') or ih.transaction_type = 'RETURN' then ih.qty else 0 end else 0 end) as total_out_qty,
|
|
49
49
|
ih.product_id,
|
|
50
|
-
sum(case when rtn.id is not null and ih.transaction_type <> 'ADJUSTMENT' then qty else 0 end) as total_return_qty
|
|
50
|
+
sum(case when rtn.id is not null and ih.transaction_type <> 'ADJUSTMENT' and ih.created_at > $1 then qty else 0 end) as total_return_qty
|
|
51
51
|
from temp_inv_history ih
|
|
52
52
|
left join return_orders rtn on rtn.id = ih.ref_order_id
|
|
53
53
|
group by ih.batch_id, ih.product_id, ih.packing_type
|
|
@@ -51,7 +51,7 @@ exports.inboundOrderDetailsReport = {
|
|
|
51
51
|
await tx.query(`
|
|
52
52
|
create temp table temp_inbound_order_report on commit drop as (
|
|
53
53
|
select * from (
|
|
54
|
-
select b2.name as "bizplace_name", b2.description as "bizplace_description",
|
|
54
|
+
select b2.id as "bizplace_id", b2.name as "bizplace_name", b2.description as "bizplace_description",
|
|
55
55
|
grn.name as "grn_no",
|
|
56
56
|
an.name as "gan_no", an.ref_no as "ref_no_1", an.ref_no_2 as "ref_no_2", an.ref_no_3 as "ref_no_3",
|
|
57
57
|
an.loose_item, an.import_cargo, an.container_no, an.container_size, an.own_transport,
|
|
@@ -43,11 +43,11 @@ exports.outboundOrderDetailsReport = {
|
|
|
43
43
|
await tx.query(`
|
|
44
44
|
create temp table temp_outbound_order_report on commit drop as (
|
|
45
45
|
select * from (
|
|
46
|
-
select b2.name AS "bizplace_name", b2.description AS "bizplace_description",
|
|
46
|
+
select b2.id AS "bizplace_id", b2.name AS "bizplace_name", b2.description AS "bizplace_description",
|
|
47
47
|
do2.name AS "delivery_order_no", do2.delivery_date as "delivery_order_date", coalesce(do2."to", concat(cp.address, cp.address_2)) as "delivery_address",
|
|
48
48
|
rg.name AS "ro_no", rg."type" as "ro_type", rg.ref_no AS "ref_no_1", rg.ref_no_2 AS "ref_no_2", rg.ref_no_3 AS "ref_no_3",
|
|
49
49
|
rg.created_at AS "order_created_at", rg.accepted_at, u4.name as accepted_by,
|
|
50
|
-
p.sku as "product_sku", p.name AS "product_name", p.description AS "product_description", p.type as "product_type",
|
|
50
|
+
p.id as "product_id", p.sku as "product_sku", p.name AS "product_name", p.description AS "product_description", p.type as "product_type",
|
|
51
51
|
oi.packing_type as "pack_type", oi.packing_size as "pack_size", oi.release_qty AS "release_qty",
|
|
52
52
|
w.started_at as "picking_start", w.ended_at as "picking_complete",
|
|
53
53
|
ih.qty as "qty", ih.uom_value as "uom_value", ih.uom, ih.pallet_id, ih.carton_id, ih.batch_id, ih.batch_id_ref,
|
|
@@ -111,6 +111,7 @@ exports.outboundOrderDetailsReport = {
|
|
|
111
111
|
let items = result.map(itm => {
|
|
112
112
|
return {
|
|
113
113
|
bizplace: {
|
|
114
|
+
id: itm.bizplace_id,
|
|
114
115
|
name: itm.bizplace_name,
|
|
115
116
|
description: itm.bizplace_description
|
|
116
117
|
},
|
|
@@ -128,6 +129,7 @@ exports.outboundOrderDetailsReport = {
|
|
|
128
129
|
pickingStart: itm.picking_start,
|
|
129
130
|
pickingComplete: itm.picking_complete,
|
|
130
131
|
product: {
|
|
132
|
+
id: itm.product_id,
|
|
131
133
|
sku: itm.product_sku,
|
|
132
134
|
name: itm.product_name,
|
|
133
135
|
description: itm.product_description,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outbound-order-details-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/outbound-order-details-report.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"outbound-order-details-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/outbound-order-details-report.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@ const inbound_order_details_report_list_1 = require("./inbound-order-details-rep
|
|
|
6
6
|
const outbound_order_details_report_1 = require("./outbound-order-details-report");
|
|
7
7
|
const outbound_order_details_report_list_1 = require("./outbound-order-details-report-list");
|
|
8
8
|
exports.Query = `
|
|
9
|
-
inboundOrderDetailsReport(filters: [Filter], pagination: Pagination, sortings: [Sorting]): InboundOrderDetailsReportList @transaction
|
|
10
|
-
outboundOrderDetailsReport(filters: [Filter], pagination: Pagination, sortings: [Sorting]): OutboundOrderDetailsReportList @transaction
|
|
9
|
+
inboundOrderDetailsReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): InboundOrderDetailsReportList @transaction
|
|
10
|
+
outboundOrderDetailsReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): OutboundOrderDetailsReportList @transaction
|
|
11
11
|
`;
|
|
12
12
|
exports.Types = [
|
|
13
13
|
inbound_order_details_report_1.InboundOrderDetailsReport,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-wms",
|
|
3
|
-
"version": "3.6.
|
|
3
|
+
"version": "3.6.34",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -25,8 +25,8 @@
|
|
|
25
25
|
"clean:server": "rm -rf dist-server",
|
|
26
26
|
"clean:client": "rm -rf dist-client",
|
|
27
27
|
"clean": "npm run clean:server && npm run clean:client",
|
|
28
|
-
"migration": "
|
|
29
|
-
"migration:privileges": "
|
|
28
|
+
"migration": "things-factory-migration",
|
|
29
|
+
"migration:privileges": "things-factory-migration-privileges",
|
|
30
30
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations",
|
|
31
31
|
"migration:generate": "node ../../node_modules/typeorm/cli.js migration:generate",
|
|
32
32
|
"migration:run": "node ../../node_modules/typeorm/cli.js migration:run",
|
|
@@ -41,71 +41,71 @@
|
|
|
41
41
|
"docker:run": "docker run -p 4000:3000 hatiolab/operato-wms:latest"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@things-factory/apptool-ui": "^3.6.
|
|
45
|
-
"@things-factory/attachment-ui": "^3.6.
|
|
46
|
-
"@things-factory/auth-ui": "^3.6.
|
|
47
|
-
"@things-factory/barcode-ui": "^3.6.
|
|
48
|
-
"@things-factory/biz-ui": "^3.6.
|
|
49
|
-
"@things-factory/board-service": "^3.6.
|
|
50
|
-
"@things-factory/board-ui": "^3.6.
|
|
51
|
-
"@things-factory/code-ui": "^3.6.
|
|
52
|
-
"@things-factory/context-ui": "^3.6.
|
|
53
|
-
"@things-factory/export-ui": "^3.6.
|
|
54
|
-
"@things-factory/export-ui-csv": "^3.6.
|
|
55
|
-
"@things-factory/export-ui-excel": "^3.6.
|
|
56
|
-
"@things-factory/fav-base": "^3.6.
|
|
57
|
-
"@things-factory/form-ui": "^3.6.
|
|
58
|
-
"@things-factory/grist-ui": "^3.6.
|
|
59
|
-
"@things-factory/help": "^3.6.
|
|
60
|
-
"@things-factory/i18n-ui": "^3.6.
|
|
61
|
-
"@things-factory/id-rule-base": "^3.6.
|
|
62
|
-
"@things-factory/import-ui": "^3.6.
|
|
63
|
-
"@things-factory/import-ui-excel": "^3.6.
|
|
64
|
-
"@things-factory/menu-ui": "^3.6.
|
|
65
|
-
"@things-factory/more-ui": "^3.6.
|
|
66
|
-
"@things-factory/notification": "^3.6.
|
|
67
|
-
"@things-factory/pdf": "^3.6.
|
|
68
|
-
"@things-factory/print-proxy-service": "^3.6.
|
|
69
|
-
"@things-factory/print-service": "^3.6.
|
|
70
|
-
"@things-factory/print-ui": "^3.6.
|
|
71
|
-
"@things-factory/product-base": "^3.6.
|
|
72
|
-
"@things-factory/resource-ui": "^3.6.
|
|
73
|
-
"@things-factory/sales-ui": "^3.6.
|
|
74
|
-
"@things-factory/scene-chartjs": "^3.6.
|
|
75
|
-
"@things-factory/scene-clock": "^3.6.
|
|
76
|
-
"@things-factory/scene-clone": "^3.6.
|
|
77
|
-
"@things-factory/scene-compass": "^3.6.
|
|
78
|
-
"@things-factory/scene-data-transform": "^3.6.
|
|
79
|
-
"@things-factory/scene-excel": "^3.6.
|
|
80
|
-
"@things-factory/scene-firebase": "^3.6.
|
|
81
|
-
"@things-factory/scene-form": "^3.6.
|
|
82
|
-
"@things-factory/scene-gauge": "^3.6.
|
|
83
|
-
"@things-factory/scene-google-map": "^3.6.
|
|
84
|
-
"@things-factory/scene-graphql": "^3.6.
|
|
85
|
-
"@things-factory/scene-half-roundrect": "^3.6.
|
|
86
|
-
"@things-factory/scene-indoor-map": "^3.6.
|
|
87
|
-
"@things-factory/scene-label": "^3.6.
|
|
88
|
-
"@things-factory/scene-legend": "^3.6.
|
|
89
|
-
"@things-factory/scene-marker": "^3.6.
|
|
90
|
-
"@things-factory/scene-mqtt": "^3.6.
|
|
91
|
-
"@things-factory/scene-news-ticker": "^3.6.
|
|
92
|
-
"@things-factory/scene-progressbar": "^3.6.
|
|
93
|
-
"@things-factory/scene-random": "^3.6.
|
|
94
|
-
"@things-factory/scene-restful": "^3.6.
|
|
95
|
-
"@things-factory/scene-switch": "^3.6.
|
|
96
|
-
"@things-factory/scene-tab": "^3.6.
|
|
97
|
-
"@things-factory/scene-table": "^3.6.
|
|
98
|
-
"@things-factory/scene-visualizer": "^3.6.
|
|
99
|
-
"@things-factory/scene-wheel-sorter": "^3.6.
|
|
100
|
-
"@things-factory/setting-ui": "^3.6.
|
|
101
|
-
"@things-factory/system-ui": "^3.6.
|
|
102
|
-
"@things-factory/transport-base": "^3.6.
|
|
103
|
-
"@things-factory/tutorial-ui": "^3.6.
|
|
104
|
-
"@things-factory/warehouse-base": "^3.6.
|
|
105
|
-
"@things-factory/worksheet-base": "^3.6.
|
|
44
|
+
"@things-factory/apptool-ui": "^3.6.33",
|
|
45
|
+
"@things-factory/attachment-ui": "^3.6.33",
|
|
46
|
+
"@things-factory/auth-ui": "^3.6.33",
|
|
47
|
+
"@things-factory/barcode-ui": "^3.6.33",
|
|
48
|
+
"@things-factory/biz-ui": "^3.6.33",
|
|
49
|
+
"@things-factory/board-service": "^3.6.33",
|
|
50
|
+
"@things-factory/board-ui": "^3.6.33",
|
|
51
|
+
"@things-factory/code-ui": "^3.6.33",
|
|
52
|
+
"@things-factory/context-ui": "^3.6.33",
|
|
53
|
+
"@things-factory/export-ui": "^3.6.33",
|
|
54
|
+
"@things-factory/export-ui-csv": "^3.6.33",
|
|
55
|
+
"@things-factory/export-ui-excel": "^3.6.33",
|
|
56
|
+
"@things-factory/fav-base": "^3.6.33",
|
|
57
|
+
"@things-factory/form-ui": "^3.6.33",
|
|
58
|
+
"@things-factory/grist-ui": "^3.6.33",
|
|
59
|
+
"@things-factory/help": "^3.6.33",
|
|
60
|
+
"@things-factory/i18n-ui": "^3.6.33",
|
|
61
|
+
"@things-factory/id-rule-base": "^3.6.33",
|
|
62
|
+
"@things-factory/import-ui": "^3.6.33",
|
|
63
|
+
"@things-factory/import-ui-excel": "^3.6.33",
|
|
64
|
+
"@things-factory/menu-ui": "^3.6.33",
|
|
65
|
+
"@things-factory/more-ui": "^3.6.33",
|
|
66
|
+
"@things-factory/notification": "^3.6.33",
|
|
67
|
+
"@things-factory/pdf": "^3.6.33",
|
|
68
|
+
"@things-factory/print-proxy-service": "^3.6.33",
|
|
69
|
+
"@things-factory/print-service": "^3.6.33",
|
|
70
|
+
"@things-factory/print-ui": "^3.6.33",
|
|
71
|
+
"@things-factory/product-base": "^3.6.33",
|
|
72
|
+
"@things-factory/resource-ui": "^3.6.33",
|
|
73
|
+
"@things-factory/sales-ui": "^3.6.34",
|
|
74
|
+
"@things-factory/scene-chartjs": "^3.6.33",
|
|
75
|
+
"@things-factory/scene-clock": "^3.6.33",
|
|
76
|
+
"@things-factory/scene-clone": "^3.6.33",
|
|
77
|
+
"@things-factory/scene-compass": "^3.6.33",
|
|
78
|
+
"@things-factory/scene-data-transform": "^3.6.33",
|
|
79
|
+
"@things-factory/scene-excel": "^3.6.33",
|
|
80
|
+
"@things-factory/scene-firebase": "^3.6.33",
|
|
81
|
+
"@things-factory/scene-form": "^3.6.33",
|
|
82
|
+
"@things-factory/scene-gauge": "^3.6.33",
|
|
83
|
+
"@things-factory/scene-google-map": "^3.6.33",
|
|
84
|
+
"@things-factory/scene-graphql": "^3.6.33",
|
|
85
|
+
"@things-factory/scene-half-roundrect": "^3.6.33",
|
|
86
|
+
"@things-factory/scene-indoor-map": "^3.6.33",
|
|
87
|
+
"@things-factory/scene-label": "^3.6.33",
|
|
88
|
+
"@things-factory/scene-legend": "^3.6.33",
|
|
89
|
+
"@things-factory/scene-marker": "^3.6.33",
|
|
90
|
+
"@things-factory/scene-mqtt": "^3.6.33",
|
|
91
|
+
"@things-factory/scene-news-ticker": "^3.6.33",
|
|
92
|
+
"@things-factory/scene-progressbar": "^3.6.33",
|
|
93
|
+
"@things-factory/scene-random": "^3.6.33",
|
|
94
|
+
"@things-factory/scene-restful": "^3.6.33",
|
|
95
|
+
"@things-factory/scene-switch": "^3.6.33",
|
|
96
|
+
"@things-factory/scene-tab": "^3.6.33",
|
|
97
|
+
"@things-factory/scene-table": "^3.6.33",
|
|
98
|
+
"@things-factory/scene-visualizer": "^3.6.33",
|
|
99
|
+
"@things-factory/scene-wheel-sorter": "^3.6.33",
|
|
100
|
+
"@things-factory/setting-ui": "^3.6.33",
|
|
101
|
+
"@things-factory/system-ui": "^3.6.33",
|
|
102
|
+
"@things-factory/transport-base": "^3.6.33",
|
|
103
|
+
"@things-factory/tutorial-ui": "^3.6.33",
|
|
104
|
+
"@things-factory/warehouse-base": "^3.6.34",
|
|
105
|
+
"@things-factory/worksheet-base": "^3.6.34"
|
|
106
106
|
},
|
|
107
107
|
"devDependencies": {
|
|
108
|
-
"@things-factory/builder": "^3.6.
|
|
108
|
+
"@things-factory/builder": "^3.6.33"
|
|
109
109
|
},
|
|
110
|
-
"gitHead": "
|
|
110
|
+
"gitHead": "026c859918f474fae1c3d5c2e5604627afe8a95b"
|
|
111
111
|
}
|
|
@@ -58,7 +58,7 @@ export const elcclInventoryHistorySummaryReport = {
|
|
|
58
58
|
sum(case when ih.created_at > $1 then case when ih.qty > 0 and ih.transaction_type <> 'ADJUSTMENT' and ih.transaction_type <> 'RETURN' and rtn.id is null then ih.qty else 0 end else 0 end) as total_in_qty,
|
|
59
59
|
sum(case when ih.created_at > $1 then case when (ih.qty < 0 and ih.transaction_type <> 'ADJUSTMENT') or ih.transaction_type = 'RETURN' then ih.qty else 0 end else 0 end) as total_out_qty,
|
|
60
60
|
ih.product_id,
|
|
61
|
-
sum(case when rtn.id is not null and ih.transaction_type <> 'ADJUSTMENT' then qty else 0 end) as total_return_qty
|
|
61
|
+
sum(case when rtn.id is not null and ih.transaction_type <> 'ADJUSTMENT' and ih.created_at > $1 then qty else 0 end) as total_return_qty
|
|
62
62
|
from temp_inv_history ih
|
|
63
63
|
left join return_orders rtn on rtn.id = ih.ref_order_id
|
|
64
64
|
group by ih.batch_id, ih.product_id, ih.packing_type
|
|
@@ -60,7 +60,7 @@ export const inboundOrderDetailsReport = {
|
|
|
60
60
|
`
|
|
61
61
|
create temp table temp_inbound_order_report on commit drop as (
|
|
62
62
|
select * from (
|
|
63
|
-
select b2.name as "bizplace_name", b2.description as "bizplace_description",
|
|
63
|
+
select b2.id as "bizplace_id", b2.name as "bizplace_name", b2.description as "bizplace_description",
|
|
64
64
|
grn.name as "grn_no",
|
|
65
65
|
an.name as "gan_no", an.ref_no as "ref_no_1", an.ref_no_2 as "ref_no_2", an.ref_no_3 as "ref_no_3",
|
|
66
66
|
an.loose_item, an.import_cargo, an.container_no, an.container_size, an.own_transport,
|
|
@@ -52,11 +52,11 @@ export const outboundOrderDetailsReport = {
|
|
|
52
52
|
`
|
|
53
53
|
create temp table temp_outbound_order_report on commit drop as (
|
|
54
54
|
select * from (
|
|
55
|
-
select b2.name AS "bizplace_name", b2.description AS "bizplace_description",
|
|
55
|
+
select b2.id AS "bizplace_id", b2.name AS "bizplace_name", b2.description AS "bizplace_description",
|
|
56
56
|
do2.name AS "delivery_order_no", do2.delivery_date as "delivery_order_date", coalesce(do2."to", concat(cp.address, cp.address_2)) as "delivery_address",
|
|
57
57
|
rg.name AS "ro_no", rg."type" as "ro_type", rg.ref_no AS "ref_no_1", rg.ref_no_2 AS "ref_no_2", rg.ref_no_3 AS "ref_no_3",
|
|
58
58
|
rg.created_at AS "order_created_at", rg.accepted_at, u4.name as accepted_by,
|
|
59
|
-
p.sku as "product_sku", p.name AS "product_name", p.description AS "product_description", p.type as "product_type",
|
|
59
|
+
p.id as "product_id", p.sku as "product_sku", p.name AS "product_name", p.description AS "product_description", p.type as "product_type",
|
|
60
60
|
oi.packing_type as "pack_type", oi.packing_size as "pack_size", oi.release_qty AS "release_qty",
|
|
61
61
|
w.started_at as "picking_start", w.ended_at as "picking_complete",
|
|
62
62
|
ih.qty as "qty", ih.uom_value as "uom_value", ih.uom, ih.pallet_id, ih.carton_id, ih.batch_id, ih.batch_id_ref,
|
|
@@ -128,6 +128,7 @@ export const outboundOrderDetailsReport = {
|
|
|
128
128
|
let items = result.map(itm => {
|
|
129
129
|
return {
|
|
130
130
|
bizplace: {
|
|
131
|
+
id: itm.bizplace_id,
|
|
131
132
|
name: itm.bizplace_name,
|
|
132
133
|
description: itm.bizplace_description
|
|
133
134
|
},
|
|
@@ -145,6 +146,7 @@ export const outboundOrderDetailsReport = {
|
|
|
145
146
|
pickingStart: itm.picking_start,
|
|
146
147
|
pickingComplete: itm.picking_complete,
|
|
147
148
|
product: {
|
|
149
|
+
id: itm.product_id,
|
|
148
150
|
sku: itm.product_sku,
|
|
149
151
|
name: itm.product_name,
|
|
150
152
|
description: itm.product_description,
|
|
@@ -4,8 +4,8 @@ import { OutboundOrderDetailsReport } from './outbound-order-details-report'
|
|
|
4
4
|
import { OutboundOrderDetailsReportList } from './outbound-order-details-report-list'
|
|
5
5
|
|
|
6
6
|
export const Query = `
|
|
7
|
-
inboundOrderDetailsReport(filters: [Filter], pagination: Pagination, sortings: [Sorting]): InboundOrderDetailsReportList @transaction
|
|
8
|
-
outboundOrderDetailsReport(filters: [Filter], pagination: Pagination, sortings: [Sorting]): OutboundOrderDetailsReportList @transaction
|
|
7
|
+
inboundOrderDetailsReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): InboundOrderDetailsReportList @transaction
|
|
8
|
+
outboundOrderDetailsReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): OutboundOrderDetailsReportList @transaction
|
|
9
9
|
`
|
|
10
10
|
|
|
11
11
|
export const Types = [
|