@things-factory/operato-wms 4.3.825 → 4.3.826
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.
|
@@ -55,15 +55,6 @@ exports.zonePickingWorksheet = {
|
|
|
55
55
|
zoneWorksheet.worksheetDetail = await (0, typeorm_1.getRepository)(worksheet_base_1.WorksheetDetail).find({
|
|
56
56
|
where: { worksheet }
|
|
57
57
|
});
|
|
58
|
-
// Lightweight pre-pass: only the columns needed to compute invIds, roIds, and
|
|
59
|
-
// isCompletable. Avoids running the heavy joined SELECT (product/inventory/
|
|
60
|
-
// location/productDetail/...) twice — the second, filtered getMany() below
|
|
61
|
-
// produces the rows actually returned to the client.
|
|
62
|
-
const orderInventories = await (0, typeorm_1.getRepository)(sales_base_1.OrderInventory)
|
|
63
|
-
.createQueryBuilder('oi')
|
|
64
|
-
.select(['oi.id', 'oi.inventoryId', 'oi.releaseGoodId', 'oi.status'])
|
|
65
|
-
.where('oi.ref_worksheet_id = :worksheetId', { worksheetId: worksheet.id })
|
|
66
|
-
.getMany();
|
|
67
58
|
//fetch order inventories
|
|
68
59
|
let qb = (0, typeorm_1.getRepository)(sales_base_1.OrderInventory)
|
|
69
60
|
.createQueryBuilder('oi')
|
|
@@ -75,6 +66,8 @@ exports.zonePickingWorksheet = {
|
|
|
75
66
|
.leftJoinAndSelect('pd.childProductDetail', 'cpd')
|
|
76
67
|
.leftJoinAndSelect('pd.parentProductDetails', 'ppd')
|
|
77
68
|
.where('ref_worksheet_id = :worksheetId', { worksheetId: worksheet.id });
|
|
69
|
+
//get all oi to find inventory changes and determine if the worksheet is completable
|
|
70
|
+
const orderInventories = await qb.getMany();
|
|
78
71
|
//item assigned to obsolete inventories will not be displayed during picking
|
|
79
72
|
if (filter) {
|
|
80
73
|
qb.andWhere('rg.status != :orderStatus', { orderStatus: sales_base_1.ORDER_STATUS.OBSOLETE });
|
|
@@ -143,10 +136,6 @@ exports.zonePickingWorksheet = {
|
|
|
143
136
|
}
|
|
144
137
|
};
|
|
145
138
|
function isCompletable(oi, ic) {
|
|
146
|
-
// NOTE: callers may pass a partial OrderInventory with only id/inventoryId/
|
|
147
|
-
// releaseGoodId/status populated (see the lightweight pre-pass in
|
|
148
|
-
// zonePickingWorksheet). Don't reference other fields here without first
|
|
149
|
-
// widening that SELECT.
|
|
150
139
|
//find processing oi and check if there is any pending inventory adjustment
|
|
151
140
|
let processingOi = oi.filter(item => item.status === sales_base_1.ORDER_INVENTORY_STATUS.PROCESSING);
|
|
152
141
|
processingOi = processingOi.filter(item => !ic.filter(change => change.status === 'APPROVED').some(change => change.inventory.id === item.inventoryId));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zone-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/zone-worksheet/zone-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAA0D;AAE1D,mEAAoG;AACpG,mEAAgE;AAChE,2DAA8G;AAEjG,QAAA,qBAAqB,GAAG;IACnC,KAAK,CAAC,qBAAqB,CAAC,CAAM,EAAE,EAAE,YAAY,EAAE,EAAE,OAAY;QAChE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,IAAI,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CACvB;;;;;;;;;;;;;;;KAeD,EACC,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,CAAC,CAC1B,CAAA;QAED,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC1B,OAAO;gBACL,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;gBACnC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;gBACjC,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,OAAO,EAAE,KAAK,EAAE,CAAA;IAClB,CAAC;CACF,CAAA;AAUY,QAAA,oBAAoB,GAAG;IAClC,KAAK,CAAC,oBAAoB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,oBAAoB,EAAE,MAAM,EAAE,EAAE,OAAY;QACrF,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QAEpD,IAAI,aAAa,GAA2B,EAAE,CAAA;QAE9C,iBAAiB;QACjB,IAAI,SAAS,GAAc,MAAM,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAC,OAAO,CAAC;YAChE,KAAK,EAAE;gBACL,MAAM;gBACN,IAAI;aACL;YACD,SAAS,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC;SACpC,CAAC,CAAA;QAEF,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;SAC5C;QAED,aAAa,CAAC,SAAS,GAAG,SAAS,CAAA;QAEnC,yBAAyB;QACzB,aAAa,CAAC,eAAe,GAAG,MAAM,IAAA,uBAAa,EAAC,gCAAe,CAAC,CAAC,IAAI,CAAC;YACxE,KAAK,EAAE,EAAE,SAAS,EAAE;SACrB,CAAC,CAAA;QAEF,
|
|
1
|
+
{"version":3,"file":"zone-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/zone-worksheet/zone-worksheet.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.826",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -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": "ad78e489cf7a885b0506c35659c3ffaff3c07cee"
|
|
121
121
|
}
|
|
@@ -75,16 +75,6 @@ export const zonePickingWorksheet = {
|
|
|
75
75
|
where: { worksheet }
|
|
76
76
|
})
|
|
77
77
|
|
|
78
|
-
// Lightweight pre-pass: only the columns needed to compute invIds, roIds, and
|
|
79
|
-
// isCompletable. Avoids running the heavy joined SELECT (product/inventory/
|
|
80
|
-
// location/productDetail/...) twice — the second, filtered getMany() below
|
|
81
|
-
// produces the rows actually returned to the client.
|
|
82
|
-
const orderInventories: OrderInventory[] = await getRepository(OrderInventory)
|
|
83
|
-
.createQueryBuilder('oi')
|
|
84
|
-
.select(['oi.id', 'oi.inventoryId', 'oi.releaseGoodId', 'oi.status'])
|
|
85
|
-
.where('oi.ref_worksheet_id = :worksheetId', { worksheetId: worksheet.id })
|
|
86
|
-
.getMany()
|
|
87
|
-
|
|
88
78
|
//fetch order inventories
|
|
89
79
|
let qb = getRepository(OrderInventory)
|
|
90
80
|
.createQueryBuilder('oi')
|
|
@@ -97,6 +87,9 @@ export const zonePickingWorksheet = {
|
|
|
97
87
|
.leftJoinAndSelect('pd.parentProductDetails', 'ppd')
|
|
98
88
|
.where('ref_worksheet_id = :worksheetId', { worksheetId: worksheet.id })
|
|
99
89
|
|
|
90
|
+
//get all oi to find inventory changes and determine if the worksheet is completable
|
|
91
|
+
const orderInventories: OrderInventory[] = await qb.getMany()
|
|
92
|
+
|
|
100
93
|
//item assigned to obsolete inventories will not be displayed during picking
|
|
101
94
|
if (filter) {
|
|
102
95
|
qb.andWhere('rg.status != :orderStatus', { orderStatus: ORDER_STATUS.OBSOLETE })
|
|
@@ -181,10 +174,6 @@ export const zonePickingWorksheet = {
|
|
|
181
174
|
}
|
|
182
175
|
|
|
183
176
|
function isCompletable(oi: OrderInventory[], ic: InventoryChange[]): String {
|
|
184
|
-
// NOTE: callers may pass a partial OrderInventory with only id/inventoryId/
|
|
185
|
-
// releaseGoodId/status populated (see the lightweight pre-pass in
|
|
186
|
-
// zonePickingWorksheet). Don't reference other fields here without first
|
|
187
|
-
// widening that SELECT.
|
|
188
177
|
//find processing oi and check if there is any pending inventory adjustment
|
|
189
178
|
let processingOi = oi.filter(item => item.status === ORDER_INVENTORY_STATUS.PROCESSING)
|
|
190
179
|
|