npm - @things-factory/operato-hub - Versions diffs - 4.3.367 → 4.3.368 - Mend

@things-factory/operato-hub 4.3.367 → 4.3.368

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 (4) hide show

package/dist-server/routers/api/restful-apis/v1/warehouse/dispatch-delivery-order.js CHANGED Viewed

@@ -12,7 +12,7 @@ api_1.restfulApiRouter.post('/v1/warehouse/dispatch-delivery-order', middlewares
         const data = context.request.body.data;
         const { name, bizplaceId } = data;
         await (0, typeorm_1.getConnection)().transaction(async (tx) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             const foundDeliveryOrder = await tx.getRepository(sales_base_1.DeliveryOrder).findOne({
                 where: {
                     domain: domain,
@@ -50,36 +50,37 @@ api_1.restfulApiRouter.post('/v1/warehouse/dispatch-delivery-order', middlewares
                 }
             }
             // Drive and Vehicle Validation
-            if (!((_a = data.transportDriver) === null || _a === void 0 ? void 0 : _a.name) ||
-                !data.transportDriver ||
-                (!((_b = data.transportDriver) === null || _b === void 0 ? void 0 : _b.driverCode) && !ownTransport)) {
+            if (!((_a = data.transportDriver) === null || _a === void 0 ? void 0 : _a.name) || !data.transportDriver) {
                 throw new error_util_1.ApiError('E03', 'transportDriver');
             }
-            else if (!((_c = data.transportVehicle) === null || _c === void 0 ? void 0 : _c.name) || !data.transportVehicle) {
+            else if (!((_b = data.transportVehicle) === null || _b === void 0 ? void 0 : _b.name) || !data.transportVehicle) {
                 throw new error_util_1.ApiError('E03', 'transportVehicle');
             }
             if (ownTransport) {
-                transportDriver = { name: (_d = data.transportDriver) === null || _d === void 0 ? void 0 : _d.name };
-                transportVehicle = { name: (_e = data.transportVehicle) === null || _e === void 0 ? void 0 : _e.name };
+                transportDriver = { name: (_c = data.transportDriver) === null || _c === void 0 ? void 0 : _c.name };
+                transportVehicle = { name: (_d = data.transportVehicle) === null || _d === void 0 ? void 0 : _d.name };
             }
             else {
                 // find transportDriver & transportVehicle
+                let transportDriverFilter = {
+                    domain: domain,
+                    name: (_e = data === null || data === void 0 ? void 0 : data.transportDriver) === null || _e === void 0 ? void 0 : _e.name
+                };
+                if ((_f = data === null || data === void 0 ? void 0 : data.transportDriver) === null || _f === void 0 ? void 0 : _f.driverCode) {
+                    transportDriverFilter.driverCode = data.transportDriver.driverCode;
+                }
                 const foundTransportDriver = await tx.getRepository(transport_base_1.TransportDriver).findOne({
-                    where: {
-                        domain: domain,
-                        name: (_f = data.transportDriver) === null || _f === void 0 ? void 0 : _f.name,
-                        driverCode: (_g = data.transportDriver) === null || _g === void 0 ? void 0 : _g.driverCode
-                    }
+                    where: transportDriverFilter
                 });
                 const foundTransportVehicle = await tx.getRepository(transport_base_1.TransportVehicle).findOne({
-                    where: { domain: domain, name: (_h = data.transportVehicle) === null || _h === void 0 ? void 0 : _h.name }
+                    where: { domain: domain, name: (_g = data.transportVehicle) === null || _g === void 0 ? void 0 : _g.name }
                 });
                 // validation for transportDriver & transportVehicle
                 if (!foundTransportDriver) {
-                    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}}`);
+                    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}}`);
                 }
                 else if (!foundTransportVehicle) {
-                    throw new error_util_1.ApiError('E04', `transportVehicle: { name: ${(_l = data.transportVehicle) === null || _l === void 0 ? void 0 : _l.name} }`);
+                    throw new error_util_1.ApiError('E04', `transportVehicle: { name: ${(_k = data.transportVehicle) === null || _k === void 0 ? void 0 : _k.name} }`);
                 }
                 else {
                     transportDriver = foundTransportDriver;
@@ -150,7 +151,7 @@ api_1.restfulApiRouter.post('/v1/warehouse/dispatch-delivery-order', middlewares
                 billingState: (data === null || data === void 0 ? void 0 : data.billingState) || null
             });
             // update OrderInventories remark
-            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)) {
+            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)) {
                 for (let i = 0; i < data.orderInventories.length; i++) {
                     const oi = data.orderInventories[i];
                     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 Viewed

	@@ -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 Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.367",
+  "version": "4.3.368",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -108,7 +108,7 @@
     "@things-factory/shell": "^4.3.281",
     "@things-factory/system-ui": "^4.3.281",
     "@things-factory/warehouse-base": "^4.3.367",
-    "@things-factory/worksheet-base": "^4.3.367",
+    "@things-factory/worksheet-base": "^4.3.368",
     "cron-parser": "^4.7.0",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
@@ -120,5 +120,5 @@
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "7ca4aeb73080cd52d7058fe97e6cbb2cc431a80d"
+  "gitHead": "179ea4bed69193b67379d92b8cc0c6ef8311e55f"
 }

package/server/routers/api/restful-apis/v1/warehouse/dispatch-delivery-order.ts CHANGED Viewed

@@ -61,11 +61,7 @@ router.post(
         }
         // Drive and Vehicle Validation
-        if (
-          !data.transportDriver?.name ||
-          !data.transportDriver ||
-          (!data.transportDriver?.driverCode && !ownTransport)
-        ) {
+        if (!data.transportDriver?.name || !data.transportDriver) {
           throw new ApiError('E03', 'transportDriver')
         } else if (!data.transportVehicle?.name || !data.transportVehicle) {
           throw new ApiError('E03', 'transportVehicle')
@@ -76,12 +72,16 @@ router.post(
           transportVehicle = { name: data.transportVehicle?.name }
         } else {
           // find transportDriver & transportVehicle
+          let transportDriverFilter: any = {
+            domain: domain,
+            name: data?.transportDriver?.name
+          }
+          if (data?.transportDriver?.driverCode) {
+            transportDriverFilter.driverCode = data.transportDriver.driverCode
+          }
           const foundTransportDriver: TransportDriver = await tx.getRepository(TransportDriver).findOne({
-            where: {
-              domain: domain,
-              name: data.transportDriver?.name,
-              driverCode: data.transportDriver?.driverCode
-            }
+            where: transportDriverFilter
           })
           const foundTransportVehicle: TransportVehicle = await tx.getRepository(TransportVehicle).findOne({