@things-factory/operato-hub 4.3.698 → 4.3.699

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 (5) hide show
  1. package/dist-server/routers/api/restful-apis/v1/warehouse/get-return-order-details.js +37 -9
  2. package/dist-server/routers/api/restful-apis/v1/warehouse/get-return-order-details.js.map +1 -1
  3. package/openapi/v1/return-order.yaml +84 -27
  4. package/package.json +3 -3
  5. package/server/routers/api/restful-apis/v1/warehouse/get-return-order-details.ts +29 -1
package/dist-server/routers/api/restful-apis/v1/warehouse/get-return-order-details.js CHANGED
@@ -46,7 +46,7 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-return-order-details', middlewares
46
46
  const itemInfos = (returnOrder.orderInventories || [])
47
47
  .filter(orderInv => orderInv.type === 'RETURN_ORDER')
48
48
  .map(orderInv => {
49
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
49
+ var _a, _b, _c, _d, _e, _f, _g;
50
50
  return {
51
51
  batchId: orderInv.batchId,
52
52
  refItemId: orderInv.refItemId,
@@ -76,16 +76,43 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-return-order-details', middlewares
76
76
  },
77
77
  returnQty: orderInv.returnQty,
78
78
  remark: orderInv.remark,
79
+ status: orderInv.status
80
+ };
81
+ });
82
+ // Putaway inventories (type !== RETURN_ORDER, created during putaway process)
83
+ const putawayInventories = (returnOrder.orderInventories || [])
84
+ .filter(orderInv => orderInv.type !== 'RETURN_ORDER')
85
+ .map(orderInv => {
86
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
87
+ return {
88
+ batchId: orderInv.batchId,
89
+ product: {
90
+ id: orderInv.product.id,
91
+ sku: orderInv.product.sku,
92
+ brandSku: (_a = orderInv.product) === null || _a === void 0 ? void 0 : _a.brandSku,
93
+ brand: (_b = orderInv.product) === null || _b === void 0 ? void 0 : _b.brand,
94
+ subBrand: (_c = orderInv.product) === null || _c === void 0 ? void 0 : _c.subBrand
95
+ },
96
+ productDetail: {
97
+ id: orderInv.productDetail.id,
98
+ refCode: orderInv.productDetail.refCode,
99
+ packingType: orderInv.productDetail.packingType,
100
+ packingSize: orderInv.productDetail.packingSize,
101
+ uom: (_d = orderInv.productDetail) === null || _d === void 0 ? void 0 : _d.uom,
102
+ uomValue: (_e = orderInv.productDetail) === null || _e === void 0 ? void 0 : _e.uomValue
103
+ },
104
+ qty: orderInv.actualPackQty,
79
105
  status: orderInv.status,
106
+ remark: orderInv.remark,
80
107
  location: {
81
- id: (_j = (_h = orderInv.inventory) === null || _h === void 0 ? void 0 : _h.location) === null || _j === void 0 ? void 0 : _j.id,
82
- name: (_l = (_k = orderInv.inventory) === null || _k === void 0 ? void 0 : _k.location) === null || _l === void 0 ? void 0 : _l.name,
83
- type: (_o = (_m = orderInv.inventory) === null || _m === void 0 ? void 0 : _m.location) === null || _o === void 0 ? void 0 : _o.type,
84
- zone: (_q = (_p = orderInv.inventory) === null || _p === void 0 ? void 0 : _p.location) === null || _q === void 0 ? void 0 : _q.zone,
108
+ id: (_g = (_f = orderInv.inventory) === null || _f === void 0 ? void 0 : _f.location) === null || _g === void 0 ? void 0 : _g.id,
109
+ name: (_j = (_h = orderInv.inventory) === null || _h === void 0 ? void 0 : _h.location) === null || _j === void 0 ? void 0 : _j.name,
110
+ type: (_l = (_k = orderInv.inventory) === null || _k === void 0 ? void 0 : _k.location) === null || _l === void 0 ? void 0 : _l.type,
111
+ zone: (_o = (_m = orderInv.inventory) === null || _m === void 0 ? void 0 : _m.location) === null || _o === void 0 ? void 0 : _o.zone,
85
112
  warehouse: {
86
- id: (_t = (_s = (_r = orderInv.inventory) === null || _r === void 0 ? void 0 : _r.location) === null || _s === void 0 ? void 0 : _s.warehouse) === null || _t === void 0 ? void 0 : _t.id,
87
- name: (_w = (_v = (_u = orderInv.inventory) === null || _u === void 0 ? void 0 : _u.location) === null || _v === void 0 ? void 0 : _v.warehouse) === null || _w === void 0 ? void 0 : _w.name,
88
- description: (_z = (_y = (_x = orderInv.inventory) === null || _x === void 0 ? void 0 : _x.location) === null || _y === void 0 ? void 0 : _y.warehouse) === null || _z === void 0 ? void 0 : _z.description
113
+ id: (_r = (_q = (_p = orderInv.inventory) === null || _p === void 0 ? void 0 : _p.location) === null || _q === void 0 ? void 0 : _q.warehouse) === null || _r === void 0 ? void 0 : _r.id,
114
+ name: (_u = (_t = (_s = orderInv.inventory) === null || _s === void 0 ? void 0 : _s.location) === null || _t === void 0 ? void 0 : _t.warehouse) === null || _u === void 0 ? void 0 : _u.name,
115
+ description: (_x = (_w = (_v = orderInv.inventory) === null || _v === void 0 ? void 0 : _v.location) === null || _w === void 0 ? void 0 : _w.warehouse) === null || _x === void 0 ? void 0 : _x.description
89
116
  }
90
117
  }
91
118
  };
@@ -107,7 +134,8 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-return-order-details', middlewares
107
134
  : null,
108
135
  createdAt: returnOrder.createdAt,
109
136
  updatedAt: returnOrder.updatedAt,
110
- itemInfos
137
+ itemInfos,
138
+ newInventories: putawayInventories
111
139
  };
112
140
  context.body = { data };
113
141
  }
package/dist-server/routers/api/restful-apis/v1/warehouse/get-return-order-details.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get-return-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-return-order-details.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get-return-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-return-order-details.ts"],"names":[],"mappings":"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"}
package/openapi/v1/return-order.yaml CHANGED
@@ -251,6 +251,90 @@ definitions:
251
251
  updatedAt:
252
252
  type: string
253
253
  example: '2025-05-05T12:00:00Z'
254
+ newInventories:
255
+ type: array
256
+ description: 'Order inventories created during putaway process (type !== RETURN_ORDER)'
257
+ items:
258
+ type: object
259
+ properties:
260
+ batchId:
261
+ type: string
262
+ example: 'batch-001'
263
+ product:
264
+ type: object
265
+ properties:
266
+ id:
267
+ type: string
268
+ example: 'product-uuid'
269
+ sku:
270
+ type: string
271
+ example: '1234567890'
272
+ brandSku:
273
+ type: string
274
+ example: '1234567890'
275
+ brand:
276
+ type: string
277
+ example: 'Brand A'
278
+ subBrand:
279
+ type: string
280
+ example: 'Sub Brand A'
281
+ productDetail:
282
+ type: object
283
+ properties:
284
+ id:
285
+ type: string
286
+ example: 'product-detail-uuid'
287
+ refCode:
288
+ type: string
289
+ example: '1234567890'
290
+ packingType:
291
+ type: string
292
+ example: 'box'
293
+ packingSize:
294
+ type: integer
295
+ example: 24
296
+ uom:
297
+ type: string
298
+ example: 'PCS'
299
+ uomValue:
300
+ type: number
301
+ example: 10.0
302
+ qty:
303
+ type: integer
304
+ example: 10
305
+ status:
306
+ type: string
307
+ example: 'PUTTING_AWAY'
308
+ remark:
309
+ type: string
310
+ example: 'Putaway in progress'
311
+ location:
312
+ type: object
313
+ properties:
314
+ id:
315
+ type: string
316
+ example: 'location-uuid'
317
+ name:
318
+ type: string
319
+ example: 'A-01-01'
320
+ type:
321
+ type: string
322
+ example: 'STORAGE'
323
+ zone:
324
+ type: string
325
+ example: 'A'
326
+ warehouse:
327
+ type: object
328
+ properties:
329
+ id:
330
+ type: string
331
+ example: 'warehouse-uuid'
332
+ name:
333
+ type: string
334
+ example: 'Main Warehouse'
335
+ description:
336
+ type: string
337
+ example: 'Primary storage facility'
254
338
  itemInfos:
255
339
  type: array
256
340
  items:
@@ -334,33 +418,6 @@ definitions:
334
418
  status:
335
419
  type: string
336
420
  example: 'PENDING'
337
- location:
338
- type: object
339
- properties:
340
- id:
341
- type: string
342
- example: 'location-uuid'
343
- name:
344
- type: string
345
- example: 'A-01-01'
346
- type:
347
- type: string
348
- example: 'STORAGE'
349
- zone:
350
- type: string
351
- example: 'A'
352
- warehouse:
353
- type: object
354
- properties:
355
- id:
356
- type: string
357
- example: 'warehouse-uuid'
358
- name:
359
- type: string
360
- example: 'Main Warehouse'
361
- description:
362
- type: string
363
- example: 'Primary storage facility'
364
421
  xml:
365
422
  name: 'ReturnOrderDetail'
366
423
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-hub",
3
- "version": "4.3.698",
3
+ "version": "4.3.699",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -109,7 +109,7 @@
109
109
  "@things-factory/system-ui": "^4.3.695",
110
110
  "@things-factory/transport-base": "^4.3.695",
111
111
  "@things-factory/warehouse-base": "^4.3.695",
112
- "@things-factory/worksheet-base": "^4.3.697",
112
+ "@things-factory/worksheet-base": "^4.3.699",
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": "1a0a2828c1aa397acb656eea3ceb4d29ddc9d6ad"
125
+ "gitHead": "1d70991e559afcb07bc401d3871703295e65a452"
126
126
  }
package/server/routers/api/restful-apis/v1/warehouse/get-return-order-details.ts CHANGED
@@ -84,7 +84,34 @@ router.get(
84
84
  },
85
85
  returnQty: orderInv.returnQty,
86
86
  remark: orderInv.remark,
87
+ status: orderInv.status
88
+ }
89
+ })
90
+
91
+ // Putaway inventories (type !== RETURN_ORDER, created during putaway process)
92
+ const putawayInventories = (returnOrder.orderInventories || [])
93
+ .filter(orderInv => orderInv.type !== 'RETURN_ORDER')
94
+ .map(orderInv => {
95
+ return {
96
+ batchId: orderInv.batchId,
97
+ product: {
98
+ id: orderInv.product.id,
99
+ sku: orderInv.product.sku,
100
+ brandSku: orderInv.product?.brandSku,
101
+ brand: orderInv.product?.brand,
102
+ subBrand: orderInv.product?.subBrand
103
+ },
104
+ productDetail: {
105
+ id: orderInv.productDetail.id,
106
+ refCode: orderInv.productDetail.refCode,
107
+ packingType: orderInv.productDetail.packingType,
108
+ packingSize: orderInv.productDetail.packingSize,
109
+ uom: orderInv.productDetail?.uom,
110
+ uomValue: orderInv.productDetail?.uomValue
111
+ },
112
+ qty: orderInv.actualPackQty,
87
113
  status: orderInv.status,
114
+ remark: orderInv.remark,
88
115
  location: {
89
116
  id: orderInv.inventory?.location?.id,
90
117
  name: orderInv.inventory?.location?.name,
@@ -115,7 +142,8 @@ router.get(
115
142
  : null,
116
143
  createdAt: returnOrder.createdAt,
117
144
  updatedAt: returnOrder.updatedAt,
118
- itemInfos
145
+ itemInfos,
146
+ newInventories: putawayInventories
119
147
  }
120
148
  context.body = { data }
121
149
  } catch (e) {