@things-factory/operato-hub 4.3.573 → 4.3.574

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.
@@ -43,11 +43,19 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-inbound-order-details', middleware
43
43
  'arrivalNotice.orderInventories.inventory'
44
44
  ]
45
45
  });
46
- let grnOrderInventories = goodsReceivedNote.arrivalNotice.orderInventories.reduce((acc, orderInventory) => {
47
- var _a, _b;
48
- let key = `${orderInventory.product.id}_${orderInventory.batchId}_${orderInventory.packingType}_${orderInventory.uom}_${orderInventory.inventory.expirationDate}`;
49
- if (!acc[key]) {
50
- acc[key] = {
46
+ let grnOrderInventories = goodsReceivedNote === null || goodsReceivedNote === void 0 ? void 0 : goodsReceivedNote.arrivalNotice.orderInventories.reduce((acc, orderInventory) => {
47
+ // let key = `${orderInventory.productDetail.id}_${orderInventory.batchId}_${orderInventory.packingType}_${orderInventory.uom}_${orderInventory.inventory.expirationDate}`
48
+ var _a, _b, _c;
49
+ let existingItem = acc.find(item => {
50
+ var _a;
51
+ return item.product.id === orderInventory.product.id &&
52
+ item.batchId === orderInventory.batchId &&
53
+ item.packingType === orderInventory.packingType &&
54
+ item.uom === orderInventory.uom &&
55
+ item.expirationDate === ((_a = orderInventory.inventory) === null || _a === void 0 ? void 0 : _a.expirationDate);
56
+ });
57
+ if (!existingItem) {
58
+ acc.push({
51
59
  product: {
52
60
  id: orderInventory.product.id,
53
61
  sku: orderInventory.product.sku,
@@ -59,23 +67,21 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-inbound-order-details', middleware
59
67
  packingSize: orderInventory.productDetail.packingSize,
60
68
  uom: orderInventory.productDetail.uom
61
69
  },
62
- type: orderInventory.type,
63
70
  batchId: orderInventory.batchId,
64
71
  packingType: orderInventory.packingType,
65
72
  packingSize: orderInventory.packingSize,
66
73
  status: orderInventory.status,
67
- qty: 0,
74
+ qty: ((_a = orderInventory.inventory) === null || _a === void 0 ? void 0 : _a.qty) || 0,
68
75
  uom: orderInventory.uom,
69
76
  uomValue: orderInventory.uomValue,
70
- expirationDate: (_a = orderInventory.inventory) === null || _a === void 0 ? void 0 : _a.expirationDate
71
- };
77
+ expirationDate: (_b = orderInventory.inventory) === null || _b === void 0 ? void 0 : _b.expirationDate
78
+ });
79
+ }
80
+ else {
81
+ existingItem.qty += ((_c = orderInventory.inventory) === null || _c === void 0 ? void 0 : _c.qty) || 0;
72
82
  }
73
- // Accumulate the quantity
74
- acc[key].qty += (_b = orderInventory.inventory) === null || _b === void 0 ? void 0 : _b.qty;
75
83
  return acc;
76
- }, {});
77
- // Convert the grouped object back to an array
78
- grnOrderInventories = Object.values(grnOrderInventories);
84
+ }, []);
79
85
  // create and format data response
80
86
  let orderProducts = [];
81
87
  for (const orderProduct of arrivalNotice.orderProducts) {
@@ -1 +1 @@
1
- {"version":3,"file":"get-inbound-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-inbound-order-details.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get-inbound-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-inbound-order-details.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.573",
3
+ "version": "4.3.574",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -122,5 +122,5 @@
122
122
  "resolutions": {
123
123
  "core-js": "^3.16.0"
124
124
  },
125
- "gitHead": "15d8bc5cdc55b056e9bf164bd44148a80af8aa22"
125
+ "gitHead": "e16e67d0683a0762a602d2ae8a910fd3eefc7a0f"
126
126
  }
@@ -49,11 +49,19 @@ router.get(
49
49
  ]
50
50
  })
51
51
 
52
- let grnOrderInventories = goodsReceivedNote.arrivalNotice.orderInventories.reduce((acc, orderInventory) => {
53
- let key = `${orderInventory.product.id}_${orderInventory.batchId}_${orderInventory.packingType}_${orderInventory.uom}_${orderInventory.inventory.expirationDate}`
52
+ let grnOrderInventories = goodsReceivedNote?.arrivalNotice.orderInventories.reduce((acc, orderInventory) => {
53
+ // let key = `${orderInventory.productDetail.id}_${orderInventory.batchId}_${orderInventory.packingType}_${orderInventory.uom}_${orderInventory.inventory.expirationDate}`
54
54
 
55
- if (!acc[key]) {
56
- acc[key] = {
55
+ let existingItem = acc.find(item =>
56
+ item.product.id === orderInventory.product.id &&
57
+ item.batchId === orderInventory.batchId &&
58
+ item.packingType === orderInventory.packingType &&
59
+ item.uom === orderInventory.uom &&
60
+ item.expirationDate === orderInventory.inventory?.expirationDate
61
+ )
62
+
63
+ if (!existingItem) {
64
+ acc.push({
57
65
  product: {
58
66
  id: orderInventory.product.id,
59
67
  sku: orderInventory.product.sku,
@@ -65,26 +73,21 @@ router.get(
65
73
  packingSize: orderInventory.productDetail.packingSize,
66
74
  uom: orderInventory.productDetail.uom
67
75
  },
68
- type: orderInventory.type,
69
76
  batchId: orderInventory.batchId,
70
77
  packingType: orderInventory.packingType,
71
78
  packingSize: orderInventory.packingSize,
72
79
  status: orderInventory.status,
73
- qty: 0, // Initialize quantity
80
+ qty: orderInventory.inventory?.qty || 0,
74
81
  uom: orderInventory.uom,
75
82
  uomValue: orderInventory.uomValue,
76
83
  expirationDate: orderInventory.inventory?.expirationDate
77
- }
84
+ })
85
+ } else {
86
+ existingItem.qty += orderInventory.inventory?.qty || 0
78
87
  }
79
88
 
80
- // Accumulate the quantity
81
- acc[key].qty += orderInventory.inventory?.qty
82
-
83
89
  return acc
84
- }, {})
85
-
86
- // Convert the grouped object back to an array
87
- grnOrderInventories = Object.values(grnOrderInventories)
90
+ }, [])
88
91
 
89
92
  // create and format data response
90
93
  let orderProducts = []