@things-factory/operato-pms 4.3.281 → 4.3.320
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/daily-dispatch/daily-dispatch-query.js +29 -17
- package/dist-server/graphql/resolvers/daily-dispatch/daily-dispatch-query.js.map +1 -1
- package/dist-server/graphql/resolvers/report/daily-production-reports.js +2 -0
- package/dist-server/graphql/resolvers/report/daily-production-reports.js.map +1 -1
- package/dist-server/graphql/resolvers/report/monthly-production-reports.js +2 -1
- package/dist-server/graphql/resolvers/report/monthly-production-reports.js.map +1 -1
- package/package.json +3 -3
- package/server/graphql/resolvers/daily-dispatch/daily-dispatch-query.ts +30 -14
- package/server/graphql/resolvers/report/daily-production-reports.ts +2 -0
- package/server/graphql/resolvers/report/monthly-production-reports.ts +2 -1
|
@@ -22,24 +22,36 @@ exports.Query = {
|
|
|
22
22
|
});
|
|
23
23
|
},
|
|
24
24
|
async dailyDispatches(_, params, context) {
|
|
25
|
-
var _a;
|
|
25
|
+
var _a, _b;
|
|
26
26
|
const { tx } = context.state;
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
.
|
|
31
|
-
.
|
|
32
|
-
.
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
27
|
+
try {
|
|
28
|
+
const dispatchIndex = params.filters.findIndex(filter => filter.name == 'dispatchAt');
|
|
29
|
+
const dispatchAt = (_a = params.filters[dispatchIndex]) === null || _a === void 0 ? void 0 : _a.value;
|
|
30
|
+
params.filters = params.filters.splice(dispatchIndex + 1, 1);
|
|
31
|
+
const queryBuilder = tx.getRepository(entities_1.DailyDispatch).createQueryBuilder();
|
|
32
|
+
(0, shell_1.buildQuery)(queryBuilder, params, context);
|
|
33
|
+
queryBuilder
|
|
34
|
+
.leftJoinAndSelect('DailyDispatch.domain', 'Domain')
|
|
35
|
+
.leftJoinAndSelect('DailyDispatch.driver', 'Driver')
|
|
36
|
+
.leftJoinAndSelect('DailyDispatch.dispatchTo', 'DispatchTo')
|
|
37
|
+
.leftJoinAndSelect('DailyDispatch.transport', 'Transport')
|
|
38
|
+
.leftJoinAndSelect('DailyDispatch.creator', 'Creator')
|
|
39
|
+
.leftJoinAndSelect('DailyDispatch.updater', 'Updater')
|
|
40
|
+
.leftJoinAndSelect('DailyDispatch.dailyDispatchDetails', 'DailyDispatchDetails');
|
|
41
|
+
if (((_b = params.filters) === null || _b === void 0 ? void 0 : _b.length) > 0) {
|
|
42
|
+
queryBuilder.andWhere('DailyDispatch.deletedAt IS NULL');
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
queryBuilder.where('DailyDispatch.deletedAt IS NULL');
|
|
46
|
+
}
|
|
47
|
+
if (dispatchAt)
|
|
48
|
+
queryBuilder.andWhere(`DailyDispatch.dispatchAt between :dispatchAt::timestamp and :dispatchAt::timestamp + interval '1 day' `, { dispatchAt });
|
|
49
|
+
const [items, total] = await queryBuilder.getManyAndCount();
|
|
50
|
+
return { items, total };
|
|
51
|
+
}
|
|
52
|
+
catch (error) {
|
|
53
|
+
throw error;
|
|
54
|
+
}
|
|
43
55
|
}
|
|
44
56
|
};
|
|
45
57
|
//# sourceMappingURL=daily-dispatch-query.js.map
|
|
@@ -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,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,wBAAmB,CAAC,CAAC,kBAAkB,EAAE,CAAA;
|
|
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,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,YAAY,CAAC,CAAA;YACrF,MAAM,UAAU,GAAG,MAAA,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,0CAAE,KAAK,CAAA;YAEvD,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;YAE5D,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,wBAAmB,CAAC,CAAC,kBAAkB,EAAE,CAAA;YAC/E,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YAEzC,YAAY;iBACT,iBAAiB,CAAC,sBAAsB,EAAE,QAAQ,CAAC;iBACnD,iBAAiB,CAAC,sBAAsB,EAAE,QAAQ,CAAC;iBACnD,iBAAiB,CAAC,0BAA0B,EAAE,YAAY,CAAC;iBAC3D,iBAAiB,CAAC,yBAAyB,EAAE,WAAW,CAAC;iBACzD,iBAAiB,CAAC,uBAAuB,EAAE,SAAS,CAAC;iBACrD,iBAAiB,CAAC,uBAAuB,EAAE,SAAS,CAAC;iBACrD,iBAAiB,CAAC,oCAAoC,EAAE,sBAAsB,CAAC,CAAA;YAElF,IAAI,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,IAAG,CAAC,EAAE;gBAC9B,YAAY,CAAC,QAAQ,CAAC,iCAAiC,CAAC,CAAA;aACzD;iBACI;gBACH,YAAY,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;aACtD;YAED,IAAI,UAAU;gBACZ,YAAY,CAAC,QAAQ,CAAC,wGAAwG,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA;YAEjJ,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;YAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;SACxB;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}
|
|
@@ -64,12 +64,14 @@ exports.dailyProductionReports = {
|
|
|
64
64
|
(
|
|
65
65
|
select sum(today_field_bunches) from temp_records t2
|
|
66
66
|
where transaction_date::timestamp < md.dateDay
|
|
67
|
+
and transaction_date between $1 and $2
|
|
67
68
|
)
|
|
68
69
|
, 0) as prev_bunch_bal_in_field,
|
|
69
70
|
coalesce(
|
|
70
71
|
(
|
|
71
72
|
select sum(today_ramp_weight) from temp_records t2
|
|
72
73
|
where transaction_date::timestamp < md.dateDay
|
|
74
|
+
and transaction_date between $1 and $2
|
|
73
75
|
)
|
|
74
76
|
, 0) as prev_weight_bal_in_ramp,
|
|
75
77
|
coalesce(today_bunch_harvest, 0) as today_bunch_harvest,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daily-production-reports.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/report/daily-production-reports.ts"],"names":[],"mappings":";;;AAIA,gDAAyC;AAE5B,QAAA,sBAAsB,GAAG;IACpC,KAAK,CAAC,sBAAsB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAClE,IAAI;YACF,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;YAEnD,IAAI,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACzF,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAE1F,IAAI,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;YAC3C,IAAI,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;YACrC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;YAEpC,IAAI,cAAc,GAAG;gBACnB,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;gBACjC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;gBAChD,IAAI;aACL,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,IAAI,YAAY,GAAG;gBACjB,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;gBAC/B,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;gBAC9C,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;aAC1C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,MAAM,KAAK,GAAG,MAAM,EAAE;iBACnB,aAAa,CAAC,gBAAK,CAAC;iBACpB,aAAa,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;YAE3F,MAAM,EAAE,CAAC,KAAK,CAAC;;;;;;;;;;;;;OAad,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CACZ,CAAA;YAED,MAAM,EAAE,CAAC,KAAK,CAAC;;;;;;;;;;;;;;OAcd,EACC,CAAC,YAAY,CAAC,CACf,CAAA;YAED,MAAM,EAAE,CAAC,KAAK,CACZ
|
|
1
|
+
{"version":3,"file":"daily-production-reports.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/report/daily-production-reports.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,7 +68,8 @@ exports.monthlyProductionReports = {
|
|
|
68
68
|
group by blk.block_id
|
|
69
69
|
) as harvest on harvest.block_id = b.id
|
|
70
70
|
left join(
|
|
71
|
-
select blk.block_id,
|
|
71
|
+
select blk.block_id,
|
|
72
|
+
coalesce(sum(dld.total_bunch_weight),0) as total_weight_loaded, coalesce(sum(dld.total_bunch_loaded),0) as total_bunch_loaded
|
|
72
73
|
from daily_loadings dl
|
|
73
74
|
inner join daily_loading_details dld on dld.daily_loading_id = dl.id
|
|
74
75
|
inner join temp_blocks blk on blk.id = dld.block_id
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monthly-production-reports.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/report/monthly-production-reports.ts"],"names":[],"mappings":";;;AAIa,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACpE,IAAI;YACF,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;YAEnD,IAAI,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACzF,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAE1F,IAAI,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;YAC3C,IAAI,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;YACrC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;YAEpC,IAAI,cAAc,GAAG;gBACnB,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;gBACjC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;gBAChD,IAAI;aACL,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,IAAI,YAAY,GAAG;gBACjB,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;gBAC/B,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;gBAC9C,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;aAC1C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,MAAM,EAAE,CAAC,KAAK,CAAC;;;;;;;;;;;;OAYd,CAAC,CAAA;YAEF,MAAM,EAAE,CAAC,KAAK,CACZ
|
|
1
|
+
{"version":3,"file":"monthly-production-reports.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/report/monthly-production-reports.ts"],"names":[],"mappings":";;;AAIa,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACpE,IAAI;YACF,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;YAEnD,IAAI,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACzF,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAE1F,IAAI,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;YAC3C,IAAI,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;YACrC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;YAEpC,IAAI,cAAc,GAAG;gBACnB,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;gBACjC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;gBAChD,IAAI;aACL,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,IAAI,YAAY,GAAG;gBACjB,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;gBAC/B,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;gBAC9C,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;aAC1C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,MAAM,EAAE,CAAC,KAAK,CAAC;;;;;;;;;;;;OAYd,CAAC,CAAA;YAEF,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAoDI,EACJ,CAAC,cAAc,EAAE,YAAY,CAAC,CAC/B,CAAA;YAED,MAAM,MAAM,GAAQ,MAAM,EAAE,CAAC,KAAK,CAAC;;OAElC,CAAC,CAAA;YAEF,MAAM,KAAK,GAAQ,MAAM,EAAE,CAAC,KAAK,CAAC;;OAEjC,CAAC,CAAA;YAGF,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBACtB,uCACK,GAAG,KACN,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAC1F;gBACH,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK;aAC1B,CAAA;SACF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}
|
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.320",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"@operato/scene-wheel-sorter": "^0.1.8",
|
|
56
56
|
"@things-factory/apptool-ui": "^4.3.281",
|
|
57
57
|
"@things-factory/auth-ui": "^4.3.281",
|
|
58
|
-
"@things-factory/biz-base": "^4.3.
|
|
58
|
+
"@things-factory/biz-base": "^4.3.301",
|
|
59
59
|
"@things-factory/board-service": "^4.3.281",
|
|
60
60
|
"@things-factory/board-ui": "^4.3.281",
|
|
61
61
|
"@things-factory/code-ui": "^4.3.281",
|
|
@@ -95,5 +95,5 @@
|
|
|
95
95
|
"devDependencies": {
|
|
96
96
|
"@things-factory/builder": "^4.3.281"
|
|
97
97
|
},
|
|
98
|
-
"gitHead": "
|
|
98
|
+
"gitHead": "62bf27be0bfa1f4489f0d4a734369b795e988e80"
|
|
99
99
|
}
|
|
@@ -26,23 +26,39 @@ export const Query = {
|
|
|
26
26
|
async dailyDispatches(_: any, params: ListParam, context: any) {
|
|
27
27
|
const { tx }: { tx: EntityManager } = context.state
|
|
28
28
|
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
try {
|
|
30
|
+
const dispatchIndex = params.filters.findIndex(filter => filter.name == 'dispatchAt')
|
|
31
|
+
const dispatchAt = params.filters[dispatchIndex]?.value
|
|
31
32
|
|
|
32
|
-
|
|
33
|
-
.leftJoinAndSelect('DailyDispatch.domain', 'Domain')
|
|
34
|
-
.leftJoinAndSelect('DailyDispatch.driver', 'Driver')
|
|
35
|
-
.leftJoinAndSelect('DailyDispatch.dispatchTo', 'DispatchTo')
|
|
36
|
-
.leftJoinAndSelect('DailyDispatch.transport', 'Transport')
|
|
37
|
-
.leftJoinAndSelect('DailyDispatch.creator', 'Creator')
|
|
38
|
-
.leftJoinAndSelect('DailyDispatch.updater', 'Updater')
|
|
39
|
-
.leftJoinAndSelect('DailyDispatch.dailyDispatchDetails', 'DailyDispatchDetails')
|
|
33
|
+
params.filters = params.filters.splice(dispatchIndex + 1, 1)
|
|
40
34
|
|
|
41
|
-
|
|
42
|
-
|
|
35
|
+
const queryBuilder = tx.getRepository(DailyDispatchEntity).createQueryBuilder()
|
|
36
|
+
buildQuery(queryBuilder, params, context)
|
|
43
37
|
|
|
44
|
-
|
|
38
|
+
queryBuilder
|
|
39
|
+
.leftJoinAndSelect('DailyDispatch.domain', 'Domain')
|
|
40
|
+
.leftJoinAndSelect('DailyDispatch.driver', 'Driver')
|
|
41
|
+
.leftJoinAndSelect('DailyDispatch.dispatchTo', 'DispatchTo')
|
|
42
|
+
.leftJoinAndSelect('DailyDispatch.transport', 'Transport')
|
|
43
|
+
.leftJoinAndSelect('DailyDispatch.creator', 'Creator')
|
|
44
|
+
.leftJoinAndSelect('DailyDispatch.updater', 'Updater')
|
|
45
|
+
.leftJoinAndSelect('DailyDispatch.dailyDispatchDetails', 'DailyDispatchDetails')
|
|
45
46
|
|
|
46
|
-
|
|
47
|
+
if (params.filters?.length > 0) {
|
|
48
|
+
queryBuilder.andWhere('DailyDispatch.deletedAt IS NULL')
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
queryBuilder.where('DailyDispatch.deletedAt IS NULL')
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
if (dispatchAt)
|
|
55
|
+
queryBuilder.andWhere(`DailyDispatch.dispatchAt between :dispatchAt::timestamp and :dispatchAt::timestamp + interval '1 day' `, { dispatchAt })
|
|
56
|
+
|
|
57
|
+
const [items, total] = await queryBuilder.getManyAndCount()
|
|
58
|
+
|
|
59
|
+
return { items, total }
|
|
60
|
+
} catch (error) {
|
|
61
|
+
throw error
|
|
62
|
+
}
|
|
47
63
|
}
|
|
48
64
|
}
|
|
@@ -78,12 +78,14 @@ export const dailyProductionReports = {
|
|
|
78
78
|
(
|
|
79
79
|
select sum(today_field_bunches) from temp_records t2
|
|
80
80
|
where transaction_date::timestamp < md.dateDay
|
|
81
|
+
and transaction_date between $1 and $2
|
|
81
82
|
)
|
|
82
83
|
, 0) as prev_bunch_bal_in_field,
|
|
83
84
|
coalesce(
|
|
84
85
|
(
|
|
85
86
|
select sum(today_ramp_weight) from temp_records t2
|
|
86
87
|
where transaction_date::timestamp < md.dateDay
|
|
88
|
+
and transaction_date between $1 and $2
|
|
87
89
|
)
|
|
88
90
|
, 0) as prev_weight_bal_in_ramp,
|
|
89
91
|
coalesce(today_bunch_harvest, 0) as today_bunch_harvest,
|
|
@@ -76,7 +76,8 @@ export const monthlyProductionReports = {
|
|
|
76
76
|
group by blk.block_id
|
|
77
77
|
) as harvest on harvest.block_id = b.id
|
|
78
78
|
left join(
|
|
79
|
-
select blk.block_id,
|
|
79
|
+
select blk.block_id,
|
|
80
|
+
coalesce(sum(dld.total_bunch_weight),0) as total_weight_loaded, coalesce(sum(dld.total_bunch_loaded),0) as total_bunch_loaded
|
|
80
81
|
from daily_loadings dl
|
|
81
82
|
inner join daily_loading_details dld on dld.daily_loading_id = dl.id
|
|
82
83
|
inner join temp_blocks blk on blk.id = dld.block_id
|