@things-factory/operato-wms 4.3.757 → 4.3.759
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/delivery-order-info.js +38 -3
- package/client/pages/outbound/loading-v2/loading-execution-base.js +132 -17
- package/dist-server/graphql/resolvers/outbound/find-loadable-release-good-by-bin.js +15 -0
- package/dist-server/graphql/resolvers/outbound/find-loadable-release-good-by-bin.js.map +1 -1
- package/dist-server/graphql/resolvers/outbound/find-loadable-release-good.js +9 -8
- package/dist-server/graphql/resolvers/outbound/find-loadable-release-good.js.map +1 -1
- package/dist-server/graphql/resolvers/outbound/load-by-qty.js +115 -45
- package/dist-server/graphql/resolvers/outbound/load-by-qty.js.map +1 -1
- package/dist-server/graphql/resolvers/outbound/loading-worksheet-v2.js +4 -0
- package/dist-server/graphql/resolvers/outbound/loading-worksheet-v2.js.map +1 -1
- package/dist-server/graphql/resolvers/outbound/undo-load.js +94 -42
- package/dist-server/graphql/resolvers/outbound/undo-load.js.map +1 -1
- package/dist-server/graphql/resolvers/route-label/route-label.js +8 -12
- package/dist-server/graphql/resolvers/route-label/route-label.js.map +1 -1
- package/dist-server/graphql/resolvers/zone-worksheet/zone-picking.js +31 -2
- package/dist-server/graphql/resolvers/zone-worksheet/zone-picking.js.map +1 -1
- package/package.json +4 -4
- package/server/graphql/resolvers/outbound/find-loadable-release-good-by-bin.ts +15 -0
- package/server/graphql/resolvers/outbound/find-loadable-release-good.ts +9 -7
- package/server/graphql/resolvers/outbound/load-by-qty.ts +198 -81
- package/server/graphql/resolvers/outbound/loading-worksheet-v2.ts +4 -0
- package/server/graphql/resolvers/outbound/undo-load.ts +116 -44
- package/server/graphql/resolvers/route-label/route-label.ts +9 -12
- package/server/graphql/resolvers/zone-worksheet/zone-picking.ts +41 -2
|
@@ -86,6 +86,10 @@ exports.loadingWorksheetv2 = {
|
|
|
86
86
|
if (filter === FILTER_TYPES.LOADING) {
|
|
87
87
|
if (shouldFilterBySortedQty(releaseGood.status, disableQc)) {
|
|
88
88
|
qb.andWhere('targetInventory.sortedQty > 0');
|
|
89
|
+
// Exclude LOADED items - they should only appear in LOADED tab
|
|
90
|
+
qb.andWhere('targetInventory.status <> :loadedStatus', {
|
|
91
|
+
loadedStatus: sales_base_1.ORDER_INVENTORY_STATUS.LOADED
|
|
92
|
+
});
|
|
89
93
|
}
|
|
90
94
|
else {
|
|
91
95
|
qb.andWhere('targetInventory.status IN (:...loadingStatus)', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loading-worksheet-v2.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/loading-worksheet-v2.ts"],"names":[],"mappings":";;;AACA,qCAA4B;AAG5B,2DAA8F;AAC9F,mEAA6G;AAC7G,+DAAsD;AAEtD,MAAM,YAAY,GAAG;IACnB,EAAE,EAAE,IAAI;IACR,OAAO,EAAE,SAAS;CACV,CAAA;AAgEV,mBAAmB;AACnB,SAAS,UAAU,CAAC,IAAiB;IACnC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAA;IACtB,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;AACpE,CAAC;AAED,SAAS,uBAAuB,CAAC,iBAAyB,EAAE,SAAkB;IAC5E,OAAO,iBAAiB,KAAK,yBAAY,CAAC,OAAO,IAAI,CAAC,SAAS,CAAA;AACjE,CAAC;AAED,SAAS,YAAY,CAAC,iBAAyB,EAAE,SAAkB,EAAE,SAAiB,EAAE,SAAiB;IACvG,OAAO,iBAAiB,KAAK,yBAAY,CAAC,OAAO,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;AACxF,CAAC;AAEY,QAAA,kBAAkB,GAAG;IAChC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,OAAY;QACvE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE;YAC1C,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;SACnC;QAED,oBAAoB;QACpB,MAAM,WAAW,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YAC3E,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;SACjC,CAAC,CAAA;QAEF,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;QAE3D,iBAAiB;QACjB,MAAM,SAAS,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,OAAO,CAAC;YACrE,KAAK,EAAE;gBACL,MAAM;gBACN,WAAW;gBACX,IAAI,EAAE,+BAAc,CAAC,OAAO;gBAC5B,MAAM,EAAE,IAAA,YAAE,EAAC,CAAC,iCAAgB,CAAC,SAAS,EAAE,iCAAgB,CAAC,iBAAiB,CAAC,CAAC;aAC7E;YACD,SAAS,EAAE,CAAC,UAAU,CAAC;SACxB,CAAC,CAAA;QAEF,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,GAAG,OAAO,CAAC,CAAA;QAElF,iBAAiB;QACjB,MAAM,gBAAgB,GAAY,MAAM,EAAE,CAAC,aAAa,CAAC,sBAAO,CAAC,CAAC,OAAO,CAAC;YACxE,KAAK,EAAE;gBACL,MAAM;gBACN,IAAI,EAAE,uBAAuB;aAC9B;SACF,CAAC,CAAA;QAEF,MAAM,SAAS,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,KAAK,MAAK,MAAM,CAAA;QAEpD,gCAAgC;QAChC,MAAM,EAAE,GAAG,EAAE;aACV,aAAa,CAAC,gCAAe,CAAC;aAC9B,kBAAkB,CAAC,iBAAiB,CAAC;aACrC,iBAAiB,CAAC,iCAAiC,EAAE,iBAAiB,CAAC;aACvE,iBAAiB,CAAC,6BAA6B,EAAE,aAAa,CAAC;aAC/D,iBAAiB,CAAC,yBAAyB,EAAE,SAAS,CAAC;aACvD,iBAAiB,CAAC,+BAA+B,EAAE,eAAe,CAAC;aACnE,QAAQ,CAAC,2BAA2B,EAAE,WAAW,CAAC;aAClD,SAAS,CAAC,0BAA0B,CAAC;aACrC,KAAK,CAAC,uCAAuC,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;aACvE,QAAQ,CAAC,6CAA6C,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAA;QAEzF,qCAAqC;QACrC,MAAM,mBAAmB,GAAsB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;QACjE,IAAI,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,iCAAgB,CAAC,WAAW,CAAC,EAAE;YACjF,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;SAC7D;QAED,gBAAgB;QAChB,EAAE,CAAC,QAAQ,CAAC,qDAAqD,EAAE;YACjE,eAAe,EAAE,CAAC,mCAAsB,CAAC,UAAU,EAAE,mCAAsB,CAAC,SAAS,CAAC;SACvF,CAAC,CAAA;QAEF,EAAE,CAAC,QAAQ,CAAC,2CAA2C,EAAE;YACvD,SAAS,EAAE,CAAC,iCAAgB,CAAC,SAAS,CAAC;SACxC,CAAC,CAAA;QAEF,IAAI,MAAM,KAAK,YAAY,CAAC,EAAE,EAAE;YAC9B,EAAE,CAAC,QAAQ,CAAC,+CAA+C,EAAE;gBAC3D,aAAa,EAAE,CAAC,mCAAsB,CAAC,OAAO,EAAE,mCAAsB,CAAC,OAAO,CAAC;aAChF,CAAC,CAAA;YACF,EAAE,CAAC,QAAQ,CAAC,wDAAwD,CAAC,CAAA;SACtE;QAED,IAAI,MAAM,KAAK,YAAY,CAAC,OAAO,EAAE;YACnC,IAAI,uBAAuB,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE;gBAC1D,EAAE,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"loading-worksheet-v2.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/loading-worksheet-v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.undoLoad = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
4
5
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
5
6
|
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
6
7
|
const worksheet_base_1 = require("@things-factory/worksheet-base");
|
|
@@ -15,56 +16,107 @@ exports.undoLoad = {
|
|
|
15
16
|
throw new Error(`Delivery order not found`);
|
|
16
17
|
}
|
|
17
18
|
const releaseGood = deliveryOrder.releaseGood;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
19
|
+
const doInventories = deliveryOrder.orderInventories;
|
|
20
|
+
if (!doInventories.length) {
|
|
21
|
+
await tx.getRepository(sales_base_1.DeliveryOrder).delete(deliveryOrder.id);
|
|
22
|
+
return true;
|
|
23
|
+
}
|
|
24
|
+
// OPTIMIZATION 1: Batch fetch all worksheet details in one query instead of N queries
|
|
25
|
+
const doInventoryIds = doInventories.map(oi => oi.id);
|
|
26
|
+
const worksheetDetails = await tx.getRepository(worksheet_base_1.WorksheetDetail).find({
|
|
27
|
+
where: {
|
|
28
|
+
targetInventory: { id: (0, typeorm_1.In)(doInventoryIds) },
|
|
29
|
+
type: worksheet_base_1.WORKSHEET_TYPE.LOADING,
|
|
30
|
+
status: worksheet_base_1.WORKSHEET_STATUS.DONE
|
|
31
|
+
}
|
|
32
|
+
});
|
|
33
|
+
// Create a map for O(1) lookup of worksheet details by targetInventory.id
|
|
34
|
+
const wsdByTargetId = new Map();
|
|
35
|
+
worksheetDetails.forEach((wsd) => {
|
|
36
|
+
var _a;
|
|
37
|
+
const targetInvId = (_a = wsd.targetInventory) === null || _a === void 0 ? void 0 : _a.id;
|
|
38
|
+
if (targetInvId) {
|
|
39
|
+
wsdByTargetId.set(targetInvId, wsd);
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
// OPTIMIZATION 2: Create a map for O(1) lookup of previous (split) order inventories
|
|
43
|
+
// Key: inventoryId_productId_productDetailId, Value: OrderInventory with LOADING status
|
|
44
|
+
const previousOiMap = new Map();
|
|
45
|
+
const doInventoryIdSet = new Set(doInventoryIds);
|
|
46
|
+
releaseGood.orderInventories.forEach(roInventory => {
|
|
47
|
+
if (!doInventoryIdSet.has(roInventory.id) && roInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.LOADING) {
|
|
48
|
+
const key = `${roInventory.inventoryId}_${roInventory.productId}_${roInventory.productDetailId}`;
|
|
49
|
+
previousOiMap.set(key, roInventory);
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
// Categorize order inventories for batch processing
|
|
53
|
+
const toTerminate = [];
|
|
54
|
+
const toRevert = [];
|
|
55
|
+
for (const doInventory of doInventories) {
|
|
56
|
+
const worksheetDetail = wsdByTargetId.get(doInventory.id);
|
|
57
|
+
const lookupKey = `${doInventory.inventoryId}_${doInventory.productId}_${doInventory.productDetailId}`;
|
|
58
|
+
const previousOi = previousOiMap.get(lookupKey);
|
|
28
59
|
if (previousOi) {
|
|
29
|
-
|
|
30
|
-
await tx.getRepository(sales_base_1.OrderInventory).update(previousOi.id, {
|
|
31
|
-
releaseQty: previousOi.releaseQty + doInventory.releaseQty,
|
|
32
|
-
pickedQty: previousOi.pickedQty + doInventory.pickedQty,
|
|
33
|
-
sortedQty: previousOi.sortedQty + doInventory.sortedQty,
|
|
34
|
-
releaseUomValue: previousOi.releaseUomValue + doInventory.releaseUomValue,
|
|
35
|
-
updater: user,
|
|
36
|
-
updatedAt: new Date()
|
|
37
|
-
});
|
|
38
|
-
//terminate splitted oi
|
|
39
|
-
await tx.getRepository(sales_base_1.OrderInventory).update(doInventory.id, {
|
|
40
|
-
deliveryOrder: null,
|
|
41
|
-
status: sales_base_1.ORDER_INVENTORY_STATUS.TERMINATED,
|
|
42
|
-
updatedAt: new Date(),
|
|
43
|
-
updater: user
|
|
44
|
-
});
|
|
45
|
-
//delete wsd
|
|
46
|
-
await tx.getRepository(worksheet_base_1.WorksheetDetail).delete({ id: worksheetDetail.id, status: worksheet_base_1.WORKSHEET_STATUS.DONE });
|
|
60
|
+
toTerminate.push({ doInventory, previousOi, wsd: worksheetDetail });
|
|
47
61
|
}
|
|
48
62
|
else {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
63
|
+
toRevert.push({ doInventory, wsd: worksheetDetail });
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
// OPTIMIZATION 3: Batch update operations
|
|
67
|
+
const now = new Date();
|
|
68
|
+
// Process terminations (split order inventories)
|
|
69
|
+
if (toTerminate.length > 0) {
|
|
70
|
+
// Update previous OIs with combined quantities - must be done individually due to different values
|
|
71
|
+
await Promise.all(toTerminate.map(({ doInventory, previousOi }) => tx.getRepository(sales_base_1.OrderInventory).update(previousOi.id, {
|
|
72
|
+
releaseQty: previousOi.releaseQty + doInventory.releaseQty,
|
|
73
|
+
pickedQty: previousOi.pickedQty + doInventory.pickedQty,
|
|
74
|
+
sortedQty: previousOi.sortedQty + doInventory.sortedQty,
|
|
75
|
+
releaseUomValue: previousOi.releaseUomValue + doInventory.releaseUomValue,
|
|
76
|
+
updater: user,
|
|
77
|
+
updatedAt: now
|
|
78
|
+
})));
|
|
79
|
+
// Batch terminate the DO inventories
|
|
80
|
+
const terminateIds = toTerminate.map(t => t.doInventory.id);
|
|
81
|
+
await tx.getRepository(sales_base_1.OrderInventory).update({ id: (0, typeorm_1.In)(terminateIds) }, {
|
|
82
|
+
deliveryOrder: null,
|
|
83
|
+
status: sales_base_1.ORDER_INVENTORY_STATUS.TERMINATED,
|
|
84
|
+
updatedAt: now,
|
|
85
|
+
updater: user
|
|
86
|
+
});
|
|
87
|
+
// Batch delete worksheet details
|
|
88
|
+
const wsdToDeleteIds = toTerminate.filter(t => { var _a; return (_a = t.wsd) === null || _a === void 0 ? void 0 : _a.id; }).map(t => t.wsd.id);
|
|
89
|
+
if (wsdToDeleteIds.length > 0) {
|
|
90
|
+
await tx.getRepository(worksheet_base_1.WorksheetDetail).delete({ id: (0, typeorm_1.In)(wsdToDeleteIds) });
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
// Process reversions (non-split order inventories)
|
|
94
|
+
if (toRevert.length > 0) {
|
|
95
|
+
// Batch update order inventories to LOADING status
|
|
96
|
+
const revertOiIds = toRevert.map(r => r.doInventory.id);
|
|
97
|
+
await tx.getRepository(sales_base_1.OrderInventory).update({ id: (0, typeorm_1.In)(revertOiIds) }, {
|
|
98
|
+
deliveryOrder: null,
|
|
99
|
+
status: sales_base_1.ORDER_INVENTORY_STATUS.LOADING,
|
|
100
|
+
loadedAt: null,
|
|
101
|
+
loadedByUser: null,
|
|
102
|
+
loadedBy: null,
|
|
103
|
+
updater: user
|
|
104
|
+
});
|
|
105
|
+
// Batch update worksheet details to EXECUTING status
|
|
106
|
+
const wsdToUpdateIds = toRevert.filter(r => { var _a; return (_a = r.wsd) === null || _a === void 0 ? void 0 : _a.id; }).map(r => r.wsd.id);
|
|
107
|
+
if (wsdToUpdateIds.length > 0) {
|
|
108
|
+
await tx.getRepository(worksheet_base_1.WorksheetDetail).update({ id: (0, typeorm_1.In)(wsdToUpdateIds) }, {
|
|
59
109
|
status: worksheet_base_1.WORKSHEET_STATUS.EXECUTING,
|
|
60
110
|
updater: user,
|
|
61
|
-
updatedAt:
|
|
111
|
+
updatedAt: now
|
|
62
112
|
});
|
|
63
113
|
}
|
|
64
|
-
//generate inventory history
|
|
65
|
-
let inventory = doInventory.inventory;
|
|
66
|
-
await (0, warehouse_base_1.generateInventoryHistory)(inventory, releaseGood, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.UNDO_LOADING, 0, 0, this.user);
|
|
67
114
|
}
|
|
115
|
+
// OPTIMIZATION 4: Generate inventory histories in parallel
|
|
116
|
+
await Promise.all(doInventories.map(doInventory => {
|
|
117
|
+
const inventory = doInventory.inventory;
|
|
118
|
+
return (0, warehouse_base_1.generateInventoryHistory)(inventory, releaseGood, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.UNDO_LOADING, 0, 0, user, tx);
|
|
119
|
+
}));
|
|
68
120
|
await tx.getRepository(sales_base_1.DeliveryOrder).delete(deliveryOrder.id);
|
|
69
121
|
return true;
|
|
70
122
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"undo-load.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/undo-load.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"undo-load.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/undo-load.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.routeLabelSequenceLogs = exports.reserveRouteLabelSequence = exports.routeLabelSequenceStatuses = exports.routeLabelReleaseGoodsInExecutingWorksheet = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
-
const worksheet_base_1 = require("@things-factory/worksheet-base");
|
|
6
5
|
const route_label_sequence_counter_1 = require("../../../entities/route-label-sequence-counter");
|
|
7
6
|
const route_label_sequence_log_1 = require("../../../entities/route-label-sequence-log");
|
|
7
|
+
// Statuses to exclude from route label printing
|
|
8
|
+
const EXCLUDED_RO_STATUSES = ['DONE', 'PENDING_CANCEL', 'CANCELLED'];
|
|
8
9
|
function ensureSeqField(field) {
|
|
9
10
|
if (!['refNo', 'refNo2', 'refNo3'].includes(field)) {
|
|
10
11
|
throw new Error('Invalid sequence field. Allowed: refNo, refNo2, refNo3');
|
|
@@ -35,7 +36,7 @@ exports.routeLabelReleaseGoodsInExecutingWorksheet = {
|
|
|
35
36
|
)`;
|
|
36
37
|
}
|
|
37
38
|
const rows = await tx.query(`
|
|
38
|
-
select
|
|
39
|
+
select
|
|
39
40
|
rg.id as "id",
|
|
40
41
|
rg.name as "name",
|
|
41
42
|
rg.ref_no as "refNo",
|
|
@@ -46,18 +47,13 @@ exports.routeLabelReleaseGoodsInExecutingWorksheet = {
|
|
|
46
47
|
rg.store_name as "storeName",
|
|
47
48
|
rg.stop_id as "stopId",
|
|
48
49
|
rg.created_at as "createdAt"
|
|
49
|
-
from
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
where ws.domain_id = $1
|
|
54
|
-
and ws.type = $2
|
|
55
|
-
and ws.status = $3
|
|
56
|
-
and rg.domain_id = $1
|
|
57
|
-
and rg.bizplace_id = $4
|
|
50
|
+
from release_goods rg
|
|
51
|
+
where rg.domain_id = $1
|
|
52
|
+
and rg.bizplace_id = $2
|
|
53
|
+
and rg.status not in ($3, $4, $5)
|
|
58
54
|
${filterRefNo}
|
|
59
55
|
order by rg.created_at desc
|
|
60
|
-
`, [domain.id,
|
|
56
|
+
`, [domain.id, partnerId, ...EXCLUDED_RO_STATUSES]);
|
|
61
57
|
const releaseGoods = rows || [];
|
|
62
58
|
// If seqField is provided, fetch and merge sequence data
|
|
63
59
|
if (seqField && ['refNo', 'refNo2', 'refNo3'].includes(seqField) && releaseGoods.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-label.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/route-label/route-label.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;
|
|
1
|
+
{"version":3,"file":"route-label.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/route-label/route-label.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,9 +30,11 @@ exports.zonePicking = {
|
|
|
30
30
|
throw new Error('No worksheet found');
|
|
31
31
|
let worksheetDetails = worksheet.worksheetDetails;
|
|
32
32
|
let oiIds = worksheetDetails.map(wsd => wsd.targetInventory.id);
|
|
33
|
+
// Use pessimistic lock to prevent race conditions with concurrent requests
|
|
33
34
|
const targetInventories = await tx
|
|
34
35
|
.getRepository(sales_base_1.OrderInventory)
|
|
35
36
|
.createQueryBuilder('oi')
|
|
37
|
+
.setLock('pessimistic_write')
|
|
36
38
|
.innerJoinAndSelect('oi.inventory', 'i', 'i.id = oi.inventory_id')
|
|
37
39
|
.where('oi.id IN(:...oiIds)', { oiIds: oiIds })
|
|
38
40
|
.andWhere('i.carton_id = :cartonId', { cartonId: cartonId })
|
|
@@ -82,6 +84,9 @@ exports.zonePicking = {
|
|
|
82
84
|
if (totalPickedQty > sumOfReleaseQty)
|
|
83
85
|
throw new Error(wsController.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `quantity can't exceed limitation`));
|
|
84
86
|
let productOrderInventory = targetInventories.filter(oi => oi.productId === product.id && oi.productDetailId === productDetail.id);
|
|
87
|
+
// Track processed OI and inventory IDs to prevent duplicate processing within this transaction
|
|
88
|
+
const processedOiIds = new Set();
|
|
89
|
+
const processedInventoryDeductions = new Map();
|
|
85
90
|
//update all oi
|
|
86
91
|
for (const oi of productOrderInventory) {
|
|
87
92
|
let targetInventory = oi;
|
|
@@ -91,6 +96,11 @@ exports.zonePicking = {
|
|
|
91
96
|
const releaseGood = targetInventory.releaseGood;
|
|
92
97
|
if (pickedQty <= 0)
|
|
93
98
|
break;
|
|
99
|
+
// Skip if this OI was already processed in this transaction
|
|
100
|
+
if (processedOiIds.has(targetInventory.id)) {
|
|
101
|
+
console.warn(`Skipping duplicate OI processing: ${targetInventory.id}`);
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
94
104
|
// validation to prevent picking if the inventory is involved in cycle count
|
|
95
105
|
let inventoryCheckItem = await tx.getRepository(sales_base_1.InventoryCheckItem).findOne({
|
|
96
106
|
where: {
|
|
@@ -113,6 +123,17 @@ exports.zonePicking = {
|
|
|
113
123
|
if (targetInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.PROCESSING &&
|
|
114
124
|
targetReleaseQty > targetPickedQty &&
|
|
115
125
|
pickedQty > 0) {
|
|
126
|
+
// Re-verify OI status from database to prevent race condition
|
|
127
|
+
const freshOiStatus = await tx
|
|
128
|
+
.getRepository(sales_base_1.OrderInventory)
|
|
129
|
+
.createQueryBuilder('oi')
|
|
130
|
+
.select('oi.status')
|
|
131
|
+
.where('oi.id = :id', { id: targetInventory.id })
|
|
132
|
+
.getRawOne();
|
|
133
|
+
if ((freshOiStatus === null || freshOiStatus === void 0 ? void 0 : freshOiStatus.oi_status) !== sales_base_1.ORDER_INVENTORY_STATUS.PROCESSING) {
|
|
134
|
+
console.warn(`OI ${targetInventory.id} status changed to ${freshOiStatus === null || freshOiStatus === void 0 ? void 0 : freshOiStatus.oi_status}, skipping`);
|
|
135
|
+
continue;
|
|
136
|
+
}
|
|
116
137
|
let remainingAssignedQty = pickedQty - (targetReleaseQty - targetPickedQty); // -1, 0, 1
|
|
117
138
|
const gapQtyRemaining = targetReleaseQty - targetPickedQty; // > 0
|
|
118
139
|
if (binNo && !(targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.binLocation)) {
|
|
@@ -127,7 +148,10 @@ exports.zonePicking = {
|
|
|
127
148
|
remainingAssignedQty = remainingAssignedQty < 0 ? 0 : remainingAssignedQty;
|
|
128
149
|
if (targetInventory.pickedQty == targetReleaseQty) {
|
|
129
150
|
//update oi and wsd to done if pickedQty matches releaseQty
|
|
130
|
-
|
|
151
|
+
// Account for any previous deductions to this inventory in this transaction
|
|
152
|
+
const previousDeduction = processedInventoryDeductions.get(inventory.id) || 0;
|
|
153
|
+
const adjustedInventoryQty = inventory.qty - previousDeduction;
|
|
154
|
+
const leftQty = adjustedInventoryQty - targetInventory.releaseQty;
|
|
131
155
|
if (leftQty < 0) {
|
|
132
156
|
throw new Error(wsController.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `quantity can't exceed limitation`));
|
|
133
157
|
}
|
|
@@ -137,6 +161,8 @@ exports.zonePicking = {
|
|
|
137
161
|
//update oi
|
|
138
162
|
targetInventory.status = sales_base_1.ORDER_INVENTORY_STATUS.PICKED;
|
|
139
163
|
await updateOrderInventories(tx, targetInventory);
|
|
164
|
+
// Mark this OI as processed
|
|
165
|
+
processedOiIds.add(targetInventory.id);
|
|
140
166
|
//update loading wsd if exist
|
|
141
167
|
let loadingWorksheetDetail = await tx.getRepository(worksheet_base_1.WorksheetDetail).findOne({
|
|
142
168
|
where: { type: worksheet_base_1.WORKSHEET_TYPE.LOADING, targetInventory: targetInventory }
|
|
@@ -163,8 +189,9 @@ exports.zonePicking = {
|
|
|
163
189
|
.where('id = :id', { id: targetInventory.inventory.id })
|
|
164
190
|
.returning(['qty'])
|
|
165
191
|
.execute();
|
|
192
|
+
// Track the deduction for this inventory
|
|
193
|
+
processedInventoryDeductions.set(inventory.id, previousDeduction + targetInventory.releaseQty);
|
|
166
194
|
console.time('inv history');
|
|
167
|
-
//slow
|
|
168
195
|
await (0, warehouse_base_1.generateInventoryHistory)(inventory, releaseGood, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.PICKING, -targetInventory.releaseQty, -targetInventory.releaseUomValue, user, tx);
|
|
169
196
|
console.timeEnd('inv history');
|
|
170
197
|
if (leftQty === 0) {
|
|
@@ -182,6 +209,8 @@ exports.zonePicking = {
|
|
|
182
209
|
else {
|
|
183
210
|
//updates oi if pickedQty != releaseQty
|
|
184
211
|
await updateOrderInventories(tx, targetInventory);
|
|
212
|
+
// Mark this OI as processed even for partial picks
|
|
213
|
+
processedOiIds.add(targetInventory.id);
|
|
185
214
|
}
|
|
186
215
|
//deduct pickedQty for the next oi
|
|
187
216
|
pickedQty = pickedQty - (targetReleaseQty - targetPickedQty);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zone-picking.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/zone-worksheet/zone-picking.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"zone-picking.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/zone-worksheet/zone-picking.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.759",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
"@things-factory/print-ui": "^4.3.755",
|
|
92
92
|
"@things-factory/product-base": "^4.3.755",
|
|
93
93
|
"@things-factory/resource-ui": "^4.3.755",
|
|
94
|
-
"@things-factory/sales-ui": "^4.3.
|
|
94
|
+
"@things-factory/sales-ui": "^4.3.759",
|
|
95
95
|
"@things-factory/scene-data-transform": "^4.3.755",
|
|
96
96
|
"@things-factory/scene-excel": "^4.3.755",
|
|
97
97
|
"@things-factory/scene-firebase": "^4.3.755",
|
|
@@ -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.759"
|
|
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": "5530ce3ae2efcd8f6309a08da7ff578c1dcec341"
|
|
121
121
|
}
|
|
@@ -124,6 +124,21 @@ const transformToWorksheetFormat = (orderInventories: OrderInventory[], releaseG
|
|
|
124
124
|
binLocation: {
|
|
125
125
|
name: oi.binLocation?.name
|
|
126
126
|
},
|
|
127
|
+
// Include releaseGood for each item to support filtering by release order in bin scan mode
|
|
128
|
+
releaseGood: oi.releaseGood
|
|
129
|
+
? {
|
|
130
|
+
id: oi.releaseGood.id,
|
|
131
|
+
name: oi.releaseGood.name,
|
|
132
|
+
attentionCompany: oi.releaseGood.attentionCompany,
|
|
133
|
+
attentionTo: oi.releaseGood.attentionTo,
|
|
134
|
+
deliveryAddress1: oi.releaseGood.deliveryAddress1,
|
|
135
|
+
deliveryAddress2: oi.releaseGood.deliveryAddress2,
|
|
136
|
+
status: oi.releaseGood.status,
|
|
137
|
+
refNo: oi.releaseGood.refNo,
|
|
138
|
+
refNo2: oi.releaseGood.refNo2,
|
|
139
|
+
refNo3: oi.releaseGood.refNo3
|
|
140
|
+
}
|
|
141
|
+
: null,
|
|
127
142
|
productName: oi.inventory?.product?.name,
|
|
128
143
|
productSku: oi.inventory?.product?.sku,
|
|
129
144
|
relatedOrderInv: {
|
|
@@ -57,6 +57,11 @@ async function getInventoryCounts(
|
|
|
57
57
|
|
|
58
58
|
/**
|
|
59
59
|
* Assigns itemCounts and tabCounts to a release good based on inventory counts
|
|
60
|
+
*
|
|
61
|
+
* Business logic for "completed" items:
|
|
62
|
+
* - QC tab: completed = items that passed QC (LOADING + LOADED status)
|
|
63
|
+
* - LOADING tab: completed = items that were loaded (LOADED status)
|
|
64
|
+
* - LOADED tab: completed = items that are loaded (LOADED status)
|
|
60
65
|
*/
|
|
61
66
|
function assignCountsToReleaseGood(
|
|
62
67
|
releaseGood: ReleaseGood,
|
|
@@ -67,13 +72,10 @@ function assignCountsToReleaseGood(
|
|
|
67
72
|
const { loadingTotal, loadingCompleted, loadedTotal, loadedCompleted, total } = counts
|
|
68
73
|
|
|
69
74
|
// Calculate completed count for current tab (backward compatibility)
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
// ORDER scan: QC tab considers LOADING+LOADED as completed
|
|
75
|
-
currentCompleted = tabName === 'QC' ? loadingTotal + loadedTotal : loadedTotal
|
|
76
|
-
}
|
|
75
|
+
// For QC tab: completed = items that passed QC (LOADING + LOADED)
|
|
76
|
+
// For LOADING/LOADED tabs: completed = items that are loaded (LOADED)
|
|
77
|
+
// This logic applies to both BIN scan and ORDER scan
|
|
78
|
+
const currentCompleted = tabName === 'QC' ? loadingTotal + loadedTotal : loadedTotal
|
|
77
79
|
|
|
78
80
|
// Backward compatibility: itemCounts for current tab
|
|
79
81
|
releaseGood['itemCounts'] = {
|