@things-factory/operato-hub 4.3.367 → 4.3.369

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.
Files changed (7) hide show
  1. package/dist-server/routers/api/restful-apis/v1/warehouse/complete-delivery-order.js +4 -4
  2. package/dist-server/routers/api/restful-apis/v1/warehouse/complete-delivery-order.js.map +1 -1
  3. package/dist-server/routers/api/restful-apis/v1/warehouse/dispatch-delivery-order.js +17 -16
  4. package/dist-server/routers/api/restful-apis/v1/warehouse/dispatch-delivery-order.js.map +1 -1
  5. package/package.json +5 -4
  6. package/server/routers/api/restful-apis/v1/warehouse/complete-delivery-order.ts +9 -8
  7. package/server/routers/api/restful-apis/v1/warehouse/dispatch-delivery-order.ts +10 -10
package/dist-server/routers/api/restful-apis/v1/warehouse/complete-delivery-order.js CHANGED
@@ -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 error_util_1 = require("../utils/error-util");
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(warehouse_base_1.TransportVehicle).update({ id: deliveryOrder.transportVehicle }, {
41
- status: warehouse_base_1.TRUCK_STATUS.IDLE,
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
  }
package/dist-server/routers/api/restful-apis/v1/warehouse/complete-delivery-order.js.map CHANGED
@@ -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":"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"}
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/dist-server/routers/api/restful-apis/v1/warehouse/dispatch-delivery-order.js CHANGED
@@ -12,7 +12,7 @@ api_1.restfulApiRouter.post('/v1/warehouse/dispatch-delivery-order', middlewares
12
12
  const data = context.request.body.data;
13
13
  const { name, bizplaceId } = data;
14
14
  await (0, typeorm_1.getConnection)().transaction(async (tx) => {
15
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
15
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
16
16
  const foundDeliveryOrder = await tx.getRepository(sales_base_1.DeliveryOrder).findOne({
17
17
  where: {
18
18
  domain: domain,
@@ -50,36 +50,37 @@ api_1.restfulApiRouter.post('/v1/warehouse/dispatch-delivery-order', middlewares
50
50
  }
51
51
  }
52
52
  // Drive and Vehicle Validation
53
- if (!((_a = data.transportDriver) === null || _a === void 0 ? void 0 : _a.name) ||
54
- !data.transportDriver ||
55
- (!((_b = data.transportDriver) === null || _b === void 0 ? void 0 : _b.driverCode) && !ownTransport)) {
53
+ if (!((_a = data.transportDriver) === null || _a === void 0 ? void 0 : _a.name) || !data.transportDriver) {
56
54
  throw new error_util_1.ApiError('E03', 'transportDriver');
57
55
  }
58
- else if (!((_c = data.transportVehicle) === null || _c === void 0 ? void 0 : _c.name) || !data.transportVehicle) {
56
+ else if (!((_b = data.transportVehicle) === null || _b === void 0 ? void 0 : _b.name) || !data.transportVehicle) {
59
57
  throw new error_util_1.ApiError('E03', 'transportVehicle');
60
58
  }
61
59
  if (ownTransport) {
62
- transportDriver = { name: (_d = data.transportDriver) === null || _d === void 0 ? void 0 : _d.name };
63
- transportVehicle = { name: (_e = data.transportVehicle) === null || _e === void 0 ? void 0 : _e.name };
60
+ transportDriver = { name: (_c = data.transportDriver) === null || _c === void 0 ? void 0 : _c.name };
61
+ transportVehicle = { name: (_d = data.transportVehicle) === null || _d === void 0 ? void 0 : _d.name };
64
62
  }
65
63
  else {
66
64
  // find transportDriver & transportVehicle
65
+ let transportDriverFilter = {
66
+ domain: domain,
67
+ name: (_e = data === null || data === void 0 ? void 0 : data.transportDriver) === null || _e === void 0 ? void 0 : _e.name
68
+ };
69
+ if ((_f = data === null || data === void 0 ? void 0 : data.transportDriver) === null || _f === void 0 ? void 0 : _f.driverCode) {
70
+ transportDriverFilter.driverCode = data.transportDriver.driverCode;
71
+ }
67
72
  const foundTransportDriver = await tx.getRepository(transport_base_1.TransportDriver).findOne({
68
- where: {
69
- domain: domain,
70
- name: (_f = data.transportDriver) === null || _f === void 0 ? void 0 : _f.name,
71
- driverCode: (_g = data.transportDriver) === null || _g === void 0 ? void 0 : _g.driverCode
72
- }
73
+ where: transportDriverFilter
73
74
  });
74
75
  const foundTransportVehicle = await tx.getRepository(transport_base_1.TransportVehicle).findOne({
75
- where: { domain: domain, name: (_h = data.transportVehicle) === null || _h === void 0 ? void 0 : _h.name }
76
+ where: { domain: domain, name: (_g = data.transportVehicle) === null || _g === void 0 ? void 0 : _g.name }
76
77
  });
77
78
  // validation for transportDriver & transportVehicle
78
79
  if (!foundTransportDriver) {
79
- throw new error_util_1.ApiError('E04', `transportDriver: { name: ${(_j = data.transportDriver) === null || _j === void 0 ? void 0 : _j.name}, driverCode: ${(_k = data.transportDriver) === null || _k === void 0 ? void 0 : _k.driverCode}}`);
80
+ throw new error_util_1.ApiError('E04', `transportDriver: { name: ${(_h = data.transportDriver) === null || _h === void 0 ? void 0 : _h.name}, driverCode: ${(_j = data.transportDriver) === null || _j === void 0 ? void 0 : _j.driverCode}}`);
80
81
  }
81
82
  else if (!foundTransportVehicle) {
82
- throw new error_util_1.ApiError('E04', `transportVehicle: { name: ${(_l = data.transportVehicle) === null || _l === void 0 ? void 0 : _l.name} }`);
83
+ throw new error_util_1.ApiError('E04', `transportVehicle: { name: ${(_k = data.transportVehicle) === null || _k === void 0 ? void 0 : _k.name} }`);
83
84
  }
84
85
  else {
85
86
  transportDriver = foundTransportDriver;
@@ -150,7 +151,7 @@ api_1.restfulApiRouter.post('/v1/warehouse/dispatch-delivery-order', middlewares
150
151
  billingState: (data === null || data === void 0 ? void 0 : data.billingState) || null
151
152
  });
152
153
  // update OrderInventories remark
153
- if ((data === null || data === void 0 ? void 0 : data.orderInventories) && ((_m = data === null || data === void 0 ? void 0 : data.orderInventories) === null || _m === void 0 ? void 0 : _m.length)) {
154
+ if ((data === null || data === void 0 ? void 0 : data.orderInventories) && ((_l = data === null || data === void 0 ? void 0 : data.orderInventories) === null || _l === void 0 ? void 0 : _l.length)) {
154
155
  for (let i = 0; i < data.orderInventories.length; i++) {
155
156
  const oi = data.orderInventories[i];
156
157
  if (!(oi === null || oi === void 0 ? void 0 : oi.id)) {
package/dist-server/routers/api/restful-apis/v1/warehouse/dispatch-delivery-order.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dispatch-delivery-order.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/dispatch-delivery-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dispatch-delivery-order.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/dispatch-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.367",
3
+ "version": "4.3.369",
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.367",
95
+ "@things-factory/sales-base": "^4.3.369",
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/transport-base": "^4.3.369",
110
111
  "@things-factory/warehouse-base": "^4.3.367",
111
- "@things-factory/worksheet-base": "^4.3.367",
112
+ "@things-factory/worksheet-base": "^4.3.369",
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": "7ca4aeb73080cd52d7058fe97e6cbb2cc431a80d"
124
+ "gitHead": "e2df2f00e1a71d0e20fd58ad8971b5c9ce965471"
124
125
  }
package/server/routers/api/restful-apis/v1/warehouse/complete-delivery-order.ts CHANGED
@@ -1,16 +1,17 @@
1
- import { getConnection, EntityManager } from 'typeorm'
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
- ORDER_TYPES,
7
- ORDER_STATUS,
5
+ DeliveryOrder,
8
6
  ORDER_INVENTORY_STATUS,
9
- OrderInventory,
10
- DeliveryOrder
7
+ ORDER_STATUS,
8
+ ORDER_TYPES,
9
+ OrderInventory
11
10
  } from '@things-factory/sales-base'
12
- import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
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
package/server/routers/api/restful-apis/v1/warehouse/dispatch-delivery-order.ts CHANGED
@@ -61,11 +61,7 @@ router.post(
61
61
  }
62
62
 
63
63
  // Drive and Vehicle Validation
64
- if (
65
- !data.transportDriver?.name ||
66
- !data.transportDriver ||
67
- (!data.transportDriver?.driverCode && !ownTransport)
68
- ) {
64
+ if (!data.transportDriver?.name || !data.transportDriver) {
69
65
  throw new ApiError('E03', 'transportDriver')
70
66
  } else if (!data.transportVehicle?.name || !data.transportVehicle) {
71
67
  throw new ApiError('E03', 'transportVehicle')
@@ -76,12 +72,16 @@ router.post(
76
72
  transportVehicle = { name: data.transportVehicle?.name }
77
73
  } else {
78
74
  // find transportDriver & transportVehicle
75
+ let transportDriverFilter: any = {
76
+ domain: domain,
77
+ name: data?.transportDriver?.name
78
+ }
79
+
80
+ if (data?.transportDriver?.driverCode) {
81
+ transportDriverFilter.driverCode = data.transportDriver.driverCode
82
+ }
79
83
  const foundTransportDriver: TransportDriver = await tx.getRepository(TransportDriver).findOne({
80
- where: {
81
- domain: domain,
82
- name: data.transportDriver?.name,
83
- driverCode: data.transportDriver?.driverCode
84
- }
84
+ where: transportDriverFilter
85
85
  })
86
86
 
87
87
  const foundTransportVehicle: TransportVehicle = await tx.getRepository(TransportVehicle).findOne({