@things-factory/operato-wms 4.3.668 → 4.3.669
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/inbound/putaway/worksheet-putaway-return.js +1 -1
- package/dist-server/graphql/resolvers/outbound/complete-load.js +49 -1
- package/dist-server/graphql/resolvers/outbound/complete-load.js.map +1 -1
- package/package.json +5 -5
- package/server/graphql/resolvers/outbound/complete-load.ts +61 -3
|
@@ -293,7 +293,7 @@ class WorksheetPutawayReturn extends localize(i18next)(PageView) {
|
|
|
293
293
|
...worksheet,
|
|
294
294
|
returnOrder: worksheet.returnOrder.name,
|
|
295
295
|
bizplace: worksheet.bizplace.name,
|
|
296
|
-
bufferLocation: worksheet
|
|
296
|
+
bufferLocation: worksheet?.bufferLocation?.name,
|
|
297
297
|
refNo: worksheet.returnOrder.refNo
|
|
298
298
|
})
|
|
299
299
|
this.data = {
|
|
@@ -2,9 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.completeLoad = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
5
6
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
6
7
|
const worksheet_base_1 = require("@things-factory/worksheet-base");
|
|
7
8
|
const integration_lmd_1 = require("@things-factory/integration-lmd");
|
|
9
|
+
const integration_powrup_1 = require("@things-factory/integration-powrup");
|
|
10
|
+
const setting_base_1 = require("@things-factory/setting-base");
|
|
8
11
|
exports.completeLoad = {
|
|
9
12
|
async completeLoad(_, { orderId, worksheetId }, context) {
|
|
10
13
|
const { domain, tx, user } = context.state;
|
|
@@ -24,7 +27,22 @@ async function completeLoading(domain, tx, user, partial, orderId, worksheetId)
|
|
|
24
27
|
domain: domain,
|
|
25
28
|
status: (0, typeorm_1.In)([sales_base_1.ORDER_STATUS.LOADING, sales_base_1.ORDER_STATUS.PROCESSING, sales_base_1.ORDER_STATUS.PARTIAL_PROCESSING])
|
|
26
29
|
},
|
|
27
|
-
relations: [
|
|
30
|
+
relations: [
|
|
31
|
+
'domain',
|
|
32
|
+
'bizplace',
|
|
33
|
+
'bizplace.domain',
|
|
34
|
+
'creator',
|
|
35
|
+
'updater',
|
|
36
|
+
'orderInventories',
|
|
37
|
+
'lastMileDelivery',
|
|
38
|
+
'orderProducts',
|
|
39
|
+
'orderProducts.product',
|
|
40
|
+
'orderProducts.productDetail',
|
|
41
|
+
'deliveryOrders',
|
|
42
|
+
'deliveryOrders.orderInventories',
|
|
43
|
+
'deliveryOrders.orderInventories.productDetail',
|
|
44
|
+
'deliveryOrders.orderInventories.product'
|
|
45
|
+
]
|
|
28
46
|
});
|
|
29
47
|
if (!releaseGood) {
|
|
30
48
|
throw new Error('Release good not found or not in a valid status');
|
|
@@ -77,6 +95,36 @@ async function completeLoading(domain, tx, user, partial, orderId, worksheetId)
|
|
|
77
95
|
const tmsService = (0, integration_lmd_1.getTmsService)(releaseGood.lastMileDelivery.platform);
|
|
78
96
|
tmsService.createAndUpdateShipment(releaseGood, deliveryOrders);
|
|
79
97
|
}
|
|
98
|
+
const orderSource = releaseGood.source;
|
|
99
|
+
switch (orderSource) {
|
|
100
|
+
case auth_base_1.ApplicationType.POWRUP:
|
|
101
|
+
const powrup = await tx.getRepository(integration_powrup_1.Powrup).findOne({ active: true, platform: 'POWRUP' });
|
|
102
|
+
const rtsTriggerLevel = await tx
|
|
103
|
+
.getRepository(setting_base_1.Setting)
|
|
104
|
+
.findOne({
|
|
105
|
+
where: { domain, category: 'id-rule', name: 'rts-trigger-level' }
|
|
106
|
+
})
|
|
107
|
+
.then((setting) => {
|
|
108
|
+
return parseInt((setting === null || setting === void 0 ? void 0 : setting.value) || 0);
|
|
109
|
+
});
|
|
110
|
+
if (powrup && rtsTriggerLevel === 3) {
|
|
111
|
+
(0, typeorm_1.getManager)().transaction(async (txMgr) => {
|
|
112
|
+
const powrupController = new sales_base_1.PowrupController();
|
|
113
|
+
const hasPackage = (await txMgr.getRepository(sales_base_1.OrderPackage).count({ where: { releaseGood: { id: releaseGood.id } } })) > 0;
|
|
114
|
+
if (!hasPackage && !releaseGood.marketPackCallSuccess) {
|
|
115
|
+
const orderProducts = await txMgr.getRepository(sales_base_1.OrderProduct).find({
|
|
116
|
+
where: { releaseGood: { id: releaseGood.id } },
|
|
117
|
+
relations: ['product', 'productDetail']
|
|
118
|
+
});
|
|
119
|
+
await powrupController.packOrder(powrup, Object.assign(Object.assign({}, releaseGood), { orderProducts }), domain, user, txMgr);
|
|
120
|
+
}
|
|
121
|
+
await powrupController.initiateShipment(powrup, releaseGood, domain, user, txMgr);
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
break;
|
|
125
|
+
default:
|
|
126
|
+
break;
|
|
127
|
+
}
|
|
80
128
|
}
|
|
81
129
|
else {
|
|
82
130
|
await updateOrderInventories(tx, orderInventories, sales_base_1.ORDER_INVENTORY_STATUS.TERMINATED, user, currentTime);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-load.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/complete-load.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"complete-load.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/complete-load.ts"],"names":[],"mappings":";;;AAAA,qCAAuD;AAEvD,yDAAiE;AACjE,2DASmC;AACnC,mEAA6G;AAC7G,qEAA+D;AAC/D,2EAA2D;AAC3D,+DAAsD;AAEzC,QAAA,YAAY,GAAG;IAC1B,KAAK,CAAC,YAAY,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,OAAY;QAC/D,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,OAAO,eAAe,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;IACvE,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,OAAY;QACxE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,OAAO,eAAe,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;IACtE,CAAC;CACF,CAAA;AAED,KAAK,UAAU,eAAe,CAC5B,MAAc,EACd,EAAiB,EACjB,IAAU,EACV,OAAgB,EAChB,OAAe,EACf,WAAmB;;IAEnB,sBAAsB;IACtB,MAAM,WAAW,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;QAC3E,KAAK,EAAE;YACL,EAAE,EAAE,OAAO;YACX,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,IAAA,YAAE,EAAC,CAAC,yBAAY,CAAC,OAAO,EAAE,yBAAY,CAAC,UAAU,EAAE,yBAAY,CAAC,kBAAkB,CAAC,CAAC;SAC7F;QACD,SAAS,EAAE;YACT,QAAQ;YACR,UAAU;YACV,iBAAiB;YACjB,SAAS;YACT,SAAS;YACT,kBAAkB;YAClB,kBAAkB;YAClB,eAAe;YACf,uBAAuB;YACvB,6BAA6B;YAC7B,gBAAgB;YAChB,iCAAiC;YACjC,+CAA+C;YAC/C,yCAAyC;SAC1C;KACF,CAAC,CAAA;IAEF,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;KACnE;IACD,MAAM,gBAAgB,GAAqB,WAAW,CAAC,gBAAgB,CAAA;IAEvE,MAAM,SAAS,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,OAAO,CAAC;QACrE,KAAK,EAAE;YACL,EAAE,EAAE,WAAW;YACf,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,IAAA,YAAE,EAAC,CAAC,iCAAgB,CAAC,SAAS,EAAE,iCAAgB,CAAC,iBAAiB,CAAC,CAAC;YAC5E,IAAI,EAAE,+BAAc,CAAC,OAAO;SAC7B;QACD,SAAS,EAAE,CAAC,kBAAkB,CAAC;KAChC,CAAC,CAAA;IACF,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;KACxE;IAED,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAA;IAE9B,eAAe;IACf,IAAI,CAAC,OAAO,EAAE;QACZ,2CAA2C;QAC3C,IACE,gBAAgB,CAAC,IAAI,CACnB,EAAE,CAAC,EAAE,CACH,EAAE,CAAC,MAAM,KAAK,mCAAsB,CAAC,MAAM;YAC3C,EAAE,CAAC,MAAM,KAAK,mCAAsB,CAAC,SAAS;YAC9C,EAAE,CAAC,MAAM,KAAK,mCAAsB,CAAC,UAAU;YAC/C,EAAE,CAAC,MAAM,KAAK,mCAAsB,CAAC,OAAO,CAC/C,EACD;YACA,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;SACjD;QAED,kDAAkD;QAClD,IAAI,cAAc,GAAoB,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAa,CAAC,CAAC,IAAI,CAAC;YAC/E,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE;YACnD,SAAS,EAAE,CAAC,aAAa,CAAC;SAC3B,CAAC,CAAA;QAEF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,IAAI,YAAY,GAAG,CAAC,CAAA;YACpB,IAAI,kBAAkB,GAAG,CAAC,CAAA;YAC1B,IAAI,gBAAyB,CAAA;YAE7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC9C,IAAI,aAAa,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;gBAErC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,kBAAkB,EAAE,CAAA;aACpE;YACD,gBAAgB,GAAG,YAAY,GAAG,kBAAkB,CAAA;YACpD,WAAW,CAAC,YAAY,GAAG,gBAAgB,CAAA;SAC5C;QAED,MAAM,sBAAsB,CAAC,EAAE,EAAE,gBAAgB,EAAE,mCAAsB,CAAC,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;QACxG,MAAM,eAAe,CAAC,EAAE,EAAE,SAAS,EAAE,iCAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;QAC9E,MAAM,iBAAiB,CAAC,EAAE,EAAE,WAAW,EAAE,yBAAY,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;QAE9E,IACE,CAAA,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,gBAAgB,0CAAE,KAAK;YACpC,cAAc,CAAC,MAAM,GAAG,CAAC;YACzB,CAAA,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,gBAAgB,0CAAE,MAAM,MAAK,QAAQ,EAClD;YACA,MAAM,UAAU,GAAG,IAAA,+BAAa,EAAC,WAAW,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;YAEvE,UAAU,CAAC,uBAAuB,CAAC,WAAW,EAAE,cAAc,CAAC,CAAA;SAChE;QAED,MAAM,WAAW,GAAW,WAAW,CAAC,MAAM,CAAA;QAC9C,QAAQ,WAAW,EAAE;YACnB,KAAK,2BAAe,CAAC,MAAM;gBACzB,MAAM,MAAM,GAAW,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAM,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAA;gBACnG,MAAM,eAAe,GAAY,MAAM,EAAE;qBACtC,aAAa,CAAC,sBAAO,CAAC;qBACtB,OAAO,CAAC;oBACP,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE;iBAClE,CAAC;qBACD,IAAI,CAAC,CAAC,OAAgB,EAAE,EAAE;oBACzB,OAAO,QAAQ,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,KAAI,CAAC,CAAC,CAAA;gBACtC,CAAC,CAAC,CAAA;gBAEJ,IAAI,MAAM,IAAI,eAAe,KAAK,CAAC,EAAE;oBACnC,IAAA,oBAAU,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;wBACrC,MAAM,gBAAgB,GAAqB,IAAI,6BAAgB,EAAE,CAAA;wBAEjE,MAAM,UAAU,GACd,CAAC,MAAM,KAAK,CAAC,aAAa,CAAC,yBAAY,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAA;wBAEzG,IAAI,CAAC,UAAU,IAAI,CAAC,WAAW,CAAC,qBAAqB,EAAE;4BACrD,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,yBAAY,CAAC,CAAC,IAAI,CAAC;gCACjE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,EAAE,EAAE,EAAE;gCAC9C,SAAS,EAAE,CAAC,SAAS,EAAE,eAAe,CAAC;6BACxC,CAAC,CAAA;4BAEF,MAAM,gBAAgB,CAAC,SAAS,CAAC,MAAM,kCAAO,WAAW,KAAE,aAAa,KAAI,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;yBACjG;wBAED,MAAM,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;oBACnF,CAAC,CAAC,CAAA;iBACH;gBACD,MAAK;YAEP;gBACE,MAAK;SACR;KACF;SAAM;QACL,MAAM,sBAAsB,CAAC,EAAE,EAAE,gBAAgB,EAAE,mCAAsB,CAAC,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;QACxG,MAAM,eAAe,CAAC,EAAE,EAAE,SAAS,EAAE,iCAAgB,CAAC,iBAAiB,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;QAC3F,MAAM,iBAAiB,CAAC,EAAE,EAAE,WAAW,EAAE,yBAAY,CAAC,kBAAkB,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;KAC7F;AACH,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,EAAE,EAAE,gBAAgB,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW;IACnF,KAAK,MAAM,EAAE,IAAI,gBAAgB,EAAE;QACjC,IAAI,EAAE,CAAC,MAAM,KAAK,mCAAsB,CAAC,MAAM,EAAE;YAC/C,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE;gBACnD,MAAM;gBACN,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,WAAW;aACvB,CAAC,CAAA;SACH;KACF;AACH,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW;IACrE,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE;QACrD,MAAM;QACN,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,IAAI,IAAI,EAAE;QACrB,OAAO,EAAE,MAAM,KAAK,iCAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI;KAC9D,CAAC,CAAA;AACJ,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW;IACzE,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE;QACzD,MAAM;QACN,YAAY,EAAE,WAAW,CAAC,YAAY;QACtC,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,IAAI,IAAI,EAAE;KACtB,CAAC,CAAA;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-wms",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.669",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
"@things-factory/print-ui": "^4.3.591",
|
|
92
92
|
"@things-factory/product-base": "^4.3.660",
|
|
93
93
|
"@things-factory/resource-ui": "^4.3.660",
|
|
94
|
-
"@things-factory/sales-ui": "^4.3.
|
|
94
|
+
"@things-factory/sales-ui": "^4.3.669",
|
|
95
95
|
"@things-factory/scene-data-transform": "^4.3.591",
|
|
96
96
|
"@things-factory/scene-excel": "^4.3.591",
|
|
97
97
|
"@things-factory/scene-firebase": "^4.3.591",
|
|
@@ -107,8 +107,8 @@
|
|
|
107
107
|
"@things-factory/system-ui": "^4.3.591",
|
|
108
108
|
"@things-factory/transport-base": "^4.3.631",
|
|
109
109
|
"@things-factory/tutorial-ui": "^4.3.591",
|
|
110
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
111
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
110
|
+
"@things-factory/warehouse-base": "^4.3.669",
|
|
111
|
+
"@things-factory/worksheet-base": "^4.3.669"
|
|
112
112
|
},
|
|
113
113
|
"devDependencies": {
|
|
114
114
|
"@things-factory/builder": "^4.3.591",
|
|
@@ -117,5 +117,5 @@
|
|
|
117
117
|
"cypress-localstorage-commands": "^1.6.1",
|
|
118
118
|
"eslint-plugin-cypress": "^2.12.1"
|
|
119
119
|
},
|
|
120
|
-
"gitHead": "
|
|
120
|
+
"gitHead": "c13a564c8b4cbf6b8e92b31fd933590f013cbccb"
|
|
121
121
|
}
|
|
@@ -1,15 +1,20 @@
|
|
|
1
|
-
import { EntityManager, In } from 'typeorm'
|
|
1
|
+
import { EntityManager, getManager, In } from 'typeorm'
|
|
2
2
|
import { Domain } from '@things-factory/shell'
|
|
3
|
-
import { User } from '@things-factory/auth-base'
|
|
3
|
+
import { ApplicationType, User } from '@things-factory/auth-base'
|
|
4
4
|
import {
|
|
5
5
|
DeliveryOrder,
|
|
6
6
|
ReleaseGood,
|
|
7
7
|
OrderInventory,
|
|
8
|
+
OrderProduct,
|
|
9
|
+
PowrupController,
|
|
10
|
+
OrderPackage,
|
|
8
11
|
ORDER_STATUS,
|
|
9
12
|
ORDER_INVENTORY_STATUS
|
|
10
13
|
} from '@things-factory/sales-base'
|
|
11
14
|
import { Worksheet, WorksheetDetail, WORKSHEET_STATUS, WORKSHEET_TYPE } from '@things-factory/worksheet-base'
|
|
12
15
|
import { getTmsService } from '@things-factory/integration-lmd'
|
|
16
|
+
import { Powrup } from '@things-factory/integration-powrup'
|
|
17
|
+
import { Setting } from '@things-factory/setting-base'
|
|
13
18
|
|
|
14
19
|
export const completeLoad = {
|
|
15
20
|
async completeLoad(_: any, { orderId, worksheetId }, context: any) {
|
|
@@ -40,7 +45,22 @@ async function completeLoading(
|
|
|
40
45
|
domain: domain,
|
|
41
46
|
status: In([ORDER_STATUS.LOADING, ORDER_STATUS.PROCESSING, ORDER_STATUS.PARTIAL_PROCESSING])
|
|
42
47
|
},
|
|
43
|
-
relations: [
|
|
48
|
+
relations: [
|
|
49
|
+
'domain',
|
|
50
|
+
'bizplace',
|
|
51
|
+
'bizplace.domain',
|
|
52
|
+
'creator',
|
|
53
|
+
'updater',
|
|
54
|
+
'orderInventories',
|
|
55
|
+
'lastMileDelivery',
|
|
56
|
+
'orderProducts',
|
|
57
|
+
'orderProducts.product',
|
|
58
|
+
'orderProducts.productDetail',
|
|
59
|
+
'deliveryOrders',
|
|
60
|
+
'deliveryOrders.orderInventories',
|
|
61
|
+
'deliveryOrders.orderInventories.productDetail',
|
|
62
|
+
'deliveryOrders.orderInventories.product'
|
|
63
|
+
]
|
|
44
64
|
})
|
|
45
65
|
|
|
46
66
|
if (!releaseGood) {
|
|
@@ -111,6 +131,44 @@ async function completeLoading(
|
|
|
111
131
|
|
|
112
132
|
tmsService.createAndUpdateShipment(releaseGood, deliveryOrders)
|
|
113
133
|
}
|
|
134
|
+
|
|
135
|
+
const orderSource: string = releaseGood.source
|
|
136
|
+
switch (orderSource) {
|
|
137
|
+
case ApplicationType.POWRUP:
|
|
138
|
+
const powrup: Powrup = await tx.getRepository(Powrup).findOne({ active: true, platform: 'POWRUP' })
|
|
139
|
+
const rtsTriggerLevel: Setting = await tx
|
|
140
|
+
.getRepository(Setting)
|
|
141
|
+
.findOne({
|
|
142
|
+
where: { domain, category: 'id-rule', name: 'rts-trigger-level' }
|
|
143
|
+
})
|
|
144
|
+
.then((setting: Setting) => {
|
|
145
|
+
return parseInt(setting?.value || 0)
|
|
146
|
+
})
|
|
147
|
+
|
|
148
|
+
if (powrup && rtsTriggerLevel === 3) {
|
|
149
|
+
getManager().transaction(async txMgr => {
|
|
150
|
+
const powrupController: PowrupController = new PowrupController()
|
|
151
|
+
|
|
152
|
+
const hasPackage =
|
|
153
|
+
(await txMgr.getRepository(OrderPackage).count({ where: { releaseGood: { id: releaseGood.id } } })) > 0
|
|
154
|
+
|
|
155
|
+
if (!hasPackage && !releaseGood.marketPackCallSuccess) {
|
|
156
|
+
const orderProducts = await txMgr.getRepository(OrderProduct).find({
|
|
157
|
+
where: { releaseGood: { id: releaseGood.id } },
|
|
158
|
+
relations: ['product', 'productDetail']
|
|
159
|
+
})
|
|
160
|
+
|
|
161
|
+
await powrupController.packOrder(powrup, { ...releaseGood, orderProducts }, domain, user, txMgr)
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
await powrupController.initiateShipment(powrup, releaseGood, domain, user, txMgr)
|
|
165
|
+
})
|
|
166
|
+
}
|
|
167
|
+
break
|
|
168
|
+
|
|
169
|
+
default:
|
|
170
|
+
break
|
|
171
|
+
}
|
|
114
172
|
} else {
|
|
115
173
|
await updateOrderInventories(tx, orderInventories, ORDER_INVENTORY_STATUS.TERMINATED, user, currentTime)
|
|
116
174
|
await updateWorksheet(tx, worksheet, WORKSHEET_STATUS.PARTIAL_EXECUTING, user, currentTime)
|