@things-factory/operato-hub 4.3.368 → 4.3.370
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.
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const typeorm_1 = require("typeorm");
|
|
4
4
|
const api_1 = require("@things-factory/api");
|
|
5
|
-
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
6
5
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
7
|
-
const
|
|
6
|
+
const transport_base_1 = require("@things-factory/transport-base");
|
|
8
7
|
const middlewares_1 = require("../middlewares");
|
|
8
|
+
const error_util_1 = require("../utils/error-util");
|
|
9
9
|
api_1.restfulApiRouter.post('/v1/warehouse/complete-delivery-order', middlewares_1.businessMiddleware, middlewares_1.validationMiddleware, middlewares_1.loggingMiddleware, async (context, next) => {
|
|
10
10
|
try {
|
|
11
11
|
await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
@@ -37,8 +37,8 @@ api_1.restfulApiRouter.post('/v1/warehouse/complete-delivery-order', middlewares
|
|
|
37
37
|
};
|
|
38
38
|
await tx.getRepository(sales_base_1.DeliveryOrder).update({ id: deliveryOrder.id }, updateDoPatch);
|
|
39
39
|
if (!(deliveryOrder === null || deliveryOrder === void 0 ? void 0 : deliveryOrder.ownCollection)) {
|
|
40
|
-
await tx.getRepository(
|
|
41
|
-
status:
|
|
40
|
+
await tx.getRepository(transport_base_1.TransportVehicle).update({ id: deliveryOrder.transportVehicle.id }, {
|
|
41
|
+
status: transport_base_1.TRUCK_STATUS.IDLE,
|
|
42
42
|
updater: user
|
|
43
43
|
});
|
|
44
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-delivery-order.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/complete-delivery-order.ts"],"names":[],"mappings":";;AAAA,qCAAsD;AAEtD,6CAAgE;AAChE,mEAA+E;
|
|
1
|
+
{"version":3,"file":"complete-delivery-order.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/complete-delivery-order.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-hub",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.370",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
"@things-factory/pdf": "^4.3.281",
|
|
93
93
|
"@things-factory/product-ui": "^4.3.357",
|
|
94
94
|
"@things-factory/resource-ui": "^4.3.281",
|
|
95
|
-
"@things-factory/sales-base": "^4.3.
|
|
95
|
+
"@things-factory/sales-base": "^4.3.370",
|
|
96
96
|
"@things-factory/scene-data-transform": "^4.3.281",
|
|
97
97
|
"@things-factory/scene-excel": "^4.3.281",
|
|
98
98
|
"@things-factory/scene-firebase": "^4.3.281",
|
|
@@ -107,8 +107,9 @@
|
|
|
107
107
|
"@things-factory/setting-ui": "^4.3.281",
|
|
108
108
|
"@things-factory/shell": "^4.3.281",
|
|
109
109
|
"@things-factory/system-ui": "^4.3.281",
|
|
110
|
-
"@things-factory/
|
|
111
|
-
"@things-factory/
|
|
110
|
+
"@things-factory/transport-base": "^4.3.369",
|
|
111
|
+
"@things-factory/warehouse-base": "^4.3.370",
|
|
112
|
+
"@things-factory/worksheet-base": "^4.3.370",
|
|
112
113
|
"cron-parser": "^4.7.0",
|
|
113
114
|
"koa2-swagger-ui": "^5.0.2",
|
|
114
115
|
"swagger-jsdoc": "^5.0.0",
|
|
@@ -120,5 +121,5 @@
|
|
|
120
121
|
"resolutions": {
|
|
121
122
|
"core-js": "^3.16.0"
|
|
122
123
|
},
|
|
123
|
-
"gitHead": "
|
|
124
|
+
"gitHead": "507feb80a78940a091efcd44b9beacda1a1d5b80"
|
|
124
125
|
}
|
|
@@ -1,16 +1,17 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { EntityManager, getConnection } from 'typeorm'
|
|
2
2
|
|
|
3
3
|
import { restfulApiRouter as router } from '@things-factory/api'
|
|
4
|
-
import { TransportVehicle, TRUCK_STATUS } from '@things-factory/warehouse-base'
|
|
5
4
|
import {
|
|
6
|
-
|
|
7
|
-
ORDER_STATUS,
|
|
5
|
+
DeliveryOrder,
|
|
8
6
|
ORDER_INVENTORY_STATUS,
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
ORDER_STATUS,
|
|
8
|
+
ORDER_TYPES,
|
|
9
|
+
OrderInventory
|
|
11
10
|
} from '@things-factory/sales-base'
|
|
12
|
-
import {
|
|
11
|
+
import { TransportVehicle, TRUCK_STATUS } from '@things-factory/transport-base'
|
|
12
|
+
|
|
13
13
|
import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
|
|
14
|
+
import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
|
|
14
15
|
|
|
15
16
|
router.post(
|
|
16
17
|
'/v1/warehouse/complete-delivery-order',
|
|
@@ -57,7 +58,7 @@ router.post(
|
|
|
57
58
|
|
|
58
59
|
if (!deliveryOrder?.ownCollection) {
|
|
59
60
|
await tx.getRepository(TransportVehicle).update(
|
|
60
|
-
{ id: deliveryOrder.transportVehicle },
|
|
61
|
+
{ id: deliveryOrder.transportVehicle.id },
|
|
61
62
|
{
|
|
62
63
|
status: TRUCK_STATUS.IDLE,
|
|
63
64
|
updater: user
|