@things-factory/operato-pms 4.3.373 → 4.3.379
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/dispatchment/dispatchment-list.js +17 -3
- package/client/pages/harvesting/harvesting-list.js +17 -3
- package/client/pages/loading/loading-list.js +17 -3
- package/dist-server/graphql/resolvers/daily-dispatch/daily-dispatch-query.js +24 -7
- package/dist-server/graphql/resolvers/daily-dispatch/daily-dispatch-query.js.map +1 -1
- package/dist-server/graphql/resolvers/daily-dispatch/generate-daily-dispatch.js +60 -4
- package/dist-server/graphql/resolvers/daily-dispatch/generate-daily-dispatch.js.map +1 -1
- package/dist-server/graphql/resolvers/daily-harvest/daily-harvest-query.js +24 -2
- package/dist-server/graphql/resolvers/daily-harvest/daily-harvest-query.js.map +1 -1
- package/dist-server/graphql/resolvers/daily-loading/daily-loading-query.js +24 -2
- package/dist-server/graphql/resolvers/daily-loading/daily-loading-query.js.map +1 -1
- package/dist-server/graphql/resolvers/daily-loading/generate-daily-loading.js +3 -2
- package/dist-server/graphql/resolvers/daily-loading/generate-daily-loading.js.map +1 -1
- package/dist-server/utils/transaction-util.js +68 -1
- package/dist-server/utils/transaction-util.js.map +1 -1
- package/package.json +41 -41
- package/server/graphql/resolvers/daily-dispatch/daily-dispatch-query.ts +25 -8
- package/server/graphql/resolvers/daily-dispatch/generate-daily-dispatch.ts +100 -16
- package/server/graphql/resolvers/daily-harvest/daily-harvest-query.ts +26 -0
- package/server/graphql/resolvers/daily-loading/daily-loading-query.ts +26 -0
- package/server/graphql/resolvers/daily-loading/generate-daily-loading.ts +64 -53
- package/server/utils/transaction-util.ts +95 -1
- package/translations/en.json +2 -0
- package/translations/ja.json +9 -9
- package/translations/ko.json +9 -9
- package/translations/zh.json +9 -9
- package/config.development.js +0 -81
|
@@ -71,10 +71,24 @@ class DispatchmentList extends localize(i18next)(PageView) {
|
|
|
71
71
|
async pageInitialized() {
|
|
72
72
|
this._searchFields = [
|
|
73
73
|
{
|
|
74
|
-
label: i18next.t('field.
|
|
75
|
-
name: '
|
|
74
|
+
label: i18next.t('field.from'),
|
|
75
|
+
name: 'fromDate',
|
|
76
76
|
type: 'date',
|
|
77
|
-
props: {
|
|
77
|
+
props: {
|
|
78
|
+
searchOper: 'gte'
|
|
79
|
+
},
|
|
80
|
+
value: (() => {
|
|
81
|
+
let date = new Date()
|
|
82
|
+
date.setMonth(date.getMonth() - 6)
|
|
83
|
+
return date.toISOString().split('T')[0]
|
|
84
|
+
})()
|
|
85
|
+
},
|
|
86
|
+
{
|
|
87
|
+
label: i18next.t('field.to'),
|
|
88
|
+
name: 'toDate',
|
|
89
|
+
type: 'date',
|
|
90
|
+
props: { searchOper: 'lte' },
|
|
91
|
+
value: new Date().toISOString().split('T')[0]
|
|
78
92
|
}
|
|
79
93
|
]
|
|
80
94
|
|
|
@@ -73,10 +73,24 @@ class HarvestingList extends localize(i18next)(PageView) {
|
|
|
73
73
|
|
|
74
74
|
this._searchFields = [
|
|
75
75
|
{
|
|
76
|
-
label: i18next.t('field.
|
|
77
|
-
name: '
|
|
76
|
+
label: i18next.t('field.from'),
|
|
77
|
+
name: 'fromDate',
|
|
78
78
|
type: 'date',
|
|
79
|
-
props: {
|
|
79
|
+
props: {
|
|
80
|
+
searchOper: 'gte'
|
|
81
|
+
},
|
|
82
|
+
value: (() => {
|
|
83
|
+
let date = new Date()
|
|
84
|
+
date.setMonth(date.getMonth() - 6)
|
|
85
|
+
return date.toISOString().split('T')[0]
|
|
86
|
+
})()
|
|
87
|
+
},
|
|
88
|
+
{
|
|
89
|
+
label: i18next.t('field.to'),
|
|
90
|
+
name: 'toDate',
|
|
91
|
+
type: 'date',
|
|
92
|
+
props: { searchOper: 'lte' },
|
|
93
|
+
value: new Date().toISOString().split('T')[0]
|
|
80
94
|
},
|
|
81
95
|
{
|
|
82
96
|
label: i18next.t('field.block'),
|
|
@@ -71,10 +71,24 @@ class LoadingList extends localize(i18next)(PageView) {
|
|
|
71
71
|
pageInitialized() {
|
|
72
72
|
this._searchFields = [
|
|
73
73
|
{
|
|
74
|
-
label: i18next.t('field.
|
|
75
|
-
name: '
|
|
74
|
+
label: i18next.t('field.from'),
|
|
75
|
+
name: 'fromDate',
|
|
76
76
|
type: 'date',
|
|
77
|
-
props: {
|
|
77
|
+
props: {
|
|
78
|
+
searchOper: 'gte'
|
|
79
|
+
},
|
|
80
|
+
value: (() => {
|
|
81
|
+
let date = new Date()
|
|
82
|
+
date.setMonth(date.getMonth() - 6)
|
|
83
|
+
return date.toISOString().split('T')[0]
|
|
84
|
+
})()
|
|
85
|
+
},
|
|
86
|
+
{
|
|
87
|
+
label: i18next.t('field.to'),
|
|
88
|
+
name: 'toDate',
|
|
89
|
+
type: 'date',
|
|
90
|
+
props: { searchOper: 'lte' },
|
|
91
|
+
value: new Date().toISOString().split('T')[0]
|
|
78
92
|
}
|
|
79
93
|
]
|
|
80
94
|
|
|
@@ -22,12 +22,31 @@ exports.Query = {
|
|
|
22
22
|
});
|
|
23
23
|
},
|
|
24
24
|
async dailyDispatches(_, params, context) {
|
|
25
|
-
var _a, _b;
|
|
25
|
+
var _a, _b, _c;
|
|
26
26
|
const { tx } = context.state;
|
|
27
27
|
try {
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
|
|
29
|
+
if (fromDateParamIdx >= 0) {
|
|
30
|
+
let dispatchDateFrom = (_a = params.filters.find(param => param.name === 'fromDate')) === null || _a === void 0 ? void 0 : _a.value;
|
|
31
|
+
params.filters.splice(fromDateParamIdx, 1);
|
|
32
|
+
params.filters.push({
|
|
33
|
+
name: 'dispatchAt',
|
|
34
|
+
operator: 'gte',
|
|
35
|
+
value: dispatchDateFrom,
|
|
36
|
+
relation: false
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate');
|
|
40
|
+
if (toDateParamIdx >= 0) {
|
|
41
|
+
let dispatchDateTo = (_b = params.filters.find(param => param.name === 'toDate')) === null || _b === void 0 ? void 0 : _b.value;
|
|
42
|
+
params.filters.splice(toDateParamIdx, 1);
|
|
43
|
+
params.filters.push({
|
|
44
|
+
name: 'dispatchAt',
|
|
45
|
+
operator: 'lte',
|
|
46
|
+
value: dispatchDateTo,
|
|
47
|
+
relation: false
|
|
48
|
+
});
|
|
49
|
+
}
|
|
31
50
|
const queryBuilder = tx.getRepository(entities_1.DailyDispatch).createQueryBuilder();
|
|
32
51
|
(0, shell_1.buildQuery)(queryBuilder, params, context);
|
|
33
52
|
queryBuilder
|
|
@@ -38,14 +57,12 @@ exports.Query = {
|
|
|
38
57
|
.leftJoinAndSelect('DailyDispatch.creator', 'Creator')
|
|
39
58
|
.leftJoinAndSelect('DailyDispatch.updater', 'Updater')
|
|
40
59
|
.leftJoinAndSelect('DailyDispatch.dailyDispatchDetails', 'DailyDispatchDetails');
|
|
41
|
-
if (((
|
|
60
|
+
if (((_c = params.filters) === null || _c === void 0 ? void 0 : _c.length) > 0) {
|
|
42
61
|
queryBuilder.andWhere('DailyDispatch.deletedAt IS NULL');
|
|
43
62
|
}
|
|
44
63
|
else {
|
|
45
64
|
queryBuilder.where('DailyDispatch.deletedAt IS NULL');
|
|
46
65
|
}
|
|
47
|
-
if (dispatchAt)
|
|
48
|
-
queryBuilder.andWhere(`DailyDispatch.dispatchAt between :dispatchAt::timestamp and :dispatchAt::timestamp + interval '1 day' `, { dispatchAt });
|
|
49
66
|
const [items, total] = await queryBuilder.getManyAndCount();
|
|
50
67
|
return { items, total };
|
|
51
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daily-dispatch-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-dispatch/daily-dispatch-query.ts"],"names":[],"mappings":";;;AAAA,qCAA+C;AAE/C,iDAAqE;AAErE,gDAAwE;AAE3D,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QAChD,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAmB,CAAC,CAAC,OAAO,CAAC;YACzD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC5C,SAAS,EAAE;gBACT,QAAQ;gBACR,sBAAsB;gBACtB,2BAA2B;gBAC3B,QAAQ;gBACR,YAAY;gBACZ,WAAW;gBACX,SAAS;gBACT,SAAS;aACV;SACF,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;;QAC3D,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;QAEnD,IAAI;YACF,MAAM,
|
|
1
|
+
{"version":3,"file":"daily-dispatch-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-dispatch/daily-dispatch-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,11 +65,67 @@ async function addDailyDispatchDetail(domain, newDailyDispatch, dailyDispatchDet
|
|
|
65
65
|
}
|
|
66
66
|
exports.addDailyDispatchDetail = addDailyDispatchDetail;
|
|
67
67
|
async function generateDispatchTransaction(domain, newDailyDispatch, dailyDispatchDetails, user, tx) {
|
|
68
|
-
|
|
69
|
-
|
|
68
|
+
const blockRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.Block)) || (0, typeorm_1.getRepository)(entities_1.Block);
|
|
69
|
+
for (let dailyDispatch of dailyDispatchDetails) {
|
|
70
|
+
const dispatchedTonnage = dailyDispatch.collectedRampWeight;
|
|
70
71
|
const dispatchDate = newDailyDispatch.dispatchAt.toString().split('T')[0];
|
|
71
|
-
|
|
72
|
-
|
|
72
|
+
const ramp = dailyDispatch.ramp;
|
|
73
|
+
await (0, utils_1.generateTransactionHistory)(null, domain, dailyDispatch.ramp, newDailyDispatch.id, newDailyDispatch.name, constants_1.TRANSACTION_TYPE.DISPATCHMENT, dispatchDate, 0, -dispatchedTonnage, user, tx);
|
|
74
|
+
let rampBlockHistory = await tx.query(`
|
|
75
|
+
SELECT * FROM (
|
|
76
|
+
SELECT *, ROW_NUMBER () OVER (PARTITION BY ramp_id, block_id ORDER BY transaction_date desc, transaction_type) AS rn FROM ramp_block_histories
|
|
77
|
+
WHERE ramp_id =$1 AND transaction_date <= $2
|
|
78
|
+
) foo WHERE rn = 1
|
|
79
|
+
`, [ramp.id, dispatchDate]);
|
|
80
|
+
let totalRampWeight = rampBlockHistory.reduce((total, currentValue) => {
|
|
81
|
+
total += currentValue.previous_weight + currentValue.weight;
|
|
82
|
+
return total;
|
|
83
|
+
}, 0);
|
|
84
|
+
for (let index = 0; index < rampBlockHistory.length; index++) {
|
|
85
|
+
const dt2 = rampBlockHistory[index];
|
|
86
|
+
const block = await blockRepo.findOne({ id: dt2.block_id });
|
|
87
|
+
let currentRampBlockWeight = dt2.previous_weight + dt2.weight;
|
|
88
|
+
let percentage = parseFloat((currentRampBlockWeight / totalRampWeight).toFixed(4));
|
|
89
|
+
let weight = (-dispatchedTonnage * percentage).toFixed(4);
|
|
90
|
+
// // insert into ramp_block_histories (id,transaction_type, creator_id, updater_id, transaction_date, created_at, updated_at, weight, domain_id, block_id, ramp_id)
|
|
91
|
+
// let processedData = await tx.query(
|
|
92
|
+
// `
|
|
93
|
+
// insert into ramp_block_histories (id, seq, transaction_type, creator_id, updater_id, transaction_date, created_at, updated_at, domain_id, ramp_id, weight, previous_weight, current_weight, block_id, daily_dispatch_id)
|
|
94
|
+
// SELECT uuid_generate_v4() AS id, (select seq from ramp_block_histories where ramp_id = '${ramp.id}' and domain_id = '${domain.id}' order by seq desc limit 1) + 1,'DISPATCH' AS transaction_type,
|
|
95
|
+
// '0933baea-e099-494b-9791-3dfe805731f0' AS creator_id, '0933baea-e099-494b-9791-3dfe805731f0' AS updater_id,
|
|
96
|
+
// $1 AS transaction_date, $2 AS created_at, $3 AS updated_at,
|
|
97
|
+
// $4 AS domain_id, $5 AS ramp_id,
|
|
98
|
+
// $6 AS weight,
|
|
99
|
+
// $7 AS previous_weight,
|
|
100
|
+
// $8 AS current_weight,
|
|
101
|
+
// $9 AS block_id,
|
|
102
|
+
// $10 AS daily_dispatch_id
|
|
103
|
+
// `,
|
|
104
|
+
// [
|
|
105
|
+
// dispatchDate,
|
|
106
|
+
// dt2.created_at,
|
|
107
|
+
// dt2.updated_at,
|
|
108
|
+
// domain.id,
|
|
109
|
+
// ramp.id,
|
|
110
|
+
// parseFloat(weight),
|
|
111
|
+
// parseFloat(currentRampBlockWeight),
|
|
112
|
+
// parseFloat(currentRampBlockWeight) + parseFloat(weight),
|
|
113
|
+
// dt2.block_id,
|
|
114
|
+
// newDailyDispatch.id
|
|
115
|
+
// ]
|
|
116
|
+
// )
|
|
117
|
+
await (0, utils_1.generateRampBlockHistories)(block, domain, ramp, 'DISPATCH', dispatchDate, parseFloat(weight), user, null, newDailyDispatch, tx);
|
|
118
|
+
// await txMgr.query(`
|
|
119
|
+
// SELECT * FROM (
|
|
120
|
+
// SELECT *, ROW_NUMBER () OVER (PARTITION BY ramp_id, block_id ORDER BY transaction_date desc) AS rn FROM ramp_block_histories
|
|
121
|
+
// WHERE ramp_id =$1 AND transaction_date <= $2
|
|
122
|
+
// ) foo WHERE rn = 1
|
|
123
|
+
// `, [dt.ramp_id, dt.transaction_date]
|
|
124
|
+
// )
|
|
125
|
+
let x = dt2;
|
|
126
|
+
}
|
|
127
|
+
let x = rampBlockHistory;
|
|
128
|
+
}
|
|
73
129
|
}
|
|
74
130
|
exports.generateDispatchTransaction = generateDispatchTransaction;
|
|
75
131
|
//# sourceMappingURL=generate-daily-dispatch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-daily-dispatch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-dispatch/generate-daily-dispatch.ts"],"names":[],"mappings":";;;AAAA,qCAAkE;AAKlE,kDAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"generate-daily-dispatch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-dispatch/generate-daily-dispatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,8 +22,30 @@ exports.Query = {
|
|
|
22
22
|
});
|
|
23
23
|
},
|
|
24
24
|
async dailyHarvests(_, params, context) {
|
|
25
|
-
var _a;
|
|
25
|
+
var _a, _b, _c;
|
|
26
26
|
const { tx } = context.state;
|
|
27
|
+
const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
|
|
28
|
+
if (fromDateParamIdx >= 0) {
|
|
29
|
+
let harvestDateFrom = (_a = params.filters.find(param => param.name === 'fromDate')) === null || _a === void 0 ? void 0 : _a.value;
|
|
30
|
+
params.filters.splice(fromDateParamIdx, 1);
|
|
31
|
+
params.filters.push({
|
|
32
|
+
name: 'harvestDate',
|
|
33
|
+
operator: 'gte',
|
|
34
|
+
value: harvestDateFrom,
|
|
35
|
+
relation: false
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate');
|
|
39
|
+
if (toDateParamIdx >= 0) {
|
|
40
|
+
let harvestDateTo = (_b = params.filters.find(param => param.name === 'toDate')) === null || _b === void 0 ? void 0 : _b.value;
|
|
41
|
+
params.filters.splice(toDateParamIdx, 1);
|
|
42
|
+
params.filters.push({
|
|
43
|
+
name: 'harvestDate',
|
|
44
|
+
operator: 'lte',
|
|
45
|
+
value: harvestDateTo,
|
|
46
|
+
relation: false
|
|
47
|
+
});
|
|
48
|
+
}
|
|
27
49
|
const queryBuilder = tx.getRepository(entities_1.DailyHarvest).createQueryBuilder();
|
|
28
50
|
(0, shell_1.buildQuery)(queryBuilder, params, context);
|
|
29
51
|
queryBuilder
|
|
@@ -31,7 +53,7 @@ exports.Query = {
|
|
|
31
53
|
.leftJoinAndSelect('DailyHarvest.block', 'Block')
|
|
32
54
|
.leftJoinAndSelect('DailyHarvest.creator', 'Creator')
|
|
33
55
|
.leftJoinAndSelect('DailyHarvest.updater', 'Updater');
|
|
34
|
-
if (((
|
|
56
|
+
if (((_c = params.filters) === null || _c === void 0 ? void 0 : _c.length) > 0)
|
|
35
57
|
queryBuilder.andWhere('DailyHarvest.deletedAt IS NULL');
|
|
36
58
|
else
|
|
37
59
|
queryBuilder.where('DailyHarvest.deletedAt IS NULL');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daily-harvest-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-harvest/daily-harvest-query.ts"],"names":[],"mappings":";;;AAAA,qCAA+C;AAE/C,iDAAqE;AAErE,gDAAyF;AAE5E,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,YAAY,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QAC/C,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,MAAM,WAAW,GAAsB,MAAM,EAAE,CAAC,aAAa,CAAC,4BAAiB,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;QAE/G,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAkB,CAAC,CAAC,OAAO,CAAC;YACxD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC5C,SAAS,EAAE;gBACT,QAAQ;gBACR,OAAO;gBACP,qBAAqB;gBACrB,uCAAuC;gBACvC,oDAAoD;gBACpD,SAAS;gBACT,SAAS;aACV;SACF,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;;QACzD,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;QAEnD,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,uBAAkB,CAAC,CAAC,kBAAkB,EAAE,CAAA;QAC9E,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEzC,YAAY;aACT,iBAAiB,CAAC,qBAAqB,EAAE,QAAQ,CAAC;aAClD,iBAAiB,CAAC,oBAAoB,EAAE,OAAO,CAAC;aAChD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC;aACpD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAA;QAEvD,IAAI,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,IAAG,CAAC;YAAE,YAAY,CAAC,QAAQ,CAAC,gCAAgC,CAAC,CAAA;;YAClF,YAAY,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAEzD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
|
|
1
|
+
{"version":3,"file":"daily-harvest-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-harvest/daily-harvest-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,15 +21,37 @@ exports.Query = {
|
|
|
21
21
|
});
|
|
22
22
|
},
|
|
23
23
|
async dailyLoadings(_, params, context) {
|
|
24
|
-
var _a;
|
|
24
|
+
var _a, _b, _c;
|
|
25
25
|
const { tx } = context.state;
|
|
26
|
+
const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
|
|
27
|
+
if (fromDateParamIdx >= 0) {
|
|
28
|
+
let loadingDateFrom = (_a = params.filters.find(param => param.name === 'fromDate')) === null || _a === void 0 ? void 0 : _a.value;
|
|
29
|
+
params.filters.splice(fromDateParamIdx, 1);
|
|
30
|
+
params.filters.push({
|
|
31
|
+
name: 'loadingDate',
|
|
32
|
+
operator: 'gte',
|
|
33
|
+
value: loadingDateFrom,
|
|
34
|
+
relation: false
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate');
|
|
38
|
+
if (toDateParamIdx >= 0) {
|
|
39
|
+
let loadingDateTo = (_b = params.filters.find(param => param.name === 'toDate')) === null || _b === void 0 ? void 0 : _b.value;
|
|
40
|
+
params.filters.splice(toDateParamIdx, 1);
|
|
41
|
+
params.filters.push({
|
|
42
|
+
name: 'loadingDate',
|
|
43
|
+
operator: 'lte',
|
|
44
|
+
value: loadingDateTo,
|
|
45
|
+
relation: false
|
|
46
|
+
});
|
|
47
|
+
}
|
|
26
48
|
const queryBuilder = tx.getRepository(entities_1.DailyLoading).createQueryBuilder();
|
|
27
49
|
(0, shell_1.buildQuery)(queryBuilder, params, context);
|
|
28
50
|
queryBuilder
|
|
29
51
|
.leftJoinAndSelect('DailyLoading.domain', 'Domain')
|
|
30
52
|
.leftJoinAndSelect('DailyLoading.creator', 'Creator')
|
|
31
53
|
.leftJoinAndSelect('DailyLoading.updater', 'Updater');
|
|
32
|
-
if (((
|
|
54
|
+
if (((_c = params.filters) === null || _c === void 0 ? void 0 : _c.length) > 0)
|
|
33
55
|
queryBuilder.andWhere('DailyLoading.deletedAt IS NULL');
|
|
34
56
|
else
|
|
35
57
|
queryBuilder.where('DailyLoading.deletedAt IS NULL');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daily-loading-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-loading/daily-loading-query.ts"],"names":[],"mappings":";;;AAAA,qCAA+C;AAE/C,iDAAqE;AAErE,gDAAsE;AAEzD,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,YAAY,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QAC/C,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAkB,CAAC,CAAC,OAAO,CAAC;YACxD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC5C,SAAS,EAAE;gBACT,QAAQ;gBACR,qBAAqB;gBACrB,2BAA2B;gBAC3B,2BAA2B;gBAC3B,0BAA0B;gBAC1B,SAAS;gBACT,SAAS;aACV;SACF,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;;QACzD,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;QAEnD,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,uBAAkB,CAAC,CAAC,kBAAkB,EAAE,CAAA;QAC9E,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEzC,YAAY;aACT,iBAAiB,CAAC,qBAAqB,EAAE,QAAQ,CAAC;aAClD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC;aACpD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAA;QAEvD,IAAI,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,IAAG,CAAC;YAAE,YAAY,CAAC,QAAQ,CAAC,gCAAgC,CAAC,CAAA;;YAClF,YAAY,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAEzD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
|
|
1
|
+
{"version":3,"file":"daily-loading-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-loading/daily-loading-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,7 @@ async function addDailyLoadingDetail(domain, newDailyLoading, dailyLoadingDetail
|
|
|
47
47
|
exports.addDailyLoadingDetail = addDailyLoadingDetail;
|
|
48
48
|
async function updatePlantationInventory(domain, newDailyLoading, dailyLoadingDetails, user, tx) {
|
|
49
49
|
const plantationInvRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.PlantationInventory)) || (0, typeorm_1.getRepository)(entities_1.PlantationInventory);
|
|
50
|
-
|
|
50
|
+
for (let dailyLoadingDetail of dailyLoadingDetails) {
|
|
51
51
|
let existingRampTonnage = await plantationInvRepo.findOne({
|
|
52
52
|
where: { domain, type: constants_1.INVENTORY_TYPE.RAMP_TONNAGE, ramp: dailyLoadingDetail.ramp },
|
|
53
53
|
relations: ['domain', 'block', 'ramp']
|
|
@@ -71,7 +71,8 @@ async function updatePlantationInventory(domain, newDailyLoading, dailyLoadingDe
|
|
|
71
71
|
plantationInventory = await plantationInvRepo.save(plantationInventory);
|
|
72
72
|
await (0, utils_1.generateTransactionHistory)(dailyLoadingDetail.block, domain, dailyLoadingDetail.ramp, newDailyLoading.id, newDailyLoading.name, constants_1.TRANSACTION_TYPE.LOADING, newDailyLoading.loadingDate, 0, dailyLoadingDetail.totalBunchWeight, user, tx);
|
|
73
73
|
}
|
|
74
|
-
|
|
74
|
+
await (0, utils_1.generateRampBlockHistories)(dailyLoadingDetail.block, domain, dailyLoadingDetail.ramp, 'LOADING', newDailyLoading.loadingDate, dailyLoadingDetail.totalBunchWeight, user, null, null, tx);
|
|
75
|
+
}
|
|
75
76
|
}
|
|
76
77
|
exports.updatePlantationInventory = updatePlantationInventory;
|
|
77
78
|
//# sourceMappingURL=generate-daily-loading.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-daily-loading.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-loading/generate-daily-loading.ts"],"names":[],"mappings":";;;AAAA,qCAAkE;AAKlE,kDAAsG;AACtG,gDAA6G;AAC7G,
|
|
1
|
+
{"version":3,"file":"generate-daily-loading.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-loading/generate-daily-loading.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.switchRampStatus = exports.generateTransactionHistory = void 0;
|
|
3
|
+
exports.switchRampStatus = exports.generateRampBlockHistories = exports.generateTransactionHistory = void 0;
|
|
4
4
|
const constants_1 = require("../constants");
|
|
5
5
|
const entities_1 = require("../entities");
|
|
6
6
|
const utils_1 = require("../utils");
|
|
@@ -37,6 +37,73 @@ async function generateTransactionHistory(block, domain, ramp, refActionID, refR
|
|
|
37
37
|
return recTransactionHistory;
|
|
38
38
|
}
|
|
39
39
|
exports.generateTransactionHistory = generateTransactionHistory;
|
|
40
|
+
/**
|
|
41
|
+
* @description It will insert new record into transaction table.
|
|
42
|
+
* seq will be calculated based on number of records for one specific plantation inventory
|
|
43
|
+
*/
|
|
44
|
+
async function generateRampBlockHistories(block, domain, ramp, transactionType, transactionDate, rampWeight, user, deletedAt, dailyDispatch, trxMgr) {
|
|
45
|
+
console.log(block, domain, ramp, user);
|
|
46
|
+
const rampBlockHistoryRepo = (trxMgr === null || trxMgr === void 0 ? void 0 : trxMgr.getRepository(entities_1.RampBlockHistory)) || (0, typeorm_1.getRepository)(entities_1.RampBlockHistory);
|
|
47
|
+
if (!(ramp === null || ramp === void 0 ? void 0 : ramp.id))
|
|
48
|
+
throw new Error(`Can't find a matching ramp.`);
|
|
49
|
+
const lastRampBlockHistory = await rampBlockHistoryRepo.findOne({
|
|
50
|
+
where: { domain, ramp, block },
|
|
51
|
+
order: { seq: 'DESC' }
|
|
52
|
+
});
|
|
53
|
+
let res;
|
|
54
|
+
if (!lastRampBlockHistory) {
|
|
55
|
+
res = await rampBlockHistoryRepo
|
|
56
|
+
.createQueryBuilder()
|
|
57
|
+
.insert()
|
|
58
|
+
.into(entities_1.RampBlockHistory)
|
|
59
|
+
.values([
|
|
60
|
+
{
|
|
61
|
+
transactionDate,
|
|
62
|
+
transactionType,
|
|
63
|
+
seq: 0,
|
|
64
|
+
domain,
|
|
65
|
+
block,
|
|
66
|
+
ramp,
|
|
67
|
+
weight: rampWeight,
|
|
68
|
+
previousWeight: 0,
|
|
69
|
+
currentWeight: rampWeight,
|
|
70
|
+
dailyDispatch,
|
|
71
|
+
deletedAt: deletedAt ? deletedAt : null,
|
|
72
|
+
creator: user,
|
|
73
|
+
updater: user
|
|
74
|
+
}
|
|
75
|
+
])
|
|
76
|
+
.returning('*')
|
|
77
|
+
.execute();
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
const previousWeight = lastRampBlockHistory.currentWeight;
|
|
81
|
+
res = await rampBlockHistoryRepo
|
|
82
|
+
.createQueryBuilder()
|
|
83
|
+
.insert()
|
|
84
|
+
.into(entities_1.RampBlockHistory)
|
|
85
|
+
.values([
|
|
86
|
+
{
|
|
87
|
+
domain,
|
|
88
|
+
block,
|
|
89
|
+
ramp,
|
|
90
|
+
transactionType,
|
|
91
|
+
transactionDate,
|
|
92
|
+
weight: rampWeight,
|
|
93
|
+
previousWeight,
|
|
94
|
+
currentWeight: parseFloat((previousWeight + rampWeight).toFixed(4)),
|
|
95
|
+
creator: user,
|
|
96
|
+
updater: user,
|
|
97
|
+
seq: () => `(select seq from ramp_block_histories where ramp_id = '${ramp.id}' and block_id = '${block.id}' and domain_id = '${domain.id}' order by seq desc limit 1) + 1`
|
|
98
|
+
}
|
|
99
|
+
])
|
|
100
|
+
.returning('*')
|
|
101
|
+
.execute();
|
|
102
|
+
}
|
|
103
|
+
let newRampBlockHistory = res.generatedMaps[0];
|
|
104
|
+
return newRampBlockHistory;
|
|
105
|
+
}
|
|
106
|
+
exports.generateRampBlockHistories = generateRampBlockHistories;
|
|
40
107
|
/**
|
|
41
108
|
* @description: Check ramp emptiness and update status of ramp
|
|
42
109
|
* @param domain
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction-util.js","sourceRoot":"","sources":["../../server/utils/transaction-util.ts"],"names":[],"mappings":";;;AAEA,4CAA8E;AAC9E,
|
|
1
|
+
{"version":3,"file":"transaction-util.js","sourceRoot":"","sources":["../../server/utils/transaction-util.ts"],"names":[],"mappings":";;;AAEA,4CAA8E;AAC9E,0CAQoB;AACpB,oCAAsC;AACtC,qCAAkE;AAElE;;;GAGG;AAEI,KAAK,UAAU,0BAA0B,CAC9C,KAAY,EACZ,MAAc,EACd,IAAU,EACV,WAAgB,EAChB,WAAmB,EACnB,eAAuB,EACvB,eAAuB,EACvB,YAAoB,EACpB,UAAkB,EAClB,IAAU,EACV,MAAsB;IAEtB,MAAM,eAAe,GACnB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,4BAAiB,CAAC,KAAI,IAAA,uBAAa,EAAC,4BAAiB,CAAC,CAAA;IAE9E,IAAI,qBAAqB,GAAsB,IAAI,4BAAiB,EAAE,CAAA;IACtE,qBAAqB,CAAC,IAAI,GAAG,mBAAW,CAAC,sBAAsB,EAAE,CAAA;IACjE,qBAAqB,CAAC,WAAW,GAAG,WAAW,CAAA;IAC/C,qBAAqB,CAAC,WAAW,GAAG,WAAW,CAAA;IAC/C,qBAAqB,CAAC,eAAe,GAAG,eAAe,CAAA;IACvD,qBAAqB,CAAC,eAAe,GAAG,eAAe,CAAA;IACvD,qBAAqB,CAAC,YAAY,GAAG,YAAY,CAAA;IACjD,qBAAqB,CAAC,UAAU,GAAG,UAAU,CAAA;IAC7C,qBAAqB,CAAC,IAAI,GAAG,IAAI,CAAA;IACjC,qBAAqB,CAAC,MAAM,GAAG,MAAM,CAAA;IACrC,qBAAqB,CAAC,KAAK,GAAG,KAAK,CAAA;IACnC,qBAAqB,CAAC,OAAO,GAAG,IAAI,CAAA;IACpC,qBAAqB,CAAC,OAAO,GAAG,IAAI,CAAA;IACpC,MAAM,eAAe,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;IAEjD,OAAO;IACP,qDAAqD;IACrD,2DAA2D;IAC3D,iEAAiE;IACjE,uEAAuE;IACvE,SAAS;IACT,MAAM;IACN,uDAAuD;IACvD,IAAI;IACJ,OAAO,qBAAqB,CAAA;AAC9B,CAAC;AAzCD,gEAyCC;AAED;;;GAGG;AAEI,KAAK,UAAU,0BAA0B,CAC9C,KAAY,EACZ,MAAc,EACd,IAAU,EACV,eAAuB,EACvB,eAAuB,EACvB,UAAkB,EAClB,IAAU,EACV,SAAe,EACf,aAA6B,EAC7B,MAAsB;IAEtB,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IACtC,MAAM,oBAAoB,GACxB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,2BAAgB,CAAC,KAAI,IAAA,uBAAa,EAAC,2BAAgB,CAAC,CAAA;IAE5E,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,EAAE,CAAA;QAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;IAE7D,MAAM,oBAAoB,GAAqB,MAAM,oBAAoB,CAAC,OAAO,CAAC;QAChF,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE;QAC9B,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE;KACvB,CAAC,CAAA;IAEF,IAAI,GAAQ,CAAA;IAEZ,IAAI,CAAC,oBAAoB,EAAE;QACzB,GAAG,GAAG,MAAM,oBAAoB;aAC7B,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,2BAAgB,CAAC;aACtB,MAAM,CAAC;YACN;gBACE,eAAe;gBACf,eAAe;gBACf,GAAG,EAAE,CAAC;gBACN,MAAM;gBACN,KAAK;gBACL,IAAI;gBACJ,MAAM,EAAE,UAAU;gBAClB,cAAc,EAAE,CAAC;gBACjB,aAAa,EAAE,UAAU;gBACzB,aAAa;gBACb,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;gBACvC,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,IAAI;aACd;SACF,CAAC;aACD,SAAS,CAAC,GAAG,CAAC;aACd,OAAO,EAAE,CAAA;KACb;SAAM;QACL,MAAM,cAAc,GAAW,oBAAoB,CAAC,aAAa,CAAA;QAEjE,GAAG,GAAG,MAAM,oBAAoB;aAC7B,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,2BAAgB,CAAC;aACtB,MAAM,CAAC;YACN;gBACE,MAAM;gBACN,KAAK;gBACL,IAAI;gBACJ,eAAe;gBACf,eAAe;gBACf,MAAM,EAAE,UAAU;gBAClB,cAAc;gBACd,aAAa,EAAE,UAAU,CAAC,CAAC,cAAc,GAAG,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBACnE,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,IAAI;gBACb,GAAG,EAAE,GAAG,EAAE,CACR,0DAA0D,IAAI,CAAC,EAAE,qBAAqB,KAAK,CAAC,EAAE,sBAAsB,MAAM,CAAC,EAAE,kCAAkC;aAClK;SACF,CAAC;aACD,SAAS,CAAC,GAAG,CAAC;aACd,OAAO,EAAE,CAAA;KACb;IAED,IAAI,mBAAmB,GAAqB,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;IAEhE,OAAO,mBAAmB,CAAA;AAC5B,CAAC;AA/ED,gEA+EC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,gBAAgB,CACpC,MAAc,EACd,IAAU,EACV,OAAa,EACb,MAAsB;IAEtB,MAAM,iBAAiB,GACrB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,8BAAmB,CAAC,KAAI,IAAA,uBAAa,EAAC,8BAAmB,CAAC,CAAA;IAClF,MAAM,QAAQ,GAAqB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,eAAI,CAAC,KAAI,IAAA,uBAAa,EAAC,eAAI,CAAC,CAAA;IACrF,MAAM,OAAO,GAAW,MAAM,iBAAiB,CAAC,KAAK,CAAC;QACpD,MAAM;QACN,MAAM,EAAE,4BAAgB,CAAC,MAAM;QAC/B,IAAI;KACL,CAAC,CAAA;IAEF,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,KAAK,uBAAW,CAAC,KAAK,EAAE;QACjD,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,iCACrB,IAAI,KACP,MAAM,EAAE,uBAAW,CAAC,KAAK,EACzB,OAAO,IACP,CAAA;KACH;SAAM,IAAI,OAAO,IAAI,IAAI,CAAC,MAAM,KAAK,uBAAW,CAAC,KAAK,EAAE;QACvD,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,iCACrB,IAAI,KACP,MAAM,EAAE,uBAAW,CAAC,MAAM,EAC1B,OAAO,IACP,CAAA;KACH;SAAM;QACL,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,iCACrB,IAAI,KACP,MAAM,EAAE,uBAAW,CAAC,MAAM,EAC1B,OAAO,IACP,CAAA;KACH;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AApCD,4CAoCC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-pms",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.379",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -53,47 +53,47 @@
|
|
|
53
53
|
"@operato/scene-tab": "^0.1.8",
|
|
54
54
|
"@operato/scene-table": "^0.1.8",
|
|
55
55
|
"@operato/scene-wheel-sorter": "^0.1.8",
|
|
56
|
-
"@things-factory/apptool-ui": "^4.3.
|
|
57
|
-
"@things-factory/auth-ui": "^4.3.
|
|
58
|
-
"@things-factory/biz-base": "^4.3.
|
|
59
|
-
"@things-factory/board-service": "^4.3.
|
|
60
|
-
"@things-factory/board-ui": "^4.3.
|
|
61
|
-
"@things-factory/code-ui": "^4.3.
|
|
62
|
-
"@things-factory/context-ui": "^4.3.
|
|
63
|
-
"@things-factory/dashboard": "^4.3.
|
|
64
|
-
"@things-factory/document-template-ui": "^4.3.
|
|
65
|
-
"@things-factory/export-ui": "^4.3.
|
|
66
|
-
"@things-factory/export-ui-csv": "^4.3.
|
|
67
|
-
"@things-factory/export-ui-excel": "^4.3.
|
|
68
|
-
"@things-factory/fav-base": "^4.3.
|
|
69
|
-
"@things-factory/form-ui": "^4.3.
|
|
70
|
-
"@things-factory/grist-ui": "^4.3.
|
|
71
|
-
"@things-factory/help": "^4.3.
|
|
72
|
-
"@things-factory/i18n-base": "^4.3.
|
|
73
|
-
"@things-factory/import-ui": "^4.3.
|
|
74
|
-
"@things-factory/import-ui-excel": "^4.3.
|
|
75
|
-
"@things-factory/lite-menu": "^4.3.
|
|
76
|
-
"@things-factory/more-ui": "^4.3.
|
|
77
|
-
"@things-factory/notification": "^4.3.
|
|
78
|
-
"@things-factory/print-ui": "^4.3.
|
|
79
|
-
"@things-factory/resource-ui": "^4.3.
|
|
80
|
-
"@things-factory/scene-data-transform": "^4.3.
|
|
81
|
-
"@things-factory/scene-excel": "^4.3.
|
|
82
|
-
"@things-factory/scene-firebase": "^4.3.
|
|
83
|
-
"@things-factory/scene-form": "^4.3.
|
|
84
|
-
"@things-factory/scene-google-map": "^4.3.
|
|
85
|
-
"@things-factory/scene-graphql": "^4.3.
|
|
86
|
-
"@things-factory/scene-label": "^4.3.
|
|
87
|
-
"@things-factory/scene-marker": "^4.3.
|
|
88
|
-
"@things-factory/scene-mqtt": "^4.3.
|
|
89
|
-
"@things-factory/scene-restful": "^4.3.
|
|
90
|
-
"@things-factory/scene-visualizer": "^4.3.
|
|
91
|
-
"@things-factory/setting-ui": "^4.3.
|
|
92
|
-
"@things-factory/shell": "^4.3.
|
|
93
|
-
"@things-factory/system-ui": "^4.3.
|
|
56
|
+
"@things-factory/apptool-ui": "^4.3.379",
|
|
57
|
+
"@things-factory/auth-ui": "^4.3.379",
|
|
58
|
+
"@things-factory/biz-base": "^4.3.379",
|
|
59
|
+
"@things-factory/board-service": "^4.3.379",
|
|
60
|
+
"@things-factory/board-ui": "^4.3.379",
|
|
61
|
+
"@things-factory/code-ui": "^4.3.379",
|
|
62
|
+
"@things-factory/context-ui": "^4.3.379",
|
|
63
|
+
"@things-factory/dashboard": "^4.3.379",
|
|
64
|
+
"@things-factory/document-template-ui": "^4.3.379",
|
|
65
|
+
"@things-factory/export-ui": "^4.3.379",
|
|
66
|
+
"@things-factory/export-ui-csv": "^4.3.379",
|
|
67
|
+
"@things-factory/export-ui-excel": "^4.3.379",
|
|
68
|
+
"@things-factory/fav-base": "^4.3.379",
|
|
69
|
+
"@things-factory/form-ui": "^4.3.379",
|
|
70
|
+
"@things-factory/grist-ui": "^4.3.379",
|
|
71
|
+
"@things-factory/help": "^4.3.379",
|
|
72
|
+
"@things-factory/i18n-base": "^4.3.379",
|
|
73
|
+
"@things-factory/import-ui": "^4.3.379",
|
|
74
|
+
"@things-factory/import-ui-excel": "^4.3.379",
|
|
75
|
+
"@things-factory/lite-menu": "^4.3.379",
|
|
76
|
+
"@things-factory/more-ui": "^4.3.379",
|
|
77
|
+
"@things-factory/notification": "^4.3.379",
|
|
78
|
+
"@things-factory/print-ui": "^4.3.379",
|
|
79
|
+
"@things-factory/resource-ui": "^4.3.379",
|
|
80
|
+
"@things-factory/scene-data-transform": "^4.3.379",
|
|
81
|
+
"@things-factory/scene-excel": "^4.3.379",
|
|
82
|
+
"@things-factory/scene-firebase": "^4.3.379",
|
|
83
|
+
"@things-factory/scene-form": "^4.3.379",
|
|
84
|
+
"@things-factory/scene-google-map": "^4.3.379",
|
|
85
|
+
"@things-factory/scene-graphql": "^4.3.379",
|
|
86
|
+
"@things-factory/scene-label": "^4.3.379",
|
|
87
|
+
"@things-factory/scene-marker": "^4.3.379",
|
|
88
|
+
"@things-factory/scene-mqtt": "^4.3.379",
|
|
89
|
+
"@things-factory/scene-restful": "^4.3.379",
|
|
90
|
+
"@things-factory/scene-visualizer": "^4.3.379",
|
|
91
|
+
"@things-factory/setting-ui": "^4.3.379",
|
|
92
|
+
"@things-factory/shell": "^4.3.379",
|
|
93
|
+
"@things-factory/system-ui": "^4.3.379"
|
|
94
94
|
},
|
|
95
95
|
"devDependencies": {
|
|
96
|
-
"@things-factory/builder": "^4.3.
|
|
96
|
+
"@things-factory/builder": "^4.3.379"
|
|
97
97
|
},
|
|
98
|
-
"gitHead": "
|
|
98
|
+
"gitHead": "be80e8ec81dedb5706ebf0dd7d240ecd5ed0a67e"
|
|
99
99
|
}
|