@things-factory/worksheet-base 4.3.191 → 4.3.194
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/ecommerce/sellercraft-controller.js +1 -1
- package/dist-server/controllers/ecommerce/sellercraft-controller.js.map +1 -1
- package/dist-server/controllers/outbound/picking-worksheet-controller.js +1 -1
- package/dist-server/controllers/outbound/picking-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/worksheet-controller.js +1 -1
- package/dist-server/controllers/worksheet-controller.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/confirm-cancellation-release-order.js +3 -2
- package/dist-server/graphql/resolvers/worksheet/confirm-cancellation-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js +30 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +25 -0
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/dist-server/utils/lmd-util.js +138 -1
- package/dist-server/utils/lmd-util.js.map +1 -1
- package/package.json +9 -8
- package/server/controllers/ecommerce/sellercraft-controller.ts +1 -1
- package/server/controllers/outbound/picking-worksheet-controller.ts +34 -9
- package/server/controllers/worksheet-controller.ts +34 -12
- package/server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts +2 -1
- package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts +34 -2
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +27 -1
- package/server/utils/lmd-util.ts +186 -1
|
@@ -9,6 +9,7 @@ const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
|
9
9
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
10
10
|
const setting_base_1 = require("@things-factory/setting-base");
|
|
11
11
|
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
12
|
+
const env_1 = require("@things-factory/env");
|
|
12
13
|
const controllers_1 = require("../../../../controllers/");
|
|
13
14
|
const ecommerce_1 = require("../../../../controllers/ecommerce");
|
|
14
15
|
const worksheet_controller_1 = require("../../../../controllers/worksheet-controller");
|
|
@@ -148,8 +149,36 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
|
|
|
148
149
|
break;
|
|
149
150
|
}
|
|
150
151
|
// trigger LMD API to create parcel
|
|
151
|
-
if (((_a = foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length) &&
|
|
152
|
+
if (((_a = foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length) &&
|
|
153
|
+
foundReleaseGood.lmdOption &&
|
|
154
|
+
foundReleaseGood.lastMileDelivery &&
|
|
155
|
+
((_b = foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.orderPackages) === null || _b === void 0 ? void 0 : _b.some(op => op.parcelId == null))) {
|
|
152
156
|
await (0, utils_1.createLmdParcel)([foundReleaseGood], tx);
|
|
157
|
+
// trigger RTS
|
|
158
|
+
try {
|
|
159
|
+
const orderSource = foundReleaseGood.source;
|
|
160
|
+
if (orderSource == auth_base_1.ApplicationType.SELLERCRAFT) {
|
|
161
|
+
const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
|
|
162
|
+
domain: foundReleaseGood.bizplace.domain,
|
|
163
|
+
status: integration_sellercraft_1.SellercraftStatus.ACTIVE
|
|
164
|
+
});
|
|
165
|
+
if (sellercraft) {
|
|
166
|
+
await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
167
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, null, null);
|
|
168
|
+
const rtsTriggerLevel = await tx.getRepository(setting_base_1.Setting).findOne({
|
|
169
|
+
where: { domain: foundReleaseGood.domain, category: 'id-rule', name: 'rts-trigger-level' }
|
|
170
|
+
});
|
|
171
|
+
if (rtsTriggerLevel && parseInt((rtsTriggerLevel === null || rtsTriggerLevel === void 0 ? void 0 : rtsTriggerLevel.value) || 0) == 1) {
|
|
172
|
+
await sellercraftCtrl.initiateOrderShipment(sellercraft, foundReleaseGood);
|
|
173
|
+
}
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
catch (e) {
|
|
179
|
+
env_1.logger.error(`[get-lmd-awb-sof-trigger]: ${e}`);
|
|
180
|
+
}
|
|
181
|
+
//
|
|
153
182
|
}
|
|
154
183
|
//
|
|
155
184
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"complete-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts"],"names":[],"mappings":"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"}
|
|
@@ -351,6 +351,31 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
351
351
|
releaseGood.lastMileDelivery &&
|
|
352
352
|
((_d = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _d === void 0 ? void 0 : _d.some(op => op.parcelId == null))) {
|
|
353
353
|
await (0, utils_1.createLmdParcel)([releaseGood], tx);
|
|
354
|
+
// trigger RTS
|
|
355
|
+
try {
|
|
356
|
+
const orderSource = releaseGood.source;
|
|
357
|
+
if (orderSource == auth_base_1.ApplicationType.SELLERCRAFT) {
|
|
358
|
+
const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
|
|
359
|
+
domain: releaseGood.bizplace.domain,
|
|
360
|
+
status: integration_sellercraft_1.SellercraftStatus.ACTIVE
|
|
361
|
+
});
|
|
362
|
+
if (sellercraft) {
|
|
363
|
+
await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
364
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, null, null);
|
|
365
|
+
const rtsTriggerLevel = await tx.getRepository(setting_base_1.Setting).findOne({
|
|
366
|
+
where: { domain: releaseGood.domain, category: 'id-rule', name: 'rts-trigger-level' }
|
|
367
|
+
});
|
|
368
|
+
if (rtsTriggerLevel && parseInt((rtsTriggerLevel === null || rtsTriggerLevel === void 0 ? void 0 : rtsTriggerLevel.value) || 0) == 1) {
|
|
369
|
+
await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
|
|
370
|
+
}
|
|
371
|
+
});
|
|
372
|
+
}
|
|
373
|
+
}
|
|
374
|
+
}
|
|
375
|
+
catch (e) {
|
|
376
|
+
env_1.logger.error(`[get-lmd-awb-sof-trigger]: ${e}`);
|
|
377
|
+
}
|
|
378
|
+
//
|
|
354
379
|
}
|
|
355
380
|
//
|
|
356
381
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createLmdParcel = void 0;
|
|
3
|
+
exports.processAwbAndTrackingNo = exports.createLmdParcel = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
5
|
+
const uuid_1 = require("uuid");
|
|
4
6
|
const integration_lmd_1 = require("@things-factory/integration-lmd");
|
|
5
7
|
const env_1 = require("@things-factory/env");
|
|
6
8
|
const geography_1 = require("@things-factory/geography");
|
|
7
9
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
8
10
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
11
|
+
const board_service_1 = require("@things-factory/board-service");
|
|
12
|
+
const board_service_2 = require("@things-factory/board-service");
|
|
13
|
+
const attachment_base_1 = require("@things-factory/attachment-base");
|
|
14
|
+
// import { SellercraftController } from '../controllers'
|
|
15
|
+
const LMD_BOARDS = {
|
|
16
|
+
// dhl: 'operato-lmd-dhl-awb',
|
|
17
|
+
airspeed: 'operato-lmd-airspeed-awb'
|
|
18
|
+
};
|
|
9
19
|
async function createLmdParcel(releaseGoods, tx) {
|
|
10
20
|
try {
|
|
11
21
|
let parcelsRequest = [];
|
|
@@ -25,6 +35,7 @@ async function createLmdParcel(releaseGoods, tx) {
|
|
|
25
35
|
pickupAccountId: lmd === null || lmd === void 0 ? void 0 : lmd.pickupAccountId,
|
|
26
36
|
soldToAccountId: lmd === null || lmd === void 0 ? void 0 : lmd.soldToAccountId,
|
|
27
37
|
token: lmd === null || lmd === void 0 ? void 0 : lmd.accessToken,
|
|
38
|
+
staging: lmd === null || lmd === void 0 ? void 0 : lmd.staging,
|
|
28
39
|
recipient: releaseGood.attentionTo,
|
|
29
40
|
phone: releaseGood.phone1,
|
|
30
41
|
email: releaseGood.email,
|
|
@@ -42,6 +53,7 @@ async function createLmdParcel(releaseGoods, tx) {
|
|
|
42
53
|
pDistrict: senderGeoArea.cityName,
|
|
43
54
|
pState: senderGeoArea.stateName,
|
|
44
55
|
pCountry: senderGeoArea.countryCode,
|
|
56
|
+
handoverMethod: 1
|
|
45
57
|
};
|
|
46
58
|
let unprocessedOrderPackages = releaseGood.orderPackages.filter(op => !op.parcelId);
|
|
47
59
|
let packagesData = unprocessedOrderPackages.map(op => {
|
|
@@ -66,6 +78,16 @@ async function createLmdParcel(releaseGoods, tx) {
|
|
|
66
78
|
for (let parcel of res) {
|
|
67
79
|
await tx.getRepository(sales_base_1.OrderPackage).update({ id: parcel.refNo }, { parcelId: parcel.parcelId });
|
|
68
80
|
}
|
|
81
|
+
const qb = tx.getRepository(sales_base_1.OrderPackage)
|
|
82
|
+
.createQueryBuilder('op')
|
|
83
|
+
.innerJoinAndSelect('op.releaseGood', 'rg')
|
|
84
|
+
.innerJoinAndSelect('rg.domain', 'd')
|
|
85
|
+
.innerJoinAndSelect('rg.bizplace', 'b')
|
|
86
|
+
.innerJoinAndSelect('b.domain', 'd2')
|
|
87
|
+
.leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
|
|
88
|
+
.where('op.id IN (:...orderPackageIds)', { orderPackageIds: res.map(parcel => { return parcel.refNo; }) });
|
|
89
|
+
const orderPackages = await qb.getMany();
|
|
90
|
+
await processAwbAndTrackingNo(orderPackages, tx);
|
|
69
91
|
}
|
|
70
92
|
}
|
|
71
93
|
catch (e) {
|
|
@@ -73,4 +95,119 @@ async function createLmdParcel(releaseGoods, tx) {
|
|
|
73
95
|
}
|
|
74
96
|
}
|
|
75
97
|
exports.createLmdParcel = createLmdParcel;
|
|
98
|
+
async function processAwbAndTrackingNo(orderPackages, tx) {
|
|
99
|
+
var _a;
|
|
100
|
+
let releaseOrders = [];
|
|
101
|
+
for (let orderPackage of orderPackages) {
|
|
102
|
+
// await getConnection().transaction(async tx => {
|
|
103
|
+
try {
|
|
104
|
+
let awbRes = await integration_lmd_1.LastMileAPI.getAwb(Object.assign(Object.assign({}, orderPackage.releaseGood.lastMileDelivery), { platform: 'lmdMiddleware' }), { parcelId: orderPackage.parcelId, staging: (_a = orderPackage.releaseGood.lastMileDelivery) === null || _a === void 0 ? void 0 : _a.staging });
|
|
105
|
+
if (awbRes) {
|
|
106
|
+
let awbContent;
|
|
107
|
+
const { deliveryConfirmationNo, tracking_no } = awbRes;
|
|
108
|
+
if (awbRes.content) {
|
|
109
|
+
awbContent = Buffer.from(awbRes.content, 'base64');
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
awbContent = await constructAwb(orderPackage, awbRes);
|
|
113
|
+
}
|
|
114
|
+
const awb = await uploadAwbToS3(awbContent, orderPackage);
|
|
115
|
+
await tx.getRepository(sales_base_1.OrderPackage).update({ id: orderPackage.id }, { airwayBill: awb.url, trackingNo: deliveryConfirmationNo || tracking_no });
|
|
116
|
+
releaseOrders.push(orderPackage.releaseGood);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
catch (e) {
|
|
120
|
+
env_1.logger.error(e);
|
|
121
|
+
}
|
|
122
|
+
// })
|
|
123
|
+
}
|
|
124
|
+
// trigger RTS
|
|
125
|
+
// try {
|
|
126
|
+
// let uniqueReleaseOrders: ReleaseGood = [...new Map(releaseOrders.map(item => [item['id'], item])).values()]
|
|
127
|
+
// for (let releaseOrder of uniqueReleaseOrders) {
|
|
128
|
+
// const orderSource: string = releaseOrder.source
|
|
129
|
+
// if (orderSource == ApplicationType.SELLERCRAFT) {
|
|
130
|
+
// const sellercraft: Sellercraft = await getRepository(Sellercraft).findOne({
|
|
131
|
+
// domain: releaseOrder.bizplace.domain,
|
|
132
|
+
// status: SellercraftStatus.ACTIVE
|
|
133
|
+
// })
|
|
134
|
+
// if (sellercraft) {
|
|
135
|
+
// await getConnection().transaction(async tx => {
|
|
136
|
+
// const sellercraftCtrl: SellercraftController = new SellercraftController(tx, null, null)
|
|
137
|
+
// const rtsTriggerLevel: Setting = await tx.getRepository(Setting).findOne({
|
|
138
|
+
// where: { domain: releaseOrder.domain, category: 'id-rule', name: 'rts-trigger-level' }
|
|
139
|
+
// })
|
|
140
|
+
// if (rtsTriggerLevel && parseInt(rtsTriggerLevel?.value || 0) == 1) {
|
|
141
|
+
// await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseOrder)
|
|
142
|
+
// }
|
|
143
|
+
// })
|
|
144
|
+
// }
|
|
145
|
+
// }
|
|
146
|
+
// }
|
|
147
|
+
// } catch (e) {
|
|
148
|
+
// logger.error(`[get-lmd-awb-sof-trigger]: ${e}`)
|
|
149
|
+
// }
|
|
150
|
+
//
|
|
151
|
+
}
|
|
152
|
+
exports.processAwbAndTrackingNo = processAwbAndTrackingNo;
|
|
153
|
+
async function constructAwb(orderPackage, awbRes) {
|
|
154
|
+
const releaseOrder = orderPackage.releaseOrder;
|
|
155
|
+
let { shipmentID, deliveryConfirmationNo, deliveryDepotCode, primarySortCode, secondarySortCode, recipient, sender, tracking_no, courier } = awbRes;
|
|
156
|
+
let senderFullAddress = `${sender === null || sender === void 0 ? void 0 : sender.address}${(sender === null || sender === void 0 ? void 0 : sender.address2) ? ', ' + (sender === null || sender === void 0 ? void 0 : sender.address2) : ''}${(sender === null || sender === void 0 ? void 0 : sender.district) ? ', ' + (sender === null || sender === void 0 ? void 0 : sender.district) : ''}${(sender === null || sender === void 0 ? void 0 : sender.city) ? ', ' + (sender === null || sender === void 0 ? void 0 : sender.city) : ''}${(sender === null || sender === void 0 ? void 0 : sender.postcode) ? ', ' + (sender === null || sender === void 0 ? void 0 : sender.postcode) : ''}${(sender === null || sender === void 0 ? void 0 : sender.state) ? ', ' + (sender === null || sender === void 0 ? void 0 : sender.state) : ''}`;
|
|
157
|
+
let recipientAddress1 = `${recipient === null || recipient === void 0 ? void 0 : recipient.address}${(recipient === null || recipient === void 0 ? void 0 : recipient.address2) ? ', ' + (recipient === null || recipient === void 0 ? void 0 : recipient.address2) : ''}${(recipient === null || recipient === void 0 ? void 0 : recipient.district) ? ', ' + (recipient === null || recipient === void 0 ? void 0 : recipient.district) : ''}`;
|
|
158
|
+
let recipientAddress2 = `${recipient === null || recipient === void 0 ? void 0 : recipient.state}${(recipient === null || recipient === void 0 ? void 0 : recipient.city) ? ', ' + (recipient === null || recipient === void 0 ? void 0 : recipient.city) : ''}${(recipient === null || recipient === void 0 ? void 0 : recipient.postcode) ? ', ' + (recipient === null || recipient === void 0 ? void 0 : recipient.postcode) : ''}`;
|
|
159
|
+
let data = {
|
|
160
|
+
senderFullAddress,
|
|
161
|
+
senderName: sender === null || sender === void 0 ? void 0 : sender.name,
|
|
162
|
+
recipientAddress1,
|
|
163
|
+
recipientAddress2,
|
|
164
|
+
recipientPhone: recipient === null || recipient === void 0 ? void 0 : recipient.phone,
|
|
165
|
+
recipientName: recipient === null || recipient === void 0 ? void 0 : recipient.name,
|
|
166
|
+
refId: shipmentID,
|
|
167
|
+
deliveryConfirmationNo: deliveryConfirmationNo || tracking_no,
|
|
168
|
+
deliveryDepotCode: deliveryDepotCode,
|
|
169
|
+
primarySortCode: primarySortCode,
|
|
170
|
+
secondarySortCode: secondarySortCode,
|
|
171
|
+
orderNo: releaseOrder === null || releaseOrder === void 0 ? void 0 : releaseOrder.refNo
|
|
172
|
+
};
|
|
173
|
+
let lmdBoard = await (0, typeorm_1.getRepository)(board_service_1.Board).findOne({
|
|
174
|
+
where: { name: LMD_BOARDS[courier] },
|
|
175
|
+
relations: ['domain']
|
|
176
|
+
});
|
|
177
|
+
if (!lmdBoard)
|
|
178
|
+
throw new Error(`[get-lmd-awb] board is not found (RO: ${releaseOrder.name})`);
|
|
179
|
+
const { model } = await (0, board_service_2.headlessModel)({ domain: lmdBoard.domain, id: lmdBoard.id });
|
|
180
|
+
const result = await (0, board_service_2.pdf)({
|
|
181
|
+
id: lmdBoard.id,
|
|
182
|
+
model,
|
|
183
|
+
data,
|
|
184
|
+
options: {
|
|
185
|
+
format: 'A4'
|
|
186
|
+
},
|
|
187
|
+
context: { state: { domain: lmdBoard.domain } }
|
|
188
|
+
});
|
|
189
|
+
return result;
|
|
190
|
+
}
|
|
191
|
+
async function uploadAwbToS3(result, orderPackage) {
|
|
192
|
+
const releaseOrder = orderPackage.releaseGood;
|
|
193
|
+
const uuid = (0, uuid_1.v4)();
|
|
194
|
+
const awb = await (0, attachment_base_1.uploadAwb)({
|
|
195
|
+
content: result,
|
|
196
|
+
title: uuid
|
|
197
|
+
});
|
|
198
|
+
if (!(awb === null || awb === void 0 ? void 0 : awb.url))
|
|
199
|
+
throw new Error(`[get-lmd-awb] awb was not uploaded for (RO: ${releaseOrder.name})`);
|
|
200
|
+
// create attachment
|
|
201
|
+
await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).insert({
|
|
202
|
+
name: uuid,
|
|
203
|
+
mimetype: 'application/pdf',
|
|
204
|
+
category: 'LMD_AWB',
|
|
205
|
+
refBy: orderPackage.id,
|
|
206
|
+
path: awb.url,
|
|
207
|
+
domain: releaseOrder.domain,
|
|
208
|
+
size: 0,
|
|
209
|
+
encoding: ''
|
|
210
|
+
});
|
|
211
|
+
return awb;
|
|
212
|
+
}
|
|
76
213
|
//# sourceMappingURL=lmd-util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lmd-util.js","sourceRoot":"","sources":["../../server/utils/lmd-util.ts"],"names":[],"mappings":";;;AAAA,qEAA+E;AAC/E,6CAA4C;AAC5C,yDAAmD;AACnD,uDAAmD;AACnD,2DAAsE;
|
|
1
|
+
{"version":3,"file":"lmd-util.js","sourceRoot":"","sources":["../../server/utils/lmd-util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worksheet-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.194",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -28,17 +28,18 @@
|
|
|
28
28
|
"@things-factory/document-template-base": "^4.3.179",
|
|
29
29
|
"@things-factory/id-rule-base": "^4.3.187",
|
|
30
30
|
"@things-factory/integration-accounting": "^4.3.190",
|
|
31
|
-
"@things-factory/integration-lmd": "^4.3.
|
|
32
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
33
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
31
|
+
"@things-factory/integration-lmd": "^4.3.193",
|
|
32
|
+
"@things-factory/integration-marketplace": "^4.3.193",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^4.3.193",
|
|
34
34
|
"@things-factory/integration-sftp": "^4.3.190",
|
|
35
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
35
|
+
"@things-factory/marketplace-base": "^4.3.193",
|
|
36
36
|
"@things-factory/notification": "^4.3.186",
|
|
37
|
-
"@things-factory/sales-base": "^4.3.
|
|
37
|
+
"@things-factory/sales-base": "^4.3.193",
|
|
38
38
|
"@things-factory/setting-base": "^4.3.186",
|
|
39
39
|
"@things-factory/shell": "^4.3.179",
|
|
40
40
|
"@things-factory/transport-base": "^4.3.179",
|
|
41
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
41
|
+
"@things-factory/warehouse-base": "^4.3.193",
|
|
42
|
+
"uuid": "^9.0.0"
|
|
42
43
|
},
|
|
43
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "fa364664b6924dd8afab814ef66d9feb77174691"
|
|
44
45
|
}
|
|
@@ -421,7 +421,7 @@ export class SellercraftController extends WorksheetController {
|
|
|
421
421
|
}
|
|
422
422
|
|
|
423
423
|
async fetchOrderDocument(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<ReleaseGood> {
|
|
424
|
-
if (releaseGood?.ownTransport) {
|
|
424
|
+
if (releaseGood?.ownTransport || (releaseGood?.ownTransport && releaseGood?.lmdOption)) {
|
|
425
425
|
return
|
|
426
426
|
}
|
|
427
427
|
try {
|
|
@@ -1,10 +1,26 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
EntityManager,
|
|
3
|
+
Equal,
|
|
4
|
+
getConnection,
|
|
5
|
+
getManager,
|
|
6
|
+
In,
|
|
7
|
+
IsNull,
|
|
8
|
+
Not
|
|
9
|
+
} from 'typeorm'
|
|
2
10
|
|
|
3
11
|
import { ApplicationType } from '@things-factory/auth-base'
|
|
4
12
|
import { Bizplace } from '@things-factory/biz-base'
|
|
13
|
+
import { logger } from '@things-factory/env'
|
|
5
14
|
import { generateId } from '@things-factory/id-rule-base'
|
|
6
|
-
import {
|
|
7
|
-
|
|
15
|
+
import {
|
|
16
|
+
Sellercraft,
|
|
17
|
+
SellercraftStatus
|
|
18
|
+
} from '@things-factory/integration-sellercraft'
|
|
19
|
+
import {
|
|
20
|
+
Product,
|
|
21
|
+
ProductBarcode,
|
|
22
|
+
ProductDetail
|
|
23
|
+
} from '@things-factory/product-base'
|
|
8
24
|
import {
|
|
9
25
|
GenerateBatchPickInfo,
|
|
10
26
|
ORDER_INVENTORY_STATUS,
|
|
@@ -17,8 +33,7 @@ import {
|
|
|
17
33
|
OrderToteItem,
|
|
18
34
|
OrderToteSeal,
|
|
19
35
|
OrderVas,
|
|
20
|
-
ReleaseGood
|
|
21
|
-
Replenishment
|
|
36
|
+
ReleaseGood
|
|
22
37
|
} from '@things-factory/sales-base'
|
|
23
38
|
import { Setting } from '@things-factory/setting-base'
|
|
24
39
|
import {
|
|
@@ -35,12 +50,22 @@ import {
|
|
|
35
50
|
TOTE_STATUS
|
|
36
51
|
} from '@things-factory/warehouse-base'
|
|
37
52
|
|
|
38
|
-
import {
|
|
53
|
+
import {
|
|
54
|
+
TASK_NUMBER_RULE_TYPE,
|
|
55
|
+
TASK_NUMBER_SETTING_KEY,
|
|
56
|
+
WORKSHEET_STATUS,
|
|
57
|
+
WORKSHEET_TYPE
|
|
58
|
+
} from '../../constants'
|
|
39
59
|
import { SellercraftController } from '../../controllers'
|
|
40
|
-
import {
|
|
41
|
-
|
|
60
|
+
import {
|
|
61
|
+
Worksheet,
|
|
62
|
+
WorksheetDetail
|
|
63
|
+
} from '../../entities'
|
|
64
|
+
import {
|
|
65
|
+
isInventoryObsolete,
|
|
66
|
+
WorksheetNoGenerator
|
|
67
|
+
} from '../../utils'
|
|
42
68
|
import { VasWorksheetController } from '../vas/vas-worksheet-controller'
|
|
43
|
-
import { logger } from '@things-factory/env'
|
|
44
69
|
|
|
45
70
|
export class PickingWorksheetController extends VasWorksheetController {
|
|
46
71
|
async generatePickingWorksheet(releaseGoodNo: string, currentStatus: string = null): Promise<Worksheet> {
|
|
@@ -1,9 +1,25 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
EntityManager,
|
|
3
|
+
EntitySchema,
|
|
4
|
+
Equal,
|
|
5
|
+
FindOneOptions,
|
|
6
|
+
getRepository,
|
|
7
|
+
In,
|
|
8
|
+
Not
|
|
9
|
+
} from 'typeorm'
|
|
2
10
|
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
11
|
+
import {
|
|
12
|
+
Role,
|
|
13
|
+
User
|
|
14
|
+
} from '@things-factory/auth-base'
|
|
15
|
+
import {
|
|
16
|
+
Bizplace,
|
|
17
|
+
getDomainUsers
|
|
18
|
+
} from '@things-factory/biz-base'
|
|
19
|
+
import {
|
|
20
|
+
Product,
|
|
21
|
+
ProductDetail
|
|
22
|
+
} from '@things-factory/product-base'
|
|
7
23
|
import {
|
|
8
24
|
ArrivalNotice,
|
|
9
25
|
DeliveryOrder,
|
|
@@ -15,21 +31,27 @@ import {
|
|
|
15
31
|
OrderProduct,
|
|
16
32
|
OrderVas,
|
|
17
33
|
ReleaseGood,
|
|
34
|
+
Replenishment,
|
|
18
35
|
ReturnOrder,
|
|
19
|
-
VasOrder
|
|
20
|
-
Replenishment
|
|
36
|
+
VasOrder
|
|
21
37
|
} from '@things-factory/sales-base'
|
|
22
38
|
import { Domain } from '@things-factory/shell'
|
|
23
39
|
import {
|
|
40
|
+
generateInventoryHistory,
|
|
24
41
|
Inventory,
|
|
25
42
|
INVENTORY_STATUS,
|
|
26
43
|
InventoryItem,
|
|
27
|
-
Pallet
|
|
28
|
-
generateInventoryHistory
|
|
44
|
+
Pallet
|
|
29
45
|
} from '@things-factory/warehouse-base'
|
|
30
46
|
|
|
31
|
-
import {
|
|
32
|
-
|
|
47
|
+
import {
|
|
48
|
+
WORKSHEET_STATUS,
|
|
49
|
+
WORKSHEET_TYPE
|
|
50
|
+
} from '../constants'
|
|
51
|
+
import {
|
|
52
|
+
Worksheet,
|
|
53
|
+
WorksheetDetail
|
|
54
|
+
} from '../entities'
|
|
33
55
|
import { WorksheetNoGenerator } from '../utils'
|
|
34
56
|
|
|
35
57
|
export type ReferenceOrderType =
|
|
@@ -1101,7 +1123,7 @@ export class WorksheetController {
|
|
|
1101
1123
|
union all
|
|
1102
1124
|
select pd.product_id as "productId", pd.id, pd.packing_size as "packingSize",
|
|
1103
1125
|
pd.packing_type as "packingType", pd.uom,
|
|
1104
|
-
dt1.qty * pd.
|
|
1126
|
+
dt1.qty * pd.uom_value as "uomValue", dt1.qty * pd.packing_size as "qty", pb.gtin
|
|
1105
1127
|
from product_details pd
|
|
1106
1128
|
inner join product_barcodes pb on pb.product_detail_id = pd.id
|
|
1107
1129
|
inner join cte dt1 on dt1.id = pd.child_product_detail_id
|
|
@@ -246,7 +246,8 @@ export const confirmCancellationReleaseOrder = {
|
|
|
246
246
|
pickupAccountId: releaseGood.lastMileDelivery?.pickupAccountId,
|
|
247
247
|
token: releaseGood.lastMileDelivery?.accessToken,
|
|
248
248
|
parcelId: op.parcelId,
|
|
249
|
-
warehouse: domain?.name
|
|
249
|
+
warehouse: domain?.name,
|
|
250
|
+
staging: releaseGood.lastMileDelivery?.staging
|
|
250
251
|
})
|
|
251
252
|
if (!res?.status) throw new Error('cannot cancel consignment note')
|
|
252
253
|
}
|