@things-factory/worksheet-base 4.3.76 → 4.3.79-alpha.0
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/packing-worksheet-controller.js +14 -2
- package/dist-server/controllers/outbound/packing-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/picking-worksheet-controller.js +6 -9
- package/dist-server/controllers/outbound/picking-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/worksheet-controller.js +14 -1
- package/dist-server/controllers/worksheet-controller.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/confirm-cancellation-release-order.js +12 -0
- package/dist-server/graphql/resolvers/worksheet/confirm-cancellation-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.js +3 -3
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.js +4 -4
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js +67 -28
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/activate-packing.js +23 -8
- package/dist-server/graphql/resolvers/worksheet/packing/activate-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js +30 -7
- package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/packing.js +23 -8
- package/dist-server/graphql/resolvers/worksheet/packing/packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js +25 -8
- package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +112 -22
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/pending-cancellation-release-order.js +87 -79
- package/dist-server/graphql/resolvers/worksheet/pending-cancellation-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/activate-picking.js +51 -25
- package/dist-server/graphql/resolvers/worksheet/picking/activate-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js +2 -2
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +266 -140
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/putaway/complete-putaway.js +39 -14
- package/dist-server/graphql/resolvers/worksheet/putaway/complete-putaway.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/reject-cancellation-release-order.js +92 -150
- package/dist-server/graphql/resolvers/worksheet/reject-cancellation-release-order.js.map +1 -1
- package/dist-server/graphql/types/worksheet/index.js +5 -2
- package/dist-server/graphql/types/worksheet/index.js.map +1 -1
- package/dist-server/graphql/types/worksheet/multiple-release-good-worksheet.js +11 -0
- package/dist-server/graphql/types/worksheet/multiple-release-good-worksheet.js.map +1 -0
- package/dist-server/utils/worksheet-util.js +3 -1
- package/dist-server/utils/worksheet-util.js.map +1 -1
- package/package.json +17 -17
- package/server/controllers/outbound/packing-worksheet-controller.ts +21 -2
- package/server/controllers/outbound/picking-worksheet-controller.ts +7 -11
- package/server/controllers/worksheet-controller.ts +25 -2
- package/server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts +13 -0
- package/server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.ts +3 -7
- package/server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts +5 -4
- package/server/graphql/resolvers/worksheet/loading/complete-loading.ts +77 -33
- package/server/graphql/resolvers/worksheet/packing/activate-packing.ts +26 -9
- package/server/graphql/resolvers/worksheet/packing/complete-packing.ts +34 -9
- package/server/graphql/resolvers/worksheet/packing/packing.ts +26 -9
- package/server/graphql/resolvers/worksheet/packing/scan-product-packing.ts +28 -9
- package/server/graphql/resolvers/worksheet/packing-worksheet.ts +128 -23
- package/server/graphql/resolvers/worksheet/pending-cancellation-release-order.ts +99 -94
- package/server/graphql/resolvers/worksheet/picking/activate-picking.ts +60 -30
- package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts +2 -2
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +288 -149
- package/server/graphql/resolvers/worksheet/putaway/complete-putaway.ts +45 -15
- package/server/graphql/resolvers/worksheet/reject-cancellation-release-order.ts +98 -213
- package/server/graphql/types/worksheet/index.ts +5 -2
- package/server/graphql/types/worksheet/multiple-release-good-worksheet.ts +8 -0
- package/server/utils/worksheet-util.ts +3 -1
|
@@ -2,17 +2,19 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getTrackingNo = exports.packingWorksheetResolver = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
5
6
|
const env_1 = require("@things-factory/env");
|
|
6
7
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
7
8
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
8
9
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
10
|
+
const setting_base_1 = require("@things-factory/setting-base");
|
|
9
11
|
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
10
12
|
const constants_1 = require("../../../constants");
|
|
11
13
|
const controllers_1 = require("../../../controllers");
|
|
12
14
|
const utils_1 = require("../../../utils");
|
|
13
15
|
exports.packingWorksheetResolver = {
|
|
14
16
|
async packingWorksheet(_, { releaseGoodNo }, context) {
|
|
15
|
-
var _a;
|
|
17
|
+
var _a, _b, _c, _d;
|
|
16
18
|
try {
|
|
17
19
|
const { tx, domain, user } = context.state;
|
|
18
20
|
let releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
@@ -34,7 +36,7 @@ exports.packingWorksheetResolver = {
|
|
|
34
36
|
qb.innerJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
|
|
35
37
|
.innerJoinAndSelect('releaseGood.bizplace', 'bizplace')
|
|
36
38
|
.innerJoinAndSelect('bizplace.domain', 'domain')
|
|
37
|
-
.innerJoinAndSelect('worksheets', 'ws', `orderInventory.release_good_id = ws.release_good_id AND ws.type = 'PACKING' AND ws.status = 'EXECUTING'`)
|
|
39
|
+
.innerJoinAndSelect('worksheets', 'ws', `orderInventory.release_good_id = ws.release_good_id AND ws.type = 'PACKING' AND (ws.status = 'EXECUTING' OR ws.status = 'DEACTIVATED')`)
|
|
38
40
|
.where('orderInventory.domain_id = :domainId', { domainId: domain.id })
|
|
39
41
|
.andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
|
|
40
42
|
orderInventoryStatus: [
|
|
@@ -46,11 +48,20 @@ exports.packingWorksheetResolver = {
|
|
|
46
48
|
.andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
|
|
47
49
|
.andWhere('releaseGood.status IN (:...status)', {
|
|
48
50
|
status: [sales_base_1.ORDER_STATUS.READY_TO_PACK, sales_base_1.ORDER_STATUS.PACKING]
|
|
51
|
+
})
|
|
52
|
+
.orderBy(`case when orderInventory.status = '${sales_base_1.ORDER_INVENTORY_STATUS.PACKED}' then 1 end`)
|
|
53
|
+
.addOrderBy('ws.created_at', 'ASC');
|
|
54
|
+
const [orderInventoriesByBin, totalInventoriesByBin] = await qb.getManyAndCount();
|
|
55
|
+
// @oscarchuaweiwen-fsd @chrislim I suggest using getMany() instead since the total is redundant here
|
|
56
|
+
// remove duplicated count of release good
|
|
57
|
+
const filteredRO = orderInventoriesByBin.map(oiBin => {
|
|
58
|
+
return oiBin.releaseGood.name;
|
|
49
59
|
});
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
releaseGood =
|
|
60
|
+
if (orderInventoriesByBin.length > 0) {
|
|
61
|
+
releaseGoodNo = orderInventoriesByBin[0].releaseGood.name;
|
|
62
|
+
releaseGood = orderInventoriesByBin[0].releaseGood;
|
|
63
|
+
releaseGood.totalInventoriesByBin = [...new Set(filteredRO)].length;
|
|
64
|
+
releaseGood.isOrderInventoryBin = true;
|
|
54
65
|
}
|
|
55
66
|
else {
|
|
56
67
|
throw new Error(`Bin do not have any existing order.`);
|
|
@@ -73,22 +84,52 @@ exports.packingWorksheetResolver = {
|
|
|
73
84
|
'worksheetDetails.targetInventory.inventory.product.productDetails',
|
|
74
85
|
'worksheetDetails.toLocation'
|
|
75
86
|
], constants_1.WORKSHEET_TYPE.PACKING, releaseGood);
|
|
76
|
-
|
|
87
|
+
if (worksheet.status === 'DEACTIVATED') {
|
|
88
|
+
const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
89
|
+
const directActivatePackingWorksheet = await tx.getRepository(setting_base_1.Setting).findOne({
|
|
90
|
+
where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-packing-worksheet' }
|
|
91
|
+
});
|
|
92
|
+
const partnerDirectActivatePackingWorksheetSetting = await tx
|
|
93
|
+
.getRepository(setting_base_1.PartnerSetting)
|
|
94
|
+
.findOne({
|
|
95
|
+
where: {
|
|
96
|
+
setting: directActivatePackingWorksheet,
|
|
97
|
+
domain: domain,
|
|
98
|
+
partnerDomain: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain
|
|
99
|
+
}
|
|
100
|
+
});
|
|
101
|
+
if (directActivatePackingWorksheet != undefined &&
|
|
102
|
+
directActivatePackingWorksheet.value.toLowerCase() == 'true') {
|
|
103
|
+
if (partnerDirectActivatePackingWorksheetSetting != undefined) {
|
|
104
|
+
if (partnerDirectActivatePackingWorksheetSetting.value.toLowerCase() == 'true')
|
|
105
|
+
await packingWSCtrl.activatePacking(worksheet.name);
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
await packingWSCtrl.activatePacking(worksheet.name);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
throw new Error('Kindly go to packing worksheet page to activate the packing worksheet');
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
let marketplaceOrder = {};
|
|
77
116
|
let marketplaceOrderItems = [];
|
|
78
117
|
let marketplaceStore;
|
|
79
118
|
let trackingNo;
|
|
80
119
|
let shippingProvider;
|
|
81
120
|
let marketplaceStatus;
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
121
|
+
const orderSource = releaseGood.source;
|
|
122
|
+
switch (orderSource) {
|
|
123
|
+
case auth_base_1.ApplicationType.SELLERCRAFT:
|
|
124
|
+
const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
|
|
125
|
+
domain: worksheet.bizplace.domain,
|
|
126
|
+
status: integration_sellercraft_1.SellercraftStatus.ACTIVE
|
|
127
|
+
});
|
|
128
|
+
if (sellercraft) {
|
|
129
|
+
getSellercraftDocument(sellercraft, releaseGood, domain, user);
|
|
130
|
+
}
|
|
131
|
+
break;
|
|
132
|
+
case auth_base_1.ApplicationType.MMS:
|
|
92
133
|
marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
93
134
|
where: { orderNo: releaseGood.refNo },
|
|
94
135
|
relations: [
|
|
@@ -121,8 +162,52 @@ exports.packingWorksheetResolver = {
|
|
|
121
162
|
: marketplaceOrderShipping.transporter;
|
|
122
163
|
marketplaceStore = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore;
|
|
123
164
|
marketplaceStatus = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.status;
|
|
124
|
-
|
|
165
|
+
break;
|
|
166
|
+
default:
|
|
167
|
+
break;
|
|
125
168
|
}
|
|
169
|
+
// if (releaseGood.type === 'b2c') {
|
|
170
|
+
// const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
|
|
171
|
+
// domain: worksheet.bizplace.domain,
|
|
172
|
+
// status: SellercraftStatus.ACTIVE
|
|
173
|
+
// })
|
|
174
|
+
// if (sellercraft) {
|
|
175
|
+
// // asynchronously get document from sellercraft
|
|
176
|
+
// getSellercraftDocument(sellercraft, releaseGood, domain, user)
|
|
177
|
+
// } else {
|
|
178
|
+
// marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
|
|
179
|
+
// where: { orderNo: releaseGood.refNo },
|
|
180
|
+
// relations: [
|
|
181
|
+
// 'domain',
|
|
182
|
+
// 'marketplaceStore',
|
|
183
|
+
// 'marketplaceOrderItems',
|
|
184
|
+
// 'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
185
|
+
// 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
|
|
186
|
+
// ]
|
|
187
|
+
// })
|
|
188
|
+
// if (!marketplaceOrder) {
|
|
189
|
+
// throw new Error('Failed to retrieve ecommerce information, kindly contact our support team for this issue.')
|
|
190
|
+
// }
|
|
191
|
+
// let marketplaceOrderShipping: MarketplaceOrderShipping
|
|
192
|
+
// if (marketplaceOrder.isSplitted) {
|
|
193
|
+
// marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
|
|
194
|
+
// where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
|
|
195
|
+
// })
|
|
196
|
+
// } else {
|
|
197
|
+
// marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
|
|
198
|
+
// where: { orderNoRef: worksheet.releaseGood.refNo }
|
|
199
|
+
// })
|
|
200
|
+
// }
|
|
201
|
+
// trackingNo = marketplaceOrderShipping.ownTrackingNo
|
|
202
|
+
// ? marketplaceOrderShipping.ownTrackingNo
|
|
203
|
+
// : marketplaceOrderShipping.trackingNo
|
|
204
|
+
// shippingProvider = marketplaceOrderShipping.ownTransporter
|
|
205
|
+
// ? marketplaceOrderShipping.ownTransporter
|
|
206
|
+
// : marketplaceOrderShipping.transporter
|
|
207
|
+
// marketplaceStore = marketplaceOrder?.marketplaceStore
|
|
208
|
+
// marketplaceStatus = marketplaceOrder?.status
|
|
209
|
+
// }
|
|
210
|
+
// }
|
|
126
211
|
return {
|
|
127
212
|
worksheetInfo: {
|
|
128
213
|
releaseGood,
|
|
@@ -130,15 +215,15 @@ exports.packingWorksheetResolver = {
|
|
|
130
215
|
refNo: releaseGood.refNo,
|
|
131
216
|
refNo2: releaseGood.refNo2,
|
|
132
217
|
refNo3: releaseGood.refNo3,
|
|
133
|
-
partnerDomainId: (
|
|
218
|
+
partnerDomainId: (_b = releaseGood.bizplace) === null || _b === void 0 ? void 0 : _b.domain.id,
|
|
134
219
|
startedAt: worksheet.startedAt,
|
|
135
220
|
shippingProvider: shippingProvider ? shippingProvider : '',
|
|
136
221
|
trackingNo: trackingNo ? trackingNo : '',
|
|
137
222
|
airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill,
|
|
138
223
|
checkedRemarkBy: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.checkedRemarkBy,
|
|
139
224
|
invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice,
|
|
140
|
-
platform: marketplaceOrder ? marketplaceOrder.marketplaceStore.platform : 'operato',
|
|
141
|
-
marketplaceStoreId: marketplaceOrder ? marketplaceOrder.marketplaceStore.id : '',
|
|
225
|
+
platform: Object.keys(marketplaceOrder).length > 0 ? (_c = marketplaceOrder.marketplaceStore) === null || _c === void 0 ? void 0 : _c.platform : 'operato',
|
|
226
|
+
marketplaceStoreId: Object.keys(marketplaceOrder).length > 0 ? (_d = marketplaceOrder.marketplaceStore) === null || _d === void 0 ? void 0 : _d.id : '',
|
|
142
227
|
marketplaceStatus: marketplaceStatus ? marketplaceStatus : '',
|
|
143
228
|
marketplaceOrder: marketplaceOrder ? marketplaceOrder : ''
|
|
144
229
|
},
|
|
@@ -237,7 +322,12 @@ async function getSellercraftDocument(sellercraft, releaseGood, domain, user) {
|
|
|
237
322
|
}
|
|
238
323
|
}
|
|
239
324
|
catch (error) {
|
|
240
|
-
env_1.logger.error(`packing-worksheet[getSellercraftDocument]:(data:${JSON.stringify({
|
|
325
|
+
env_1.logger.error(`packing-worksheet[getSellercraftDocument]:(data:${JSON.stringify({
|
|
326
|
+
sellercraft,
|
|
327
|
+
releaseGood,
|
|
328
|
+
domain,
|
|
329
|
+
user
|
|
330
|
+
})}) ${error} `);
|
|
241
331
|
}
|
|
242
332
|
});
|
|
243
333
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAAuE;
|
|
1
|
+
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,17 +2,17 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.pendingCancellationReleaseOrder = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
-
const auth_base_1 = require("@things-factory/auth-base");
|
|
6
5
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
7
6
|
const entities_1 = require("../../../entities");
|
|
8
7
|
exports.pendingCancellationReleaseOrder = {
|
|
9
8
|
async pendingCancellationReleaseOrder(_, { name }, context) {
|
|
10
|
-
var _a;
|
|
11
9
|
const { tx, domain, user } = context.state;
|
|
12
10
|
const foundRO = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
13
11
|
where: { domain, name },
|
|
14
12
|
relations: ['bizplace', 'orderInventories', 'orderVass']
|
|
15
13
|
});
|
|
14
|
+
if (foundRO.status === "DONE")
|
|
15
|
+
throw new Error('Release good has been completed!');
|
|
16
16
|
if (!foundRO)
|
|
17
17
|
throw new Error(`Release good order doesn't exists.`);
|
|
18
18
|
let targetOIs = foundRO.orderInventories;
|
|
@@ -58,54 +58,62 @@ exports.pendingCancellationReleaseOrder = {
|
|
|
58
58
|
});
|
|
59
59
|
await tx.getRepository(sales_base_1.OrderVas).save(foundOVs);
|
|
60
60
|
}
|
|
61
|
-
if (pickedOIs && pickedOIs.length) {
|
|
62
|
-
let pickedWSD = await tx.getRepository(entities_1.WorksheetDetail).find({
|
|
63
|
-
where: {
|
|
64
|
-
domain,
|
|
65
|
-
targetInventory: (0, typeorm_1.In)(pickedOIs.map(oi => oi.id)),
|
|
66
|
-
status: sales_base_1.ORDER_INVENTORY_STATUS.DONE
|
|
67
|
-
}
|
|
68
|
-
});
|
|
69
|
-
pickedWSD = pickedWSD.map((wsd) => {
|
|
70
|
-
return Object.assign(Object.assign({}, wsd), { status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_CANCEL, updater: user });
|
|
71
|
-
});
|
|
72
|
-
await tx.getRepository(entities_1.WorksheetDetail).save(pickedWSD);
|
|
73
|
-
let replacedWSD = await tx.getRepository(entities_1.WorksheetDetail).find({
|
|
74
|
-
where: {
|
|
75
|
-
domain,
|
|
76
|
-
targetInventory: (0, typeorm_1.In)(pickedOIs.map(oi => oi.id)),
|
|
77
|
-
status: sales_base_1.ORDER_INVENTORY_STATUS.REPLACED
|
|
78
|
-
},
|
|
79
|
-
relations: ['targetInventory']
|
|
80
|
-
});
|
|
81
|
-
if (replacedWSD && replacedWSD.length) {
|
|
82
|
-
let replacedOI = replacedWSD.map((wsd) => wsd.targetInventory);
|
|
83
|
-
replacedOI = replacedOI.map((oi) => {
|
|
84
|
-
return Object.assign(Object.assign({}, oi), { status: sales_base_1.ORDER_INVENTORY_STATUS.REPLACED, updater: user });
|
|
85
|
-
});
|
|
86
|
-
await tx.getRepository(sales_base_1.OrderInventory).save(replacedOI);
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
if (pickingOIs && pickingOIs.length) {
|
|
90
|
-
let pickingWSD = await tx.getRepository(entities_1.WorksheetDetail).find({
|
|
91
|
-
where: { domain, targetInventory: (0, typeorm_1.In)(pickingOIs.map(oi => oi.id)) }
|
|
92
|
-
});
|
|
93
|
-
pickingWSD = pickingWSD.map((wsd) => {
|
|
94
|
-
return Object.assign(Object.assign({}, wsd), { status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_CANCEL, updater: user });
|
|
95
|
-
});
|
|
96
|
-
await tx.getRepository(entities_1.WorksheetDetail).save(pickingWSD);
|
|
97
|
-
}
|
|
98
61
|
// find worksheet and update status to PENDING_CANCEL
|
|
99
|
-
let foundWS = await tx.getRepository(entities_1.Worksheet).
|
|
62
|
+
let foundWS = await tx.getRepository(entities_1.Worksheet).findOne({
|
|
100
63
|
where: {
|
|
101
64
|
domain,
|
|
102
65
|
releaseGood: foundRO
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
foundWS = foundWS.map((ws) => {
|
|
106
|
-
return Object.assign(Object.assign({}, ws), { status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_CANCEL, updater: user });
|
|
66
|
+
},
|
|
67
|
+
order: { 'createdAt': 'DESC' }
|
|
107
68
|
});
|
|
108
|
-
|
|
69
|
+
if (foundWS) {
|
|
70
|
+
await tx.getRepository(entities_1.Worksheet).update({ id: foundWS.id }, {
|
|
71
|
+
status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_CANCEL,
|
|
72
|
+
updater: user
|
|
73
|
+
});
|
|
74
|
+
if (pickedOIs && pickedOIs.length) {
|
|
75
|
+
let pickedWSD = await tx.getRepository(entities_1.WorksheetDetail).find({
|
|
76
|
+
where: {
|
|
77
|
+
domain,
|
|
78
|
+
targetInventory: (0, typeorm_1.In)(pickedOIs.map(oi => oi.id)),
|
|
79
|
+
status: sales_base_1.ORDER_INVENTORY_STATUS.DONE,
|
|
80
|
+
worksheet: foundWS
|
|
81
|
+
}
|
|
82
|
+
});
|
|
83
|
+
pickedWSD = pickedWSD.map((wsd) => {
|
|
84
|
+
return Object.assign(Object.assign({}, wsd), { status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_CANCEL, updater: user });
|
|
85
|
+
});
|
|
86
|
+
await tx.getRepository(entities_1.WorksheetDetail).save(pickedWSD);
|
|
87
|
+
let replacedWSD = await tx.getRepository(entities_1.WorksheetDetail).find({
|
|
88
|
+
where: {
|
|
89
|
+
domain,
|
|
90
|
+
targetInventory: (0, typeorm_1.In)(pickedOIs.map(oi => oi.id)),
|
|
91
|
+
status: sales_base_1.ORDER_INVENTORY_STATUS.REPLACED,
|
|
92
|
+
worksheet: foundWS
|
|
93
|
+
},
|
|
94
|
+
relations: ['targetInventory']
|
|
95
|
+
});
|
|
96
|
+
if (replacedWSD && replacedWSD.length) {
|
|
97
|
+
let replacedOI = replacedWSD.map((wsd) => wsd.targetInventory);
|
|
98
|
+
replacedOI = replacedOI.map((oi) => {
|
|
99
|
+
return Object.assign(Object.assign({}, oi), { status: sales_base_1.ORDER_INVENTORY_STATUS.REPLACED, updater: user });
|
|
100
|
+
});
|
|
101
|
+
await tx.getRepository(sales_base_1.OrderInventory).save(replacedOI);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
if (pickingOIs && pickingOIs.length) {
|
|
105
|
+
let pickingWSD = await tx.getRepository(entities_1.WorksheetDetail).find({
|
|
106
|
+
where: {
|
|
107
|
+
domain, targetInventory: (0, typeorm_1.In)(pickingOIs.map(oi => oi.id)),
|
|
108
|
+
worksheet: foundWS
|
|
109
|
+
}
|
|
110
|
+
});
|
|
111
|
+
pickingWSD = pickingWSD.map((wsd) => {
|
|
112
|
+
return Object.assign(Object.assign({}, wsd), { status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_CANCEL, updater: user });
|
|
113
|
+
});
|
|
114
|
+
await tx.getRepository(entities_1.WorksheetDetail).save(pickingWSD);
|
|
115
|
+
}
|
|
116
|
+
}
|
|
109
117
|
// find DO and change status to pending cancel
|
|
110
118
|
let foundDO = await tx.getRepository(sales_base_1.DeliveryOrder).find({
|
|
111
119
|
where: { domain, releaseGood: foundRO }
|
|
@@ -115,40 +123,40 @@ exports.pendingCancellationReleaseOrder = {
|
|
|
115
123
|
});
|
|
116
124
|
await tx.getRepository(sales_base_1.DeliveryOrder).save(foundDO);
|
|
117
125
|
await tx.getRepository(sales_base_1.ReleaseGood).save(Object.assign(Object.assign({}, foundRO), { status: sales_base_1.ORDER_STATUS.PENDING_CANCEL, updater: user }));
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
})
|
|
134
|
-
|
|
135
|
-
//
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
}
|
|
126
|
+
/**
|
|
127
|
+
* @notes Temporary off sendNotification due to suspect of causing wms down
|
|
128
|
+
*/
|
|
129
|
+
// // notification logics
|
|
130
|
+
// // get Office Admin Users
|
|
131
|
+
// const users: any[] = await tx
|
|
132
|
+
// .getRepository('users_roles')
|
|
133
|
+
// .createQueryBuilder('ur')
|
|
134
|
+
// .select('ur.users_id', 'id')
|
|
135
|
+
// .where(qb => {
|
|
136
|
+
// const subQuery = qb
|
|
137
|
+
// .subQuery()
|
|
138
|
+
// .select('role.id')
|
|
139
|
+
// .from(Role, 'role')
|
|
140
|
+
// .where("role.name = 'Office Admin'")
|
|
141
|
+
// .andWhere('role.domain_id = :domain', { domain: domain.id })
|
|
142
|
+
// .getQuery()
|
|
143
|
+
// return 'ur.roles_id IN ' + subQuery
|
|
144
|
+
// })
|
|
145
|
+
// .getRawMany()
|
|
146
|
+
// // send notification to Office Admin Users
|
|
147
|
+
// if (users?.length && context.header?.referer) {
|
|
148
|
+
// const receivers: any[] = users.map(user => user.id)
|
|
149
|
+
// const msg = {
|
|
150
|
+
// title: `${foundRO.name} cancellation`,
|
|
151
|
+
// body: `${customerBizplace.name} is requesting to cancel order`,
|
|
152
|
+
// url: context.header.referer,
|
|
153
|
+
// data: { url: context.header.referer }
|
|
154
|
+
// }
|
|
155
|
+
// await sendNotification({
|
|
156
|
+
// receivers,
|
|
157
|
+
// message: { ...msg }
|
|
158
|
+
// })
|
|
159
|
+
// }
|
|
152
160
|
return;
|
|
153
161
|
}
|
|
154
162
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pending-cancellation-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/pending-cancellation-release-order.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;
|
|
1
|
+
{"version":3,"file":"pending-cancellation-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/pending-cancellation-release-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.activatePicking = exports.activatePickingResolver = void 0;
|
|
4
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
4
5
|
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
5
|
-
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
6
6
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
7
7
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
8
8
|
const controllers_1 = require("../../../../controllers");
|
|
@@ -16,36 +16,62 @@ async function activatePicking(tx, domain, user, worksheetNo) {
|
|
|
16
16
|
const worksheetController = new controllers_1.PickingWorksheetController(tx, domain, user);
|
|
17
17
|
const worksheet = await worksheetController.activatePicking(worksheetNo);
|
|
18
18
|
const companyDomain = worksheet === null || worksheet === void 0 ? void 0 : worksheet.bizplace.company.domain;
|
|
19
|
-
// find for any existing marketplace store connections
|
|
20
|
-
const marketplaceStores = await tx.getRepository(integration_marketplace_1.MarketplaceStore).find({
|
|
21
|
-
where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
|
|
22
|
-
relations: ['marketplaceDistributors']
|
|
23
|
-
});
|
|
24
19
|
let releaseGood = worksheet.releaseGood;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
let orderInventories = worksheetDetails.map(wsd => wsd.targetInventory);
|
|
33
|
-
const ecommerceCtrl = new controllers_1.EcommerceController(tx, domain, user);
|
|
34
|
-
await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain);
|
|
35
|
-
}
|
|
36
|
-
const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
37
|
-
where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
38
|
-
relations: ['marketplaceStore']
|
|
20
|
+
const orderSource = releaseGood.source;
|
|
21
|
+
switch (orderSource) {
|
|
22
|
+
case auth_base_1.ApplicationType.MMS:
|
|
23
|
+
// find for any existing marketplace store connections
|
|
24
|
+
const marketplaceStores = await tx.getRepository(integration_marketplace_1.MarketplaceStore).find({
|
|
25
|
+
where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
|
|
26
|
+
relations: ['marketplaceDistributors']
|
|
39
27
|
});
|
|
40
|
-
if (
|
|
41
|
-
|
|
42
|
-
|
|
28
|
+
if (marketplaceStores === null || marketplaceStores === void 0 ? void 0 : marketplaceStores.length) {
|
|
29
|
+
if (marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
|
|
30
|
+
const worksheetDetails = worksheet.worksheetDetails;
|
|
31
|
+
let orderInventories = worksheetDetails.map(wsd => wsd.targetInventory);
|
|
43
32
|
const ecommerceCtrl = new controllers_1.EcommerceController(tx, domain, user);
|
|
44
|
-
await ecommerceCtrl.
|
|
33
|
+
await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain);
|
|
34
|
+
}
|
|
35
|
+
const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
36
|
+
where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
37
|
+
relations: ['marketplaceStore']
|
|
38
|
+
});
|
|
39
|
+
if (marketplaceOrder) {
|
|
40
|
+
const marketplaceStore = marketplaceOrder.marketplaceStore;
|
|
41
|
+
if (marketplaceStore.isAutoUpdateShipment) {
|
|
42
|
+
const ecommerceCtrl = new controllers_1.EcommerceController(tx, domain, user);
|
|
43
|
+
await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, sales_base_1.ORDER_STATUS.PICKING);
|
|
44
|
+
}
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
|
-
|
|
47
|
+
break;
|
|
48
|
+
default:
|
|
49
|
+
break;
|
|
48
50
|
}
|
|
51
|
+
// if (releaseGood.type === 'b2c') {
|
|
52
|
+
// const sellercraft: Sellercraft = await tx
|
|
53
|
+
// .getRepository(Sellercraft)
|
|
54
|
+
// .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
|
|
55
|
+
// if (marketplaceStores?.length && !sellercraft) {
|
|
56
|
+
// if (marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
|
|
57
|
+
// const worksheetDetails = worksheet.worksheetDetails
|
|
58
|
+
// let orderInventories: any[] = worksheetDetails.map(wsd => wsd.targetInventory)
|
|
59
|
+
// const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
|
|
60
|
+
// await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain)
|
|
61
|
+
// }
|
|
62
|
+
// const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
|
|
63
|
+
// where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
64
|
+
// relations: ['marketplaceStore']
|
|
65
|
+
// })
|
|
66
|
+
// if (marketplaceOrder) {
|
|
67
|
+
// const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
|
|
68
|
+
// if (marketplaceStore.isAutoUpdateShipment) {
|
|
69
|
+
// const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
|
|
70
|
+
// await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PICKING)
|
|
71
|
+
// }
|
|
72
|
+
// }
|
|
73
|
+
// }
|
|
74
|
+
// }
|
|
49
75
|
return worksheet;
|
|
50
76
|
}
|
|
51
77
|
exports.activatePicking = activatePicking;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activate-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/activate-picking.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"activate-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/activate-picking.ts"],"names":[],"mappings":";;;AAEA,yDAAiE;AACjE,qFAA0E;AAC1E,uEAAmE;AACnE,2DAAsE;AAGtE,yDAAyF;AAG5E,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,EAAE,WAAW,EAAE,EAAE,OAAY;QACzD,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,OAAO,MAAM,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;IAC7D,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,eAAe,CACnC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,WAAmB;IAEnB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;IACxE,MAAM,aAAa,GAAW,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAA;IAEhE,IAAI,WAAW,GAAgB,SAAS,CAAC,WAAW,CAAA;IAEpD,MAAM,WAAW,GAAW,WAAW,CAAC,MAAM,CAAA;IAC9C,QAAQ,WAAW,EAAE;QACnB,KAAK,2BAAe,CAAC,GAAG;YACtB,sDAAsD;YACtD,MAAM,iBAAiB,GAAuB,MAAM,EAAE,CAAC,aAAa,CAAC,0CAAgB,CAAC,CAAC,IAAI,CAAC;gBAC1F,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,IAAI,EAAE;gBAC9E,SAAS,EAAE,CAAC,yBAAyB,CAAC;aACvC,CAAC,CAAA;YAEF,IAAI,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,EAAE;gBAC7B,IAAI,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;oBAC/D,MAAM,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAA;oBACnD,IAAI,gBAAgB,GAAU,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;oBAC9E,MAAM,aAAa,GAAwB,IAAI,iCAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;oBACpF,MAAM,aAAa,CAAC,2BAA2B,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAA;iBACpG;gBAED,MAAM,gBAAgB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAgB,CAAC,CAAC,OAAO,CAAC;oBAC1F,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE;oBAC5D,SAAS,EAAE,CAAC,kBAAkB,CAAC;iBAChC,CAAC,CAAA;gBAEF,IAAI,gBAAgB,EAAE;oBACpB,MAAM,gBAAgB,GAAqB,gBAAgB,CAAC,gBAAgB,CAAA;oBAE5E,IAAI,gBAAgB,CAAC,oBAAoB,EAAE;wBACzC,MAAM,aAAa,GAAwB,IAAI,iCAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;wBACpF,MAAM,aAAa,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,yBAAY,CAAC,OAAO,CAAC,CAAA;qBACjG;iBACF;aACF;YACD,MAAK;QAEP;YACE,MAAK;KACR;IAED,oCAAoC;IACpC,8CAA8C;IAC9C,kCAAkC;IAClC,wFAAwF;IAExF,qDAAqD;IACrD,yEAAyE;IACzE,4DAA4D;IAC5D,uFAAuF;IACvF,6FAA6F;IAC7F,4GAA4G;IAC5G,QAAQ;IAER,oGAAoG;IACpG,sEAAsE;IACtE,wCAAwC;IACxC,SAAS;IAET,8BAA8B;IAC9B,qFAAqF;IAErF,qDAAqD;IACrD,+FAA+F;IAC/F,2GAA2G;IAC3G,UAAU;IACV,QAAQ;IACR,MAAM;IACN,IAAI;IAEJ,OAAO,SAAS,CAAA;AAClB,CAAC;AA/ED,0CA+EC"}
|
|
@@ -44,7 +44,7 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
|
|
|
44
44
|
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
45
45
|
let foundReleaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
46
46
|
where: { id: releaseGood.id },
|
|
47
|
-
relations: ['orderProducts', 'orderProducts.product'
|
|
47
|
+
relations: ['orderProducts', 'orderProducts.product']
|
|
48
48
|
});
|
|
49
49
|
if (!(foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.packageId)) {
|
|
50
50
|
foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood);
|
|
@@ -77,7 +77,7 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
|
|
|
77
77
|
}
|
|
78
78
|
});
|
|
79
79
|
// loop to generate packing worksheet
|
|
80
|
-
for (
|
|
80
|
+
for (let i = 0; i < uniqueRoNo.length; i++) {
|
|
81
81
|
const releaseGoodNo = uniqueRoNo[i];
|
|
82
82
|
const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
83
83
|
await packingWSCtrl.generatePackingWorksheet(releaseGoodNo);
|