@things-factory/worksheet-base 4.3.75 → 4.3.78
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/packing-worksheet.js +54 -11
- 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/complete-picking.js +4 -22
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.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/packing-worksheet.ts +62 -12
- package/server/graphql/resolvers/worksheet/pending-cancellation-release-order.ts +99 -94
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +1 -20
- 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
|
@@ -4,11 +4,11 @@ exports.generateMultipleReleaseGoodWorksheetResolver = void 0;
|
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
5
|
const generate_release_good_worksheet_1 = require("./generate-release-good-worksheet");
|
|
6
6
|
exports.generateMultipleReleaseGoodWorksheetResolver = {
|
|
7
|
-
async generateMultipleReleaseGoodWorksheet(_, {
|
|
7
|
+
async generateMultipleReleaseGoodWorksheet(_, { releaseGoods }, context) {
|
|
8
8
|
const { tx, domain, user } = context.state;
|
|
9
|
-
for (let idx = 0; idx <
|
|
9
|
+
for (let idx = 0; idx < releaseGoods.length; idx++) {
|
|
10
10
|
await (0, typeorm_1.getManager)().transaction(async (txMgr) => {
|
|
11
|
-
await (0, generate_release_good_worksheet_1.generatePickingWorksheet)(txMgr, domain, user,
|
|
11
|
+
await (0, generate_release_good_worksheet_1.generatePickingWorksheet)(txMgr, domain, user, releaseGoods[idx].name, releaseGoods[idx].status);
|
|
12
12
|
});
|
|
13
13
|
}
|
|
14
14
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-multiple-release-good-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;
|
|
1
|
+
{"version":3,"file":"generate-multiple-release-good-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AAKnD,uFAA4E;AAE/D,QAAA,4CAA4C,GAAG;IAC1D,KAAK,CAAC,oCAAoC,CAAC,CAAM,EAAE,EAAE,YAAY,EAAE,EAAE,OAAY;QAC/E,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YAClD,MAAM,IAAA,oBAAU,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;gBAC3C,MAAM,IAAA,0DAAwB,EAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAA;YACvG,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}
|
|
@@ -7,12 +7,12 @@ const controllers_1 = require("../../../../controllers/");
|
|
|
7
7
|
const entities_1 = require("../../../../entities");
|
|
8
8
|
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
9
9
|
exports.generateReleaseGoodWorksheetResolver = {
|
|
10
|
-
async generateReleaseGoodWorksheet(_, { releaseGoodNo }, context) {
|
|
10
|
+
async generateReleaseGoodWorksheet(_, { releaseGoodNo, currentStatus = null }, context) {
|
|
11
11
|
const { tx, domain, user } = context.state;
|
|
12
|
-
return await generatePickingWorksheet(tx, domain, user, releaseGoodNo);
|
|
12
|
+
return await generatePickingWorksheet(tx, domain, user, releaseGoodNo, currentStatus);
|
|
13
13
|
}
|
|
14
14
|
};
|
|
15
|
-
async function generatePickingWorksheet(tx, domain, user, releaseGoodNo) {
|
|
15
|
+
async function generatePickingWorksheet(tx, domain, user, releaseGoodNo, currentStatus = null) {
|
|
16
16
|
try {
|
|
17
17
|
const worksheetController = new controllers_1.PickingWorksheetController(tx, domain, user);
|
|
18
18
|
let releaseGood = await worksheetController.findRefOrder(sales_base_1.ReleaseGood, {
|
|
@@ -53,7 +53,7 @@ async function generatePickingWorksheet(tx, domain, user, releaseGoodNo) {
|
|
|
53
53
|
await tx.getRepository(sales_base_1.ReleaseGood).update({ id: releaseGood.id }, { status: sales_base_1.ORDER_STATUS.DONE });
|
|
54
54
|
}
|
|
55
55
|
else {
|
|
56
|
-
worksheet = await worksheetController.generatePickingWorksheet(releaseGoodNo);
|
|
56
|
+
worksheet = await worksheetController.generatePickingWorksheet(releaseGoodNo, currentStatus);
|
|
57
57
|
}
|
|
58
58
|
return worksheet;
|
|
59
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-release-good-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts"],"names":[],"mappings":";;;AAGA,2DAA8G;AAE9G,+DAAsE;AAEtE,0DAAqE;AACrE,mDAAiE;AAEjE,mEAAqG;AAExF,QAAA,oCAAoC,GAAG;IAClD,KAAK,CAAC,4BAA4B,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;
|
|
1
|
+
{"version":3,"file":"generate-release-good-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,9 +10,10 @@ const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
|
10
10
|
const constants_1 = require("../../../constants");
|
|
11
11
|
const controllers_1 = require("../../../controllers");
|
|
12
12
|
const utils_1 = require("../../../utils");
|
|
13
|
+
const setting_base_1 = require("@things-factory/setting-base");
|
|
13
14
|
exports.packingWorksheetResolver = {
|
|
14
15
|
async packingWorksheet(_, { releaseGoodNo }, context) {
|
|
15
|
-
var _a;
|
|
16
|
+
var _a, _b, _c, _d;
|
|
16
17
|
try {
|
|
17
18
|
const { tx, domain, user } = context.state;
|
|
18
19
|
let releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
@@ -34,7 +35,7 @@ exports.packingWorksheetResolver = {
|
|
|
34
35
|
qb.innerJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
|
|
35
36
|
.innerJoinAndSelect('releaseGood.bizplace', 'bizplace')
|
|
36
37
|
.innerJoinAndSelect('bizplace.domain', 'domain')
|
|
37
|
-
.innerJoinAndSelect('worksheets', 'ws', `orderInventory.release_good_id = ws.release_good_id AND ws.type = 'PACKING' AND ws.status = 'EXECUTING'`)
|
|
38
|
+
.innerJoinAndSelect('worksheets', 'ws', `orderInventory.release_good_id = ws.release_good_id AND ws.type = 'PACKING' AND (ws.status = 'EXECUTING' OR ws.status = 'DEACTIVATED')`)
|
|
38
39
|
.where('orderInventory.domain_id = :domainId', { domainId: domain.id })
|
|
39
40
|
.andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
|
|
40
41
|
orderInventoryStatus: [
|
|
@@ -46,11 +47,20 @@ exports.packingWorksheetResolver = {
|
|
|
46
47
|
.andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
|
|
47
48
|
.andWhere('releaseGood.status IN (:...status)', {
|
|
48
49
|
status: [sales_base_1.ORDER_STATUS.READY_TO_PACK, sales_base_1.ORDER_STATUS.PACKING]
|
|
50
|
+
})
|
|
51
|
+
.orderBy(`case when orderInventory.status = '${sales_base_1.ORDER_INVENTORY_STATUS.PACKED}' then 1 end`)
|
|
52
|
+
.addOrderBy('ws.created_at', 'ASC');
|
|
53
|
+
const [orderInventoriesByBin, totalInventoriesByBin] = await qb.getManyAndCount();
|
|
54
|
+
// @oscarchuaweiwen-fsd @chrislim I suggest using getMany() instead since the total is redundant here
|
|
55
|
+
// remove duplicated count of release good
|
|
56
|
+
const filteredRO = orderInventoriesByBin.map(oiBin => {
|
|
57
|
+
return oiBin.releaseGood.name;
|
|
49
58
|
});
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
releaseGood =
|
|
59
|
+
if (orderInventoriesByBin.length > 0) {
|
|
60
|
+
releaseGoodNo = orderInventoriesByBin[0].releaseGood.name;
|
|
61
|
+
releaseGood = orderInventoriesByBin[0].releaseGood;
|
|
62
|
+
releaseGood.totalInventoriesByBin = [...new Set(filteredRO)].length;
|
|
63
|
+
releaseGood.isOrderInventoryBin = true;
|
|
54
64
|
}
|
|
55
65
|
else {
|
|
56
66
|
throw new Error(`Bin do not have any existing order.`);
|
|
@@ -73,7 +83,35 @@ exports.packingWorksheetResolver = {
|
|
|
73
83
|
'worksheetDetails.targetInventory.inventory.product.productDetails',
|
|
74
84
|
'worksheetDetails.toLocation'
|
|
75
85
|
], constants_1.WORKSHEET_TYPE.PACKING, releaseGood);
|
|
76
|
-
|
|
86
|
+
if (worksheet.status === 'DEACTIVATED') {
|
|
87
|
+
const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
88
|
+
const directActivatePackingWorksheet = await tx.getRepository(setting_base_1.Setting).findOne({
|
|
89
|
+
where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-packing-worksheet' }
|
|
90
|
+
});
|
|
91
|
+
const partnerDirectActivatePackingWorksheetSetting = await tx
|
|
92
|
+
.getRepository(setting_base_1.PartnerSetting)
|
|
93
|
+
.findOne({
|
|
94
|
+
where: {
|
|
95
|
+
setting: directActivatePackingWorksheet,
|
|
96
|
+
domain: domain,
|
|
97
|
+
partnerDomain: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain
|
|
98
|
+
}
|
|
99
|
+
});
|
|
100
|
+
if (directActivatePackingWorksheet != undefined &&
|
|
101
|
+
directActivatePackingWorksheet.value.toLowerCase() == 'true') {
|
|
102
|
+
if (partnerDirectActivatePackingWorksheetSetting != undefined) {
|
|
103
|
+
if (partnerDirectActivatePackingWorksheetSetting.value.toLowerCase() == 'true')
|
|
104
|
+
await packingWSCtrl.activatePacking(worksheet.name);
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
await packingWSCtrl.activatePacking(worksheet.name);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
throw new Error('Kindly go to packing worksheet page to activate the packing worksheet');
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
let marketplaceOrder = {};
|
|
77
115
|
let marketplaceOrderItems = [];
|
|
78
116
|
let marketplaceStore;
|
|
79
117
|
let trackingNo;
|
|
@@ -130,15 +168,15 @@ exports.packingWorksheetResolver = {
|
|
|
130
168
|
refNo: releaseGood.refNo,
|
|
131
169
|
refNo2: releaseGood.refNo2,
|
|
132
170
|
refNo3: releaseGood.refNo3,
|
|
133
|
-
partnerDomainId: (
|
|
171
|
+
partnerDomainId: (_b = releaseGood.bizplace) === null || _b === void 0 ? void 0 : _b.domain.id,
|
|
134
172
|
startedAt: worksheet.startedAt,
|
|
135
173
|
shippingProvider: shippingProvider ? shippingProvider : '',
|
|
136
174
|
trackingNo: trackingNo ? trackingNo : '',
|
|
137
175
|
airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill,
|
|
138
176
|
checkedRemarkBy: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.checkedRemarkBy,
|
|
139
177
|
invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice,
|
|
140
|
-
platform: marketplaceOrder ? marketplaceOrder.marketplaceStore.platform : 'operato',
|
|
141
|
-
marketplaceStoreId: marketplaceOrder ? marketplaceOrder.marketplaceStore.id : '',
|
|
178
|
+
platform: Object.keys(marketplaceOrder).length > 0 ? (_c = marketplaceOrder.marketplaceStore) === null || _c === void 0 ? void 0 : _c.platform : 'operato',
|
|
179
|
+
marketplaceStoreId: Object.keys(marketplaceOrder).length > 0 ? (_d = marketplaceOrder.marketplaceStore) === null || _d === void 0 ? void 0 : _d.id : '',
|
|
142
180
|
marketplaceStatus: marketplaceStatus ? marketplaceStatus : '',
|
|
143
181
|
marketplaceOrder: marketplaceOrder ? marketplaceOrder : ''
|
|
144
182
|
},
|
|
@@ -237,7 +275,12 @@ async function getSellercraftDocument(sellercraft, releaseGood, domain, user) {
|
|
|
237
275
|
}
|
|
238
276
|
}
|
|
239
277
|
catch (error) {
|
|
240
|
-
env_1.logger.error(`packing-worksheet[getSellercraftDocument]:(data:${JSON.stringify({
|
|
278
|
+
env_1.logger.error(`packing-worksheet[getSellercraftDocument]:(data:${JSON.stringify({
|
|
279
|
+
sellercraft,
|
|
280
|
+
releaseGood,
|
|
281
|
+
domain,
|
|
282
|
+
user
|
|
283
|
+
})}) ${error} `);
|
|
241
284
|
}
|
|
242
285
|
});
|
|
243
286
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAAuE;AAGvE,6CAA4C;AAC5C,qFAAwF;AACxF,uEAKyC;AACzC,2DAA8G;AAE9G,mEAAoE;AAEpE,kDAAmD;AACnD,
|
|
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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"}
|
|
@@ -8,7 +8,6 @@ const integration_marketplace_1 = require("@things-factory/integration-marketpla
|
|
|
8
8
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
9
9
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
10
10
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
11
|
-
const setting_base_1 = require("@things-factory/setting-base");
|
|
12
11
|
const constants_1 = require("../../../../constants");
|
|
13
12
|
const controllers_1 = require("../../../../controllers/");
|
|
14
13
|
const ecommerce_1 = require("../../../../controllers/ecommerce");
|
|
@@ -29,7 +28,7 @@ exports.completePickingResolver = {
|
|
|
29
28
|
}
|
|
30
29
|
};
|
|
31
30
|
async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
32
|
-
var _a, _b
|
|
31
|
+
var _a, _b;
|
|
33
32
|
const pickingWSCtrl = new controllers_1.PickingWorksheetController(tx, domain, user);
|
|
34
33
|
let releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
35
34
|
where: { domain, name: releaseGoodNo },
|
|
@@ -176,24 +175,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
176
175
|
}
|
|
177
176
|
if (releaseGood.packingOption) {
|
|
178
177
|
const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
179
|
-
|
|
180
|
-
where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-packing-worksheet' }
|
|
181
|
-
});
|
|
182
|
-
const partnerDirectActivatePackingWorksheetSetting = await tx
|
|
183
|
-
.getRepository(setting_base_1.PartnerSetting)
|
|
184
|
-
.findOne({
|
|
185
|
-
where: { setting: directActivatePackingWorksheet, domain: domain, partnerDomain: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain }
|
|
186
|
-
});
|
|
187
|
-
let packingWorksheet = await packingWSCtrl.generatePackingWorksheet(releaseGoodNo);
|
|
188
|
-
if (directActivatePackingWorksheet != undefined && directActivatePackingWorksheet.value.toLowerCase() == 'true') {
|
|
189
|
-
if (partnerDirectActivatePackingWorksheetSetting != undefined) {
|
|
190
|
-
if (partnerDirectActivatePackingWorksheetSetting.value.toLowerCase() == 'true')
|
|
191
|
-
await packingWSCtrl.activatePacking(packingWorksheet.name);
|
|
192
|
-
}
|
|
193
|
-
else {
|
|
194
|
-
await packingWSCtrl.activatePacking(packingWorksheet.name);
|
|
195
|
-
}
|
|
196
|
-
}
|
|
178
|
+
await packingWSCtrl.generatePackingWorksheet(releaseGoodNo);
|
|
197
179
|
}
|
|
198
180
|
else {
|
|
199
181
|
// Find Existing Loading Worksheet if any
|
|
@@ -208,7 +190,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
208
190
|
if (pickedTargetInventories.length > 0) {
|
|
209
191
|
const loadingWSCtrl = new controllers_1.LoadingWorksheetController(tx, domain, user);
|
|
210
192
|
let loadingWorksheet = await loadingWSCtrl.generateLoadingWorksheet(releaseGoodNo, pickedTargetInventories);
|
|
211
|
-
if (!((
|
|
193
|
+
if (!((_a = loadingWorksheet.worksheetDetails) === null || _a === void 0 ? void 0 : _a.length)) {
|
|
212
194
|
loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id);
|
|
213
195
|
}
|
|
214
196
|
const loadingWorksheetDetails = loadingWorksheet.worksheetDetails;
|
|
@@ -218,7 +200,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
218
200
|
else {
|
|
219
201
|
const loadingWSCtrl = new controllers_1.LoadingWorksheetController(tx, domain, user);
|
|
220
202
|
let loadingWorksheet = await loadingWSCtrl.updateLoadingWorksheet(releaseGoodNo, pickedTargetInventories, existLoadingWorksheet);
|
|
221
|
-
if (!((
|
|
203
|
+
if (!((_b = loadingWorksheet.worksheetDetails) === null || _b === void 0 ? void 0 : _b.length)) {
|
|
222
204
|
loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id);
|
|
223
205
|
}
|
|
224
206
|
const loadingWorksheetDetails = loadingWorksheet.worksheetDetails;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AAGnD,uDAAgF;AAChF,qEAA+E;AAC/E,qFAAkG;AAClG,qFAAwF;AACxF,uEAKyC;AACzC,2DAMmC;
|
|
1
|
+
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
|