@things-factory/operato-hub 4.3.673 → 4.3.675

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.
@@ -34,12 +34,17 @@ exports.outboundOrderDetailsReport = {
34
34
  id: bizplaceFilter.value
35
35
  });
36
36
  await (0, utils_1.rawProductsQuery)(tx, params, bizplace);
37
- let extraQueryFilters = '';
37
+ // Apply filters using base table columns within the inner SELECT to avoid alias scoping issues
38
+ // The first subquery joins delivery_orders as do2; the second does not. Split filters accordingly.
39
+ let innerQueryFilters1 = '';
40
+ let innerQueryFilters2 = '';
41
+ const hasDoFilter = !!doNo;
38
42
  if (roNo) {
39
- extraQueryFilters = `${extraQueryFilters} and ro_no like '%${roNo.value}%' `;
43
+ innerQueryFilters1 = `${innerQueryFilters1} and rg.name like '%${roNo.value}%' `;
44
+ innerQueryFilters2 = `${innerQueryFilters2} and rg.name like '%${roNo.value}%' `;
40
45
  }
41
46
  if (doNo) {
42
- extraQueryFilters = `${extraQueryFilters} and delivery_order_no like '%${doNo.value}%' `;
47
+ innerQueryFilters1 = `${innerQueryFilters1} and do2.name like '%${doNo.value}%' `;
43
48
  }
44
49
  console.time('temp');
45
50
  await tx.query(`
@@ -79,9 +84,47 @@ exports.outboundOrderDetailsReport = {
79
84
  and rg.created_at >= $3 and rg.created_at <= $4
80
85
  and oi.status <> 'REPLACED'
81
86
  ${status ? `and rg.status = '${status.value}' ` : ``}
87
+ ${innerQueryFilters1}
82
88
  ) src
83
89
  where 1=1
84
- ${extraQueryFilters}
90
+ ${hasDoFilter
91
+ ? ''
92
+ : `union all
93
+ select * from (
94
+ select op.id,
95
+ op.release_qty AS "release_qty", NULL::timestamp, NULL, NULL::timestamp, NULL, NULL::timestamp, NULL,
96
+ op.release_qty as "qty", op.release_uom_value as "uom_value", NULL:: double precision, null:: double precision, op.product_detail_id,
97
+ NULL,
98
+ NULL, NULL,
99
+ NULL, NULL::timestamp, NULL, null::uuid, null,
100
+ null::timestamp,
101
+ rg.bizplace_id, $5 AS "bizplace_name", $6 AS "bizplace_description",
102
+ NULL, so.container_no, so.container_size,
103
+ rg.export_option, rg.name AS "ro_no", rg."type" as "ro_type", rg.ref_no AS "ref_no_1", rg.ref_no_2 AS "ref_no_2", rg.ref_no_3 AS "ref_no_3", rg.status as "ro_status",
104
+ u1.name as "order_created_by", rg.created_at AS "order_created_at",
105
+ rg.accepted_at, u4.name as accepted_by, rg.checked_remark_by, rg.checked_remark_at, rg.own_transport AS own_transport,
106
+ p.id as "product_id", p.sku as "product_sku", p.name AS "product_name", p.description AS "product_description", p.type as "product_type", op.packing_type as "packing_type", op.packing_size as "packing_size",
107
+ op.uom, null::double precision,
108
+ null::uuid, NULL, NULL, op.batch_id, op.batch_id_ref, null::date, null::date,
109
+ coalesce(ms.name,'') as manifest_no, coalesce(rg.manifested_at, ms.created_at) as manifested_at, coalesce(u6.name, u5.name) as manifested_by
110
+ from release_goods rg
111
+ left join users u1 on u1.id = rg.creator_id
112
+ inner join order_products op on rg.id = op.release_good_id
113
+ left join shipping_orders so on so.id = rg.shipping_order_id
114
+ left join users u4 on u4.id = rg.accepted_by_id
115
+ left join manifests ms on ms.id = rg.manifest_id
116
+ left join users u5 on u5.id = ms.creator_id
117
+ left join users u6 on u6.id = rg.manifested_by_id
118
+ inner join temp_products p on p.id = op.product_id
119
+ where rg.bizplace_id = $2 and rg.domain_id = $1
120
+ and rg.created_at >= $3 and rg.created_at <= $4
121
+ and rg.assigned_inventory = false
122
+ ${status ? `and rg.status = '${status.value}' ` : ``}
123
+ ${innerQueryFilters2}
124
+ and rg.assigned_inventory = false
125
+ and op.release_qty > 0
126
+ ) src2
127
+ where 1=1`}
85
128
  )
86
129
  `, [context.state.domain.id, bizplace.id, fromDate.value, toDate.value, bizplace.name, bizplace.description]);
87
130
  console.timeEnd('temp');
@@ -1 +1 @@
1
- {"version":3,"file":"outbound-order-details-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/outbound-order-details-report.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"outbound-order-details-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/outbound-order-details-report.ts"],"names":[],"mappings":"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"}
@@ -12,7 +12,7 @@ const axios = require('axios');
12
12
  const debug = require('debug')('things-factory:operato-hub:validation-middleware');
13
13
  let req;
14
14
  async function validationMiddleware(context, next) {
15
- var _a, _b, _c;
15
+ var _a, _b, _c, _d;
16
16
  let path = context.req._parsedUrl.pathname;
17
17
  let endpoint = path.substring(path.lastIndexOf('/') + 1);
18
18
  let q = (_a = context === null || context === void 0 ? void 0 : context.request) === null || _a === void 0 ? void 0 : _a.query;
@@ -23,9 +23,9 @@ async function validationMiddleware(context, next) {
23
23
  throw new error_util_1.ApiError('E03', 'data');
24
24
  }
25
25
  let contentType = getContentType(context.request.req.rawHeaders);
26
- if (contentType.includes('multipart/form-data')) {
26
+ if (contentType && contentType.includes('multipart/form-data')) {
27
27
  context.request.body.data = JSON.parse(context.request.body.data).data;
28
- if (context.request.body.urls) {
28
+ if ((_d = context.request.body) === null || _d === void 0 ? void 0 : _d.urls) {
29
29
  context.request.body.urls = JSON.parse(context.request.body.urls);
30
30
  }
31
31
  await validateAttachments(context);
@@ -1 +1 @@
1
- {"version":3,"file":"validation-middleware.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/middlewares/validation-middleware.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validation-middleware.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/middlewares/validation-middleware.ts"],"names":[],"mappings":"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"}
@@ -11,6 +11,7 @@ const sales_base_1 = require("@things-factory/sales-base");
11
11
  const middlewares_1 = require("../middlewares");
12
12
  const error_util_1 = require("../utils/error-util");
13
13
  api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-details', middlewares_1.businessMiddleware, middlewares_1.validationMiddleware, middlewares_1.loggingMiddleware, async (context, next) => {
14
+ var _a, _b, _c, _d, _e, _f, _g;
14
15
  try {
15
16
  // get contact points for that bizplace
16
17
  // optional query parameter filter
@@ -38,7 +39,7 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-details', middleware
38
39
  }
39
40
  const releaseGood = await (0, typeorm_1.getRepository)(sales_base_1.ReleaseGood).findOne({
40
41
  where: filter,
41
- relations: ['orderPackages', 'orderPackages.orderPackageItems', 'bizplace']
42
+ relations: ['orderPackages', 'orderPackages.orderPackageItems', 'bizplace', 'shippingOrder']
42
43
  });
43
44
  if (!releaseGood)
44
45
  throw new error_util_1.ApiError('E04', `release order: ${filter['name']} do not exist.`);
@@ -210,6 +211,18 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-details', middleware
210
211
  };
211
212
  });
212
213
  }
214
+ let { shippingOrder } = releaseGood;
215
+ if (shippingOrder) {
216
+ shippingOrder = {
217
+ containerNo: (_a = shippingOrder.containerNo) !== null && _a !== void 0 ? _a : null,
218
+ containerArrivalDate: (_b = shippingOrder.containerArrivalDate) !== null && _b !== void 0 ? _b : null,
219
+ containerLeavingDate: (_c = shippingOrder.containerLeavingDate) !== null && _c !== void 0 ? _c : null,
220
+ containerClosureDate: (_d = shippingOrder.containerClosureDate) !== null && _d !== void 0 ? _d : null,
221
+ containerSize: (_e = shippingOrder.containerSize) !== null && _e !== void 0 ? _e : null,
222
+ shipName: (_f = shippingOrder.shipName) !== null && _f !== void 0 ? _f : null,
223
+ remark: (_g = shippingOrder.remark) !== null && _g !== void 0 ? _g : null
224
+ };
225
+ }
213
226
  const data = {
214
227
  id: releaseGood.id,
215
228
  roNo: releaseGood.roNo,
@@ -262,7 +275,8 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-details', middleware
262
275
  orderInventories: orderInventories.length > 0 ? orderInventories : null,
263
276
  orderPackages: orderPackages.length > 0 ? orderPackages : null,
264
277
  deliveryOrders: deliveryOrders.length > 0 ? deliveryOrders : null,
265
- attachment: attachments.length > 0 ? attachments : null
278
+ attachment: attachments.length > 0 ? attachments : null,
279
+ shippingOrder: shippingOrder ? shippingOrder : null
266
280
  };
267
281
  context.body = {
268
282
  data
@@ -1 +1 @@
1
- {"version":3,"file":"get-release-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get-release-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts"],"names":[],"mappings":"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"}
@@ -1086,6 +1086,25 @@ definitions:
1086
1086
  fullpath:
1087
1087
  type: 'string'
1088
1088
  example: 'context.origin/attachment/ae0cfe87-ed48-48d4-b377-88494bdeuuid.pdf'
1089
+ shippingOrder:
1090
+ type: 'object'
1091
+ properties:
1092
+ containerNo:
1093
+ type: 'string'
1094
+ containerArrivalDate:
1095
+ type: 'string'
1096
+ example: '2025-08-26'
1097
+ containerLeavingDate:
1098
+ type: 'string'
1099
+ example: '2025-08-26'
1100
+ containerClosureDate:
1101
+ type: 'string'
1102
+ example: '2025-08-26'
1103
+ containerSize:
1104
+ type: 'string'
1105
+ example: '40ft'
1106
+ remark:
1107
+ type: 'string'
1089
1108
 
1090
1109
  xml:
1091
1110
  name: 'GetReleaseOrderDetails'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-hub",
3
- "version": "4.3.673",
3
+ "version": "4.3.675",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -55,61 +55,61 @@
55
55
  "@operato/scene-tab": "^0.1.8",
56
56
  "@operato/scene-table": "^0.1.8",
57
57
  "@operato/scene-wheel-sorter": "^0.1.8",
58
- "@things-factory/api": "^4.3.673",
59
- "@things-factory/apptool-ui": "^4.3.673",
60
- "@things-factory/attachment-base": "^4.3.673",
61
- "@things-factory/auth-base": "^4.3.673",
62
- "@things-factory/auth-ui": "^4.3.673",
63
- "@things-factory/biz-base": "^4.3.673",
64
- "@things-factory/biz-ui": "^4.3.673",
65
- "@things-factory/board-service": "^4.3.673",
66
- "@things-factory/board-ui": "^4.3.673",
67
- "@things-factory/code-ui": "^4.3.673",
58
+ "@things-factory/api": "^4.3.675",
59
+ "@things-factory/apptool-ui": "^4.3.675",
60
+ "@things-factory/attachment-base": "^4.3.675",
61
+ "@things-factory/auth-base": "^4.3.675",
62
+ "@things-factory/auth-ui": "^4.3.675",
63
+ "@things-factory/biz-base": "^4.3.675",
64
+ "@things-factory/biz-ui": "^4.3.675",
65
+ "@things-factory/board-service": "^4.3.675",
66
+ "@things-factory/board-ui": "^4.3.675",
67
+ "@things-factory/code-ui": "^4.3.675",
68
68
  "@things-factory/component-ui": "^4.3.591",
69
- "@things-factory/context-ui": "^4.3.673",
70
- "@things-factory/document-template-ui": "^4.3.673",
71
- "@things-factory/export-ui": "^4.3.673",
72
- "@things-factory/export-ui-csv": "^4.3.673",
73
- "@things-factory/export-ui-excel": "^4.3.673",
74
- "@things-factory/geography": "^4.3.673",
75
- "@things-factory/grist-ui": "^4.3.673",
76
- "@things-factory/help": "^4.3.673",
77
- "@things-factory/i18n-base": "^4.3.673",
78
- "@things-factory/import-ui": "^4.3.673",
79
- "@things-factory/import-ui-excel": "^4.3.673",
80
- "@things-factory/integration-accounting": "^4.3.673",
81
- "@things-factory/integration-fulfillment": "^4.3.673",
82
- "@things-factory/integration-lmd": "^4.3.673",
83
- "@things-factory/integration-marketplace": "^4.3.673",
84
- "@things-factory/integration-pos": "^4.3.673",
85
- "@things-factory/integration-powrup": "^4.3.673",
86
- "@things-factory/integration-sellercraft": "^4.3.673",
87
- "@things-factory/integration-sftp": "^4.3.673",
88
- "@things-factory/lite-menu": "^4.3.673",
89
- "@things-factory/marketplace-base": "^4.3.673",
90
- "@things-factory/more-ui": "^4.3.673",
91
- "@things-factory/notification": "^4.3.673",
69
+ "@things-factory/context-ui": "^4.3.675",
70
+ "@things-factory/document-template-ui": "^4.3.675",
71
+ "@things-factory/export-ui": "^4.3.675",
72
+ "@things-factory/export-ui-csv": "^4.3.675",
73
+ "@things-factory/export-ui-excel": "^4.3.675",
74
+ "@things-factory/geography": "^4.3.675",
75
+ "@things-factory/grist-ui": "^4.3.675",
76
+ "@things-factory/help": "^4.3.675",
77
+ "@things-factory/i18n-base": "^4.3.675",
78
+ "@things-factory/import-ui": "^4.3.675",
79
+ "@things-factory/import-ui-excel": "^4.3.675",
80
+ "@things-factory/integration-accounting": "^4.3.675",
81
+ "@things-factory/integration-fulfillment": "^4.3.675",
82
+ "@things-factory/integration-lmd": "^4.3.675",
83
+ "@things-factory/integration-marketplace": "^4.3.675",
84
+ "@things-factory/integration-pos": "^4.3.675",
85
+ "@things-factory/integration-powrup": "^4.3.675",
86
+ "@things-factory/integration-sellercraft": "^4.3.675",
87
+ "@things-factory/integration-sftp": "^4.3.675",
88
+ "@things-factory/lite-menu": "^4.3.675",
89
+ "@things-factory/marketplace-base": "^4.3.675",
90
+ "@things-factory/more-ui": "^4.3.675",
91
+ "@things-factory/notification": "^4.3.675",
92
92
  "@things-factory/pdf": "^4.3.591",
93
- "@things-factory/product-ui": "^4.3.673",
94
- "@things-factory/resource-ui": "^4.3.673",
95
- "@things-factory/sales-base": "^4.3.673",
93
+ "@things-factory/product-ui": "^4.3.675",
94
+ "@things-factory/resource-ui": "^4.3.675",
95
+ "@things-factory/sales-base": "^4.3.675",
96
96
  "@things-factory/scene-data-transform": "^4.3.591",
97
97
  "@things-factory/scene-excel": "^4.3.591",
98
98
  "@things-factory/scene-firebase": "^4.3.591",
99
99
  "@things-factory/scene-form": "^4.3.591",
100
100
  "@things-factory/scene-google-map": "^4.3.591",
101
101
  "@things-factory/scene-graphql": "^4.3.591",
102
- "@things-factory/scene-label": "^4.3.673",
102
+ "@things-factory/scene-label": "^4.3.675",
103
103
  "@things-factory/scene-marker": "^4.3.591",
104
104
  "@things-factory/scene-mqtt": "^4.3.591",
105
105
  "@things-factory/scene-restful": "^4.3.591",
106
106
  "@things-factory/scene-visualizer": "^4.3.591",
107
- "@things-factory/setting-ui": "^4.3.673",
108
- "@things-factory/shell": "^4.3.673",
109
- "@things-factory/system-ui": "^4.3.673",
110
- "@things-factory/transport-base": "^4.3.673",
111
- "@things-factory/warehouse-base": "^4.3.673",
112
- "@things-factory/worksheet-base": "^4.3.673",
107
+ "@things-factory/setting-ui": "^4.3.675",
108
+ "@things-factory/shell": "^4.3.675",
109
+ "@things-factory/system-ui": "^4.3.675",
110
+ "@things-factory/transport-base": "^4.3.675",
111
+ "@things-factory/warehouse-base": "^4.3.675",
112
+ "@things-factory/worksheet-base": "^4.3.675",
113
113
  "cron-parser": "^4.7.0",
114
114
  "koa2-swagger-ui": "^5.0.2",
115
115
  "swagger-jsdoc": "^5.0.0",
@@ -122,5 +122,5 @@
122
122
  "resolutions": {
123
123
  "core-js": "^3.16.0"
124
124
  },
125
- "gitHead": "d22f985380f3af2ebc0f81ea8bec478ba00b4777"
125
+ "gitHead": "71e1820fa406b37bab179e29d0d08a37ffb68b85"
126
126
  }
@@ -41,12 +41,17 @@ export const outboundOrderDetailsReport = {
41
41
 
42
42
  await rawProductsQuery(tx, params, bizplace)
43
43
 
44
- let extraQueryFilters = ''
44
+ // Apply filters using base table columns within the inner SELECT to avoid alias scoping issues
45
+ // The first subquery joins delivery_orders as do2; the second does not. Split filters accordingly.
46
+ let innerQueryFilters1 = ''
47
+ let innerQueryFilters2 = ''
48
+ const hasDoFilter = !!doNo
45
49
  if (roNo) {
46
- extraQueryFilters = `${extraQueryFilters} and ro_no like '%${roNo.value}%' `
50
+ innerQueryFilters1 = `${innerQueryFilters1} and rg.name like '%${roNo.value}%' `
51
+ innerQueryFilters2 = `${innerQueryFilters2} and rg.name like '%${roNo.value}%' `
47
52
  }
48
53
  if (doNo) {
49
- extraQueryFilters = `${extraQueryFilters} and delivery_order_no like '%${doNo.value}%' `
54
+ innerQueryFilters1 = `${innerQueryFilters1} and do2.name like '%${doNo.value}%' `
50
55
  }
51
56
 
52
57
  console.time('temp')
@@ -88,9 +93,49 @@ export const outboundOrderDetailsReport = {
88
93
  and rg.created_at >= $3 and rg.created_at <= $4
89
94
  and oi.status <> 'REPLACED'
90
95
  ${status ? `and rg.status = '${status.value}' ` : ``}
96
+ ${innerQueryFilters1}
91
97
  ) src
92
98
  where 1=1
93
- ${extraQueryFilters}
99
+ ${
100
+ hasDoFilter
101
+ ? ''
102
+ : `union all
103
+ select * from (
104
+ select op.id,
105
+ op.release_qty AS "release_qty", NULL::timestamp, NULL, NULL::timestamp, NULL, NULL::timestamp, NULL,
106
+ op.release_qty as "qty", op.release_uom_value as "uom_value", NULL:: double precision, null:: double precision, op.product_detail_id,
107
+ NULL,
108
+ NULL, NULL,
109
+ NULL, NULL::timestamp, NULL, null::uuid, null,
110
+ null::timestamp,
111
+ rg.bizplace_id, $5 AS "bizplace_name", $6 AS "bizplace_description",
112
+ NULL, so.container_no, so.container_size,
113
+ rg.export_option, rg.name AS "ro_no", rg."type" as "ro_type", rg.ref_no AS "ref_no_1", rg.ref_no_2 AS "ref_no_2", rg.ref_no_3 AS "ref_no_3", rg.status as "ro_status",
114
+ u1.name as "order_created_by", rg.created_at AS "order_created_at",
115
+ rg.accepted_at, u4.name as accepted_by, rg.checked_remark_by, rg.checked_remark_at, rg.own_transport AS own_transport,
116
+ p.id as "product_id", p.sku as "product_sku", p.name AS "product_name", p.description AS "product_description", p.type as "product_type", op.packing_type as "packing_type", op.packing_size as "packing_size",
117
+ op.uom, null::double precision,
118
+ null::uuid, NULL, NULL, op.batch_id, op.batch_id_ref, null::date, null::date,
119
+ coalesce(ms.name,'') as manifest_no, coalesce(rg.manifested_at, ms.created_at) as manifested_at, coalesce(u6.name, u5.name) as manifested_by
120
+ from release_goods rg
121
+ left join users u1 on u1.id = rg.creator_id
122
+ inner join order_products op on rg.id = op.release_good_id
123
+ left join shipping_orders so on so.id = rg.shipping_order_id
124
+ left join users u4 on u4.id = rg.accepted_by_id
125
+ left join manifests ms on ms.id = rg.manifest_id
126
+ left join users u5 on u5.id = ms.creator_id
127
+ left join users u6 on u6.id = rg.manifested_by_id
128
+ inner join temp_products p on p.id = op.product_id
129
+ where rg.bizplace_id = $2 and rg.domain_id = $1
130
+ and rg.created_at >= $3 and rg.created_at <= $4
131
+ and rg.assigned_inventory = false
132
+ ${status ? `and rg.status = '${status.value}' ` : ``}
133
+ ${innerQueryFilters2}
134
+ and rg.assigned_inventory = false
135
+ and op.release_qty > 0
136
+ ) src2
137
+ where 1=1`
138
+ }
94
139
  )
95
140
  `,
96
141
  [context.state.domain.id, bizplace.id, fromDate.value, toDate.value, bizplace.name, bizplace.description]
@@ -21,9 +21,9 @@ export async function validationMiddleware(context, next) {
21
21
  }
22
22
 
23
23
  let contentType = getContentType(context.request.req.rawHeaders)
24
- if (contentType.includes('multipart/form-data')) {
24
+ if (contentType && contentType.includes('multipart/form-data')) {
25
25
  context.request.body.data = JSON.parse(context.request.body.data).data
26
- if (context.request.body.urls) {
26
+ if (context.request.body?.urls) {
27
27
  context.request.body.urls = JSON.parse(context.request.body.urls)
28
28
  }
29
29
  await validateAttachments(context)
@@ -46,7 +46,7 @@ router.get(
46
46
 
47
47
  const releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({
48
48
  where: filter,
49
- relations: ['orderPackages', 'orderPackages.orderPackageItems', 'bizplace']
49
+ relations: ['orderPackages', 'orderPackages.orderPackageItems', 'bizplace', 'shippingOrder']
50
50
  })
51
51
 
52
52
  if (!releaseGood) throw new ApiError('E04', `release order: ${filter['name']} do not exist.`)
@@ -228,7 +228,19 @@ router.get(
228
228
  }
229
229
  })
230
230
  }
231
+ let { shippingOrder } = releaseGood
231
232
 
233
+ if (shippingOrder) {
234
+ shippingOrder = {
235
+ containerNo: shippingOrder.containerNo ?? null,
236
+ containerArrivalDate: shippingOrder.containerArrivalDate ?? null,
237
+ containerLeavingDate: shippingOrder.containerLeavingDate ?? null,
238
+ containerClosureDate: shippingOrder.containerClosureDate ?? null,
239
+ containerSize: shippingOrder.containerSize ?? null,
240
+ shipName: shippingOrder.shipName ?? null,
241
+ remark: shippingOrder.remark ?? null
242
+ }
243
+ }
232
244
  const data = {
233
245
  id: releaseGood.id,
234
246
  roNo: releaseGood.roNo,
@@ -281,7 +293,8 @@ router.get(
281
293
  orderInventories: orderInventories.length > 0 ? orderInventories : null,
282
294
  orderPackages: orderPackages.length > 0 ? orderPackages : null,
283
295
  deliveryOrders: deliveryOrders.length > 0 ? deliveryOrders : null,
284
- attachment: attachments.length > 0 ? attachments : null
296
+ attachment: attachments.length > 0 ? attachments : null,
297
+ shippingOrder: shippingOrder ? shippingOrder : null
285
298
  }
286
299
 
287
300
  context.body = {