@things-factory/operato-wms 4.3.759 → 4.3.760
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/client/pages/outbound/loading-v2/loading-execution-base.js +8 -20
- package/dist-server/graphql/resolvers/outbound/complete-load.js +8 -18
- package/dist-server/graphql/resolvers/outbound/complete-load.js.map +1 -1
- package/package.json +3 -3
- package/server/graphql/resolvers/outbound/complete-load.ts +8 -18
|
@@ -586,9 +586,7 @@ export class LoadingExecutionBase extends LitElement {
|
|
|
586
586
|
// Note: FIND_LOADABLE_RELEASE_GOOD_BY_BIN returns OrderInventory status ('LOADED'),
|
|
587
587
|
// not WorksheetDetail status ('DONE'), so we filter by 'LOADED'
|
|
588
588
|
this.loadingData = (binData || []).filter(
|
|
589
|
-
data =>
|
|
590
|
-
data?.status !== 'LOADED' &&
|
|
591
|
-
data?.releaseGood?.name === this._currentReleaseGood.releaseGood.name
|
|
589
|
+
data => data?.status !== 'LOADED' && data?.releaseGood?.name === this._currentReleaseGood.releaseGood.name
|
|
592
590
|
)
|
|
593
591
|
}
|
|
594
592
|
|
|
@@ -621,9 +619,7 @@ export class LoadingExecutionBase extends LitElement {
|
|
|
621
619
|
} else {
|
|
622
620
|
this.loadingData = await this.fetchData(this.worksheet?.releaseGood?.name, 'loading', this._useQcSku)
|
|
623
621
|
// Filter out items that are already LOADED (safety check in case backend returns them)
|
|
624
|
-
this.loadingData = (this.loadingData || []).filter(
|
|
625
|
-
data => data?.status !== WORKSHEET_STATUS.DONE.value
|
|
626
|
-
)
|
|
622
|
+
this.loadingData = (this.loadingData || []).filter(data => data?.status !== WORKSHEET_STATUS.DONE.value)
|
|
627
623
|
// Refresh tabCounts when switching to LOADING tab
|
|
628
624
|
if (this._currentReleaseGood?.releaseGood?.name || this.worksheet?.releaseGood?.name) {
|
|
629
625
|
const orderNo = this._currentReleaseGood?.releaseGood?.name || this.worksheet?.releaseGood?.name
|
|
@@ -784,9 +780,7 @@ export class LoadingExecutionBase extends LitElement {
|
|
|
784
780
|
} else {
|
|
785
781
|
this.loadingData = await this.fetchData(selectedRO.name, 'loading', false)
|
|
786
782
|
// Filter out items that are already LOADED (safety check)
|
|
787
|
-
this.loadingData = (this.loadingData || []).filter(
|
|
788
|
-
data => data?.status !== WORKSHEET_STATUS.DONE.value
|
|
789
|
-
)
|
|
783
|
+
this.loadingData = (this.loadingData || []).filter(data => data?.status !== WORKSHEET_STATUS.DONE.value)
|
|
790
784
|
}
|
|
791
785
|
} else if (finalTabName === TAB_TYPES.LOADED) {
|
|
792
786
|
this.loadedData = await fetchDeliveryOrders(selectedRO.name)
|
|
@@ -810,9 +804,7 @@ export class LoadingExecutionBase extends LitElement {
|
|
|
810
804
|
let binLoadingData = await this.fetchData(this.worksheet.binLocationName, 'loading', true)
|
|
811
805
|
this.loadingData = (binLoadingData || []).filter(
|
|
812
806
|
data =>
|
|
813
|
-
data?.sortedQty > 0 &&
|
|
814
|
-
data?.status !== 'LOADED' &&
|
|
815
|
-
data?.releaseGood?.name === selectedRO.name
|
|
807
|
+
data?.sortedQty > 0 && data?.status !== 'LOADED' && data?.releaseGood?.name === selectedRO.name
|
|
816
808
|
)
|
|
817
809
|
} else {
|
|
818
810
|
const [qcData, loadingData] = await Promise.all([
|
|
@@ -1005,9 +997,7 @@ export class LoadingExecutionBase extends LitElement {
|
|
|
1005
997
|
// Standard mode: fetch by release order name
|
|
1006
998
|
this.loadingData = await this.fetchData(orderNo, 'loading', false)
|
|
1007
999
|
// Filter out items that are already LOADED (safety check)
|
|
1008
|
-
this.loadingData = (this.loadingData || []).filter(
|
|
1009
|
-
data => data?.status !== WORKSHEET_STATUS.DONE.value
|
|
1010
|
-
)
|
|
1000
|
+
this.loadingData = (this.loadingData || []).filter(data => data?.status !== WORKSHEET_STATUS.DONE.value)
|
|
1011
1001
|
}
|
|
1012
1002
|
}
|
|
1013
1003
|
|
|
@@ -1339,7 +1329,7 @@ export class LoadingExecutionBase extends LitElement {
|
|
|
1339
1329
|
const response = await client.mutate({
|
|
1340
1330
|
mutation: COMPLETE_LOAD,
|
|
1341
1331
|
variables: {
|
|
1342
|
-
orderId: this._currentReleaseGood?.releaseGood.
|
|
1332
|
+
orderId: this._currentReleaseGood?.releaseGood.name,
|
|
1343
1333
|
worksheetId: this._executionData.worksheetId
|
|
1344
1334
|
}
|
|
1345
1335
|
})
|
|
@@ -1426,7 +1416,7 @@ export class LoadingExecutionBase extends LitElement {
|
|
|
1426
1416
|
const response = await client.mutate({
|
|
1427
1417
|
mutation: COMPLETE_LOAD_PARTIALLY,
|
|
1428
1418
|
variables: {
|
|
1429
|
-
orderId: this._currentReleaseGood?.releaseGood.
|
|
1419
|
+
orderId: this._currentReleaseGood?.releaseGood.name,
|
|
1430
1420
|
worksheetId: this._executionData.worksheetId
|
|
1431
1421
|
}
|
|
1432
1422
|
})
|
|
@@ -1504,9 +1494,7 @@ export class LoadingExecutionBase extends LitElement {
|
|
|
1504
1494
|
showToast({ type: 'success', message: 'Returning worksheet generated' })
|
|
1505
1495
|
this.loadingData = await this.fetchData(this.worksheet?.releaseGood?.name, 'loading', this._useQcSku)
|
|
1506
1496
|
// Filter out items that are already LOADED (safety check)
|
|
1507
|
-
this.loadingData = (this.loadingData || []).filter(
|
|
1508
|
-
data => data?.status !== WORKSHEET_STATUS.DONE.value
|
|
1509
|
-
)
|
|
1497
|
+
this.loadingData = (this.loadingData || []).filter(data => data?.status !== WORKSHEET_STATUS.DONE.value)
|
|
1510
1498
|
}}
|
|
1511
1499
|
></warehouse-return-popup>
|
|
1512
1500
|
`,
|
|
@@ -25,30 +25,20 @@ exports.completeLoad = {
|
|
|
25
25
|
};
|
|
26
26
|
async function completeLoading(domain, tx, user, partial, orderId, worksheetId) {
|
|
27
27
|
var _a, _b, _c;
|
|
28
|
-
// Fetch release order
|
|
28
|
+
// Fetch release order - optimized to reduce DB locks (14 relations → 4 relations)
|
|
29
|
+
// - orderProducts re-fetched at line 200 with fresh relations
|
|
30
|
+
// - deliveryOrders re-fetched at line 109
|
|
31
|
+
// - Only load essential relations needed before those re-fetches
|
|
32
|
+
console.time('completeLoading - fetch releaseGood');
|
|
29
33
|
const releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
30
34
|
where: {
|
|
31
|
-
|
|
35
|
+
name: orderId,
|
|
32
36
|
domain: domain,
|
|
33
37
|
status: (0, typeorm_1.In)([sales_base_1.ORDER_STATUS.LOADING, sales_base_1.ORDER_STATUS.PROCESSING, sales_base_1.ORDER_STATUS.PARTIAL_PROCESSING])
|
|
34
38
|
},
|
|
35
|
-
relations: [
|
|
36
|
-
'domain',
|
|
37
|
-
'bizplace',
|
|
38
|
-
'bizplace.domain',
|
|
39
|
-
'creator',
|
|
40
|
-
'updater',
|
|
41
|
-
'orderInventories',
|
|
42
|
-
'lastMileDelivery',
|
|
43
|
-
'orderProducts',
|
|
44
|
-
'orderProducts.product',
|
|
45
|
-
'orderProducts.productDetail',
|
|
46
|
-
'deliveryOrders',
|
|
47
|
-
'deliveryOrders.orderInventories',
|
|
48
|
-
'deliveryOrders.orderInventories.productDetail',
|
|
49
|
-
'deliveryOrders.orderInventories.product'
|
|
50
|
-
]
|
|
39
|
+
relations: ['bizplace', 'bizplace.domain', 'orderInventories', 'lastMileDelivery']
|
|
51
40
|
});
|
|
41
|
+
console.timeEnd('completeLoading - fetch releaseGood');
|
|
52
42
|
if (!releaseGood) {
|
|
53
43
|
throw new Error('Release good not found or not in a valid status');
|
|
54
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-load.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/complete-load.ts"],"names":[],"mappings":";;;AAAA,qCAAuD;AAEvD,yDAAiE;AACjE,2DAUmC;AACnC,mEAA6G;AAC7G,qEAA+D;AAC/D,2EAA2D;AAC3D,+DAAsD;AACtD,uEAAoF;AAEpF,SAAS,mBAAmB,CAAC,KAAU;IACrC,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,GAAG,EAAE,EAAE,CAAC,CAAA;IACpC,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAChD,CAAC;AAEY,QAAA,YAAY,GAAG;IAC1B,KAAK,CAAC,YAAY,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,OAAY;QAC/D,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,OAAO,eAAe,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;IACvE,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,OAAY;QACxE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,OAAO,eAAe,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;IACtE,CAAC;CACF,CAAA;AAED,KAAK,UAAU,eAAe,CAC5B,MAAc,EACd,EAAiB,EACjB,IAAU,EACV,OAAgB,EAChB,OAAe,EACf,WAAmB;;IAEnB,
|
|
1
|
+
{"version":3,"file":"complete-load.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/complete-load.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-wms",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.760",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -108,7 +108,7 @@
|
|
|
108
108
|
"@things-factory/transport-base": "^4.3.755",
|
|
109
109
|
"@things-factory/tutorial-ui": "^4.3.755",
|
|
110
110
|
"@things-factory/warehouse-base": "^4.3.755",
|
|
111
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
111
|
+
"@things-factory/worksheet-base": "^4.3.760"
|
|
112
112
|
},
|
|
113
113
|
"devDependencies": {
|
|
114
114
|
"@things-factory/builder": "^4.3.755",
|
|
@@ -117,5 +117,5 @@
|
|
|
117
117
|
"cypress-localstorage-commands": "^1.6.1",
|
|
118
118
|
"eslint-plugin-cypress": "^2.12.1"
|
|
119
119
|
},
|
|
120
|
-
"gitHead": "
|
|
120
|
+
"gitHead": "c6b185ad92efc92e1ea5d80899f2a1f38cf37c4b"
|
|
121
121
|
}
|
|
@@ -45,31 +45,21 @@ async function completeLoading(
|
|
|
45
45
|
orderId: String,
|
|
46
46
|
worksheetId: String
|
|
47
47
|
) {
|
|
48
|
-
// Fetch release order
|
|
48
|
+
// Fetch release order - optimized to reduce DB locks (14 relations → 4 relations)
|
|
49
|
+
// - orderProducts re-fetched at line 200 with fresh relations
|
|
50
|
+
// - deliveryOrders re-fetched at line 109
|
|
51
|
+
// - Only load essential relations needed before those re-fetches
|
|
52
|
+
console.time('completeLoading - fetch releaseGood')
|
|
49
53
|
const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
|
|
50
54
|
where: {
|
|
51
|
-
|
|
55
|
+
name: orderId,
|
|
52
56
|
domain: domain,
|
|
53
57
|
status: In([ORDER_STATUS.LOADING, ORDER_STATUS.PROCESSING, ORDER_STATUS.PARTIAL_PROCESSING])
|
|
54
58
|
},
|
|
55
|
-
relations: [
|
|
56
|
-
'domain',
|
|
57
|
-
'bizplace',
|
|
58
|
-
'bizplace.domain',
|
|
59
|
-
'creator',
|
|
60
|
-
'updater',
|
|
61
|
-
'orderInventories',
|
|
62
|
-
'lastMileDelivery',
|
|
63
|
-
'orderProducts',
|
|
64
|
-
'orderProducts.product',
|
|
65
|
-
'orderProducts.productDetail',
|
|
66
|
-
'deliveryOrders',
|
|
67
|
-
'deliveryOrders.orderInventories',
|
|
68
|
-
'deliveryOrders.orderInventories.productDetail',
|
|
69
|
-
'deliveryOrders.orderInventories.product'
|
|
70
|
-
]
|
|
59
|
+
relations: ['bizplace', 'bizplace.domain', 'orderInventories', 'lastMileDelivery']
|
|
71
60
|
})
|
|
72
61
|
|
|
62
|
+
console.timeEnd('completeLoading - fetch releaseGood')
|
|
73
63
|
if (!releaseGood) {
|
|
74
64
|
throw new Error('Release good not found or not in a valid status')
|
|
75
65
|
}
|