@things-factory/worksheet-base 3.6.7 → 3.6.15
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/ecommerce-controller.js +20 -8
- package/dist-server/controllers/ecommerce/ecommerce-controller.js.map +1 -1
- package/dist-server/controllers/index.js +1 -0
- package/dist-server/controllers/index.js.map +1 -1
- package/dist-server/controllers/render-grn.js +184 -0
- package/dist-server/controllers/render-grn.js.map +1 -0
- package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js +11 -6
- package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +20 -4
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/activate-picking.js +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/activate-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +2 -2
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking-worksheet.js +2 -1
- package/dist-server/graphql/resolvers/worksheet/picking-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/worksheet.js +31 -8
- package/dist-server/graphql/resolvers/worksheet/worksheet.js.map +1 -1
- package/dist-server/routes.js +4 -0
- package/dist-server/routes.js.map +1 -1
- package/package.json +16 -16
- package/server/controllers/ecommerce/ecommerce-controller.ts +23 -6
- package/server/controllers/index.ts +1 -0
- package/server/controllers/render-grn.ts +210 -0
- package/server/graphql/resolvers/worksheet/packing/complete-packing.ts +17 -10
- package/server/graphql/resolvers/worksheet/packing-worksheet.ts +25 -5
- package/server/graphql/resolvers/worksheet/picking/activate-picking.ts +1 -1
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +2 -2
- package/server/graphql/resolvers/worksheet/picking-worksheet.ts +5 -2
- package/server/graphql/resolvers/worksheet/worksheet.ts +67 -43
- package/server/routes.ts +5 -0
|
@@ -75,20 +75,32 @@ class EcommerceController extends worksheet_controller_1.WorksheetController {
|
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
|
-
async createOrderShip(marketplaceStore, marketplaceOrder, companyDomain) {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
.findOne({
|
|
82
|
-
|
|
83
|
-
|
|
78
|
+
async createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain) {
|
|
79
|
+
let marketplaceOrderShipping;
|
|
80
|
+
if (marketplaceOrder.isSplitted) {
|
|
81
|
+
marketplaceOrderShipping = await this.trxMgr.getRepository(marketplace_base_1.MarketplaceOrderShipping).findOne({
|
|
82
|
+
where: { domain: companyDomain, marketplaceStore, subOrderNoRef: releaseGood.refNo2 }
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
marketplaceOrderShipping = await this.trxMgr.getRepository(marketplace_base_1.MarketplaceOrderShipping).findOne({
|
|
87
|
+
where: { domain: companyDomain, marketplaceStore, orderNoRef: releaseGood.refNo }
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
const trackingNo = marketplaceOrderShipping.ownTrackingNo
|
|
91
|
+
? marketplaceOrderShipping.ownTrackingNo
|
|
92
|
+
: marketplaceOrderShipping.trackingNo;
|
|
93
|
+
const shippingProvider = marketplaceOrderShipping.ownTransporter
|
|
94
|
+
? marketplaceOrderShipping.ownTransporter
|
|
95
|
+
: marketplaceOrderShipping.transporter;
|
|
84
96
|
let validMarketplaceDistributors = [];
|
|
85
97
|
if (marketplaceOrder.marketplaceStore.marketplaceDistributors) {
|
|
86
98
|
validMarketplaceDistributors = marketplaceOrder.marketplaceStore.marketplaceDistributors.filter(distributor => distributor.status === 'ACTIVE');
|
|
87
99
|
}
|
|
88
100
|
await integration_marketplace_1.StoreAPI.createOrderShip(marketplaceStore, {
|
|
89
101
|
orderId: marketplaceOrder.name,
|
|
90
|
-
orderItems: marketplaceOrder.marketplaceOrderItems,
|
|
91
|
-
shippings: [{ trackingNo
|
|
102
|
+
orderItems: marketplaceOrder.marketplaceOrderItems.filter(item => item.marketplaceOrderShipping.id === marketplaceOrderShipping.id),
|
|
103
|
+
shippings: [{ trackingNo, carrierCode: shippingProvider }],
|
|
92
104
|
sourceCodes: validMarketplaceDistributors.map(distributor => distributor.name)
|
|
93
105
|
});
|
|
94
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ecommerce-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/ecommerce-controller.ts"],"names":[],"mappings":";;;AAAA,qFAAwG;AACxG,uEAIyC;
|
|
1
|
+
{"version":3,"file":"ecommerce-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/ecommerce-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
11
11
|
};
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
__exportStar(require("./render-ro-do"), exports);
|
|
14
|
+
__exportStar(require("./render-grn"), exports);
|
|
14
15
|
__exportStar(require("./render-manual-do"), exports);
|
|
15
16
|
__exportStar(require("./render-elccl-grn"), exports);
|
|
16
17
|
__exportStar(require("./render-job-sheet"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/controllers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA8B;AAC9B,qDAAkC;AAClC,qDAAkC;AAClC,qDAAkC;AAClC,sDAAmC;AACnC,yDAAsC;AACtC,wDAAqC;AACrC,sDAAmC;AAEnC,2BAA2B;AAC3B,yDAAsC;AACtC,8CAA2B;AAC3B,4CAAyB;AACzB,4CAAyB;AACzB,6CAA0B;AAC1B,wCAAqB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/controllers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA8B;AAC9B,+CAA4B;AAC5B,qDAAkC;AAClC,qDAAkC;AAClC,qDAAkC;AAClC,sDAAmC;AACnC,yDAAsC;AACtC,wDAAqC;AACrC,sDAAmC;AAEnC,2BAA2B;AAC3B,yDAAsC;AACtC,8CAA2B;AAC3B,4CAAyB;AACzB,4CAAyB;AACzB,6CAA0B;AAC1B,wCAAqB"}
|
|
@@ -0,0 +1,184 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.renderGRN = void 0;
|
|
7
|
+
const form_data_1 = __importDefault(require("form-data"));
|
|
8
|
+
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
9
|
+
const typeorm_1 = require("typeorm");
|
|
10
|
+
const attachment_base_1 = require("@things-factory/attachment-base");
|
|
11
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
12
|
+
const biz_base_1 = require("@things-factory/biz-base");
|
|
13
|
+
const env_1 = require("@things-factory/env");
|
|
14
|
+
const sales_base_1 = require("@things-factory/sales-base");
|
|
15
|
+
const shell_1 = require("@things-factory/shell");
|
|
16
|
+
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
17
|
+
const constants_1 = require("../constants");
|
|
18
|
+
const entities_1 = require("../entities");
|
|
19
|
+
const datetime_util_1 = require("../utils/datetime-util");
|
|
20
|
+
const REPORT_API_URL = env_1.config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html');
|
|
21
|
+
async function renderGRN({ grnNo, timezoneOffSet }, context) {
|
|
22
|
+
// 1. find domain
|
|
23
|
+
const domain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne({
|
|
24
|
+
where: { id: context.state.domain.id }
|
|
25
|
+
});
|
|
26
|
+
// 2. find grn
|
|
27
|
+
const foundGRN = await (0, typeorm_1.getRepository)(sales_base_1.GoodsReceivalNote).findOne({
|
|
28
|
+
where: { domain, name: grnNo },
|
|
29
|
+
relations: ['domain', 'bizplace', 'bizplace.domain', 'bizplace.company', 'arrivalNotice']
|
|
30
|
+
});
|
|
31
|
+
// 3. find GAN
|
|
32
|
+
const foundGAN = foundGRN.arrivalNotice;
|
|
33
|
+
const ownRefNo = foundGAN.refNo;
|
|
34
|
+
// 4. find customer bizplace
|
|
35
|
+
const partnerBiz = foundGRN.bizplace;
|
|
36
|
+
const partnerDomain = await (0, typeorm_1.getRepository)(auth_base_1.Partner).findOne({
|
|
37
|
+
where: { partnerDomain: partnerBiz.domain },
|
|
38
|
+
relations: ['domain']
|
|
39
|
+
});
|
|
40
|
+
const domainOwner = partnerDomain.domain;
|
|
41
|
+
const domainBizplace = await (0, typeorm_1.getRepository)(biz_base_1.Bizplace).findOne({
|
|
42
|
+
where: { domain: domainOwner },
|
|
43
|
+
relations: ['company']
|
|
44
|
+
});
|
|
45
|
+
const qbReducedInventory = (0, typeorm_1.getRepository)(warehouse_base_1.ReducedInventoryHistory)
|
|
46
|
+
.createQueryBuilder(`ivh`)
|
|
47
|
+
.select(`product_id`, `productId`)
|
|
48
|
+
.addSelect(`batch_id`, `batchId`)
|
|
49
|
+
.addSelect(`reusable_pallet_id`, `reusablePalletId`)
|
|
50
|
+
.addSelect(`packing_type`, `packingType`)
|
|
51
|
+
.addSelect(`sum(qty)`, `qty`)
|
|
52
|
+
.addSelect(`sum(uom_value)`, `uomValue`)
|
|
53
|
+
.addSelect(`uom`, `uom`)
|
|
54
|
+
.addSelect(`count(distinct pallet_id)`, `pallet`)
|
|
55
|
+
.addSelect(`string_agg(distinct expiration_date::varchar,', ' order by expiration_date::varchar)`, `expiryDate`)
|
|
56
|
+
.addSelect(`string_agg(distinct pallet_id::varchar,', ' order by pallet_id::varchar)`, `palletId`)
|
|
57
|
+
.where(`ivh.domain_id = :domainId`, { domainId: domain.id })
|
|
58
|
+
.andWhere(`ivh.ref_order_id = :refOrderId`, { refOrderId: foundGAN.id })
|
|
59
|
+
.andWhere(`ivh.transaction_type = 'UNLOADING'`)
|
|
60
|
+
.groupBy(`reusable_pallet_id`)
|
|
61
|
+
.addGroupBy(`product_id`)
|
|
62
|
+
.addGroupBy(`batch_id`)
|
|
63
|
+
.addGroupBy(`packing_type`)
|
|
64
|
+
.addGroupBy(`uom`)
|
|
65
|
+
.getRawMany();
|
|
66
|
+
// 5. find domain contact point
|
|
67
|
+
const foundCP = await (0, typeorm_1.getRepository)(biz_base_1.ContactPoint).findOne({
|
|
68
|
+
where: { domain, bizplace: domainBizplace }
|
|
69
|
+
});
|
|
70
|
+
// 5. find domain contact point
|
|
71
|
+
const foundPartnerCP = await (0, typeorm_1.getRepository)(biz_base_1.ContactPoint).findOne({
|
|
72
|
+
where: { domain, bizplace: partnerBiz }
|
|
73
|
+
});
|
|
74
|
+
// 6. find unloading worksheet
|
|
75
|
+
const foundWS = await (0, typeorm_1.getRepository)(entities_1.Worksheet).findOne({
|
|
76
|
+
where: { domain, arrivalNotice: foundGAN, type: constants_1.WORKSHEET_TYPE.UNLOADING, status: sales_base_1.ORDER_STATUS.DONE },
|
|
77
|
+
relations: ['worksheetDetails', 'updater']
|
|
78
|
+
});
|
|
79
|
+
// find putaway worksheet
|
|
80
|
+
const foundPutawayWS = await (0, typeorm_1.getRepository)(entities_1.Worksheet).findOne({
|
|
81
|
+
where: { domain, arrivalNotice: foundGAN, type: constants_1.WORKSHEET_TYPE.PUTAWAY, status: sales_base_1.ORDER_STATUS.DONE },
|
|
82
|
+
relations: ['worksheetDetails', 'updater']
|
|
83
|
+
});
|
|
84
|
+
const targetProducts = await (0, typeorm_1.getRepository)(sales_base_1.OrderProduct).find({
|
|
85
|
+
where: { domain, arrivalNotice: foundGAN, actualPalletQty: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()), actualPackQty: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) },
|
|
86
|
+
relations: ['product']
|
|
87
|
+
});
|
|
88
|
+
// 7. find grn template based on category
|
|
89
|
+
const foundTemplate = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
|
|
90
|
+
where: { domain, category: constants_1.TEMPLATE_TYPE.GRN_TEMPLATE }
|
|
91
|
+
});
|
|
92
|
+
// 8. find grn logo
|
|
93
|
+
const foundLogo = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
|
|
94
|
+
where: {
|
|
95
|
+
domain,
|
|
96
|
+
category: constants_1.TEMPLATE_TYPE.LOGO
|
|
97
|
+
}
|
|
98
|
+
});
|
|
99
|
+
// 9. find signature
|
|
100
|
+
const foundSignature = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
|
|
101
|
+
where: {
|
|
102
|
+
domain,
|
|
103
|
+
category: constants_1.TEMPLATE_TYPE.SIGNATURE
|
|
104
|
+
}
|
|
105
|
+
});
|
|
106
|
+
const foundCop = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
|
|
107
|
+
where: {
|
|
108
|
+
domain,
|
|
109
|
+
category: constants_1.TEMPLATE_TYPE.COP
|
|
110
|
+
}
|
|
111
|
+
});
|
|
112
|
+
const inboundInventories = await qbReducedInventory;
|
|
113
|
+
const template = await attachment_base_1.STORAGE.readFile(foundTemplate.path, 'utf-8');
|
|
114
|
+
let logo = null;
|
|
115
|
+
if (foundLogo === null || foundLogo === void 0 ? void 0 : foundLogo.path) {
|
|
116
|
+
logo = 'data:' + foundLogo.mimetype + ';base64,' + (await attachment_base_1.STORAGE.readFile(foundLogo.path, 'base64'));
|
|
117
|
+
}
|
|
118
|
+
let signature = null;
|
|
119
|
+
if (foundSignature === null || foundSignature === void 0 ? void 0 : foundSignature.path) {
|
|
120
|
+
signature = 'data:' + foundSignature.mimetype + ';base64,' + (await attachment_base_1.STORAGE.readFile(foundSignature.path, 'base64'));
|
|
121
|
+
}
|
|
122
|
+
let cop = null;
|
|
123
|
+
if (foundCop === null || foundCop === void 0 ? void 0 : foundCop.path) {
|
|
124
|
+
cop = 'data:' + foundSignature.mimetype + ';base64,' + (await attachment_base_1.STORAGE.readFile(foundCop.path, 'base64'));
|
|
125
|
+
}
|
|
126
|
+
const data = {
|
|
127
|
+
logo_url: logo,
|
|
128
|
+
sign_url: signature,
|
|
129
|
+
cop_url: cop,
|
|
130
|
+
customer_biz: partnerBiz.name,
|
|
131
|
+
customer_address: partnerBiz.address,
|
|
132
|
+
company_domain: domainBizplace.company.name,
|
|
133
|
+
company_phone: foundCP.phone,
|
|
134
|
+
company_email: foundCP.email,
|
|
135
|
+
company_brn: domainBizplace.company.brn,
|
|
136
|
+
company_address: domainBizplace.company.address,
|
|
137
|
+
order_no: foundGRN.name,
|
|
138
|
+
gan_no: foundGAN.name,
|
|
139
|
+
gan_accepted_at: foundGAN.acceptedAt ? datetime_util_1.DateTimeConverter.datetime(foundGAN.acceptedAt, timezoneOffSet) : '',
|
|
140
|
+
unload_date: datetime_util_1.DateTimeConverter.date(foundWS.endedAt),
|
|
141
|
+
ref_no: ownRefNo ? `${foundGAN.name} / ${foundGAN.refNo}` : `${foundGAN.name}`,
|
|
142
|
+
received_date: datetime_util_1.DateTimeConverter.date(foundWS.endedAt),
|
|
143
|
+
truck_no: foundGAN.truckNo || '',
|
|
144
|
+
container_no: foundGAN.containerNo || '',
|
|
145
|
+
delivery_order_no: foundGAN.deliveryOrderNo ? foundGAN.deliveryOrderNo : '',
|
|
146
|
+
account_no: foundPartnerCP ? foundPartnerCP.accountNo : '',
|
|
147
|
+
unloaded_by: foundWS ? foundWS.updater.name : '',
|
|
148
|
+
putaway_by: foundPutawayWS ? foundPutawayWS.updater.name : '',
|
|
149
|
+
product_list: targetProducts.map((item, idx) => {
|
|
150
|
+
let unloadInvHistory = inboundInventories.find(ih => ih.productId == item.product.id &&
|
|
151
|
+
ih.batchId == item.batchId &&
|
|
152
|
+
ih.packingType == item.packingType &&
|
|
153
|
+
ih.uom == item.uom);
|
|
154
|
+
return {
|
|
155
|
+
list_no: idx + 1,
|
|
156
|
+
product_sku: `${item.product.sku}`,
|
|
157
|
+
product_name: `${item.product.name}(${item.product.description})`,
|
|
158
|
+
product_desc: item.product.description,
|
|
159
|
+
product_nameOnly: item.product.name,
|
|
160
|
+
product_type: item.packingType,
|
|
161
|
+
product_size: item.packingSize,
|
|
162
|
+
product_batch: item.batchId,
|
|
163
|
+
pallet_qty: item.actualPalletQty,
|
|
164
|
+
product_qty: unloadInvHistory.qty || item.actualPackQty,
|
|
165
|
+
product_unit_uom_value: `${Math.round(item.uomValue * 100) / 100}`,
|
|
166
|
+
product_total_uom_value: `${Math.round((unloadInvHistory.uomValue || item.uomValue * item.actualPackQty) * 100) / 100}`,
|
|
167
|
+
product_uom: `${unloadInvHistory.uom || item.uom}`,
|
|
168
|
+
expiry_date: unloadInvHistory.expiryDate || ``,
|
|
169
|
+
reusable_pallet_id: unloadInvHistory.reusablePalletId || ``,
|
|
170
|
+
remark: (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '')
|
|
171
|
+
};
|
|
172
|
+
})
|
|
173
|
+
};
|
|
174
|
+
const formData = new form_data_1.default();
|
|
175
|
+
formData.append('template', template);
|
|
176
|
+
formData.append('jsonString', JSON.stringify(data));
|
|
177
|
+
const response = await (0, node_fetch_1.default)(REPORT_API_URL, {
|
|
178
|
+
method: 'POST',
|
|
179
|
+
body: formData
|
|
180
|
+
});
|
|
181
|
+
return await response.text();
|
|
182
|
+
}
|
|
183
|
+
exports.renderGRN = renderGRN;
|
|
184
|
+
//# sourceMappingURL=render-grn.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"render-grn.js","sourceRoot":"","sources":["../../server/controllers/render-grn.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.completePacking = exports.completePackingResolver = void 0;
|
|
4
4
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
5
|
-
const controllers_1 = require("../../../../controllers/");
|
|
6
|
-
const sales_base_1 = require("@things-factory/sales-base");
|
|
7
5
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
6
|
+
const sales_base_1 = require("@things-factory/sales-base");
|
|
8
7
|
const constants_1 = require("../../../../constants");
|
|
9
|
-
const
|
|
8
|
+
const controllers_1 = require("../../../../controllers/");
|
|
10
9
|
const ecommerce_1 = require("../../../../controllers/ecommerce");
|
|
10
|
+
const worksheet_controller_1 = require("../../../../controllers/worksheet-controller");
|
|
11
11
|
exports.completePackingResolver = {
|
|
12
12
|
async completePacking(_, { releaseGoodNo }, context) {
|
|
13
13
|
const { tx, domain, user } = context.state;
|
|
@@ -25,13 +25,18 @@ exports.completePackingResolver = {
|
|
|
25
25
|
if (releaseGood.type === 'b2c') {
|
|
26
26
|
const companyDomain = releaseGood.bizplace.company.domain;
|
|
27
27
|
const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
28
|
-
where: {
|
|
29
|
-
relations: [
|
|
28
|
+
where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
29
|
+
relations: [
|
|
30
|
+
'marketplaceOrderItems',
|
|
31
|
+
'marketplaceOrderItems.marketplaceOrderShipping',
|
|
32
|
+
'marketplaceStore',
|
|
33
|
+
'marketplaceStore.marketplaceDistributors'
|
|
34
|
+
]
|
|
30
35
|
});
|
|
31
36
|
const marketplaceStore = marketplaceOrder.marketplaceStore;
|
|
32
37
|
if (marketplaceStore.isAutoUpdateShipment) {
|
|
33
38
|
const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
|
|
34
|
-
await ecommerceCtrl.createOrderShip(marketplaceStore, marketplaceOrder, companyDomain);
|
|
39
|
+
await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain);
|
|
35
40
|
}
|
|
36
41
|
}
|
|
37
42
|
const bizplace = await (0, biz_base_1.getMyBizplace)(domain, user);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/complete-packing.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"complete-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/complete-packing.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,7 +55,7 @@ exports.packingWorksheetResolver = {
|
|
|
55
55
|
}
|
|
56
56
|
if (!sellercraft) {
|
|
57
57
|
marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
58
|
-
where: {
|
|
58
|
+
where: { orderNo: releaseGood.refNo },
|
|
59
59
|
relations: [
|
|
60
60
|
'domain',
|
|
61
61
|
'marketplaceStore',
|
|
@@ -66,10 +66,25 @@ exports.packingWorksheetResolver = {
|
|
|
66
66
|
if (!marketplaceOrder) {
|
|
67
67
|
throw new Error('Failed to retrieve ecommerce information, kindly contact our support team for this issue.');
|
|
68
68
|
}
|
|
69
|
-
|
|
69
|
+
let marketplaceOrderShipping;
|
|
70
|
+
if (marketplaceOrder.isSplitted) {
|
|
71
|
+
marketplaceOrderShipping = await tx.getRepository(marketplace_base_1.MarketplaceOrderShipping).findOne({
|
|
72
|
+
where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
marketplaceOrderShipping = await tx.getRepository(marketplace_base_1.MarketplaceOrderShipping).findOne({
|
|
77
|
+
where: { orderNoRef: worksheet.releaseGood.refNo }
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
trackingNo = marketplaceOrderShipping.ownTrackingNo
|
|
81
|
+
? marketplaceOrderShipping.ownTrackingNo
|
|
82
|
+
: marketplaceOrderShipping.trackingNo;
|
|
83
|
+
shippingProvider = marketplaceOrderShipping.ownTransporter
|
|
84
|
+
? marketplaceOrderShipping.ownTransporter
|
|
85
|
+
: marketplaceOrderShipping.transporter;
|
|
86
|
+
marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems.filter(item => item.marketplaceOrderShipping.id === marketplaceOrderShipping.id);
|
|
70
87
|
marketplaceStore = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore;
|
|
71
|
-
trackingNo = await getTrackingNo(marketplaceStore, marketplaceOrderItems);
|
|
72
|
-
shippingProvider = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.shippingProvider;
|
|
73
88
|
marketplaceStatus = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.status;
|
|
74
89
|
}
|
|
75
90
|
}
|
|
@@ -77,6 +92,7 @@ exports.packingWorksheetResolver = {
|
|
|
77
92
|
worksheetInfo: {
|
|
78
93
|
bizplaceName: releaseGood.bizplace.name,
|
|
79
94
|
refNo: releaseGood.refNo,
|
|
95
|
+
refNo2: releaseGood.refNo2,
|
|
80
96
|
partnerDomainId: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id,
|
|
81
97
|
startedAt: worksheet.startedAt,
|
|
82
98
|
shippingProvider: shippingProvider ? shippingProvider : '',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":";;;AAGA,qFAAwF;AACxF,
|
|
1
|
+
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,7 @@ async function activatePicking(tx, domain, user, worksheetNo) {
|
|
|
38
38
|
await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain);
|
|
39
39
|
}
|
|
40
40
|
const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
41
|
-
where: {
|
|
41
|
+
where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
42
42
|
relations: ['marketplaceStore']
|
|
43
43
|
});
|
|
44
44
|
const marketplaceStore = marketplaceOrder.marketplaceStore;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activate-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/activate-picking.ts"],"names":[],"mappings":";;;AAGA,qFAA0E;AAC1E,qFAAwF;AACxF,uEAAmE;AACnE,2DAAsE;AAGtE,yDAAgH;AAGnG,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,sDAAsD;IACtD,MAAM,iBAAiB,GAAuB,MAAM,EAAE,CAAC,aAAa,CAAC,0CAAgB,CAAC,CAAC,IAAI,CAAC;QAC1F,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,IAAI,EAAE;QAC9E,SAAS,EAAE,CAAC,yBAAyB,CAAC;KACvC,CAAC,CAAA;IAEF,IAAI,WAAW,GAAgB,SAAS,CAAC,WAAW,CAAA;IAEpD,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK,EAAE;QAC9B,MAAM,WAAW,GAAgB,MAAM,EAAE;aACtC,aAAa,CAAC,qCAAW,CAAC;aAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;QAEnF,IAAI,WAAW,EAAE;YACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YAC1F,MAAM,eAAe,CAAC,qBAAqB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;SACtE;QAED,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,KAAI,CAAC,WAAW,EAAE;YAC7C,IAAI,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;gBAC/D,MAAM,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAA;gBACnD,IAAI,gBAAgB,GAAU,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;gBAC9E,MAAM,aAAa,GAAwB,IAAI,iCAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;gBACpF,MAAM,aAAa,CAAC,2BAA2B,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAA;aACpG;YAED,MAAM,gBAAgB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAgB,CAAC,CAAC,OAAO,CAAC;gBAC1F,KAAK,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"activate-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/activate-picking.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,7 +77,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
77
77
|
else {
|
|
78
78
|
const companyDomain = releaseGood.bizplace.company.domain;
|
|
79
79
|
let marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
80
|
-
where: {
|
|
80
|
+
where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
81
81
|
relations: ['marketplaceStore']
|
|
82
82
|
});
|
|
83
83
|
const marketplaceStore = marketplaceOrder.marketplaceStore;
|
|
@@ -87,7 +87,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
87
87
|
await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, sales_base_1.ORDER_STATUS.PACKING);
|
|
88
88
|
}
|
|
89
89
|
marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
90
|
-
where: {
|
|
90
|
+
where: { orderNo: releaseGood.refNo },
|
|
91
91
|
relations: ['marketplaceStore', 'marketplaceOrderItems', 'marketplaceOrderItems.marketplaceOrderShipping']
|
|
92
92
|
});
|
|
93
93
|
if (!marketplaceOrder)
|
|
@@ -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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"}
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.pickingWorksheetResolver = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
-
const utils_1 = require("../../../utils");
|
|
6
5
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
7
6
|
const constants_1 = require("../../../constants");
|
|
8
7
|
const entities_1 = require("../../../entities");
|
|
8
|
+
const utils_1 = require("../../../utils");
|
|
9
9
|
exports.pickingWorksheetResolver = {
|
|
10
10
|
async pickingWorksheet(_, { releaseGoodNo, locationSortingRules }, context) {
|
|
11
11
|
var _a;
|
|
@@ -38,6 +38,7 @@ exports.pickingWorksheetResolver = {
|
|
|
38
38
|
partnerDomainId: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id,
|
|
39
39
|
startedAt: worksheet.startedAt,
|
|
40
40
|
refNo: releaseGood.refNo,
|
|
41
|
+
refNo2: releaseGood.refNo2,
|
|
41
42
|
releaseGood
|
|
42
43
|
},
|
|
43
44
|
worksheetDetailInfos: worksheetDetails.map(async (pickingWSD) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"picking-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/picking-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAA+E;AAE/E,
|
|
1
|
+
{"version":3,"file":"picking-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/picking-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.worksheetResolver = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
4
5
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
5
6
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
6
|
-
const
|
|
7
|
+
const setting_base_1 = require("@things-factory/setting-base");
|
|
7
8
|
const constants_1 = require("../../../constants");
|
|
8
9
|
const entities_1 = require("../../../entities");
|
|
9
|
-
const setting_base_1 = require("@things-factory/setting-base");
|
|
10
10
|
exports.worksheetResolver = {
|
|
11
11
|
async worksheet(_, { name }, context) {
|
|
12
12
|
var _a, _b, _c, _d, _e;
|
|
@@ -81,7 +81,8 @@ exports.worksheetResolver = {
|
|
|
81
81
|
// },
|
|
82
82
|
// relations: ['releaseGood', 'inventory', 'product', 'inventory.location', 'bizplace']
|
|
83
83
|
// })
|
|
84
|
-
let qbOrderInventories = (0, typeorm_1.getRepository)(sales_base_1.OrderInventory)
|
|
84
|
+
let qbOrderInventories = (0, typeorm_1.getRepository)(sales_base_1.OrderInventory)
|
|
85
|
+
.createQueryBuilder('oi')
|
|
85
86
|
.leftJoinAndSelect('oi.releaseGood', 'releaseGood')
|
|
86
87
|
.leftJoinAndSelect('oi.inventory', 'inventory')
|
|
87
88
|
.leftJoinAndSelect('oi.product', 'product')
|
|
@@ -115,7 +116,8 @@ exports.worksheetResolver = {
|
|
|
115
116
|
// },
|
|
116
117
|
// relations: ['product', 'inventory', 'inventory.location']
|
|
117
118
|
// })
|
|
118
|
-
let qbOrderInventories = (0, typeorm_1.getRepository)(sales_base_1.OrderInventory)
|
|
119
|
+
let qbOrderInventories = (0, typeorm_1.getRepository)(sales_base_1.OrderInventory)
|
|
120
|
+
.createQueryBuilder('oi')
|
|
119
121
|
.leftJoinAndSelect('oi.releaseGood', 'releaseGood')
|
|
120
122
|
.leftJoinAndSelect('oi.inventory', 'inventory')
|
|
121
123
|
.leftJoinAndSelect('oi.product', 'product')
|
|
@@ -140,10 +142,31 @@ exports.worksheetResolver = {
|
|
|
140
142
|
}
|
|
141
143
|
let orderInventories = await qbOrderInventories.getMany();
|
|
142
144
|
worksheet.orderInventories = orderInventories;
|
|
143
|
-
worksheet.
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
145
|
+
if (worksheet.releaseGood.type == 'b2c') {
|
|
146
|
+
worksheet.marketplaceOrder = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).findOne({
|
|
147
|
+
where: { orderNo: worksheet.releaseGood.refNo },
|
|
148
|
+
relations: ['marketplaceOrderItems', 'marketplaceStore']
|
|
149
|
+
});
|
|
150
|
+
if (worksheet.marketplaceOrder) {
|
|
151
|
+
let marketplaceOrderShipping;
|
|
152
|
+
if (worksheet.marketplaceOrder.isSplitted) {
|
|
153
|
+
marketplaceOrderShipping = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).findOne({
|
|
154
|
+
where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
else {
|
|
158
|
+
marketplaceOrderShipping = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).findOne({
|
|
159
|
+
where: { orderNoRef: worksheet.releaseGood.refNo }
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
worksheet.marketplaceOrder.trackingNo = marketplaceOrderShipping.ownTrackingNo
|
|
163
|
+
? marketplaceOrderShipping.ownTrackingNo
|
|
164
|
+
: marketplaceOrderShipping.trackingNo;
|
|
165
|
+
worksheet.marketplaceOrder.shippingProvider = marketplaceOrderShipping.ownTransporter
|
|
166
|
+
? marketplaceOrderShipping.ownTransporter
|
|
167
|
+
: marketplaceOrderShipping.transporter;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
147
170
|
worksheet.orderVass = await (0, typeorm_1.getRepository)(sales_base_1.OrderVas).find({
|
|
148
171
|
where: {
|
|
149
172
|
domain,
|