@things-factory/worksheet-base 6.2.130 → 6.2.132
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.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worksheet-base",
|
|
3
|
-
"version": "6.2.
|
|
3
|
+
"version": "6.2.132",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -34,11 +34,11 @@
|
|
|
34
34
|
"@things-factory/integration-sftp": "^6.2.126",
|
|
35
35
|
"@things-factory/marketplace-base": "^6.2.130",
|
|
36
36
|
"@things-factory/notification": "^6.2.126",
|
|
37
|
-
"@things-factory/sales-base": "^6.2.
|
|
37
|
+
"@things-factory/sales-base": "^6.2.132",
|
|
38
38
|
"@things-factory/setting-base": "^6.2.126",
|
|
39
39
|
"@things-factory/shell": "^6.2.126",
|
|
40
40
|
"@things-factory/transport-base": "^6.2.126",
|
|
41
41
|
"@things-factory/warehouse-base": "^6.2.130"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "945f6cd7423c8af4e5bc50b80e2c8f131134dd53"
|
|
44
44
|
}
|
|
@@ -33,6 +33,7 @@ export const worksheetResolver = {
|
|
|
33
33
|
'bufferLocation.warehouse',
|
|
34
34
|
'arrivalNotice',
|
|
35
35
|
'arrivalNotice.releaseGood',
|
|
36
|
+
'arrivalNotice.supplier',
|
|
36
37
|
'releaseGood',
|
|
37
38
|
'releaseGood.arrivalNotice',
|
|
38
39
|
'releaseGood.shippingOrder',
|
|
@@ -115,10 +116,7 @@ export const worksheetResolver = {
|
|
|
115
116
|
})
|
|
116
117
|
|
|
117
118
|
// update inventory data >> unloaded inventory history data
|
|
118
|
-
if (
|
|
119
|
-
worksheet.type === WORKSHEET_TYPE.PUTAWAY &&
|
|
120
|
-
worksheet.worksheetDetails.every(wsd => wsd.targetInventory.inventory)
|
|
121
|
-
) {
|
|
119
|
+
if (worksheet.type === WORKSHEET_TYPE.PUTAWAY && worksheet.worksheetDetails.every(wsd => wsd.targetInventory.inventory)) {
|
|
122
120
|
worksheet.worksheetDetails = await Promise.all(
|
|
123
121
|
worksheet.worksheetDetails.map(async (wsd: WorksheetDetail) => {
|
|
124
122
|
let inventory: Inventory = wsd.targetInventory.inventory
|
|
@@ -253,9 +251,7 @@ export const worksheetResolver = {
|
|
|
253
251
|
})
|
|
254
252
|
}
|
|
255
253
|
|
|
256
|
-
worksheet.marketplaceOrder.trackingNo = marketplaceOrderShipping.ownTrackingNo
|
|
257
|
-
? marketplaceOrderShipping.ownTrackingNo
|
|
258
|
-
: marketplaceOrderShipping.trackingNo
|
|
254
|
+
worksheet.marketplaceOrder.trackingNo = marketplaceOrderShipping.ownTrackingNo ? marketplaceOrderShipping.ownTrackingNo : marketplaceOrderShipping.trackingNo
|
|
259
255
|
worksheet.marketplaceOrder.shippingProvider = marketplaceOrderShipping.ownTransporter
|
|
260
256
|
? marketplaceOrderShipping.ownTransporter
|
|
261
257
|
: marketplaceOrderShipping.transporter
|
|
@@ -274,10 +270,7 @@ export const worksheetResolver = {
|
|
|
274
270
|
|
|
275
271
|
if (worksheet.orderInventories) {
|
|
276
272
|
worksheet.worksheetDetails.sort(function (a, b) {
|
|
277
|
-
return (
|
|
278
|
-
worksheet.orderInventories.map(oi => oi.id).indexOf(a.targetInventory.id) -
|
|
279
|
-
worksheet.orderInventories.map(oi => oi.id).indexOf(b.targetInventory.id)
|
|
280
|
-
)
|
|
273
|
+
return worksheet.orderInventories.map(oi => oi.id).indexOf(a.targetInventory.id) - worksheet.orderInventories.map(oi => oi.id).indexOf(b.targetInventory.id)
|
|
281
274
|
})
|
|
282
275
|
}
|
|
283
276
|
|