@things-factory/worksheet-base 4.3.248 → 4.3.249
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/controllers/outbound/picking-worksheet-controller.js +239 -27
- package/dist-server/controllers/outbound/picking-worksheet-controller.js.map +1 -1
- package/dist-server/entities/warehouse-bizplace-onhand-inventory.js +6 -4
- package/dist-server/entities/warehouse-bizplace-onhand-inventory.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js +1 -0
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/worksheet.js +15 -8
- package/dist-server/graphql/resolvers/worksheet/worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.js +1 -0
- package/dist-server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.js.map +1 -1
- package/package.json +4 -4
- package/server/controllers/outbound/picking-worksheet-controller.ts +326 -36
- package/server/entities/warehouse-bizplace-onhand-inventory.ts +6 -4
- package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts +48 -62
- package/server/graphql/resolvers/worksheet/worksheet.ts +11 -4
- package/server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.ts +1 -0
|
@@ -38,6 +38,8 @@ export const worksheetResolver = {
|
|
|
38
38
|
'releaseGood.arrivalNotice',
|
|
39
39
|
'releaseGood.shippingOrder',
|
|
40
40
|
'releaseGood.orderPackages',
|
|
41
|
+
'releaseGood.orderProducts',
|
|
42
|
+
'releaseGood.orderProducts.product',
|
|
41
43
|
'replenishment',
|
|
42
44
|
'returnOrder',
|
|
43
45
|
'inventoryCheck',
|
|
@@ -47,6 +49,7 @@ export const worksheetResolver = {
|
|
|
47
49
|
'worksheetDetails.toLocation',
|
|
48
50
|
'worksheetDetails.targetProduct',
|
|
49
51
|
'worksheetDetails.targetProduct.product',
|
|
52
|
+
'worksheetDetails.targetProduct.releaseGood',
|
|
50
53
|
'worksheetDetails.targetVas',
|
|
51
54
|
'worksheetDetails.targetVas.product',
|
|
52
55
|
'worksheetDetails.targetVas.newProduct',
|
|
@@ -187,7 +190,7 @@ export const worksheetResolver = {
|
|
|
187
190
|
worksheet.orderInventories = orderInventories
|
|
188
191
|
}
|
|
189
192
|
|
|
190
|
-
if (worksheet?.releaseGood?.id) {
|
|
193
|
+
if (worksheet?.releaseGood?.id && worksheet?.releaseGood?.assignedInventory) {
|
|
191
194
|
let qbOrderInventories = getRepository(OrderInventory)
|
|
192
195
|
.createQueryBuilder('oi')
|
|
193
196
|
.leftJoinAndSelect('oi.releaseGood', 'releaseGood')
|
|
@@ -258,11 +261,15 @@ export const worksheetResolver = {
|
|
|
258
261
|
}
|
|
259
262
|
|
|
260
263
|
// before VAS
|
|
261
|
-
if (worksheet
|
|
264
|
+
if (worksheet?.orderInventories?.length > 0) {
|
|
262
265
|
worksheet.worksheetDetails.sort(function (a, b) {
|
|
263
266
|
return (
|
|
264
|
-
worksheet.orderInventories
|
|
265
|
-
|
|
267
|
+
worksheet.orderInventories
|
|
268
|
+
.map(oi => oi.id)
|
|
269
|
+
.indexOf(worksheet.type == 'VAS' ? a.targetVas.id : a.targetInventory.id) -
|
|
270
|
+
worksheet.orderInventories
|
|
271
|
+
.map(oi => oi.id)
|
|
272
|
+
.indexOf(worksheet.type == 'VAS' ? b.targetVas.id : b.targetInventory.id)
|
|
266
273
|
)
|
|
267
274
|
})
|
|
268
275
|
}
|