@things-factory/operato-pms 4.3.40 → 4.3.51
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/harvesting/edit-harvesting-record.js +2 -2
- package/client/pages/harvesting/harvesting-create-record.js +2 -1
- package/dist-server/graphql/resolvers/daily-harvest/generate-daily-harvest.js +4 -2
- package/dist-server/graphql/resolvers/daily-harvest/generate-daily-harvest.js.map +1 -1
- package/dist-server/utils/transaction-util.js +3 -2
- package/dist-server/utils/transaction-util.js.map +1 -1
- package/package.json +41 -41
- package/server/graphql/resolvers/daily-harvest/generate-daily-harvest.ts +6 -2
- package/server/utils/transaction-util.ts +5 -4
|
@@ -409,10 +409,10 @@ class EditHarvestingRecord extends localize(i18next)(PageView) {
|
|
|
409
409
|
if (!this.harvestingForm.checkValidity()) throw new Error(i18next.t('text.harvesting_record_invalid'))
|
|
410
410
|
|
|
411
411
|
if (this.balanceInput?.value < 0 || isNaN(this.balanceInput?.value))
|
|
412
|
-
throw new Error(i18next.t('text.x_has_invalid_value', {
|
|
412
|
+
throw new Error(i18next.t('text.x_has_invalid_value', { x: i18next.t('label.yesterday_balance_bunch') }))
|
|
413
413
|
|
|
414
414
|
if (this.collectionInput?.value < 0 || isNaN(this.collectionInput?.value))
|
|
415
|
-
throw new Error(i18next.t('text.x_has_invalid_value', {
|
|
415
|
+
throw new Error(i18next.t('text.x_has_invalid_value', { x: i18next.t('label.collected_bunch') }))
|
|
416
416
|
}
|
|
417
417
|
|
|
418
418
|
_validateHarvestData() {
|
|
@@ -320,7 +320,8 @@ class HarvestingCreateRecord extends localize(i18next)(PageView) {
|
|
|
320
320
|
variables: { filters }
|
|
321
321
|
})
|
|
322
322
|
|
|
323
|
-
|
|
323
|
+
const totalBunches = response.data.plantationInventories.items[0]?.totalBunches || 0
|
|
324
|
+
return totalBunches <= 0 ? 0 : totalBunches
|
|
324
325
|
}
|
|
325
326
|
|
|
326
327
|
async _generateHarvestingRecord() {
|
|
@@ -18,8 +18,6 @@ exports.generateDailyHarvest = {
|
|
|
18
18
|
}, 0);
|
|
19
19
|
const collectedBunch = dailyHarvest.collectedBunch || 0;
|
|
20
20
|
let yesterdayBalanceBunchInField = dailyHarvest.yesterdayBalanceBunchInField || 0;
|
|
21
|
-
if (collectedBunch > totalBunchHarvested)
|
|
22
|
-
throw new Error('Collected bunch more than total bunch harvested today');
|
|
23
21
|
// 1. Create daily harvest
|
|
24
22
|
let newDailyHarvest = new entities_1.DailyHarvest();
|
|
25
23
|
newDailyHarvest.name = utils_1.NoGenerator.dailyHarvest();
|
|
@@ -62,6 +60,10 @@ async function addPlantationInventory(domain, newDailyHarvest, block, user, tx)
|
|
|
62
60
|
});
|
|
63
61
|
let newTotalBunches = 0;
|
|
64
62
|
if (existingFieldBunch) {
|
|
63
|
+
const totalBunches = existingFieldBunch.totalBunches;
|
|
64
|
+
if (totalBunches < 0) {
|
|
65
|
+
existingFieldBunch = await plantationInvRepo.save(Object.assign(Object.assign({}, existingFieldBunch), { totalBunches: 0 }));
|
|
66
|
+
}
|
|
65
67
|
newTotalBunches = existingFieldBunch.totalBunches + newDailyHarvest.totalBunchHarvested;
|
|
66
68
|
existingFieldBunch.totalBunches = newTotalBunches;
|
|
67
69
|
existingFieldBunch.updater = user;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-daily-harvest.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-harvest/generate-daily-harvest.ts"],"names":[],"mappings":";;;AAAA,qCAA0E;AAK1E,kDAAsG;AACtG,gDAAmH;AACnH,0CAAwE;AAE3D,QAAA,oBAAoB,GAAG;IAClC,KAAK,CAAC,oBAAoB,CAAC,CAAM,EAAE,EAAE,YAAY,EAAE,EAAE,OAAY;QAC/D,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,IAAI,mBAAmB,GAAyB,YAAY,CAAC,mBAAmB,CAAA;QAEhF,MAAM,KAAK,GAAU,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAK,CAAC,CAAC,OAAO,CAAC;YACzD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;SACjE,CAAC,CAAA;QAEF,4CAA4C;QAC5C,MAAM,mBAAmB,GAAW,mBAAmB,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,GAAG;YAChF,OAAO,IAAI,GAAG,GAAG,CAAC,mBAAmB,CAAA;QACvC,CAAC,EAAE,CAAC,CAAC,CAAA;QAEL,MAAM,cAAc,GAAW,YAAY,CAAC,cAAc,IAAI,CAAC,CAAA;QAC/D,IAAI,4BAA4B,GAAW,YAAY,CAAC,4BAA4B,IAAI,CAAC,CAAA;QAEzF,
|
|
1
|
+
{"version":3,"file":"generate-daily-harvest.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-harvest/generate-daily-harvest.ts"],"names":[],"mappings":";;;AAAA,qCAA0E;AAK1E,kDAAsG;AACtG,gDAAmH;AACnH,0CAAwE;AAE3D,QAAA,oBAAoB,GAAG;IAClC,KAAK,CAAC,oBAAoB,CAAC,CAAM,EAAE,EAAE,YAAY,EAAE,EAAE,OAAY;QAC/D,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,IAAI,mBAAmB,GAAyB,YAAY,CAAC,mBAAmB,CAAA;QAEhF,MAAM,KAAK,GAAU,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAK,CAAC,CAAC,OAAO,CAAC;YACzD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;SACjE,CAAC,CAAA;QAEF,4CAA4C;QAC5C,MAAM,mBAAmB,GAAW,mBAAmB,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,GAAG;YAChF,OAAO,IAAI,GAAG,GAAG,CAAC,mBAAmB,CAAA;QACvC,CAAC,EAAE,CAAC,CAAC,CAAA;QAEL,MAAM,cAAc,GAAW,YAAY,CAAC,cAAc,IAAI,CAAC,CAAA;QAC/D,IAAI,4BAA4B,GAAW,YAAY,CAAC,4BAA4B,IAAI,CAAC,CAAA;QAEzF,0BAA0B;QAC1B,IAAI,eAAe,GAAiB,IAAI,uBAAY,EAAE,CAAA;QACtD,eAAe,CAAC,IAAI,GAAG,mBAAW,CAAC,YAAY,EAAE,CAAA;QACjD,eAAe,CAAC,MAAM,GAAG,MAAM,CAAA;QAC/B,eAAe,CAAC,KAAK,GAAG,KAAK,CAAA;QAC7B,eAAe,CAAC,eAAe,GAAG,YAAY,CAAC,eAAe,CAAA;QAC9D,eAAe,CAAC,WAAW,GAAG,YAAY,CAAC,WAAW,CAAA;QACtD,eAAe,CAAC,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAA;QAChD,eAAe,CAAC,4BAA4B,GAAG,4BAA4B,CAAA;QAC3E,eAAe,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;QACzD,eAAe,CAAC,cAAc,GAAG,cAAc,CAAA;QAC/C,eAAe,CAAC,mBAAmB,GAAG,4BAA4B,GAAG,mBAAmB,GAAG,cAAc,CAAA;QACzG,eAAe,CAAC,MAAM,GAAG,yBAAa,CAAC,MAAM,CAAA;QAC7C,eAAe,CAAC,OAAO,GAAG,IAAI,CAAA;QAC9B,eAAe,CAAC,OAAO,GAAG,IAAI,CAAA;QAE9B,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAY,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;QAE1D,iCAAiC;QACjC,MAAM,qBAAqB,CACzB,MAAM,EACN,eAAe,EACf,mBAAmB,CAAC,GAAG,CAAC,CAAC,MAA0B,EAAE,EAAE;YACrD,yBAAY,MAAM,EAAE;QACtB,CAAC,CAAC,EACF,IAAI,EACJ,EAAE,CACH,CAAA;QAED,uCAAuC;QACvC,MAAM,sBAAsB,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;QAEtE,OAAO,eAAe,CAAA;IACxB,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,qBAAqB,CACzC,MAAc,EACd,eAA6B,EAC7B,mBAAyC,EACzC,IAAU,EACV,EAAkB;IAElB,MAAM,qBAAqB,GACzB,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,CAAC,4BAAiB,CAAC,KAAI,IAAA,uBAAa,EAAC,4BAAiB,CAAC,CAAA;IAC1E,MAAM,sBAAsB,GAC1B,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,CAAC,6BAAkB,CAAC,KAAI,IAAA,uBAAa,EAAC,6BAAkB,CAAC,CAAA;IAE5E,mBAAmB,GAAG,MAAM,OAAO,CAAC,GAAG,CACrC,mBAAmB,CAAC,GAAG,CAAC,KAAK,EAAE,MAA0B,EAAE,EAAE;QAC3D,uCACK,MAAM,KACT,MAAM,EACN,IAAI,EAAE,mBAAW,CAAC,kBAAkB,EAAE,EACtC,iBAAiB,EAAE,MAAM,qBAAqB,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,EAC3F,YAAY,EAAE,eAAe,EAC7B,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACd;IACH,CAAC,CAAC,CACH,CAAA;IAED,MAAM,sBAAsB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;AACxD,CAAC;AA3BD,sDA2BC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,MAAc,EACd,eAA6B,EAC7B,KAAY,EACZ,IAAU,EACV,EAAkB;IAElB,MAAM,iBAAiB,GACrB,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,CAAC,8BAAmB,CAAC,KAAI,IAAA,uBAAa,EAAC,8BAAmB,CAAC,CAAA;IAE9E,IAAI,kBAAkB,GAAwB,MAAM,iBAAiB,CAAC,OAAO,CAAC;QAC5E,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,0BAAc,CAAC,aAAa,EAAE;QAC5D,SAAS,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC;KAC/B,CAAC,CAAA;IAEF,IAAI,eAAe,GAAW,CAAC,CAAA;IAE/B,IAAI,kBAAkB,EAAE;QACtB,MAAM,YAAY,GAAW,kBAAkB,CAAC,YAAY,CAAA;QAE5D,IAAI,YAAY,GAAG,CAAC,EAAE;YACpB,kBAAkB,GAAG,MAAM,iBAAiB,CAAC,IAAI,iCAAM,kBAAkB,KAAE,YAAY,EAAE,CAAC,IAAG,CAAA;SAC9F;QAED,eAAe,GAAG,kBAAkB,CAAC,YAAY,GAAG,eAAe,CAAC,mBAAmB,CAAA;QAEvF,kBAAkB,CAAC,YAAY,GAAG,eAAe,CAAA;QACjD,kBAAkB,CAAC,OAAO,GAAG,IAAI,CAAA;QACjC,kBAAkB,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;QAErE,MAAM,IAAA,kCAA0B,EAC9B,kBAAkB,EAClB,eAAe,CAAC,EAAE,EAClB,eAAe,CAAC,IAAI,EACpB,4BAAgB,CAAC,OAAO,EACxB,eAAe,CAAC,WAAW,EAC3B,eAAe,CAAC,mBAAmB,EACnC,CAAC,EACD,IAAI,EACJ,EAAE,CACH,CAAA;QAED,IAAI,eAAe,CAAC,cAAc,GAAG,CAAC,EAAE;YACtC,kBAAkB,CAAC,YAAY,IAAI,eAAe,CAAC,cAAc,CAAA;YACjE,kBAAkB,CAAC,OAAO,GAAG,IAAI,CAAA;YACjC,kBAAkB,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;YAErE,MAAM,IAAA,kCAA0B,EAC9B,kBAAkB,EAClB,eAAe,CAAC,EAAE,EAClB,eAAe,CAAC,IAAI,EACpB,4BAAgB,CAAC,OAAO,EACxB,eAAe,CAAC,WAAW,EAC3B,CAAC,eAAe,CAAC,cAAc,EAC/B,CAAC,EACD,IAAI,EACJ,EAAE,CACH,CAAA;SACF;KACF;SAAM;QACL,eAAe,GAAG,eAAe,GAAG,eAAe,CAAC,mBAAmB,CAAA;QAEvE,IAAI,mBAAmB,GAAwB,IAAI,8BAAmB,EAAE,CAAA;QACxE,mBAAmB,CAAC,MAAM,GAAG,MAAM,CAAA;QACnC,mBAAmB,CAAC,IAAI,GAAG,mBAAW,CAAC,cAAc,EAAE,CAAA;QACvD,mBAAmB,CAAC,KAAK,GAAG,KAAK,CAAA;QACjC,mBAAmB,CAAC,IAAI,GAAG,0BAAc,CAAC,aAAa,CAAA;QACvD,mBAAmB,CAAC,YAAY,GAAG,eAAe,CAAA;QAClD,mBAAmB,CAAC,MAAM,GAAG,4BAAgB,CAAC,MAAM,CAAA;QACpD,mBAAmB,CAAC,OAAO,GAAG,IAAI,CAAA;QAClC,mBAAmB,CAAC,OAAO,GAAG,IAAI,CAAA;QAElC,mBAAmB,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;QAEvE,MAAM,IAAA,kCAA0B,EAC9B,mBAAmB,EACnB,eAAe,CAAC,EAAE,EAClB,eAAe,CAAC,IAAI,EACpB,4BAAgB,CAAC,OAAO,EACxB,eAAe,CAAC,WAAW,EAC3B,eAAe,CAAC,mBAAmB,EACnC,CAAC,EACD,IAAI,EACJ,EAAE,CACH,CAAA;QAED,IAAI,eAAe,CAAC,cAAc,GAAG,CAAC,EAAE;YACtC,mBAAmB,CAAC,YAAY,IAAI,eAAe,CAAC,cAAc,CAAA;YAClE,mBAAmB,CAAC,OAAO,GAAG,IAAI,CAAA;YAClC,mBAAmB,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;YAEvE,MAAM,IAAA,kCAA0B,EAC9B,mBAAmB,EACnB,eAAe,CAAC,EAAE,EAClB,eAAe,CAAC,IAAI,EACpB,4BAAgB,CAAC,OAAO,EACxB,eAAe,CAAC,WAAW,EAC3B,CAAC,eAAe,CAAC,cAAc,EAC/B,CAAC,EACD,IAAI,EACJ,EAAE,CACH,CAAA;SACF;KACF;AACH,CAAC;AAxGD,wDAwGC"}
|
|
@@ -29,10 +29,11 @@ async function generateTransactionHistory(plantationInventory, refActionID, refR
|
|
|
29
29
|
recTransactionHistory.creator = user;
|
|
30
30
|
recTransactionHistory.updater = user;
|
|
31
31
|
await transactionRepo.save(recTransactionHistory);
|
|
32
|
-
if (transactionType === constants_1.TRANSACTION_TYPE.LOADING ||
|
|
32
|
+
if ((transactionType === constants_1.TRANSACTION_TYPE.LOADING ||
|
|
33
33
|
transactionType === constants_1.TRANSACTION_TYPE.DISPATCHMENT ||
|
|
34
34
|
transactionType === constants_1.TRANSACTION_TYPE.LOADING_ADJUSTMENT ||
|
|
35
|
-
transactionType === constants_1.TRANSACTION_TYPE.DISPATCHMENT_ADJUSTMENT)
|
|
35
|
+
transactionType === constants_1.TRANSACTION_TYPE.DISPATCHMENT_ADJUSTMENT) &&
|
|
36
|
+
ramp) {
|
|
36
37
|
await switchRampStatus(domain, ramp, user, trxMgr);
|
|
37
38
|
}
|
|
38
39
|
return recTransactionHistory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction-util.js","sourceRoot":"","sources":["../../server/utils/transaction-util.ts"],"names":[],"mappings":";;;AAEA,4CAA8E;AAC9E,0CAA0E;AAC1E,oCAAsC;AACtC,qCAAkE;AAElE;;;GAGG;AAEI,KAAK,UAAU,0BAA0B,CAC9C,mBAAwC,EACxC,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,CAAC,CAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,EAAE,CAAA;QAAE,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;IAE3F,MAAM,MAAM,GAAW,mBAAmB,CAAC,MAAM,CAAA;IACjD,MAAM,IAAI,GAAS,mBAAmB,CAAC,IAAI,CAAA;IAE3C,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,mBAAmB,GAAG,mBAAmB,CAAA;IAC/D,qBAAqB,CAAC,MAAM,GAAG,MAAM,CAAA;IACrC,qBAAqB,CAAC,KAAK,GAAG,mBAAmB,CAAC,KAAK,CAAA;IACvD,qBAAqB,CAAC,OAAO,GAAG,IAAI,CAAA;IACpC,qBAAqB,CAAC,OAAO,GAAG,IAAI,CAAA;IACpC,MAAM,eAAe,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;IAEjD,IACE,eAAe,KAAK,4BAAgB,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"transaction-util.js","sourceRoot":"","sources":["../../server/utils/transaction-util.ts"],"names":[],"mappings":"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"}
|
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.51",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -54,47 +54,47 @@
|
|
|
54
54
|
"@operato/scene-tab": "^0.1.6",
|
|
55
55
|
"@operato/scene-table": "^0.1.6",
|
|
56
56
|
"@operato/scene-wheel-sorter": "^0.1.6",
|
|
57
|
-
"@things-factory/apptool-ui": "^4.3.
|
|
58
|
-
"@things-factory/auth-ui": "^4.3.
|
|
59
|
-
"@things-factory/biz-base": "^4.3.
|
|
60
|
-
"@things-factory/board-service": "^4.3.
|
|
61
|
-
"@things-factory/board-ui": "^4.3.
|
|
62
|
-
"@things-factory/code-ui": "^4.3.
|
|
63
|
-
"@things-factory/context-ui": "^4.3.
|
|
64
|
-
"@things-factory/dashboard": "^4.3.
|
|
65
|
-
"@things-factory/document-template-ui": "^4.3.
|
|
66
|
-
"@things-factory/export-ui": "^4.3.
|
|
67
|
-
"@things-factory/export-ui-csv": "^4.3.
|
|
68
|
-
"@things-factory/export-ui-excel": "^4.3.
|
|
69
|
-
"@things-factory/fav-base": "^4.3.
|
|
70
|
-
"@things-factory/form-ui": "^4.3.
|
|
71
|
-
"@things-factory/grist-ui": "^4.3.
|
|
72
|
-
"@things-factory/help": "^4.3.
|
|
73
|
-
"@things-factory/i18n-base": "^4.3.
|
|
74
|
-
"@things-factory/import-ui": "^4.3.
|
|
75
|
-
"@things-factory/import-ui-excel": "^4.3.
|
|
76
|
-
"@things-factory/lite-menu": "^4.3.
|
|
77
|
-
"@things-factory/more-ui": "^4.3.
|
|
78
|
-
"@things-factory/notification": "^4.3.
|
|
79
|
-
"@things-factory/print-ui": "^4.3.
|
|
80
|
-
"@things-factory/resource-ui": "^4.3.
|
|
81
|
-
"@things-factory/scene-data-transform": "^4.3.
|
|
82
|
-
"@things-factory/scene-excel": "^4.3.
|
|
83
|
-
"@things-factory/scene-firebase": "^4.3.
|
|
84
|
-
"@things-factory/scene-form": "^4.3.
|
|
85
|
-
"@things-factory/scene-google-map": "^4.3.
|
|
86
|
-
"@things-factory/scene-graphql": "^4.3.
|
|
87
|
-
"@things-factory/scene-label": "^4.3.
|
|
88
|
-
"@things-factory/scene-marker": "^4.3.
|
|
89
|
-
"@things-factory/scene-mqtt": "^4.3.
|
|
90
|
-
"@things-factory/scene-restful": "^4.3.
|
|
91
|
-
"@things-factory/scene-visualizer": "^4.3.
|
|
92
|
-
"@things-factory/setting-ui": "^4.3.
|
|
93
|
-
"@things-factory/shell": "^4.3.
|
|
94
|
-
"@things-factory/system-ui": "^4.3.
|
|
57
|
+
"@things-factory/apptool-ui": "^4.3.47",
|
|
58
|
+
"@things-factory/auth-ui": "^4.3.47",
|
|
59
|
+
"@things-factory/biz-base": "^4.3.47",
|
|
60
|
+
"@things-factory/board-service": "^4.3.47",
|
|
61
|
+
"@things-factory/board-ui": "^4.3.47",
|
|
62
|
+
"@things-factory/code-ui": "^4.3.47",
|
|
63
|
+
"@things-factory/context-ui": "^4.3.47",
|
|
64
|
+
"@things-factory/dashboard": "^4.3.47",
|
|
65
|
+
"@things-factory/document-template-ui": "^4.3.47",
|
|
66
|
+
"@things-factory/export-ui": "^4.3.47",
|
|
67
|
+
"@things-factory/export-ui-csv": "^4.3.47",
|
|
68
|
+
"@things-factory/export-ui-excel": "^4.3.47",
|
|
69
|
+
"@things-factory/fav-base": "^4.3.47",
|
|
70
|
+
"@things-factory/form-ui": "^4.3.47",
|
|
71
|
+
"@things-factory/grist-ui": "^4.3.47",
|
|
72
|
+
"@things-factory/help": "^4.3.47",
|
|
73
|
+
"@things-factory/i18n-base": "^4.3.47",
|
|
74
|
+
"@things-factory/import-ui": "^4.3.47",
|
|
75
|
+
"@things-factory/import-ui-excel": "^4.3.47",
|
|
76
|
+
"@things-factory/lite-menu": "^4.3.47",
|
|
77
|
+
"@things-factory/more-ui": "^4.3.47",
|
|
78
|
+
"@things-factory/notification": "^4.3.47",
|
|
79
|
+
"@things-factory/print-ui": "^4.3.47",
|
|
80
|
+
"@things-factory/resource-ui": "^4.3.47",
|
|
81
|
+
"@things-factory/scene-data-transform": "^4.3.47",
|
|
82
|
+
"@things-factory/scene-excel": "^4.3.47",
|
|
83
|
+
"@things-factory/scene-firebase": "^4.3.47",
|
|
84
|
+
"@things-factory/scene-form": "^4.3.47",
|
|
85
|
+
"@things-factory/scene-google-map": "^4.3.47",
|
|
86
|
+
"@things-factory/scene-graphql": "^4.3.47",
|
|
87
|
+
"@things-factory/scene-label": "^4.3.47",
|
|
88
|
+
"@things-factory/scene-marker": "^4.3.47",
|
|
89
|
+
"@things-factory/scene-mqtt": "^4.3.47",
|
|
90
|
+
"@things-factory/scene-restful": "^4.3.47",
|
|
91
|
+
"@things-factory/scene-visualizer": "^4.3.47",
|
|
92
|
+
"@things-factory/setting-ui": "^4.3.47",
|
|
93
|
+
"@things-factory/shell": "^4.3.47",
|
|
94
|
+
"@things-factory/system-ui": "^4.3.47"
|
|
95
95
|
},
|
|
96
96
|
"devDependencies": {
|
|
97
|
-
"@things-factory/builder": "^4.3.
|
|
97
|
+
"@things-factory/builder": "^4.3.47"
|
|
98
98
|
},
|
|
99
|
-
"gitHead": "
|
|
99
|
+
"gitHead": "2f4e4825183242e10f4c2f2e1181e3fd5618d19e"
|
|
100
100
|
}
|
|
@@ -25,8 +25,6 @@ export const generateDailyHarvest = {
|
|
|
25
25
|
const collectedBunch: number = dailyHarvest.collectedBunch || 0
|
|
26
26
|
let yesterdayBalanceBunchInField: number = dailyHarvest.yesterdayBalanceBunchInField || 0
|
|
27
27
|
|
|
28
|
-
if (collectedBunch > totalBunchHarvested) throw new Error('Collected bunch more than total bunch harvested today')
|
|
29
|
-
|
|
30
28
|
// 1. Create daily harvest
|
|
31
29
|
let newDailyHarvest: DailyHarvest = new DailyHarvest()
|
|
32
30
|
newDailyHarvest.name = NoGenerator.dailyHarvest()
|
|
@@ -110,6 +108,12 @@ export async function addPlantationInventory(
|
|
|
110
108
|
let newTotalBunches: number = 0
|
|
111
109
|
|
|
112
110
|
if (existingFieldBunch) {
|
|
111
|
+
const totalBunches: number = existingFieldBunch.totalBunches
|
|
112
|
+
|
|
113
|
+
if (totalBunches < 0) {
|
|
114
|
+
existingFieldBunch = await plantationInvRepo.save({ ...existingFieldBunch, totalBunches: 0 })
|
|
115
|
+
}
|
|
116
|
+
|
|
113
117
|
newTotalBunches = existingFieldBunch.totalBunches + newDailyHarvest.totalBunchHarvested
|
|
114
118
|
|
|
115
119
|
existingFieldBunch.totalBunches = newTotalBunches
|
|
@@ -45,10 +45,11 @@ export async function generateTransactionHistory(
|
|
|
45
45
|
await transactionRepo.save(recTransactionHistory)
|
|
46
46
|
|
|
47
47
|
if (
|
|
48
|
-
transactionType === TRANSACTION_TYPE.LOADING ||
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
48
|
+
(transactionType === TRANSACTION_TYPE.LOADING ||
|
|
49
|
+
transactionType === TRANSACTION_TYPE.DISPATCHMENT ||
|
|
50
|
+
transactionType === TRANSACTION_TYPE.LOADING_ADJUSTMENT ||
|
|
51
|
+
transactionType === TRANSACTION_TYPE.DISPATCHMENT_ADJUSTMENT) &&
|
|
52
|
+
ramp
|
|
52
53
|
) {
|
|
53
54
|
await switchRampStatus(domain, ramp, user, trxMgr)
|
|
54
55
|
}
|