@things-factory/operato-pms 4.3.373 → 4.3.378
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/config.development.js +48 -43
- 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/graphql/resolvers/report/daily-production-reports.js +59 -57
- package/dist-server/graphql/resolvers/report/daily-production-reports.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
|
@@ -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
|
|
package/config.development.js
CHANGED
|
@@ -2,16 +2,16 @@ module.exports = {
|
|
|
2
2
|
useVirtualHostBasedDomain: false,
|
|
3
3
|
fallbackRoute: '/',
|
|
4
4
|
subdomainOffset: 2,
|
|
5
|
-
port:
|
|
6
|
-
inspect: '
|
|
5
|
+
port: 3000,
|
|
6
|
+
inspect: '9260',
|
|
7
7
|
ormconfig: {
|
|
8
8
|
name: 'default',
|
|
9
9
|
type: 'postgres',
|
|
10
|
-
database: '
|
|
10
|
+
database: 'postgres',
|
|
11
11
|
username: 'postgres',
|
|
12
|
-
password: '
|
|
12
|
+
password: 'abcd1234',
|
|
13
13
|
host: 'localhost',
|
|
14
|
-
port:
|
|
14
|
+
port: 35432,
|
|
15
15
|
synchronize: true,
|
|
16
16
|
logging: true
|
|
17
17
|
},
|
|
@@ -27,6 +27,12 @@ module.exports = {
|
|
|
27
27
|
looseCharacterLength: 4,
|
|
28
28
|
history: 2
|
|
29
29
|
},
|
|
30
|
+
sftpFileStorage: {
|
|
31
|
+
type: 's3',
|
|
32
|
+
accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
|
|
33
|
+
secretAccessKey: 'OG2qS0Usg4wyjPWbfv1ahPZzP80/w8z4i8MYHl+e',
|
|
34
|
+
bucketName: 'operato-sftp'
|
|
35
|
+
},
|
|
30
36
|
uploads: 'uploads',
|
|
31
37
|
attachmentsPath: 'attachments',
|
|
32
38
|
SECRET: '0xD58F835B69D207A76CC5F84a70a1D0d4C79dfC95',
|
|
@@ -40,42 +46,41 @@ module.exports = {
|
|
|
40
46
|
level: 'info'
|
|
41
47
|
}
|
|
42
48
|
},
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
reportApiUrl: 'http://localhost:8888/rest/report/show_html'
|
|
49
|
+
email: {
|
|
50
|
+
host: 'smtp.office365.com',
|
|
51
|
+
port: 587,
|
|
52
|
+
secure: false, // true for 465, false for other ports
|
|
53
|
+
auth: {
|
|
54
|
+
user: 'noreply@hatiolab.com', // generated ethereal user
|
|
55
|
+
pass: 'h@ti0LAB1008' // generated ethereal password
|
|
56
|
+
},
|
|
57
|
+
secureConnection: false,
|
|
58
|
+
tls: {
|
|
59
|
+
ciphers: 'SSLv3'
|
|
60
|
+
}
|
|
61
|
+
},
|
|
62
|
+
sender: 'noreply@hatiolab.com',
|
|
63
|
+
notification: {
|
|
64
|
+
// fcm: {
|
|
65
|
+
// serviceAccount: {
|
|
66
|
+
// project_id: 'operato',
|
|
67
|
+
// private_key:
|
|
68
|
+
// '-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDYNOfyNjPMSeG9\nzU1qs0cpVK5cVfadcUaw5g+hkQZMOMlAA7uqW2eX4vkayj7MzbYUayH+sei8044Q\nJIyl6f26dNX1VT3UgTmSmCS0v48EBEZHCgusrUGFjduLRN6OS6uvrXW1xKA18k9q\nai1C2EHCXF2AE4PTvf239RC1UIOnVePcMtT7rMTdHRO4s8OKVuSDbzIt8k1cV3Zt\nES0YsJlkELqBisYpV//2/ZSILTt39J9JzrVef03X9kkoo9p+YnNyy6tWsfQPfgJO\nybiRGBNxiyJ/E2pxRo/WqU0go9OzYJlGaSUrUx09heNiRD1b0MAOmyPDJz/6AaTk\nkU/A+kLzAgMBAAECggEADQ5s2gtR53VSujk1V/Xe8e0Di99DwaWUj5w6YhcK7/wX\nPdQRN4Fw6RLeLjL7xeG/rCNSwzm6hKSrQJL5zLnWW7XbMdyQRk6jdmnVAEv3zACi\nFH9+eFK3e+Q214XfgWz/v4p/FZdRLCYni5VBNHcwyWxLLS/V1ynzB3KM1sDiTRmI\npcT7+uTtwrKgJq64sXtFE2pYrFxDdCiyqzkhv/2ed4YIowAjpKBbbcCDKeVxVkoz\nC1P4PAzs9EeUuKSWYrWaUjN17lqtRlYeT1ylR1PIJuWqd4cKfgoEgz+lHwRPDCEX\nAYbk3nofiJIPBhSfCHrXS755wK48mY8vMwFdfCPJeQKBgQDsz4tjYTHdat5A25n5\nekwMxZwFQ5OvMV4eulwZUDMypTAYSz1iB6sDlgwKDm5omZIfuneqCEIvrqxV/kx3\n5wV/DANHO3hYxdp/NV7rM23xmqlaKZhHQbDono1Fm/LP6DEmJiD7N2eFKsXYcPpR\nSAIdCv0X3zkDQ4zRi51yJlCXzQKBgQDpufJBxCoXngiQJ2j14lWVAeOOdQ6zh5Ip\nBcDwF0X67cNSN3Wl40bS4yLFdolhEAyj5m0WPuYYXpjzhHhZ0W3V3ItdBkrmwIvy\nWOWu26qN0ZbwxVS2qVpHuj6iHWJKHuDZZUkFtJg3BeeBSOUHSA8TvjnA0xd83xeb\n8ZJasWoFvwKBgQDFs/gQ/gIdcq0exLfluh5nw0qgcmyHpNWJHdjqITS9IX/nqFkU\n0IYLtmdStf2jQiLmbkydHcvz9wZVvLqml67VBHhwLcwpgPULoskd34/4V0Dvzy4c\nv1Esw8H5zVqIDLeLu+VpFjZMzQrjyl6RIWbyTExEc84rVWfpQYAu3qIGOQKBgAFr\nXatEk7TdAtRNSPflTfu/rTAaSeKROjQBkvBiU8x4US1YpOBDBxUUyAtG8wKh5FHC\nfnsaGq+fM3KXJVv2R6J62mXQOfg4xyDLpWlwcBK4aSBBMoiBcsjouqSlZQlqMpdf\nZBgixqHe6U8BsFJg/6ZxC0y+e3AIss4Bo4/lb+1lAoGAFOexvaBh21K6W3inmRW4\nLlkVYJaBJ20OwokXg5aXjBiHxqmk7VLAuFbkpb5LOKH2xPILRQ0OEkn51yVymS3T\n9lLpHOFTQXt5tF2/F7NW7kaQJNlLr/h5jPi3O9XHeFmuaN2z150ZB6zzgjeGKzr8\ni+1fgTsRfDtNw8xkSH9qL1Y=\n-----END PRIVATE KEY-----\n',
|
|
69
|
+
// client_email: 'firebase-adminsdk-xmm2e@operato.iam.gserviceaccount.com'
|
|
70
|
+
// },
|
|
71
|
+
// appConfig: {
|
|
72
|
+
// apiKey: 'AIzaSyDdTM2BTLHSt2LNS0G5QB8G0i4KBXFiG7U',
|
|
73
|
+
// projectId: 'operato',
|
|
74
|
+
// messagingSenderId: 79537064975,
|
|
75
|
+
// appId: '1:79537064975:web:32f53119e9c8c6ee2a277a'
|
|
76
|
+
// },
|
|
77
|
+
// serverKey:
|
|
78
|
+
// 'AAAAEoTHTA8:APA91bGwt-4HT82Dfwf_VwbQaKT0_qHd0Y3tuW41udjWz5Lz0Ko0mEMD6WbHHSILvQpa6yuoGGKCMsrU7VW2qWRrUm3CYpyG9oSwshNm1tIhljAnOuUfwHCoawbVLwf9qlWpHt4dwCoc'
|
|
79
|
+
// },
|
|
80
|
+
// vapidKey: {
|
|
81
|
+
// subject: 'mailto:heartyoh@hatiolab.com',
|
|
82
|
+
// publicKey: 'BAkVkITsCXBIsYL1yeaBmx5_dn57we-ZXMjirPPHzC2dan82cdEnAio_53PQ-1_w3ykWCBPrrFAWQ_d9N4cFF0o',
|
|
83
|
+
// privateKey: '4pmlt3Wk019u7nqU3Q_oGZE6LbUDjjf8DpmAcn9-iss'
|
|
84
|
+
// }
|
|
85
|
+
}
|
|
81
86
|
}
|
|
@@ -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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"}
|