@things-factory/worksheet-base 4.3.234 → 4.3.236
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/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +7 -3
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking-worksheet.js +6 -1
- package/dist-server/graphql/resolvers/worksheet/picking-worksheet.js.map +1 -1
- package/package.json +3 -3
- package/server/graphql/resolvers/worksheet/packing-worksheet.ts +6 -4
- package/server/graphql/resolvers/worksheet/picking-worksheet.ts +5 -1
|
@@ -68,12 +68,14 @@ exports.packingWorksheetResolver = {
|
|
|
68
68
|
//find first release good of order inventory within the bin
|
|
69
69
|
releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
70
70
|
where: { id: orderInventoriesByBin[0].id },
|
|
71
|
-
relations: ['bizplace', 'bizplace.domain', 'orderInventories']
|
|
71
|
+
relations: ['bizplace', 'bizplace.domain', 'orderInventories', 'orderInventories.binLocation']
|
|
72
72
|
});
|
|
73
73
|
//query worksheet to find does the order associated with batch picking
|
|
74
74
|
let worksheet = null;
|
|
75
75
|
if (releaseGood.orderInventories[0].refWorksheetId) {
|
|
76
|
-
worksheet = await tx.getRepository(entities_1.Worksheet).findOne({
|
|
76
|
+
worksheet = await tx.getRepository(entities_1.Worksheet).findOne({
|
|
77
|
+
where: { id: releaseGood.orderInventories[0].refWorksheetId, type: constants_1.WORKSHEET_TYPE.BATCH_PICKING }
|
|
78
|
+
});
|
|
77
79
|
}
|
|
78
80
|
releaseGoodNo = releaseGood.name;
|
|
79
81
|
isBatchPicking = worksheet ? true : false;
|
|
@@ -236,6 +238,7 @@ exports.packingWorksheetResolver = {
|
|
|
236
238
|
},
|
|
237
239
|
worksheetDetailInfos: processingOrderPackage[0].orderPackageItems
|
|
238
240
|
.map(opi => {
|
|
241
|
+
var _a;
|
|
239
242
|
const orderProduct = opi.orderProduct;
|
|
240
243
|
return {
|
|
241
244
|
id: opi.id,
|
|
@@ -253,7 +256,8 @@ exports.packingWorksheetResolver = {
|
|
|
253
256
|
// targetName: targetInventory.name,
|
|
254
257
|
// packingType: inventory.packingType,
|
|
255
258
|
// packingSize: inventory.packingSize,
|
|
256
|
-
|
|
259
|
+
// this is the problem
|
|
260
|
+
binLocation: binLocation ? (_a = releaseGood.orderInventories.find(oi => oi.orderProductId == opi.orderProduct.id)) === null || _a === void 0 ? void 0 : _a.binLocation : binLocation,
|
|
257
261
|
isBatchPicking
|
|
258
262
|
// location: inventory.location,
|
|
259
263
|
// relatedOrderInv: targetInventory
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,7 +65,12 @@ async function pickingWorksheet(domain, orderNo, locationSortingRules, tx) {
|
|
|
65
65
|
.leftJoinAndSelect('INV.location', 'LOC');
|
|
66
66
|
if ((locationSortingRules === null || locationSortingRules === void 0 ? void 0 : locationSortingRules.length) > 0) {
|
|
67
67
|
locationSortingRules.forEach((rule) => {
|
|
68
|
-
|
|
68
|
+
if (rule.name.toLowerCase() !== 'product') {
|
|
69
|
+
qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC');
|
|
70
|
+
}
|
|
71
|
+
else {
|
|
72
|
+
qb.addOrderBy(`PROD.name`, rule.desc ? 'DESC' : 'ASC');
|
|
73
|
+
}
|
|
69
74
|
});
|
|
70
75
|
}
|
|
71
76
|
qb.addOrderBy(`PROD.name`, 'ASC');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"picking-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/picking-worksheet.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"picking-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/picking-worksheet.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worksheet-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.236",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -35,12 +35,12 @@
|
|
|
35
35
|
"@things-factory/integration-sftp": "^4.3.234",
|
|
36
36
|
"@things-factory/marketplace-base": "^4.3.234",
|
|
37
37
|
"@things-factory/notification": "^4.3.234",
|
|
38
|
-
"@things-factory/sales-base": "^4.3.
|
|
38
|
+
"@things-factory/sales-base": "^4.3.236",
|
|
39
39
|
"@things-factory/setting-base": "^4.3.234",
|
|
40
40
|
"@things-factory/shell": "^4.3.227",
|
|
41
41
|
"@things-factory/transport-base": "^4.3.234",
|
|
42
42
|
"@things-factory/warehouse-base": "^4.3.234",
|
|
43
43
|
"uuid": "^9.0.0"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "88d028f476ba15ffd7bedf3b9aa5ad2f8c51e5a8"
|
|
46
46
|
}
|
|
@@ -52,7 +52,6 @@ export const packingWorksheetResolver = {
|
|
|
52
52
|
})
|
|
53
53
|
|
|
54
54
|
if (binLocation) {
|
|
55
|
-
|
|
56
55
|
// find unique release goods id based on READY_TO_PACK, PACKING, PACKED order inventories within bins
|
|
57
56
|
const qb: SelectQueryBuilder<OrderInventory> = tx
|
|
58
57
|
.getRepository(OrderInventory)
|
|
@@ -92,13 +91,15 @@ export const packingWorksheetResolver = {
|
|
|
92
91
|
//find first release good of order inventory within the bin
|
|
93
92
|
releaseGood = await tx.getRepository(ReleaseGood).findOne({
|
|
94
93
|
where: { id: orderInventoriesByBin[0].id },
|
|
95
|
-
relations: ['bizplace', 'bizplace.domain', 'orderInventories']
|
|
94
|
+
relations: ['bizplace', 'bizplace.domain', 'orderInventories', 'orderInventories.binLocation']
|
|
96
95
|
})
|
|
97
96
|
|
|
98
97
|
//query worksheet to find does the order associated with batch picking
|
|
99
98
|
let worksheet: Worksheet = null
|
|
100
99
|
if (releaseGood.orderInventories[0].refWorksheetId) {
|
|
101
|
-
worksheet = await tx.getRepository(Worksheet).findOne({
|
|
100
|
+
worksheet = await tx.getRepository(Worksheet).findOne({
|
|
101
|
+
where: { id: releaseGood.orderInventories[0].refWorksheetId, type: WORKSHEET_TYPE.BATCH_PICKING }
|
|
102
|
+
})
|
|
102
103
|
}
|
|
103
104
|
|
|
104
105
|
releaseGoodNo = releaseGood.name
|
|
@@ -295,7 +296,8 @@ export const packingWorksheetResolver = {
|
|
|
295
296
|
// targetName: targetInventory.name,
|
|
296
297
|
// packingType: inventory.packingType,
|
|
297
298
|
// packingSize: inventory.packingSize,
|
|
298
|
-
|
|
299
|
+
// this is the problem
|
|
300
|
+
binLocation: binLocation ? releaseGood.orderInventories.find(oi => oi.orderProductId == opi.orderProduct.id)?.binLocation : binLocation ,
|
|
299
301
|
isBatchPicking
|
|
300
302
|
// location: inventory.location,
|
|
301
303
|
// relatedOrderInv: targetInventory
|
|
@@ -90,7 +90,11 @@ export async function pickingWorksheet(domain: Domain, orderNo: String, location
|
|
|
90
90
|
|
|
91
91
|
if (locationSortingRules?.length > 0) {
|
|
92
92
|
locationSortingRules.forEach((rule: { name: string; desc: boolean }) => {
|
|
93
|
-
|
|
93
|
+
if (rule.name.toLowerCase() !== 'product') {
|
|
94
|
+
qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
|
|
95
|
+
} else {
|
|
96
|
+
qb.addOrderBy(`PROD.name`, rule.desc ? 'DESC' : 'ASC')
|
|
97
|
+
}
|
|
94
98
|
})
|
|
95
99
|
}
|
|
96
100
|
|