@things-factory/worksheet-base 3.6.47 → 3.6.52
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/render-grn.js +8 -0
- package/dist-server/controllers/render-grn.js.map +1 -1
- package/dist-server/controllers/render-ro-do.js +18 -5
- package/dist-server/controllers/render-ro-do.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +8 -7
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/repackaging/complete-repackaging.js +7 -4
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/repackaging/complete-repackaging.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/repackaging/repackaging.js +5 -1
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/repackaging/repackaging.js.map +1 -1
- package/package.json +16 -16
- package/server/controllers/render-grn.ts +8 -0
- package/server/controllers/render-ro-do.ts +21 -6
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +8 -13
- package/server/graphql/resolvers/worksheet/vas-transactions/repackaging/complete-repackaging.ts +80 -73
- package/server/graphql/resolvers/worksheet/vas-transactions/repackaging/repackaging.ts +8 -14
|
@@ -134,6 +134,14 @@ async function renderGRN({ grnNo, timezoneOffSet }, context) {
|
|
|
134
134
|
company_email: foundCP.email,
|
|
135
135
|
company_brn: domainBizplace.company.brn,
|
|
136
136
|
company_address: domainBizplace.company.address,
|
|
137
|
+
warehouse_address: foundCP.address,
|
|
138
|
+
warehouse_address2: foundCP.address2,
|
|
139
|
+
warehouse_postcode: foundCP.postCode,
|
|
140
|
+
warehouse_city: foundCP.city,
|
|
141
|
+
warehouse_state: foundCP.state,
|
|
142
|
+
warehouse_phone: foundCP.phone,
|
|
143
|
+
warehouse_fax: foundCP.fax,
|
|
144
|
+
warehouse_email: foundCP.email,
|
|
137
145
|
order_no: foundGRN.name,
|
|
138
146
|
gan_no: foundGAN.name,
|
|
139
147
|
gan_accepted_at: foundGAN.acceptedAt ? datetime_util_1.DateTimeConverter.datetime(foundGAN.acceptedAt, timezoneOffSet) : '',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-grn.js","sourceRoot":"","sources":["../../server/controllers/render-grn.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"render-grn.js","sourceRoot":"","sources":["../../server/controllers/render-grn.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.renderRODO = 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");
|
|
7
10
|
const attachment_base_1 = require("@things-factory/attachment-base");
|
|
8
11
|
const auth_base_1 = require("@things-factory/auth-base");
|
|
9
12
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
@@ -11,9 +14,6 @@ const env_1 = require("@things-factory/env");
|
|
|
11
14
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
12
15
|
const shell_1 = require("@things-factory/shell");
|
|
13
16
|
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
14
|
-
const form_data_1 = __importDefault(require("form-data"));
|
|
15
|
-
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
16
|
-
const typeorm_1 = require("typeorm");
|
|
17
17
|
const constants_1 = require("../constants");
|
|
18
18
|
const entities_1 = require("../entities");
|
|
19
19
|
const REPORT_API_URL = env_1.config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html');
|
|
@@ -46,7 +46,7 @@ async function renderRODO({ doNo }, context) {
|
|
|
46
46
|
const partnerBiz = foundDO.bizplace; //customer bizplace
|
|
47
47
|
const ownRefNo = foundRO.refNo;
|
|
48
48
|
const partnerDomain = await (0, typeorm_1.getRepository)(auth_base_1.Partner).findOne({
|
|
49
|
-
where: { partnerDomain: partnerBiz.domain },
|
|
49
|
+
where: { partnerDomain: partnerBiz.domain, domain },
|
|
50
50
|
relations: ['domain']
|
|
51
51
|
});
|
|
52
52
|
const domainOwner = partnerDomain.domain;
|
|
@@ -181,12 +181,25 @@ async function renderRODO({ doNo }, context) {
|
|
|
181
181
|
company_domain: domainBizplace.company.name,
|
|
182
182
|
company_brn: domainBizplace.company.brn,
|
|
183
183
|
company_address: domainBizplace.company.address,
|
|
184
|
+
company_email: foundWarehouseCP.email ? foundWarehouseCP.email : null,
|
|
184
185
|
company_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
|
|
186
|
+
warehouse_address: foundWarehouseCP ? foundWarehouseCP.address : null,
|
|
187
|
+
warehouse_address2: foundWarehouseCP ? foundWarehouseCP.address2 : null,
|
|
188
|
+
warehouse_postcode: foundWarehouseCP ? foundWarehouseCP.postCode : null,
|
|
189
|
+
warehouse_city: foundWarehouseCP ? foundWarehouseCP.city : null,
|
|
190
|
+
warehouse_state: foundWarehouseCP ? foundWarehouseCP.state : null,
|
|
185
191
|
warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
|
|
186
|
-
|
|
192
|
+
warehouse_fax: foundWarehouseCP ? foundWarehouseCP.fax : null,
|
|
193
|
+
warehouse_email: foundWarehouseCP ? foundWarehouseCP.email : null,
|
|
187
194
|
customer_name: foundCP ? foundCP.name : null,
|
|
188
195
|
customer_delivery_address: foundCP ? foundCP.address : null,
|
|
189
196
|
customer_billing_address: foundCP ? foundCP.billingAddress : null,
|
|
197
|
+
new_delivery_address: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress1) || null,
|
|
198
|
+
new_delivery_address2: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress2) || null,
|
|
199
|
+
new_billing_address: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.billingAddress) || null,
|
|
200
|
+
new_attention_to: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionTo) || null,
|
|
201
|
+
new_attention_company: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionCompany) || null,
|
|
202
|
+
new_phone_no: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.phone1) || null,
|
|
190
203
|
customer_phone: foundCP ? foundCP.phone : null,
|
|
191
204
|
customer_fax: foundCP ? foundCP.fax : null,
|
|
192
205
|
customer_email: foundCP ? foundCP.email : null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-ro-do.js","sourceRoot":"","sources":["../../server/controllers/render-ro-do.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"render-ro-do.js","sourceRoot":"","sources":["../../server/controllers/render-ro-do.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.completePicking = exports.completePickingResolver = void 0;
|
|
4
4
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
5
5
|
const integration_lmd_1 = require("@things-factory/integration-lmd");
|
|
6
|
+
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
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");
|
|
@@ -94,7 +95,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
94
95
|
}
|
|
95
96
|
});
|
|
96
97
|
//Get which transporter to use
|
|
97
|
-
const marketplaceTransporter = await tx.getRepository(
|
|
98
|
+
const marketplaceTransporter = await tx.getRepository(integration_marketplace_1.MarketplaceTransporter).findOne({
|
|
98
99
|
where: { marketplaceStore: marketplaceOrder.marketplaceStore },
|
|
99
100
|
relations: ['pickupTransporter', 'deliveryTransporter']
|
|
100
101
|
});
|
|
@@ -112,12 +113,12 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
112
113
|
pickupCity: warehouseContactPoint.city,
|
|
113
114
|
pickupPhone: warehouseContactPoint.phone,
|
|
114
115
|
pickupEmail: warehouseContactPoint.email,
|
|
115
|
-
name: marketplaceOrderShipping.attentionTo.trim(),
|
|
116
|
-
address1: marketplaceOrderShipping.address1.trim(),
|
|
117
|
-
address2: marketplaceOrderShipping.address2.trim(),
|
|
118
|
-
postCode: marketplaceOrderShipping.postCode.trim(),
|
|
119
|
-
city: marketplaceOrderShipping.city.trim(),
|
|
120
|
-
state: marketplaceOrderShipping.state.trim(),
|
|
116
|
+
name: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.attentionTo) ? marketplaceOrderShipping.attentionTo.trim() : '',
|
|
117
|
+
address1: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1.trim() : '-',
|
|
118
|
+
address2: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2.trim() : '-',
|
|
119
|
+
postCode: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode.trim() : '',
|
|
120
|
+
city: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city.trim() : '',
|
|
121
|
+
state: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state.trim() : '',
|
|
121
122
|
phone: marketplaceOrderShipping.phone1 || '',
|
|
122
123
|
email: marketplaceOrderShipping.email || '',
|
|
123
124
|
attentionTo: marketplaceOrderShipping.attentionTo,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":";;;AAGA,uDAAgF;AAChF,qEAA+E;
|
|
1
|
+
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
|
package/dist-server/graphql/resolvers/worksheet/vas-transactions/repackaging/complete-repackaging.js
CHANGED
|
@@ -83,9 +83,12 @@ async function completeRepackaging(trxMgr, orderVas, user) {
|
|
|
83
83
|
}
|
|
84
84
|
exports.completeRepackaging = completeRepackaging;
|
|
85
85
|
function extractRepackedFroms(operationGuideData, orderVas, packingUnit) {
|
|
86
|
-
return operationGuideData.repackedInvs
|
|
87
|
-
.
|
|
88
|
-
.
|
|
86
|
+
return (operationGuideData.repackedInvs
|
|
87
|
+
.reduce((acc, ri) => {
|
|
88
|
+
acc = [...acc, ...ri.repackedFrom];
|
|
89
|
+
return acc;
|
|
90
|
+
}, [])
|
|
91
|
+
// .flat()
|
|
89
92
|
.reduce((acc, inv) => {
|
|
90
93
|
let foundInv = acc.find(a => a.fromPalletId == inv.fromPalletId);
|
|
91
94
|
if (foundInv) {
|
|
@@ -155,7 +158,7 @@ function extractRepackedFroms(operationGuideData, orderVas, packingUnit) {
|
|
|
155
158
|
}
|
|
156
159
|
return Object.assign(Object.assign({}, pc), { originalQty,
|
|
157
160
|
originalUomValue });
|
|
158
|
-
});
|
|
161
|
+
}));
|
|
159
162
|
}
|
|
160
163
|
function getRoundedAmount(value, decimalPlace = 100) {
|
|
161
164
|
return Math.round((value + Number.EPSILON) * decimalPlace) / decimalPlace;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-repackaging.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/repackaging/complete-repackaging.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"complete-repackaging.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/repackaging/complete-repackaging.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,11 @@ exports.repackagingResolver = {
|
|
|
51
51
|
throw new Error(`Unable to repack into the same lot ID ${toPalletId}`);
|
|
52
52
|
let palletChanges = [];
|
|
53
53
|
if (repackedInvs && repackedInvs.length) {
|
|
54
|
-
palletChanges = repackedInvs.
|
|
54
|
+
palletChanges = repackedInvs.reduce((acc, ri) => {
|
|
55
|
+
acc = [...acc, ...ri.repackedFrom];
|
|
56
|
+
return acc;
|
|
57
|
+
}, []);
|
|
58
|
+
// .map((ri: RepackedInvInfo) => ri.repackedFrom).flat()
|
|
55
59
|
}
|
|
56
60
|
else if (!repackedInvs) {
|
|
57
61
|
operationGuideData.repackedInvs = [];
|
package/dist-server/graphql/resolvers/worksheet/vas-transactions/repackaging/repackaging.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repackaging.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/repackaging/repackaging.ts"],"names":[],"mappings":";;;AAMA,
|
|
1
|
+
{"version":3,"file":"repackaging.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/repackaging/repackaging.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": "3.6.
|
|
3
|
+
"version": "3.6.52",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,20 +24,20 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/auth-base": "^3.6.
|
|
28
|
-
"@things-factory/biz-base": "^3.6.
|
|
29
|
-
"@things-factory/document-template-base": "^3.6.
|
|
30
|
-
"@things-factory/id-rule-base": "^3.6.
|
|
31
|
-
"@things-factory/integration-lmd": "^3.6.
|
|
32
|
-
"@things-factory/integration-marketplace": "^3.6.
|
|
33
|
-
"@things-factory/integration-sellercraft": "^3.6.
|
|
34
|
-
"@things-factory/marketplace-base": "^3.6.
|
|
35
|
-
"@things-factory/notification": "^3.6.
|
|
36
|
-
"@things-factory/sales-base": "^3.6.
|
|
37
|
-
"@things-factory/setting-base": "^3.6.
|
|
38
|
-
"@things-factory/shell": "^3.6.
|
|
39
|
-
"@things-factory/transport-base": "^3.6.
|
|
40
|
-
"@things-factory/warehouse-base": "^3.6.
|
|
27
|
+
"@things-factory/auth-base": "^3.6.52",
|
|
28
|
+
"@things-factory/biz-base": "^3.6.52",
|
|
29
|
+
"@things-factory/document-template-base": "^3.6.52",
|
|
30
|
+
"@things-factory/id-rule-base": "^3.6.52",
|
|
31
|
+
"@things-factory/integration-lmd": "^3.6.52",
|
|
32
|
+
"@things-factory/integration-marketplace": "^3.6.52",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^3.6.52",
|
|
34
|
+
"@things-factory/marketplace-base": "^3.6.52",
|
|
35
|
+
"@things-factory/notification": "^3.6.52",
|
|
36
|
+
"@things-factory/sales-base": "^3.6.52",
|
|
37
|
+
"@things-factory/setting-base": "^3.6.52",
|
|
38
|
+
"@things-factory/shell": "^3.6.52",
|
|
39
|
+
"@things-factory/transport-base": "^3.6.52",
|
|
40
|
+
"@things-factory/warehouse-base": "^3.6.52"
|
|
41
41
|
},
|
|
42
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "bc26afe1527faaf050d43122b8cf4248769b814e"
|
|
43
43
|
}
|
|
@@ -153,6 +153,14 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
|
|
|
153
153
|
company_email: foundCP.email,
|
|
154
154
|
company_brn: domainBizplace.company.brn,
|
|
155
155
|
company_address: domainBizplace.company.address,
|
|
156
|
+
warehouse_address: foundCP.address,
|
|
157
|
+
warehouse_address2: foundCP.address2,
|
|
158
|
+
warehouse_postcode: foundCP.postCode,
|
|
159
|
+
warehouse_city: foundCP.city,
|
|
160
|
+
warehouse_state: foundCP.state,
|
|
161
|
+
warehouse_phone: foundCP.phone,
|
|
162
|
+
warehouse_fax: foundCP.fax,
|
|
163
|
+
warehouse_email: foundCP.email,
|
|
156
164
|
order_no: foundGRN.name,
|
|
157
165
|
gan_no: foundGAN.name,
|
|
158
166
|
gan_accepted_at: foundGAN.acceptedAt ? DateTimeConverter.datetime(foundGAN.acceptedAt, timezoneOffSet) : '',
|
|
@@ -1,13 +1,15 @@
|
|
|
1
|
+
import FormData from 'form-data'
|
|
2
|
+
import fetch from 'node-fetch'
|
|
3
|
+
import { Equal, getRepository, In } from 'typeorm'
|
|
4
|
+
|
|
1
5
|
import { Attachment, STORAGE } from '@things-factory/attachment-base'
|
|
2
6
|
import { Partner } from '@things-factory/auth-base'
|
|
3
7
|
import { Bizplace, ContactPoint } from '@things-factory/biz-base'
|
|
4
8
|
import { config } from '@things-factory/env'
|
|
5
|
-
import { DeliveryOrder,
|
|
9
|
+
import { DeliveryOrder, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
|
|
6
10
|
import { Domain } from '@things-factory/shell'
|
|
7
11
|
import { Inventory, Pallet } from '@things-factory/warehouse-base'
|
|
8
|
-
|
|
9
|
-
import fetch from 'node-fetch'
|
|
10
|
-
import { Equal, getRepository, In } from 'typeorm'
|
|
12
|
+
|
|
11
13
|
import { TEMPLATE_TYPE, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
|
|
12
14
|
import { Worksheet, WorksheetDetail } from '../entities'
|
|
13
15
|
|
|
@@ -46,7 +48,7 @@ export async function renderRODO({ doNo }, context: any) {
|
|
|
46
48
|
const ownRefNo = foundRO.refNo
|
|
47
49
|
|
|
48
50
|
const partnerDomain: Partner = await getRepository(Partner).findOne({
|
|
49
|
-
where: { partnerDomain: partnerBiz.domain },
|
|
51
|
+
where: { partnerDomain: partnerBiz.domain, domain },
|
|
50
52
|
relations: ['domain']
|
|
51
53
|
})
|
|
52
54
|
|
|
@@ -202,12 +204,25 @@ export async function renderRODO({ doNo }, context: any) {
|
|
|
202
204
|
company_domain: domainBizplace.company.name,
|
|
203
205
|
company_brn: domainBizplace.company.brn,
|
|
204
206
|
company_address: domainBizplace.company.address,
|
|
207
|
+
company_email: foundWarehouseCP.email ? foundWarehouseCP.email : null,
|
|
205
208
|
company_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
|
|
209
|
+
warehouse_address: foundWarehouseCP ? foundWarehouseCP.address : null,
|
|
210
|
+
warehouse_address2: foundWarehouseCP ? foundWarehouseCP.address2 : null,
|
|
211
|
+
warehouse_postcode: foundWarehouseCP ? foundWarehouseCP.postCode : null,
|
|
212
|
+
warehouse_city: foundWarehouseCP ? foundWarehouseCP.city : null,
|
|
213
|
+
warehouse_state: foundWarehouseCP ? foundWarehouseCP.state : null,
|
|
206
214
|
warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
|
|
207
|
-
|
|
215
|
+
warehouse_fax: foundWarehouseCP ? foundWarehouseCP.fax : null,
|
|
216
|
+
warehouse_email: foundWarehouseCP ? foundWarehouseCP.email : null,
|
|
208
217
|
customer_name: foundCP ? foundCP.name : null,
|
|
209
218
|
customer_delivery_address: foundCP ? foundCP.address : null,
|
|
210
219
|
customer_billing_address: foundCP ? foundCP.billingAddress : null,
|
|
220
|
+
new_delivery_address: foundRO?.deliveryAddress1 || null,
|
|
221
|
+
new_delivery_address2: foundRO?.deliveryAddress2 || null,
|
|
222
|
+
new_billing_address: foundRO?.billingAddress || null,
|
|
223
|
+
new_attention_to: foundRO?.attentionTo || null,
|
|
224
|
+
new_attention_company: foundRO?.attentionCompany || null,
|
|
225
|
+
new_phone_no: foundRO?.phone1 || null,
|
|
211
226
|
customer_phone: foundCP ? foundCP.phone : null,
|
|
212
227
|
customer_fax: foundCP ? foundCP.fax : null,
|
|
213
228
|
customer_email: foundCP ? foundCP.email : null,
|
|
@@ -3,14 +3,9 @@ import { EntityManager } from 'typeorm'
|
|
|
3
3
|
import { User } from '@things-factory/auth-base'
|
|
4
4
|
import { Bizplace, ContactPoint, getMyBizplace } from '@things-factory/biz-base'
|
|
5
5
|
import { LastMileAPI, LastMileDelivery } from '@things-factory/integration-lmd'
|
|
6
|
-
import { MarketplaceStore } from '@things-factory/integration-marketplace'
|
|
6
|
+
import { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integration-marketplace'
|
|
7
7
|
import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
|
|
8
|
-
import {
|
|
9
|
-
MarketplaceOrder,
|
|
10
|
-
MarketplaceOrderItem,
|
|
11
|
-
MarketplaceOrderShipping,
|
|
12
|
-
MarketplaceTransporter
|
|
13
|
-
} from '@things-factory/marketplace-base'
|
|
8
|
+
import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
|
|
14
9
|
import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
|
|
15
10
|
import { Domain } from '@things-factory/shell'
|
|
16
11
|
|
|
@@ -147,12 +142,12 @@ export async function completePicking(
|
|
|
147
142
|
pickupCity: warehouseContactPoint.city,
|
|
148
143
|
pickupPhone: warehouseContactPoint.phone,
|
|
149
144
|
pickupEmail: warehouseContactPoint.email,
|
|
150
|
-
name: marketplaceOrderShipping.attentionTo.trim(),
|
|
151
|
-
address1: marketplaceOrderShipping
|
|
152
|
-
address2: marketplaceOrderShipping
|
|
153
|
-
postCode: marketplaceOrderShipping
|
|
154
|
-
city: marketplaceOrderShipping
|
|
155
|
-
state: marketplaceOrderShipping
|
|
145
|
+
name: marketplaceOrderShipping?.attentionTo ? marketplaceOrderShipping.attentionTo.trim() : '',
|
|
146
|
+
address1: marketplaceOrderShipping?.address1 ? marketplaceOrderShipping?.address1.trim() : '-',
|
|
147
|
+
address2: marketplaceOrderShipping?.address2 ? marketplaceOrderShipping?.address2.trim() : '-',
|
|
148
|
+
postCode: marketplaceOrderShipping?.postCode ? marketplaceOrderShipping?.postCode.trim() : '',
|
|
149
|
+
city: marketplaceOrderShipping?.city ? marketplaceOrderShipping?.city.trim() : '',
|
|
150
|
+
state: marketplaceOrderShipping?.state ? marketplaceOrderShipping?.state.trim() : '',
|
|
156
151
|
phone: marketplaceOrderShipping.phone1 || '',
|
|
157
152
|
email: marketplaceOrderShipping.email || '',
|
|
158
153
|
attentionTo: marketplaceOrderShipping.attentionTo,
|
package/server/graphql/resolvers/worksheet/vas-transactions/repackaging/complete-repackaging.ts
CHANGED
|
@@ -143,83 +143,90 @@ function extractRepackedFroms(
|
|
|
143
143
|
orderVas: OrderVas,
|
|
144
144
|
packingUnit: string
|
|
145
145
|
): Partial<TemporaryPalletChangesInterface[]> {
|
|
146
|
-
return
|
|
147
|
-
.
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
146
|
+
return (
|
|
147
|
+
operationGuideData.repackedInvs
|
|
148
|
+
.reduce((acc, ri: RepackedInvInfo) => {
|
|
149
|
+
acc = [...acc, ...ri.repackedFrom]
|
|
150
|
+
return acc
|
|
151
|
+
}, [])
|
|
152
|
+
// .flat()
|
|
153
|
+
.reduce((acc, inv) => {
|
|
154
|
+
let foundInv = acc.find(a => a.fromPalletId == inv.fromPalletId)
|
|
155
|
+
if (foundInv) {
|
|
156
|
+
if (packingUnit == PackingUnits.QTY) {
|
|
157
|
+
foundInv.reducedUnitQty += inv.reducedUnitQty
|
|
158
|
+
foundInv.reducedUomValue += inv.reducedUomValue
|
|
159
|
+
} else if (packingUnit == PackingUnits.UOM) {
|
|
160
|
+
foundInv.reducedQty += inv.reducedQty
|
|
161
|
+
foundInv.reducedUomValue += inv.reducedUomValue
|
|
162
|
+
}
|
|
163
|
+
} else {
|
|
164
|
+
if (packingUnit == PackingUnits.QTY) {
|
|
165
|
+
acc.push({
|
|
166
|
+
fromPalletId: inv.fromPalletId,
|
|
167
|
+
reducedUnitQty: inv.reducedUnitQty,
|
|
168
|
+
reducedUomValue: inv.reducedUomValue,
|
|
169
|
+
packingSize: inv.packingSize
|
|
170
|
+
})
|
|
171
|
+
} else if (packingUnit == PackingUnits.UOM) {
|
|
172
|
+
acc.push({
|
|
173
|
+
fromPalletId: inv.fromPalletId,
|
|
174
|
+
reducedQty: inv.reducedQty,
|
|
175
|
+
reducedUomValue: inv.reducedUomValue,
|
|
176
|
+
packingSize: inv.packingSize
|
|
177
|
+
})
|
|
178
|
+
}
|
|
158
179
|
}
|
|
159
|
-
} else {
|
|
160
|
-
if (packingUnit == PackingUnits.QTY) {
|
|
161
|
-
acc.push({
|
|
162
|
-
fromPalletId: inv.fromPalletId,
|
|
163
|
-
reducedUnitQty: inv.reducedUnitQty,
|
|
164
|
-
reducedUomValue: inv.reducedUomValue,
|
|
165
|
-
packingSize: inv.packingSize
|
|
166
|
-
})
|
|
167
|
-
} else if (packingUnit == PackingUnits.UOM) {
|
|
168
|
-
acc.push({
|
|
169
|
-
fromPalletId: inv.fromPalletId,
|
|
170
|
-
reducedQty: inv.reducedQty,
|
|
171
|
-
reducedUomValue: inv.reducedUomValue,
|
|
172
|
-
packingSize: inv.packingSize
|
|
173
|
-
})
|
|
174
|
-
}
|
|
175
|
-
}
|
|
176
|
-
|
|
177
|
-
return acc
|
|
178
|
-
}, [])
|
|
179
|
-
.map((pc: TemporaryPalletChangesInterface) => {
|
|
180
|
-
const featuredInvs: FeaturedInventoryInterface[] = operationGuideData.featuredInvs || []
|
|
181
|
-
const foundFeaturedInv = featuredInvs.find((inv: FeaturedInventoryInterface) => inv.palletId === pc.fromPalletId)
|
|
182
180
|
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
181
|
+
return acc
|
|
182
|
+
}, [])
|
|
183
|
+
.map((pc: TemporaryPalletChangesInterface) => {
|
|
184
|
+
const featuredInvs: FeaturedInventoryInterface[] = operationGuideData.featuredInvs || []
|
|
185
|
+
const foundFeaturedInv = featuredInvs.find(
|
|
186
|
+
(inv: FeaturedInventoryInterface) => inv.palletId === pc.fromPalletId
|
|
187
|
+
)
|
|
188
|
+
|
|
189
|
+
let originalQty: number
|
|
190
|
+
let originalUomValue: number
|
|
191
|
+
|
|
192
|
+
if (foundFeaturedInv) {
|
|
193
|
+
originalQty = foundFeaturedInv.originalQty
|
|
194
|
+
originalUomValue = foundFeaturedInv.originalUomValue
|
|
195
|
+
|
|
196
|
+
if (packingUnit == PackingUnits.QTY) {
|
|
197
|
+
pc.currentUnitQty = foundFeaturedInv.currentUnitQty
|
|
198
|
+
} else if (packingUnit == PackingUnits.UOM) {
|
|
199
|
+
pc.currentUomValue = foundFeaturedInv.currentUomValue
|
|
200
|
+
}
|
|
201
|
+
} else {
|
|
202
|
+
originalQty =
|
|
203
|
+
packingUnit == PackingUnits.UOM
|
|
204
|
+
? orderVas.qty
|
|
205
|
+
: orderVas.qty -
|
|
206
|
+
featuredInvs.reduce((qty: number, inv: FeaturedInventoryInterface) => {
|
|
207
|
+
return qty + inv.originalQty
|
|
208
|
+
}, 0)
|
|
209
|
+
|
|
210
|
+
originalUomValue =
|
|
211
|
+
orderVas.uomValue -
|
|
212
|
+
featuredInvs.reduce((uomValue: number, inv: FeaturedInventoryInterface) => {
|
|
213
|
+
return uomValue + inv.originalUomValue
|
|
214
|
+
}, 0)
|
|
215
|
+
|
|
216
|
+
if (packingUnit == PackingUnits.QTY) {
|
|
217
|
+
pc.currentUnitQty = originalQty - pc.reducedUnitQty / pc.packingSize
|
|
218
|
+
} else if (packingUnit == PackingUnits.UOM) {
|
|
219
|
+
pc.currentUomValue = getRoundedAmount(originalUomValue - pc.reducedUomValue)
|
|
220
|
+
}
|
|
214
221
|
}
|
|
215
|
-
}
|
|
216
222
|
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
+
return {
|
|
224
|
+
...pc,
|
|
225
|
+
originalQty,
|
|
226
|
+
originalUomValue
|
|
227
|
+
}
|
|
228
|
+
})
|
|
229
|
+
)
|
|
223
230
|
}
|
|
224
231
|
|
|
225
232
|
function getRoundedAmount(value: number, decimalPlace: number = 100): number {
|
|
@@ -4,20 +4,10 @@ import { User } from '@things-factory/auth-base'
|
|
|
4
4
|
import { Bizplace } from '@things-factory/biz-base'
|
|
5
5
|
import { OrderVas } from '@things-factory/sales-base'
|
|
6
6
|
import { Domain } from '@things-factory/shell'
|
|
7
|
-
import {
|
|
8
|
-
Inventory,
|
|
9
|
-
Location,
|
|
10
|
-
Warehouse
|
|
11
|
-
} from '@things-factory/warehouse-base'
|
|
7
|
+
import { Inventory, Location, Warehouse } from '@things-factory/warehouse-base'
|
|
12
8
|
|
|
13
|
-
import {
|
|
14
|
-
|
|
15
|
-
WorksheetDetail
|
|
16
|
-
} from '../../../../../entities'
|
|
17
|
-
import {
|
|
18
|
-
checkPalletDuplication,
|
|
19
|
-
checkPalletIdenticallity
|
|
20
|
-
} from '../../../../../utils'
|
|
9
|
+
import { Worksheet, WorksheetDetail } from '../../../../../entities'
|
|
10
|
+
import { checkPalletDuplication, checkPalletIdenticallity } from '../../../../../utils'
|
|
21
11
|
import { executeVas } from '../../vas/execute-vas'
|
|
22
12
|
import {
|
|
23
13
|
assignInventory,
|
|
@@ -94,7 +84,11 @@ export const repackagingResolver = {
|
|
|
94
84
|
let palletChanges: TemporaryPalletChangesInterface[] = []
|
|
95
85
|
|
|
96
86
|
if (repackedInvs && repackedInvs.length) {
|
|
97
|
-
palletChanges = repackedInvs.
|
|
87
|
+
palletChanges = repackedInvs.reduce((acc, ri: RepackedInvInfo) => {
|
|
88
|
+
acc = [...acc, ...ri.repackedFrom]
|
|
89
|
+
return acc
|
|
90
|
+
}, [])
|
|
91
|
+
// .map((ri: RepackedInvInfo) => ri.repackedFrom).flat()
|
|
98
92
|
} else if (!repackedInvs) {
|
|
99
93
|
operationGuideData.repackedInvs = []
|
|
100
94
|
}
|