@things-factory/worksheet-base 5.0.0-alpha.26 → 5.0.0-alpha.29
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/inbound/unloading-worksheet-controller.js +2 -0
- package/dist-server/controllers/inbound/unloading-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/packing-worksheet-controller.js +166 -8
- package/dist-server/controllers/outbound/packing-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/picking-worksheet-controller.js +57 -32
- package/dist-server/controllers/outbound/picking-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/returning-worksheet-controller.js +7 -1
- package/dist-server/controllers/outbound/returning-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/sorting-worksheet-controller.js +110 -3
- package/dist-server/controllers/outbound/sorting-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/render-grn.js +27 -3
- package/dist-server/controllers/render-grn.js.map +1 -1
- package/dist-server/controllers/render-orientage-do.js.map +1 -1
- package/dist-server/controllers/render-orientage-grn.js +1 -0
- package/dist-server/controllers/render-orientage-grn.js.map +1 -1
- package/dist-server/controllers/render-ro-do.js +65 -1
- package/dist-server/controllers/render-ro-do.js.map +1 -1
- package/dist-server/controllers/worksheet-controller.js +2 -1
- package/dist-server/controllers/worksheet-controller.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/find-release-orders-by-task-no.js +30 -1
- package/dist-server/graphql/resolvers/worksheet/find-release-orders-by-task-no.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js +3 -0
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/index.js +2 -1
- package/dist-server/graphql/resolvers/worksheet/packing/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/packing.js +4 -4
- package/dist-server/graphql/resolvers/worksheet/packing/packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js +4 -4
- package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/undo-serial-number-packing.js +15 -0
- package/dist-server/graphql/resolvers/worksheet/packing/undo-serial-number-packing.js.map +1 -0
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +152 -133
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/assign-picking-worker.js +13 -10
- package/dist-server/graphql/resolvers/worksheet/picking/assign-picking-worker.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.js +4 -7
- package/dist-server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/sorting/scan-product-sorting.js +4 -4
- package/dist-server/graphql/resolvers/worksheet/sorting/scan-product-sorting.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/sorting/sorting-product.js +4 -4
- package/dist-server/graphql/resolvers/worksheet/sorting/sorting-product.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/sorting-worksheet.js +6 -0
- package/dist-server/graphql/resolvers/worksheet/sorting-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details-by-bulk.js +4 -5
- package/dist-server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details-by-bulk.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet-detail/generate-picking-worksheet-details.js +4 -2
- package/dist-server/graphql/resolvers/worksheet-detail/generate-picking-worksheet-details.js.map +1 -1
- package/dist-server/graphql/types/worksheet/find-release-orders-by-task-no.js +11 -0
- package/dist-server/graphql/types/worksheet/find-release-orders-by-task-no.js.map +1 -0
- package/dist-server/graphql/types/worksheet/index.js +14 -4
- package/dist-server/graphql/types/worksheet/index.js.map +1 -1
- package/dist-server/graphql/types/worksheet/worksheet-detail-info.js +2 -0
- package/dist-server/graphql/types/worksheet/worksheet-detail-info.js.map +1 -1
- package/dist-server/graphql/types/worksheet-detail/index.js +0 -2
- package/dist-server/graphql/types/worksheet-detail/index.js.map +1 -1
- package/dist-server/utils/inventory-util.js +14 -25
- package/dist-server/utils/inventory-util.js.map +1 -1
- package/package.json +17 -17
- package/server/controllers/inbound/unloading-worksheet-controller.ts +2 -0
- package/server/controllers/outbound/packing-worksheet-controller.ts +217 -11
- package/server/controllers/outbound/picking-worksheet-controller.ts +66 -34
- package/server/controllers/outbound/returning-worksheet-controller.ts +7 -1
- package/server/controllers/outbound/sorting-worksheet-controller.ts +149 -4
- package/server/controllers/render-grn.ts +39 -5
- package/server/controllers/render-orientage-do.ts +11 -11
- package/server/controllers/render-orientage-grn.ts +12 -11
- package/server/controllers/render-ro-do.ts +93 -8
- package/server/controllers/worksheet-controller.ts +2 -1
- package/server/graphql/resolvers/worksheet/find-release-orders-by-task-no.ts +35 -2
- package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts +2 -0
- package/server/graphql/resolvers/worksheet/packing/index.ts +3 -1
- package/server/graphql/resolvers/worksheet/packing/packing.ts +5 -4
- package/server/graphql/resolvers/worksheet/packing/scan-product-packing.ts +9 -4
- package/server/graphql/resolvers/worksheet/packing/undo-serial-number-packing.ts +24 -0
- package/server/graphql/resolvers/worksheet/packing-worksheet.ts +166 -144
- package/server/graphql/resolvers/worksheet/picking/assign-picking-worker.ts +15 -11
- package/server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.ts +5 -7
- package/server/graphql/resolvers/worksheet/sorting/scan-product-sorting.ts +5 -4
- package/server/graphql/resolvers/worksheet/sorting/sorting-product.ts +5 -4
- package/server/graphql/resolvers/worksheet/sorting-worksheet.ts +6 -0
- package/server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details-by-bulk.ts +10 -12
- package/server/graphql/resolvers/worksheet-detail/generate-picking-worksheet-details.ts +4 -2
- package/server/graphql/types/worksheet/find-release-orders-by-task-no.ts +8 -0
- package/server/graphql/types/worksheet/index.ts +14 -4
- package/server/graphql/types/worksheet/worksheet-detail-info.ts +2 -0
- package/server/graphql/types/worksheet-detail/index.ts +0 -2
- package/server/utils/inventory-util.ts +15 -23
|
@@ -11,149 +11,168 @@ const utils_1 = require("../../../utils");
|
|
|
11
11
|
exports.packingWorksheetResolver = {
|
|
12
12
|
async packingWorksheet(_, { releaseGoodNo }, context) {
|
|
13
13
|
var _a;
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
// Find Release Order based on Bin
|
|
23
|
-
if (!releaseGood) {
|
|
24
|
-
const binLocation = await tx.getRepository(warehouse_base_1.Location).findOne({
|
|
25
|
-
where: { domain, name: releaseGoodNo }
|
|
14
|
+
try {
|
|
15
|
+
const { tx, domain, user } = context.state;
|
|
16
|
+
let releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
17
|
+
where: {
|
|
18
|
+
domain,
|
|
19
|
+
name: releaseGoodNo
|
|
20
|
+
},
|
|
21
|
+
relations: ['bizplace', 'bizplace.domain']
|
|
26
22
|
});
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
.
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
], constants_1.WORKSHEET_TYPE.PACKING, releaseGood);
|
|
61
|
-
let marketplaceOrder;
|
|
62
|
-
let marketplaceOrderItems = [];
|
|
63
|
-
let marketplaceStore;
|
|
64
|
-
let trackingNo;
|
|
65
|
-
let shippingProvider;
|
|
66
|
-
let marketplaceStatus;
|
|
67
|
-
if (releaseGood.type === 'b2c') {
|
|
68
|
-
const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
|
|
69
|
-
domain: worksheet.bizplace.domain,
|
|
70
|
-
status: integration_sellercraft_1.SellercraftStatus.ACTIVE
|
|
71
|
-
});
|
|
72
|
-
if (sellercraft) {
|
|
73
|
-
if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill)) {
|
|
74
|
-
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
75
|
-
releaseGood = await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood);
|
|
23
|
+
// Find Release Order based on Bin
|
|
24
|
+
if (!releaseGood) {
|
|
25
|
+
const binLocation = await tx.getRepository(warehouse_base_1.Location).findOne({
|
|
26
|
+
where: { domain, name: releaseGoodNo }
|
|
27
|
+
});
|
|
28
|
+
if (binLocation) {
|
|
29
|
+
const qb = tx
|
|
30
|
+
.getRepository(sales_base_1.OrderInventory)
|
|
31
|
+
.createQueryBuilder('orderInventory');
|
|
32
|
+
qb.innerJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
|
|
33
|
+
.innerJoinAndSelect('releaseGood.bizplace', 'bizplace')
|
|
34
|
+
.innerJoinAndSelect('bizplace.domain', 'domain')
|
|
35
|
+
.innerJoinAndSelect('worksheets', 'ws', `orderInventory.release_good_id = ws.release_good_id AND ws.type = 'PACKING' AND ws.status = 'EXECUTING'`)
|
|
36
|
+
.where('orderInventory.domain_id = :domainId', { domainId: domain.id })
|
|
37
|
+
.andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
|
|
38
|
+
orderInventoryStatus: [
|
|
39
|
+
sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_PACK,
|
|
40
|
+
sales_base_1.ORDER_INVENTORY_STATUS.PACKING,
|
|
41
|
+
sales_base_1.ORDER_INVENTORY_STATUS.PACKED
|
|
42
|
+
]
|
|
43
|
+
})
|
|
44
|
+
.andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
|
|
45
|
+
.andWhere('releaseGood.status IN (:...status)', {
|
|
46
|
+
status: [sales_base_1.ORDER_STATUS.READY_TO_PACK, sales_base_1.ORDER_STATUS.PACKING]
|
|
47
|
+
});
|
|
48
|
+
const orderInventoryByBin = await qb.getOne();
|
|
49
|
+
if (orderInventoryByBin === null || orderInventoryByBin === void 0 ? void 0 : orderInventoryByBin.releaseGood) {
|
|
50
|
+
releaseGoodNo = orderInventoryByBin.releaseGood.name;
|
|
51
|
+
releaseGood = orderInventoryByBin.releaseGood;
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
throw new Error(`Bin do not have any existing order.`);
|
|
55
|
+
}
|
|
76
56
|
}
|
|
77
|
-
trackingNo = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.trackingNo;
|
|
78
|
-
shippingProvider = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.transporter;
|
|
79
|
-
marketplaceStatus = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.marketplaceOrderStatus;
|
|
80
57
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
58
|
+
if (!releaseGood)
|
|
59
|
+
throw new Error(`Release good do not exist.`);
|
|
60
|
+
const worksheet = await (0, utils_1.fetchExecutingWorksheet)(domain, releaseGood.bizplace, [
|
|
61
|
+
'bizplace',
|
|
62
|
+
'bizplace.domain',
|
|
63
|
+
'releaseGood',
|
|
64
|
+
'releaseGood.domain',
|
|
65
|
+
'worksheetDetails',
|
|
66
|
+
'worksheetDetails.targetInventory',
|
|
67
|
+
'worksheetDetails.targetInventory.binLocation',
|
|
68
|
+
'worksheetDetails.targetInventory.inventory',
|
|
69
|
+
'worksheetDetails.targetInventory.inventory.location',
|
|
70
|
+
'worksheetDetails.targetInventory.inventory.product',
|
|
71
|
+
'worksheetDetails.targetInventory.inventory.product.productDetails',
|
|
72
|
+
'worksheetDetails.toLocation'
|
|
73
|
+
], constants_1.WORKSHEET_TYPE.PACKING, releaseGood);
|
|
74
|
+
let marketplaceOrder;
|
|
75
|
+
let marketplaceOrderItems = [];
|
|
76
|
+
let marketplaceStore;
|
|
77
|
+
let trackingNo;
|
|
78
|
+
let shippingProvider;
|
|
79
|
+
let marketplaceStatus;
|
|
80
|
+
if (releaseGood.type === 'b2c') {
|
|
81
|
+
const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
|
|
82
|
+
domain: worksheet.bizplace.domain,
|
|
83
|
+
status: integration_sellercraft_1.SellercraftStatus.ACTIVE
|
|
91
84
|
});
|
|
92
|
-
if (
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
85
|
+
if (sellercraft) {
|
|
86
|
+
if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill)) {
|
|
87
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
88
|
+
releaseGood = await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood);
|
|
89
|
+
}
|
|
90
|
+
trackingNo = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.trackingNo;
|
|
91
|
+
shippingProvider = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.transporter;
|
|
92
|
+
marketplaceStatus = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.marketplaceOrderStatus;
|
|
100
93
|
}
|
|
101
94
|
else {
|
|
102
|
-
|
|
103
|
-
where: {
|
|
95
|
+
marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
96
|
+
where: { orderNo: releaseGood.refNo },
|
|
97
|
+
relations: [
|
|
98
|
+
'domain',
|
|
99
|
+
'marketplaceStore',
|
|
100
|
+
'marketplaceOrderItems',
|
|
101
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
102
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
|
|
103
|
+
]
|
|
104
104
|
});
|
|
105
|
+
if (!marketplaceOrder) {
|
|
106
|
+
throw new Error('Failed to retrieve ecommerce information, kindly contact our support team for this issue.');
|
|
107
|
+
}
|
|
108
|
+
let marketplaceOrderShipping;
|
|
109
|
+
if (marketplaceOrder.isSplitted) {
|
|
110
|
+
marketplaceOrderShipping = await tx.getRepository(marketplace_base_1.MarketplaceOrderShipping).findOne({
|
|
111
|
+
where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
marketplaceOrderShipping = await tx.getRepository(marketplace_base_1.MarketplaceOrderShipping).findOne({
|
|
116
|
+
where: { orderNoRef: worksheet.releaseGood.refNo }
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
trackingNo = marketplaceOrderShipping.ownTrackingNo
|
|
120
|
+
? marketplaceOrderShipping.ownTrackingNo
|
|
121
|
+
: marketplaceOrderShipping.trackingNo;
|
|
122
|
+
shippingProvider = marketplaceOrderShipping.ownTransporter
|
|
123
|
+
? marketplaceOrderShipping.ownTransporter
|
|
124
|
+
: marketplaceOrderShipping.transporter;
|
|
125
|
+
marketplaceStore = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore;
|
|
126
|
+
marketplaceStatus = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.status;
|
|
105
127
|
}
|
|
106
|
-
trackingNo = marketplaceOrderShipping.ownTrackingNo
|
|
107
|
-
? marketplaceOrderShipping.ownTrackingNo
|
|
108
|
-
: marketplaceOrderShipping.trackingNo;
|
|
109
|
-
shippingProvider = marketplaceOrderShipping.ownTransporter
|
|
110
|
-
? marketplaceOrderShipping.ownTransporter
|
|
111
|
-
: marketplaceOrderShipping.transporter;
|
|
112
|
-
marketplaceStore = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore;
|
|
113
|
-
marketplaceStatus = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.status;
|
|
114
128
|
}
|
|
129
|
+
return {
|
|
130
|
+
worksheetInfo: {
|
|
131
|
+
releaseGood,
|
|
132
|
+
bizplaceName: releaseGood.bizplace.name,
|
|
133
|
+
refNo: releaseGood.refNo,
|
|
134
|
+
refNo2: releaseGood.refNo2,
|
|
135
|
+
refNo3: releaseGood.refNo3,
|
|
136
|
+
partnerDomainId: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id,
|
|
137
|
+
startedAt: worksheet.startedAt,
|
|
138
|
+
shippingProvider: shippingProvider ? shippingProvider : '',
|
|
139
|
+
trackingNo: trackingNo ? trackingNo : '',
|
|
140
|
+
airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill,
|
|
141
|
+
invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice,
|
|
142
|
+
platform: marketplaceOrder ? marketplaceOrder.marketplaceStore.platform : 'operato',
|
|
143
|
+
marketplaceStoreId: marketplaceOrder ? marketplaceOrder.marketplaceStore.id : '',
|
|
144
|
+
marketplaceStatus: marketplaceStatus ? marketplaceStatus : '',
|
|
145
|
+
marketplaceOrder: marketplaceOrder ? marketplaceOrder : ''
|
|
146
|
+
},
|
|
147
|
+
worksheetDetailInfos: worksheet.worksheetDetails.map(async (packingWSD) => {
|
|
148
|
+
const targetInventory = packingWSD.targetInventory;
|
|
149
|
+
const inventory = targetInventory.inventory;
|
|
150
|
+
return {
|
|
151
|
+
name: packingWSD.name,
|
|
152
|
+
palletId: inventory.palletId,
|
|
153
|
+
cartonId: inventory.cartonId,
|
|
154
|
+
batchId: inventory.batchId,
|
|
155
|
+
batchIdRef: inventory.batchIdRef,
|
|
156
|
+
product: inventory.product,
|
|
157
|
+
sku: inventory.product.sku,
|
|
158
|
+
releaseQty: targetInventory.releaseQty,
|
|
159
|
+
packedQty: targetInventory.packedQty,
|
|
160
|
+
status: packingWSD.status,
|
|
161
|
+
description: packingWSD.description,
|
|
162
|
+
targetName: targetInventory.name,
|
|
163
|
+
packingType: inventory.packingType,
|
|
164
|
+
packingSize: inventory.packingSize,
|
|
165
|
+
binLocation: targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.binLocation,
|
|
166
|
+
location: inventory.location,
|
|
167
|
+
relatedOrderInv: targetInventory
|
|
168
|
+
};
|
|
169
|
+
})
|
|
170
|
+
};
|
|
171
|
+
}
|
|
172
|
+
catch (error) {
|
|
173
|
+
console.error(error);
|
|
174
|
+
throw error;
|
|
115
175
|
}
|
|
116
|
-
return {
|
|
117
|
-
worksheetInfo: {
|
|
118
|
-
releaseGood,
|
|
119
|
-
bizplaceName: releaseGood.bizplace.name,
|
|
120
|
-
refNo: releaseGood.refNo,
|
|
121
|
-
refNo2: releaseGood.refNo2,
|
|
122
|
-
refNo3: releaseGood.refNo3,
|
|
123
|
-
partnerDomainId: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id,
|
|
124
|
-
startedAt: worksheet.startedAt,
|
|
125
|
-
shippingProvider: shippingProvider ? shippingProvider : '',
|
|
126
|
-
trackingNo: trackingNo ? trackingNo : '',
|
|
127
|
-
airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill,
|
|
128
|
-
invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice,
|
|
129
|
-
platform: marketplaceOrder ? marketplaceOrder.marketplaceStore.platform : 'operato',
|
|
130
|
-
marketplaceStoreId: marketplaceOrder ? marketplaceOrder.marketplaceStore.id : '',
|
|
131
|
-
marketplaceStatus: marketplaceStatus ? marketplaceStatus : '',
|
|
132
|
-
marketplaceOrder: marketplaceOrder ? marketplaceOrder : ''
|
|
133
|
-
},
|
|
134
|
-
worksheetDetailInfos: worksheet.worksheetDetails.map(async (packingWSD) => {
|
|
135
|
-
const targetInventory = packingWSD.targetInventory;
|
|
136
|
-
const inventory = targetInventory.inventory;
|
|
137
|
-
return {
|
|
138
|
-
name: packingWSD.name,
|
|
139
|
-
palletId: inventory.palletId,
|
|
140
|
-
cartonId: inventory.cartonId,
|
|
141
|
-
batchId: inventory.batchId,
|
|
142
|
-
batchIdRef: inventory.batchIdRef,
|
|
143
|
-
product: inventory.product,
|
|
144
|
-
sku: inventory.product.sku,
|
|
145
|
-
releaseQty: targetInventory.releaseQty,
|
|
146
|
-
packedQty: targetInventory.packedQty,
|
|
147
|
-
status: packingWSD.status,
|
|
148
|
-
description: packingWSD.description,
|
|
149
|
-
targetName: targetInventory.name,
|
|
150
|
-
packingType: inventory.packingType,
|
|
151
|
-
packingSize: inventory.packingSize,
|
|
152
|
-
binLocation: targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.binLocation,
|
|
153
|
-
location: inventory.location
|
|
154
|
-
};
|
|
155
|
-
})
|
|
156
|
-
};
|
|
157
176
|
}
|
|
158
177
|
};
|
|
159
178
|
async function getTrackingNo(marketplaceStore, marketplaceOrderItems) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":";;;AAGA,qFAAwF;AACxF,uEAKyC;AACzC,2DAA8G;AAE9G,mEAAoE;AAGpE,kDAAmD;AACnD,sDAA4D;AAE5D,0CAAwD;AAE3C,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,gBAAgB,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;;QAC5D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;
|
|
1
|
+
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,16 +12,19 @@ exports.assignPickingWorkerResolver = {
|
|
|
12
12
|
throw new Error('Target user is not belong to current domain');
|
|
13
13
|
if (!assignee)
|
|
14
14
|
throw new Error('failed to find target user');
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
15
|
+
await Promise.all(worksheetId.map(async (worksheetId) => {
|
|
16
|
+
const worksheet = await tx.getRepository(entities_1.Worksheet).findOne({
|
|
17
|
+
id: worksheetId,
|
|
18
|
+
}, { where: [{
|
|
19
|
+
type: constants_1.WORKSHEET_TYPE.BATCH_PICKING
|
|
20
|
+
}, { type: constants_1.WORKSHEET_TYPE.PICKING }] });
|
|
21
|
+
if (!worksheet)
|
|
22
|
+
throw new Error('failed to find target picking worksheet');
|
|
23
|
+
if (worksheet.status !== constants_1.WORKSHEET_STATUS.DEACTIVATED)
|
|
24
|
+
throw new Error(`current status of worksheet is not able to assign worker`);
|
|
25
|
+
worksheet.assignee = assignee;
|
|
26
|
+
await tx.getRepository(entities_1.Worksheet).save(worksheet);
|
|
27
|
+
}));
|
|
25
28
|
}
|
|
26
29
|
};
|
|
27
30
|
//# sourceMappingURL=assign-picking-worker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assign-picking-worker.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/assign-picking-worker.ts"],"names":[],"mappings":";;;AAAA,yDAAgD;AAGhD,qDAAwE;AACxE,mDAAgD;AAEnC,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CACvB,UAAgB,EAChB,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"assign-picking-worker.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/assign-picking-worker.ts"],"names":[],"mappings":";;;AAAA,yDAAgD;AAGhD,qDAAwE;AACxE,mDAAgD;AAEnC,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CACvB,UAAgB,EAChB,EAAE,WAAW,EAAE,MAAM,EAA6C,EAClE,OAAY;QAEZ,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAC3E,MAAM,QAAQ,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QAC/F,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,KAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,UAAkB,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC;YACtF,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;QAEhE,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAE5D,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,EAAC,EAAE;YACrD,MAAM,SAAS,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;gBACrE,EAAE,EAAE,WAAW;aAChB,EAAC,EAAC,KAAK,EAAE,CAAC;wBACT,IAAI,EAAC,0BAAc,CAAC,aAAa;qBAClC,EAAC,EAAC,IAAI,EAAC,0BAAc,CAAC,OAAO,EAAC,CAAC,EAAC,CAAC,CAAA;YAElC,IAAI,CAAC,SAAS;gBAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;YAC1E,IAAI,SAAS,CAAC,MAAM,KAAK,4BAAgB,CAAC,WAAW;gBACnD,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;YAE7E,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAA;YAC7B,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAEnD,CAAC,CAAC,CAAC,CAAA;IACL,CAAC;CACF,CAAA"}
|
package/dist-server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.js
CHANGED
|
@@ -2,12 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.pickingAssignmentStatusByUsersResolver = void 0;
|
|
4
4
|
const auth_base_1 = require("@things-factory/auth-base");
|
|
5
|
-
const biz_base_1 = require("@things-factory/biz-base");
|
|
6
5
|
const typeorm_1 = require("typeorm");
|
|
7
6
|
const constants_1 = require("../../../../constants");
|
|
8
7
|
const entities_1 = require("../../../../entities");
|
|
9
8
|
exports.pickingAssignmentStatusByUsersResolver = {
|
|
10
|
-
async pickingAssignmentStatusByUsers(_, {
|
|
9
|
+
async pickingAssignmentStatusByUsers(_, { name, email }, context) {
|
|
11
10
|
const { domain } = context.state;
|
|
12
11
|
const domainUsers = await (0, auth_base_1.getDomainUsers)(domain);
|
|
13
12
|
const domainUserIds = domainUsers
|
|
@@ -19,14 +18,12 @@ exports.pickingAssignmentStatusByUsersResolver = {
|
|
|
19
18
|
if (email)
|
|
20
19
|
findOneOption.where.email = (0, typeorm_1.ILike)(`%${email}%`);
|
|
21
20
|
const users = await (0, typeorm_1.getRepository)(auth_base_1.User).find(findOneOption);
|
|
22
|
-
const bizplace = await (0, typeorm_1.getRepository)(biz_base_1.Bizplace).findOne(bizplaceId);
|
|
23
21
|
const assignedPickingWorksheets = await (0, typeorm_1.getRepository)(entities_1.Worksheet).find({
|
|
24
22
|
where: {
|
|
25
|
-
|
|
26
|
-
bizplace,
|
|
27
|
-
type: constants_1.WORKSHEET_TYPE.PICKING,
|
|
23
|
+
type: (0, typeorm_1.In)([constants_1.WORKSHEET_TYPE.PICKING, constants_1.WORKSHEET_TYPE.BATCH_PICKING]),
|
|
28
24
|
status: (0, typeorm_1.In)([constants_1.WORKSHEET_STATUS.DEACTIVATED, constants_1.WORKSHEET_STATUS.EXECUTING]),
|
|
29
|
-
assignee: (0, typeorm_1.In)(users.map((u) => u.id))
|
|
25
|
+
assignee: (0, typeorm_1.In)(users.map((u) => u.id)),
|
|
26
|
+
domain
|
|
30
27
|
},
|
|
31
28
|
relations: ['assignee']
|
|
32
29
|
});
|
package/dist-server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"picking-assignment-status-by-user.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.ts"],"names":[],"mappings":";;;AAAA,yDAAgE;
|
|
1
|
+
{"version":3,"file":"picking-assignment-status-by-user.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.scanProductSorting = exports.scanProductSortingResolver = void 0;
|
|
4
4
|
const controllers_1 = require("../../../../controllers");
|
|
5
5
|
exports.scanProductSortingResolver = {
|
|
6
|
-
async scanProductSorting(_, { taskNo, releaseGoodNo, productBarcode }, context) {
|
|
6
|
+
async scanProductSorting(_, { taskNo, releaseGoodNo, productBarcode, serialNumber }, context) {
|
|
7
7
|
const { tx, domain, user } = context.state;
|
|
8
|
-
await scanProductSorting(tx, domain, user, taskNo, releaseGoodNo, productBarcode);
|
|
8
|
+
await scanProductSorting(tx, domain, user, taskNo, releaseGoodNo, productBarcode, serialNumber);
|
|
9
9
|
}
|
|
10
10
|
};
|
|
11
|
-
async function scanProductSorting(tx, domain, user, taskNo, releaseGoodNo, productBarcode) {
|
|
11
|
+
async function scanProductSorting(tx, domain, user, taskNo, releaseGoodNo, productBarcode, serialNumber) {
|
|
12
12
|
const worksheetController = new controllers_1.SortingWorksheetController(tx, domain, user);
|
|
13
|
-
await worksheetController.scanProductSorting(taskNo, releaseGoodNo, productBarcode);
|
|
13
|
+
await worksheetController.scanProductSorting(taskNo, releaseGoodNo, productBarcode, serialNumber);
|
|
14
14
|
}
|
|
15
15
|
exports.scanProductSorting = scanProductSorting;
|
|
16
16
|
//# sourceMappingURL=scan-product-sorting.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan-product-sorting.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/sorting/scan-product-sorting.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,EAAE,OAAY;
|
|
1
|
+
{"version":3,"file":"scan-product-sorting.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/sorting/scan-product-sorting.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,OAAY;QACpG,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,CAAC,CAAA;IACjG,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CACtC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,MAAc,EACd,aAAqB,EACrB,cAAuB,EACvB,YAAqB;IAErB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,CAAC,CAAA;AACnG,CAAC;AAXD,gDAWC"}
|
|
@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.sortingProduct = exports.sortingProductResolver = void 0;
|
|
4
4
|
const controllers_1 = require("../../../../controllers");
|
|
5
5
|
exports.sortingProductResolver = {
|
|
6
|
-
async sortingProduct(_, { taskNo, releaseGoodNo, productId, sortingQty }, context) {
|
|
6
|
+
async sortingProduct(_, { taskNo, releaseGoodNo, productId, sortingQty, serialNumber }, context) {
|
|
7
7
|
const { tx, domain, user } = context.state;
|
|
8
|
-
await sortingProduct(tx, domain, user, taskNo, releaseGoodNo, productId, sortingQty);
|
|
8
|
+
await sortingProduct(tx, domain, user, taskNo, releaseGoodNo, productId, sortingQty, serialNumber);
|
|
9
9
|
}
|
|
10
10
|
};
|
|
11
|
-
async function sortingProduct(tx, domain, user, taskNo, releaseGoodNo, productId, sortingQty) {
|
|
11
|
+
async function sortingProduct(tx, domain, user, taskNo, releaseGoodNo, productId, sortingQty, serialNumber) {
|
|
12
12
|
const worksheetController = new controllers_1.SortingWorksheetController(tx, domain, user);
|
|
13
|
-
await worksheetController.sortingProduct(taskNo, releaseGoodNo, productId, sortingQty);
|
|
13
|
+
await worksheetController.sortingProduct(taskNo, releaseGoodNo, productId, sortingQty, serialNumber);
|
|
14
14
|
}
|
|
15
15
|
exports.sortingProduct = sortingProduct;
|
|
16
16
|
//# sourceMappingURL=sorting-product.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sorting-product.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/sorting/sorting-product.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,sBAAsB,GAAG;IACpC,KAAK,CAAC,cAAc,CAAC,CAAM,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,OAAY;
|
|
1
|
+
{"version":3,"file":"sorting-product.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/sorting/sorting-product.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,sBAAsB,GAAG;IACpC,KAAK,CAAC,cAAc,CAAC,CAAM,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,OAAY;QACvG,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;IACpG,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,cAAc,CAClC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,MAAc,EACd,aAAqB,EACrB,SAAiB,EACjB,UAAkB,EAClB,YAAqB;IAErB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;AACtG,CAAC;AAZD,wCAYC"}
|
|
@@ -19,22 +19,26 @@ exports.sortingWorksheetResolver = {
|
|
|
19
19
|
const qb = (0, typeorm_1.getRepository)(sales_base_1.OrderInventory).createQueryBuilder('OI');
|
|
20
20
|
qb.select('SUM(OI.releaseQty)', 'releaseQty')
|
|
21
21
|
.addSelect('SUM(OI.sortedQty)', 'sortedQty')
|
|
22
|
+
.addSelect(`string_agg(CONCAT(BIN.name, '(', OI.releaseQty, ')' ), ' ')`, 'binRemarks')
|
|
22
23
|
.addSelect('PROD.id', 'productId')
|
|
23
24
|
.addSelect('PROD.name', 'productName')
|
|
24
25
|
.addSelect('PROD.sku', 'productSku')
|
|
25
26
|
.addSelect('PROD.description', 'productDescription')
|
|
27
|
+
.addSelect('PROD.isRequireSerialNumberScanningOutbound', 'isRequireSerialNumberScanningOutbound')
|
|
26
28
|
.addSelect('OI.batch_id', 'batchId')
|
|
27
29
|
.addSelect('OI.packing_type', 'packingType')
|
|
28
30
|
.addSelect('OI.packing_size', 'packingSize')
|
|
29
31
|
.addSelect('INV.expiration_date', 'expirationDate')
|
|
30
32
|
.leftJoin('OI.product', 'PROD')
|
|
31
33
|
.leftJoin('OI.inventory', 'INV')
|
|
34
|
+
.leftJoin('OI.binLocation', 'BIN')
|
|
32
35
|
.where('OI.release_good_id = :releaseGoodId', { releaseGoodId: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.id })
|
|
33
36
|
.andWhere('OI.status <> :releaseGoodStatus', { releaseGoodStatus: sales_base_1.ORDER_INVENTORY_STATUS.COMPLETE_SPLIT })
|
|
34
37
|
.groupBy('PROD.id')
|
|
35
38
|
.addGroupBy('PROD.name')
|
|
36
39
|
.addGroupBy('PROD.sku')
|
|
37
40
|
.addGroupBy('PROD.description')
|
|
41
|
+
.addGroupBy('PROD.isRequireSerialNumberScanningOutbound')
|
|
38
42
|
.addGroupBy('INV.expiration_date')
|
|
39
43
|
.addGroupBy('OI.batch_id')
|
|
40
44
|
.addGroupBy('OI.packing_type')
|
|
@@ -58,12 +62,14 @@ exports.sortingWorksheetResolver = {
|
|
|
58
62
|
productSku: item === null || item === void 0 ? void 0 : item.productSku,
|
|
59
63
|
productName: item === null || item === void 0 ? void 0 : item.productName,
|
|
60
64
|
productDescription: item === null || item === void 0 ? void 0 : item.productDescription,
|
|
65
|
+
isRequireSerialNumberScanningOutbound: item === null || item === void 0 ? void 0 : item.isRequireSerialNumberScanningOutbound,
|
|
61
66
|
releaseQty: item.releaseQty,
|
|
62
67
|
sortedQty: item.sortedQty,
|
|
63
68
|
status: item.status,
|
|
64
69
|
expirationDate: item === null || item === void 0 ? void 0 : item.expirationDate,
|
|
65
70
|
packingType: item === null || item === void 0 ? void 0 : item.packingType,
|
|
66
71
|
packingSize: item === null || item === void 0 ? void 0 : item.packingSize,
|
|
72
|
+
binRemarks: item === null || item === void 0 ? void 0 : item.binRemarks,
|
|
67
73
|
releaseGood
|
|
68
74
|
};
|
|
69
75
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sorting-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/sorting-worksheet.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sorting-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/sorting-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateBatchPickingWorksheetDetailsByBulkResolver = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
4
5
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
5
|
-
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
6
6
|
const setting_base_1 = require("@things-factory/setting-base");
|
|
7
|
-
const
|
|
7
|
+
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
8
8
|
const constants_1 = require("../../../constants");
|
|
9
9
|
const entities_1 = require("../../../entities");
|
|
10
10
|
const utils_1 = require("../../../utils");
|
|
11
11
|
exports.generateBatchPickingWorksheetDetailsByBulkResolver = {
|
|
12
|
-
async generateBatchPickingWorksheetDetailsByBulk(_, { worksheetId, bizplaceId, selectedItems
|
|
12
|
+
async generateBatchPickingWorksheetDetailsByBulk(_, { worksheetId, bizplaceId, selectedItems }, context) {
|
|
13
13
|
const { tx, user, domain } = context.state;
|
|
14
14
|
try {
|
|
15
15
|
let worksheet = await tx.getRepository(entities_1.Worksheet).findOne({
|
|
@@ -50,8 +50,7 @@ exports.generateBatchPickingWorksheetDetailsByBulkResolver = {
|
|
|
50
50
|
releaseQty: 'DESC'
|
|
51
51
|
}
|
|
52
52
|
});
|
|
53
|
-
let pInventoryList = (0, utils_1.inventoriesByStrategy)(Object.assign(Object.assign({}, oi), { worksheetId: worksheet.id, bizplaceId,
|
|
54
|
-
pickingStrategy, locationSortingRules: inventoryAssignmentSetting ? JSON.parse(inventoryAssignmentSetting.value) : false }), domain, tx);
|
|
53
|
+
let pInventoryList = (0, utils_1.inventoriesByStrategy)(Object.assign(Object.assign({}, oi), { worksheetId: worksheet.id, bizplaceId, locationSortingRules: inventoryAssignmentSetting ? JSON.parse(inventoryAssignmentSetting.value) : false }), domain, tx);
|
|
55
54
|
let idx = 0;
|
|
56
55
|
let [orderInventories, inventoryList] = await Promise.all([pOrderInventories, pInventoryList]);
|
|
57
56
|
for (let oiIdx = 0; oiIdx < orderInventories.length; oiIdx++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-batch-picking-worksheet-details-by-bulk.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details-by-bulk.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"generate-batch-picking-worksheet-details-by-bulk.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details-by-bulk.ts"],"names":[],"mappings":"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"}
|