@things-factory/worksheet-base 3.6.8 → 3.6.19
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/ecommerce/sellercraft-controller.js +38 -0
- package/dist-server/controllers/ecommerce/sellercraft-controller.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/cycle-count-adjustment.js +23 -1
- package/dist-server/graphql/resolvers/worksheet/cycle-count-adjustment.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js +21 -35
- package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +19 -3
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.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/package.json +16 -16
- package/server/controllers/ecommerce/ecommerce-controller.ts +23 -6
- package/server/controllers/ecommerce/sellercraft-controller.ts +51 -0
- package/server/graphql/resolvers/worksheet/cycle-count-adjustment.ts +30 -2
- package/server/graphql/resolvers/worksheet/packing/complete-packing.ts +24 -45
- package/server/graphql/resolvers/worksheet/packing-worksheet.ts +24 -4
- package/server/graphql/resolvers/worksheet/picking-worksheet.ts +5 -2
- package/server/graphql/resolvers/worksheet/worksheet.ts +67 -43
|
@@ -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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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SellercraftController = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
4
5
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
5
6
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
7
|
+
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
6
8
|
const worksheet_controller_1 = require("../worksheet-controller");
|
|
7
9
|
class SellercraftController extends worksheet_controller_1.WorksheetController {
|
|
8
10
|
async registerProductInbound(sellercraft, arrivalNotice) {
|
|
@@ -78,6 +80,42 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
|
|
|
78
80
|
};
|
|
79
81
|
await integration_sellercraft_1.SellercraftAPI.addInboundOrder(sellercraft, Object.assign({}, returnInbound));
|
|
80
82
|
}
|
|
83
|
+
async updateSellercraftStock(sellercraft, inventory) {
|
|
84
|
+
let product = inventory.product;
|
|
85
|
+
const productDetails = product.productDetails;
|
|
86
|
+
const inventories = await this.trxMgr.getRepository(warehouse_base_1.Inventory).find({
|
|
87
|
+
where: { domain: this.domain, product, status: (0, typeorm_1.Not)((0, typeorm_1.Equal)(warehouse_base_1.INVENTORY_STATUS.TERMINATED)) }
|
|
88
|
+
});
|
|
89
|
+
let defaultProductDetail;
|
|
90
|
+
const sellercraftInvs = await Promise.all(inventories.map(async (inventory) => {
|
|
91
|
+
const inventoryPackingType = inventory.packingType;
|
|
92
|
+
defaultProductDetail = product.productDetails.find(productDetail => productDetail.isDefault);
|
|
93
|
+
let packingSize = 1;
|
|
94
|
+
if (inventoryPackingType !== defaultProductDetail.packingType) {
|
|
95
|
+
const unmatchingProductDetail = product.productDetails.find(productDetail => productDetail.packingType === inventoryPackingType);
|
|
96
|
+
packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail);
|
|
97
|
+
}
|
|
98
|
+
return { quantity: inventory.qty * packingSize - inventory.lockedQty * packingSize };
|
|
99
|
+
}));
|
|
100
|
+
const totalQty = sellercraftInvs.reduce((total, currentValue) => {
|
|
101
|
+
total += currentValue.quantity;
|
|
102
|
+
return total;
|
|
103
|
+
}, 0);
|
|
104
|
+
const sellercraftInv = {
|
|
105
|
+
accountId: sellercraft.accountId,
|
|
106
|
+
sku: product.sku,
|
|
107
|
+
uom: 'EA',
|
|
108
|
+
quantity: totalQty,
|
|
109
|
+
gtin: defaultProductDetail.gtin,
|
|
110
|
+
weight: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
|
|
111
|
+
packageDimension: {
|
|
112
|
+
length: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
|
|
113
|
+
width: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
|
|
114
|
+
height: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
|
|
115
|
+
}
|
|
116
|
+
};
|
|
117
|
+
await integration_sellercraft_1.SellercraftAPI.updateProduct(sellercraft, { sellercraftInv });
|
|
118
|
+
}
|
|
81
119
|
async initiateOrderShipment(sellercraft, releaseGood) {
|
|
82
120
|
const orderInformation = {
|
|
83
121
|
accountId: sellercraft.accountId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sellercraft-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/sellercraft-controller.ts"],"names":[],"mappings":";;;AAAA,qFAAqF;AAErF,2DAOmC;
|
|
1
|
+
{"version":3,"file":"sellercraft-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/sellercraft-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.cycleCountAdjustment = exports.cycleCountAdjustmentResolver = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
5
|
+
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
4
6
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
5
7
|
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
6
|
-
const typeorm_1 = require("typeorm");
|
|
7
8
|
const constants_1 = require("../../../constants");
|
|
9
|
+
const controllers_1 = require("../../../controllers");
|
|
8
10
|
const entities_1 = require("../../../entities");
|
|
9
11
|
const utils_1 = require("../../../utils");
|
|
10
12
|
exports.cycleCountAdjustmentResolver = {
|
|
@@ -40,6 +42,11 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
|
|
|
40
42
|
relations: [
|
|
41
43
|
'targetInventory',
|
|
42
44
|
'targetInventory.inventory',
|
|
45
|
+
'targetInventory.inventory.product',
|
|
46
|
+
'targetInventory.inventory.product.productDetails',
|
|
47
|
+
'targetInventory.inventory.product.productDetails.childProductDetail',
|
|
48
|
+
'targetInventory.inventory.bizplace',
|
|
49
|
+
'targetInventory.inventory.bizplace.domain',
|
|
43
50
|
'targetInventory.inventory.location',
|
|
44
51
|
'targetInventory.inspectedLocation',
|
|
45
52
|
'targetInventory.inspectedLocation.warehouse'
|
|
@@ -50,6 +57,9 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
|
|
|
50
57
|
let inventory = targetInventory.inventory;
|
|
51
58
|
const transactQty = targetInventory.inspectedQty - inventory.qty;
|
|
52
59
|
const transactUomValue = targetInventory.inspectedUomValue - inventory.uomValue;
|
|
60
|
+
const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
|
|
61
|
+
where: { domain: inventory.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE }
|
|
62
|
+
});
|
|
53
63
|
if (targetInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.MISSING) {
|
|
54
64
|
// create STORED, CC_ADJUSTMENT history
|
|
55
65
|
await (0, utils_1.generateInventoryHistory)(inventory, cycleCount, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.CC_ADJUSTMENT, -inventory.qty, -inventory.uomValue, user, tx);
|
|
@@ -62,6 +72,10 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
|
|
|
62
72
|
inventory = await tx.getRepository(warehouse_base_1.Inventory).save(inventory);
|
|
63
73
|
// create TERMINATED, TERMINATED history
|
|
64
74
|
await (0, utils_1.generateInventoryHistory)(inventory, cycleCount, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TERMINATED, 0, 0, user, tx);
|
|
75
|
+
if (sellercraft) {
|
|
76
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
77
|
+
await sellercraftCtrl.updateSellercraftStock(sellercraft, inventory);
|
|
78
|
+
}
|
|
65
79
|
}
|
|
66
80
|
else if (targetInventory.inspectedQty == 0) {
|
|
67
81
|
// create STORED, CC_ADJUSTMENT history
|
|
@@ -79,6 +93,10 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
|
|
|
79
93
|
inventory = await tx.getRepository(warehouse_base_1.Inventory).save(inventory);
|
|
80
94
|
// create TERMINATED, TERMINATED history
|
|
81
95
|
await (0, utils_1.generateInventoryHistory)(inventory, cycleCount, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TERMINATED, 0, 0, user, tx);
|
|
96
|
+
if (sellercraft) {
|
|
97
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
98
|
+
await sellercraftCtrl.updateSellercraftStock(sellercraft, inventory);
|
|
99
|
+
}
|
|
82
100
|
}
|
|
83
101
|
else {
|
|
84
102
|
const prevLocationId = inventory.location.id;
|
|
@@ -103,6 +121,10 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
|
|
|
103
121
|
}
|
|
104
122
|
await (0, utils_1.generateInventoryHistory)(inventory, cycleCount, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.CC_ADJUSTMENT, transactQty, transactUomValue, user, tx);
|
|
105
123
|
}
|
|
124
|
+
if (sellercraft) {
|
|
125
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
126
|
+
await sellercraftCtrl.updateSellercraftStock(sellercraft, inventory);
|
|
127
|
+
}
|
|
106
128
|
targetInventory.status = sales_base_1.ORDER_INVENTORY_STATUS.TERMINATED;
|
|
107
129
|
targetInventory.updater = user;
|
|
108
130
|
await tx.getRepository(sales_base_1.OrderInventory).save(targetInventory);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cycle-count-adjustment.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/cycle-count-adjustment.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"cycle-count-adjustment.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/cycle-count-adjustment.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,9 @@
|
|
|
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 integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
5
6
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
6
7
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
7
|
-
const constants_1 = require("../../../../constants");
|
|
8
8
|
const controllers_1 = require("../../../../controllers/");
|
|
9
9
|
const ecommerce_1 = require("../../../../controllers/ecommerce");
|
|
10
10
|
const worksheet_controller_1 = require("../../../../controllers/worksheet-controller");
|
|
@@ -16,6 +16,7 @@ exports.completePackingResolver = {
|
|
|
16
16
|
where: { domain, name: releaseGoodNo },
|
|
17
17
|
relations: [
|
|
18
18
|
'bizplace',
|
|
19
|
+
'bizplace.domain',
|
|
19
20
|
'bizplace.company',
|
|
20
21
|
'bizplace.company.domain',
|
|
21
22
|
'orderInventories',
|
|
@@ -23,15 +24,25 @@ exports.completePackingResolver = {
|
|
|
23
24
|
]
|
|
24
25
|
});
|
|
25
26
|
if (releaseGood.type === 'b2c') {
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
27
|
+
const sellercraft = await tx
|
|
28
|
+
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
29
|
+
.findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
30
|
+
if (!sellercraft) {
|
|
31
|
+
const companyDomain = releaseGood.bizplace.company.domain;
|
|
32
|
+
const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
33
|
+
where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
34
|
+
relations: [
|
|
35
|
+
'marketplaceOrderItems',
|
|
36
|
+
'marketplaceOrderItems.marketplaceOrderShipping',
|
|
37
|
+
'marketplaceStore',
|
|
38
|
+
'marketplaceStore.marketplaceDistributors'
|
|
39
|
+
]
|
|
40
|
+
});
|
|
41
|
+
const marketplaceStore = marketplaceOrder.marketplaceStore;
|
|
42
|
+
if (marketplaceStore.isAutoUpdateShipment) {
|
|
43
|
+
const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
|
|
44
|
+
await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain);
|
|
45
|
+
}
|
|
35
46
|
}
|
|
36
47
|
}
|
|
37
48
|
const bizplace = await (0, biz_base_1.getMyBizplace)(domain, user);
|
|
@@ -45,33 +56,8 @@ exports.completePackingResolver = {
|
|
|
45
56
|
}
|
|
46
57
|
};
|
|
47
58
|
async function completePacking(tx, domain, user, releaseGoodNo) {
|
|
48
|
-
var _a;
|
|
49
59
|
const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
50
|
-
const releaseGood = await packingWSCtrl.findRefOrder(sales_base_1.ReleaseGood, {
|
|
51
|
-
domain,
|
|
52
|
-
name: releaseGoodNo
|
|
53
|
-
});
|
|
54
|
-
const worksheet = await packingWSCtrl.findWorksheetByRefOrder(releaseGood, constants_1.WORKSHEET_TYPE.PACKING, [
|
|
55
|
-
'worksheetDetails',
|
|
56
|
-
'worksheetDetails.targetInventory'
|
|
57
|
-
]);
|
|
58
|
-
const worksheetDetails = worksheet.worksheetDetails;
|
|
59
|
-
const targetInventories = worksheetDetails.map((wsd) => wsd.targetInventory);
|
|
60
|
-
const packedTargetInventories = targetInventories
|
|
61
|
-
.filter(targetInventory => targetInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.PACKED)
|
|
62
|
-
.map((packedTargetInventory) => {
|
|
63
|
-
return packedTargetInventory;
|
|
64
|
-
});
|
|
65
60
|
await packingWSCtrl.completePacking(releaseGoodNo);
|
|
66
|
-
if (!releaseGood.courierOption) {
|
|
67
|
-
const loadingWSCtrl = new controllers_1.LoadingWorksheetController(tx, domain, user);
|
|
68
|
-
let loadingWorksheet = await loadingWSCtrl.generateLoadingWorksheet(releaseGoodNo, packedTargetInventories);
|
|
69
|
-
if (!((_a = loadingWorksheet.worksheetDetails) === null || _a === void 0 ? void 0 : _a.length)) {
|
|
70
|
-
loadingWorksheet = await packingWSCtrl.findWorksheetById(loadingWorksheet.id);
|
|
71
|
-
}
|
|
72
|
-
const loadingWorksheetDetails = loadingWorksheet.worksheetDetails;
|
|
73
|
-
await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails);
|
|
74
|
-
}
|
|
75
61
|
}
|
|
76
62
|
exports.completePacking = completePacking;
|
|
77
63
|
//# sourceMappingURL=complete-packing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/complete-packing.ts"],"names":[],"mappings":";;;AAGA,uDAAkE;AAElE,uEAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"complete-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/complete-packing.ts"],"names":[],"mappings":";;;AAGA,uDAAkE;AAElE,qFAAwF;AACxF,uEAAmE;AACnE,2DAAwD;AAGxD,0DAAqE;AACrE,iEAAuE;AACvE,uFAAkF;AAErE,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;QAC3D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,CAAA;QAEtD,MAAM,WAAW,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YAC3E,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE;YACtC,SAAS,EAAE;gBACT,UAAU;gBACV,iBAAiB;gBACjB,kBAAkB;gBAClB,yBAAyB;gBACzB,kBAAkB;gBAClB,0BAA0B;aAC3B;SACF,CAAC,CAAA;QAEF,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK,EAAE;YAC9B,MAAM,WAAW,GAAgB,MAAM,EAAE;iBACtC,aAAa,CAAC,qCAAW,CAAC;iBAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;YAErF,IAAI,CAAC,WAAW,EAAE;gBAChB,MAAM,aAAa,GAAW,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAA;gBACjE,MAAM,gBAAgB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAgB,CAAC,CAAC,OAAO,CAAC;oBAC1F,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE;oBAC5D,SAAS,EAAE;wBACT,uBAAuB;wBACvB,gDAAgD;wBAChD,kBAAkB;wBAClB,0CAA0C;qBAC3C;iBACF,CAAC,CAAA;gBACF,MAAM,gBAAgB,GAAqB,gBAAgB,CAAC,gBAAgB,CAAA;gBAE5E,IAAI,gBAAgB,CAAC,oBAAoB,EAAE;oBACzC,MAAM,aAAa,GAAwB,IAAI,+BAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;oBACpF,MAAM,aAAa,CAAC,eAAe,CAAC,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAA;iBACpG;aACF;SACF;QAED,MAAM,QAAQ,GAAa,MAAM,IAAA,wBAAa,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAC5D,MAAM,mBAAmB,GAAwB,IAAI,0CAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC1F,MAAM,mBAAmB,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YACnD,KAAK,EAAE,+BAA+B,QAAQ,CAAC,IAAI,KAAK,aAAa,GAAG;YACxE,IAAI,EAAE,4CAA4C;YAClD,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO;YAC3B,IAAI,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE;SACtC,CAAC,CAAA;IACJ,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,eAAe,CACnC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAAqB;IAErB,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAClG,MAAM,aAAa,CAAC,eAAe,CAAC,aAAa,CAAC,CAAA;AACpD,CAAC;AARD,0CAQC"}
|
|
@@ -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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"}
|
|
@@ -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,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/worksheet.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/worksheet.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.19",
|
|
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.19",
|
|
28
|
+
"@things-factory/biz-base": "^3.6.19",
|
|
29
|
+
"@things-factory/document-template-base": "^3.6.19",
|
|
30
|
+
"@things-factory/id-rule-base": "^3.6.19",
|
|
31
|
+
"@things-factory/integration-lmd": "^3.6.19",
|
|
32
|
+
"@things-factory/integration-marketplace": "^3.6.19",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^3.6.19",
|
|
34
|
+
"@things-factory/marketplace-base": "^3.6.19",
|
|
35
|
+
"@things-factory/notification": "^3.6.19",
|
|
36
|
+
"@things-factory/sales-base": "^3.6.19",
|
|
37
|
+
"@things-factory/setting-base": "^3.6.19",
|
|
38
|
+
"@things-factory/shell": "^3.6.19",
|
|
39
|
+
"@things-factory/transport-base": "^3.6.19",
|
|
40
|
+
"@things-factory/warehouse-base": "^3.6.19"
|
|
41
41
|
},
|
|
42
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "e8a5ade8e7c470c6e51dca428409c405b7cccf3a"
|
|
43
43
|
}
|
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
MarketplaceOrderShipping,
|
|
5
5
|
MarketplaceProductVariation
|
|
6
6
|
} from '@things-factory/marketplace-base'
|
|
7
|
+
import { ReleaseGood } from '@things-factory/sales-base'
|
|
7
8
|
import { Domain } from '@things-factory/shell'
|
|
8
9
|
import { getProductBundleInventory, Inventory } from '@things-factory/warehouse-base'
|
|
9
10
|
|
|
@@ -109,15 +110,29 @@ export class EcommerceController extends WorksheetController {
|
|
|
109
110
|
}
|
|
110
111
|
|
|
111
112
|
async createOrderShip(
|
|
113
|
+
releaseGood: ReleaseGood,
|
|
112
114
|
marketplaceStore: MarketplaceStore,
|
|
113
115
|
marketplaceOrder: MarketplaceOrder,
|
|
114
116
|
companyDomain: Domain
|
|
115
117
|
): Promise<void> {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
118
|
+
let marketplaceOrderShipping: MarketplaceOrderShipping
|
|
119
|
+
|
|
120
|
+
if (marketplaceOrder.isSplitted) {
|
|
121
|
+
marketplaceOrderShipping = await this.trxMgr.getRepository(MarketplaceOrderShipping).findOne({
|
|
122
|
+
where: { domain: companyDomain, marketplaceStore, subOrderNoRef: releaseGood.refNo2 }
|
|
123
|
+
})
|
|
124
|
+
} else {
|
|
125
|
+
marketplaceOrderShipping = await this.trxMgr.getRepository(MarketplaceOrderShipping).findOne({
|
|
126
|
+
where: { domain: companyDomain, marketplaceStore, orderNoRef: releaseGood.refNo }
|
|
120
127
|
})
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
const trackingNo: string = marketplaceOrderShipping.ownTrackingNo
|
|
131
|
+
? marketplaceOrderShipping.ownTrackingNo
|
|
132
|
+
: marketplaceOrderShipping.trackingNo
|
|
133
|
+
const shippingProvider: string = marketplaceOrderShipping.ownTransporter
|
|
134
|
+
? marketplaceOrderShipping.ownTransporter
|
|
135
|
+
: marketplaceOrderShipping.transporter
|
|
121
136
|
|
|
122
137
|
let validMarketplaceDistributors: any[] = []
|
|
123
138
|
if (marketplaceOrder.marketplaceStore.marketplaceDistributors) {
|
|
@@ -128,8 +143,10 @@ export class EcommerceController extends WorksheetController {
|
|
|
128
143
|
|
|
129
144
|
await StoreAPI.createOrderShip(marketplaceStore, {
|
|
130
145
|
orderId: marketplaceOrder.name,
|
|
131
|
-
orderItems: marketplaceOrder.marketplaceOrderItems
|
|
132
|
-
|
|
146
|
+
orderItems: marketplaceOrder.marketplaceOrderItems.filter(
|
|
147
|
+
item => item.marketplaceOrderShipping.id === marketplaceOrderShipping.id
|
|
148
|
+
),
|
|
149
|
+
shippings: [{ trackingNo, carrierCode: shippingProvider }],
|
|
133
150
|
sourceCodes: validMarketplaceDistributors.map(distributor => distributor.name)
|
|
134
151
|
})
|
|
135
152
|
}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { Equal, Not } from 'typeorm'
|
|
2
|
+
|
|
1
3
|
import { Sellercraft, SellercraftAPI } from '@things-factory/integration-sellercraft'
|
|
2
4
|
import { Product, ProductDetail } from '@things-factory/product-base'
|
|
3
5
|
import {
|
|
@@ -8,6 +10,7 @@ import {
|
|
|
8
10
|
ReleaseGood,
|
|
9
11
|
ReturnOrder
|
|
10
12
|
} from '@things-factory/sales-base'
|
|
13
|
+
import { Inventory, INVENTORY_STATUS } from '@things-factory/warehouse-base'
|
|
11
14
|
|
|
12
15
|
import { WorksheetController } from '../worksheet-controller'
|
|
13
16
|
|
|
@@ -107,6 +110,54 @@ export class SellercraftController extends WorksheetController {
|
|
|
107
110
|
await SellercraftAPI.addInboundOrder(sellercraft, { ...returnInbound })
|
|
108
111
|
}
|
|
109
112
|
|
|
113
|
+
async updateSellercraftStock(sellercraft: Sellercraft, inventory: Inventory): Promise<void> {
|
|
114
|
+
let product: Product = inventory.product
|
|
115
|
+
const productDetails: ProductDetail[] = product.productDetails
|
|
116
|
+
const inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
|
|
117
|
+
where: { domain: this.domain, product, status: Not(Equal(INVENTORY_STATUS.TERMINATED)) }
|
|
118
|
+
})
|
|
119
|
+
|
|
120
|
+
let defaultProductDetail: ProductDetail
|
|
121
|
+
const sellercraftInvs: any[] = await Promise.all(
|
|
122
|
+
inventories.map(async (inventory: Inventory) => {
|
|
123
|
+
const inventoryPackingType: string = inventory.packingType
|
|
124
|
+
defaultProductDetail = product.productDetails.find(productDetail => productDetail.isDefault)
|
|
125
|
+
|
|
126
|
+
let packingSize: number = 1
|
|
127
|
+
if (inventoryPackingType !== defaultProductDetail.packingType) {
|
|
128
|
+
const unmatchingProductDetail: ProductDetail = product.productDetails.find(
|
|
129
|
+
productDetail => productDetail.packingType === inventoryPackingType
|
|
130
|
+
)
|
|
131
|
+
|
|
132
|
+
packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail)
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
return { quantity: inventory.qty * packingSize - inventory.lockedQty * packingSize }
|
|
136
|
+
})
|
|
137
|
+
)
|
|
138
|
+
|
|
139
|
+
const totalQty: number = sellercraftInvs.reduce((total, currentValue) => {
|
|
140
|
+
total += currentValue.quantity
|
|
141
|
+
return total
|
|
142
|
+
}, 0)
|
|
143
|
+
|
|
144
|
+
const sellercraftInv: any = {
|
|
145
|
+
accountId: sellercraft.accountId,
|
|
146
|
+
sku: product.sku,
|
|
147
|
+
uom: 'EA',
|
|
148
|
+
quantity: totalQty,
|
|
149
|
+
gtin: defaultProductDetail.gtin,
|
|
150
|
+
weight: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
|
|
151
|
+
packageDimension: {
|
|
152
|
+
length: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
|
|
153
|
+
width: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
|
|
154
|
+
height: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
await SellercraftAPI.updateProduct(sellercraft, { sellercraftInv })
|
|
159
|
+
}
|
|
160
|
+
|
|
110
161
|
async initiateOrderShipment(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<void> {
|
|
111
162
|
const orderInformation: any = {
|
|
112
163
|
accountId: sellercraft.accountId,
|
|
@@ -1,9 +1,13 @@
|
|
|
1
|
+
import { EntityManager, In } from 'typeorm'
|
|
2
|
+
|
|
1
3
|
import { User } from '@things-factory/auth-base'
|
|
2
|
-
import {
|
|
4
|
+
import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
|
|
5
|
+
import { InventoryCheck, ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory } from '@things-factory/sales-base'
|
|
3
6
|
import { Domain } from '@things-factory/shell'
|
|
4
7
|
import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location } from '@things-factory/warehouse-base'
|
|
5
|
-
|
|
8
|
+
|
|
6
9
|
import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
|
|
10
|
+
import { SellercraftController } from '../../../controllers'
|
|
7
11
|
import { Worksheet, WorksheetDetail } from '../../../entities'
|
|
8
12
|
import { generateInventoryHistory, switchLocationStatus } from '../../../utils'
|
|
9
13
|
|
|
@@ -48,6 +52,11 @@ export async function cycleCountAdjustment(
|
|
|
48
52
|
relations: [
|
|
49
53
|
'targetInventory',
|
|
50
54
|
'targetInventory.inventory',
|
|
55
|
+
'targetInventory.inventory.product',
|
|
56
|
+
'targetInventory.inventory.product.productDetails',
|
|
57
|
+
'targetInventory.inventory.product.productDetails.childProductDetail',
|
|
58
|
+
'targetInventory.inventory.bizplace',
|
|
59
|
+
'targetInventory.inventory.bizplace.domain',
|
|
51
60
|
'targetInventory.inventory.location',
|
|
52
61
|
'targetInventory.inspectedLocation',
|
|
53
62
|
'targetInventory.inspectedLocation.warehouse'
|
|
@@ -61,6 +70,10 @@ export async function cycleCountAdjustment(
|
|
|
61
70
|
const transactQty: number = targetInventory.inspectedQty - inventory.qty
|
|
62
71
|
const transactUomValue: number = targetInventory.inspectedUomValue - inventory.uomValue
|
|
63
72
|
|
|
73
|
+
const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
|
|
74
|
+
where: { domain: inventory.bizplace.domain, status: SellercraftStatus.ACTIVE }
|
|
75
|
+
})
|
|
76
|
+
|
|
64
77
|
if (targetInventory.status === ORDER_INVENTORY_STATUS.MISSING) {
|
|
65
78
|
// create STORED, CC_ADJUSTMENT history
|
|
66
79
|
await generateInventoryHistory(
|
|
@@ -83,6 +96,11 @@ export async function cycleCountAdjustment(
|
|
|
83
96
|
|
|
84
97
|
// create TERMINATED, TERMINATED history
|
|
85
98
|
await generateInventoryHistory(inventory, cycleCount, INVENTORY_TRANSACTION_TYPE.TERMINATED, 0, 0, user, tx)
|
|
99
|
+
|
|
100
|
+
if (sellercraft) {
|
|
101
|
+
const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
102
|
+
await sellercraftCtrl.updateSellercraftStock(sellercraft, inventory)
|
|
103
|
+
}
|
|
86
104
|
} else if (targetInventory.inspectedQty == 0) {
|
|
87
105
|
// create STORED, CC_ADJUSTMENT history
|
|
88
106
|
await generateInventoryHistory(
|
|
@@ -109,6 +127,11 @@ export async function cycleCountAdjustment(
|
|
|
109
127
|
|
|
110
128
|
// create TERMINATED, TERMINATED history
|
|
111
129
|
await generateInventoryHistory(inventory, cycleCount, INVENTORY_TRANSACTION_TYPE.TERMINATED, 0, 0, user, tx)
|
|
130
|
+
|
|
131
|
+
if (sellercraft) {
|
|
132
|
+
const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
133
|
+
await sellercraftCtrl.updateSellercraftStock(sellercraft, inventory)
|
|
134
|
+
}
|
|
112
135
|
} else {
|
|
113
136
|
const prevLocationId: string = inventory.location.id
|
|
114
137
|
|
|
@@ -153,6 +176,11 @@ export async function cycleCountAdjustment(
|
|
|
153
176
|
)
|
|
154
177
|
}
|
|
155
178
|
|
|
179
|
+
if (sellercraft) {
|
|
180
|
+
const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
181
|
+
await sellercraftCtrl.updateSellercraftStock(sellercraft, inventory)
|
|
182
|
+
}
|
|
183
|
+
|
|
156
184
|
targetInventory.status = ORDER_INVENTORY_STATUS.TERMINATED
|
|
157
185
|
targetInventory.updater = user
|
|
158
186
|
await tx.getRepository(OrderInventory).save(targetInventory)
|
|
@@ -3,15 +3,14 @@ import { EntityManager } from 'typeorm'
|
|
|
3
3
|
import { User } from '@things-factory/auth-base'
|
|
4
4
|
import { Bizplace, getMyBizplace } from '@things-factory/biz-base'
|
|
5
5
|
import { MarketplaceStore } from '@things-factory/integration-marketplace'
|
|
6
|
+
import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
|
|
6
7
|
import { MarketplaceOrder } from '@things-factory/marketplace-base'
|
|
7
|
-
import {
|
|
8
|
+
import { ReleaseGood } from '@things-factory/sales-base'
|
|
8
9
|
import { Domain } from '@things-factory/shell'
|
|
9
10
|
|
|
10
|
-
import {
|
|
11
|
-
import { LoadingWorksheetController, PackingWorksheetController } from '../../../../controllers/'
|
|
11
|
+
import { PackingWorksheetController } from '../../../../controllers/'
|
|
12
12
|
import { EcommerceController } from '../../../../controllers/ecommerce'
|
|
13
13
|
import { WorksheetController } from '../../../../controllers/worksheet-controller'
|
|
14
|
-
import { Worksheet, WorksheetDetail } from '../../../../entities'
|
|
15
14
|
|
|
16
15
|
export const completePackingResolver = {
|
|
17
16
|
async completePacking(_: any, { releaseGoodNo }, context: any) {
|
|
@@ -22,6 +21,7 @@ export const completePackingResolver = {
|
|
|
22
21
|
where: { domain, name: releaseGoodNo },
|
|
23
22
|
relations: [
|
|
24
23
|
'bizplace',
|
|
24
|
+
'bizplace.domain',
|
|
25
25
|
'bizplace.company',
|
|
26
26
|
'bizplace.company.domain',
|
|
27
27
|
'orderInventories',
|
|
@@ -30,16 +30,27 @@ export const completePackingResolver = {
|
|
|
30
30
|
})
|
|
31
31
|
|
|
32
32
|
if (releaseGood.type === 'b2c') {
|
|
33
|
-
const
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
relations: ['marketplaceOrderItems', 'marketplaceStore', 'marketplaceStore.marketplaceDistributors']
|
|
37
|
-
})
|
|
38
|
-
const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
|
|
33
|
+
const sellercraft: Sellercraft = await tx
|
|
34
|
+
.getRepository(Sellercraft)
|
|
35
|
+
.findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
|
|
39
36
|
|
|
40
|
-
if (
|
|
41
|
-
const
|
|
42
|
-
await
|
|
37
|
+
if (!sellercraft) {
|
|
38
|
+
const companyDomain: Domain = releaseGood.bizplace.company.domain
|
|
39
|
+
const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
|
|
40
|
+
where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
41
|
+
relations: [
|
|
42
|
+
'marketplaceOrderItems',
|
|
43
|
+
'marketplaceOrderItems.marketplaceOrderShipping',
|
|
44
|
+
'marketplaceStore',
|
|
45
|
+
'marketplaceStore.marketplaceDistributors'
|
|
46
|
+
]
|
|
47
|
+
})
|
|
48
|
+
const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
|
|
49
|
+
|
|
50
|
+
if (marketplaceStore.isAutoUpdateShipment) {
|
|
51
|
+
const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
|
|
52
|
+
await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain)
|
|
53
|
+
}
|
|
43
54
|
}
|
|
44
55
|
}
|
|
45
56
|
|
|
@@ -61,37 +72,5 @@ export async function completePacking(
|
|
|
61
72
|
releaseGoodNo: string
|
|
62
73
|
): Promise<void> {
|
|
63
74
|
const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
|
|
64
|
-
const releaseGood: ReleaseGood = await packingWSCtrl.findRefOrder(ReleaseGood, {
|
|
65
|
-
domain,
|
|
66
|
-
name: releaseGoodNo
|
|
67
|
-
})
|
|
68
|
-
const worksheet: Worksheet = await packingWSCtrl.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.PACKING, [
|
|
69
|
-
'worksheetDetails',
|
|
70
|
-
'worksheetDetails.targetInventory'
|
|
71
|
-
])
|
|
72
|
-
|
|
73
|
-
const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
|
|
74
|
-
const targetInventories: OrderInventory[] = worksheetDetails.map((wsd: WorksheetDetail) => wsd.targetInventory)
|
|
75
|
-
const packedTargetInventories: OrderInventory[] = targetInventories
|
|
76
|
-
.filter(targetInventory => targetInventory.status === ORDER_INVENTORY_STATUS.PACKED)
|
|
77
|
-
.map((packedTargetInventory: OrderInventory) => {
|
|
78
|
-
return packedTargetInventory
|
|
79
|
-
})
|
|
80
|
-
|
|
81
75
|
await packingWSCtrl.completePacking(releaseGoodNo)
|
|
82
|
-
|
|
83
|
-
if (!releaseGood.courierOption) {
|
|
84
|
-
const loadingWSCtrl: LoadingWorksheetController = new LoadingWorksheetController(tx, domain, user)
|
|
85
|
-
let loadingWorksheet: Worksheet = await loadingWSCtrl.generateLoadingWorksheet(
|
|
86
|
-
releaseGoodNo,
|
|
87
|
-
packedTargetInventories
|
|
88
|
-
)
|
|
89
|
-
|
|
90
|
-
if (!loadingWorksheet.worksheetDetails?.length) {
|
|
91
|
-
loadingWorksheet = await packingWSCtrl.findWorksheetById(loadingWorksheet.id)
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
const loadingWorksheetDetails: WorksheetDetail[] = loadingWorksheet.worksheetDetails
|
|
95
|
-
await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails)
|
|
96
|
-
}
|
|
97
76
|
}
|
|
@@ -2,7 +2,7 @@ import { EntityManager } from 'typeorm'
|
|
|
2
2
|
|
|
3
3
|
import { User } from '@things-factory/auth-base'
|
|
4
4
|
import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
|
|
5
|
-
import { MarketplaceOrder, MarketplaceOrderItem } from '@things-factory/marketplace-base'
|
|
5
|
+
import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
|
|
6
6
|
import { OrderInventory, ReleaseGood } from '@things-factory/sales-base'
|
|
7
7
|
import { Domain } from '@things-factory/shell'
|
|
8
8
|
import { Inventory } from '@things-factory/warehouse-base'
|
|
@@ -81,10 +81,29 @@ export const packingWorksheetResolver = {
|
|
|
81
81
|
if (!marketplaceOrder) {
|
|
82
82
|
throw new Error('Failed to retrieve ecommerce information, kindly contact our support team for this issue.')
|
|
83
83
|
}
|
|
84
|
-
|
|
84
|
+
|
|
85
|
+
let marketplaceOrderShipping: MarketplaceOrderShipping
|
|
86
|
+
if (marketplaceOrder.isSplitted) {
|
|
87
|
+
marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
|
|
88
|
+
where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
|
|
89
|
+
})
|
|
90
|
+
} else {
|
|
91
|
+
marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
|
|
92
|
+
where: { orderNoRef: worksheet.releaseGood.refNo }
|
|
93
|
+
})
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
trackingNo = marketplaceOrderShipping.ownTrackingNo
|
|
97
|
+
? marketplaceOrderShipping.ownTrackingNo
|
|
98
|
+
: marketplaceOrderShipping.trackingNo
|
|
99
|
+
shippingProvider = marketplaceOrderShipping.ownTransporter
|
|
100
|
+
? marketplaceOrderShipping.ownTransporter
|
|
101
|
+
: marketplaceOrderShipping.transporter
|
|
102
|
+
|
|
103
|
+
marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems.filter(
|
|
104
|
+
item => item.marketplaceOrderShipping.id === marketplaceOrderShipping.id
|
|
105
|
+
)
|
|
85
106
|
marketplaceStore = marketplaceOrder?.marketplaceStore
|
|
86
|
-
trackingNo = await getTrackingNo(marketplaceStore, marketplaceOrderItems)
|
|
87
|
-
shippingProvider = marketplaceOrder?.shippingProvider
|
|
88
107
|
marketplaceStatus = marketplaceOrder?.status
|
|
89
108
|
}
|
|
90
109
|
}
|
|
@@ -93,6 +112,7 @@ export const packingWorksheetResolver = {
|
|
|
93
112
|
worksheetInfo: {
|
|
94
113
|
bizplaceName: releaseGood.bizplace.name,
|
|
95
114
|
refNo: releaseGood.refNo,
|
|
115
|
+
refNo2: releaseGood.refNo2,
|
|
96
116
|
partnerDomainId: releaseGood.bizplace?.domain.id,
|
|
97
117
|
startedAt: worksheet.startedAt,
|
|
98
118
|
shippingProvider: shippingProvider ? shippingProvider : '',
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { createQueryBuilder, getRepository, SelectQueryBuilder } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { ORDER_INVENTORY_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
|
|
2
4
|
import { Domain } from '@things-factory/shell'
|
|
3
|
-
import { fetchExecutingWorksheet } from '../../../utils'
|
|
4
5
|
import { Inventory } from '@things-factory/warehouse-base'
|
|
5
|
-
|
|
6
|
+
|
|
6
7
|
import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
|
|
7
8
|
import { WorksheetDetail } from '../../../entities'
|
|
9
|
+
import { fetchExecutingWorksheet } from '../../../utils'
|
|
8
10
|
|
|
9
11
|
export const pickingWorksheetResolver = {
|
|
10
12
|
async pickingWorksheet(_: any, { releaseGoodNo, locationSortingRules }, context: any) {
|
|
@@ -47,6 +49,7 @@ export const pickingWorksheetResolver = {
|
|
|
47
49
|
partnerDomainId: releaseGood.bizplace?.domain.id,
|
|
48
50
|
startedAt: worksheet.startedAt,
|
|
49
51
|
refNo: releaseGood.refNo,
|
|
52
|
+
refNo2: releaseGood.refNo2,
|
|
50
53
|
releaseGood
|
|
51
54
|
},
|
|
52
55
|
worksheetDetailInfos: worksheetDetails.map(async (pickingWSD: WorksheetDetail) => {
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import { MarketplaceOrder } from '@things-factory/marketplace-base'
|
|
2
|
-
import { OrderInventory, OrderProduct, OrderVas, ORDER_INVENTORY_STATUS } from '@things-factory/sales-base'
|
|
3
|
-
import { Domain } from '@things-factory/shell'
|
|
4
1
|
import { Equal, getRepository, Not } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { MarketplaceOrder, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
|
|
4
|
+
import { ORDER_INVENTORY_STATUS, OrderInventory, OrderProduct, OrderVas } from '@things-factory/sales-base'
|
|
5
|
+
import { Setting } from '@things-factory/setting-base'
|
|
6
|
+
import { Domain } from '@things-factory/shell'
|
|
7
|
+
|
|
5
8
|
import { WORKSHEET_TYPE } from '../../../constants'
|
|
6
9
|
import { Worksheet } from '../../../entities'
|
|
7
|
-
import { Setting } from '@things-factory/setting-base'
|
|
8
|
-
import orderBy from 'lodash/orderBy'
|
|
9
10
|
|
|
10
11
|
interface WorksheetInterface extends Worksheet {
|
|
11
12
|
orderProducts: OrderProduct[]
|
|
@@ -82,7 +83,6 @@ export const worksheetResolver = {
|
|
|
82
83
|
})
|
|
83
84
|
}
|
|
84
85
|
|
|
85
|
-
|
|
86
86
|
if (worksheet.type === WORKSHEET_TYPE.BATCH_PICKING) {
|
|
87
87
|
// let orderInventories: OrderInventory[] = await getRepository(OrderInventory).find({
|
|
88
88
|
// where: {
|
|
@@ -93,23 +93,24 @@ export const worksheetResolver = {
|
|
|
93
93
|
// relations: ['releaseGood', 'inventory', 'product', 'inventory.location', 'bizplace']
|
|
94
94
|
// })
|
|
95
95
|
|
|
96
|
-
let qbOrderInventories = getRepository(OrderInventory)
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
96
|
+
let qbOrderInventories = getRepository(OrderInventory)
|
|
97
|
+
.createQueryBuilder('oi')
|
|
98
|
+
.leftJoinAndSelect('oi.releaseGood', 'releaseGood')
|
|
99
|
+
.leftJoinAndSelect('oi.inventory', 'inventory')
|
|
100
|
+
.leftJoinAndSelect('oi.product', 'product')
|
|
101
|
+
.leftJoinAndSelect('inventory.location', 'location')
|
|
102
|
+
.leftJoinAndSelect('oi.bizplace', 'bizplace')
|
|
103
|
+
.where('"oi"."domain_id" = :domain')
|
|
104
|
+
.andWhere('"oi"."bizplace_id" = :bizplace')
|
|
105
|
+
.andWhere('"oi"."ref_worksheet_id" = :refWorksheetId')
|
|
106
|
+
.setParameters({
|
|
107
|
+
domain: domain.id,
|
|
108
|
+
bizplace: worksheet.bizplace.id,
|
|
109
|
+
refWorksheetId: worksheet.id
|
|
110
|
+
})
|
|
111
|
+
|
|
111
112
|
let sortingSetting: Setting = await pWorksheetPickingItemSorting
|
|
112
|
-
if(sortingSetting?.value){
|
|
113
|
+
if (sortingSetting?.value) {
|
|
113
114
|
let settingValue = JSON.parse(sortingSetting.value)
|
|
114
115
|
for (const key in settingValue) {
|
|
115
116
|
qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC')
|
|
@@ -131,25 +132,26 @@ export const worksheetResolver = {
|
|
|
131
132
|
// relations: ['product', 'inventory', 'inventory.location']
|
|
132
133
|
// })
|
|
133
134
|
|
|
134
|
-
let qbOrderInventories = getRepository(OrderInventory)
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
135
|
+
let qbOrderInventories = getRepository(OrderInventory)
|
|
136
|
+
.createQueryBuilder('oi')
|
|
137
|
+
.leftJoinAndSelect('oi.releaseGood', 'releaseGood')
|
|
138
|
+
.leftJoinAndSelect('oi.inventory', 'inventory')
|
|
139
|
+
.leftJoinAndSelect('oi.product', 'product')
|
|
140
|
+
.leftJoinAndSelect('inventory.location', 'location')
|
|
141
|
+
.leftJoinAndSelect('oi.bizplace', 'bizplace')
|
|
142
|
+
.where('"oi"."domain_id" = :domain')
|
|
143
|
+
.andWhere('"oi"."bizplace_id" = :bizplace')
|
|
144
|
+
.andWhere('"oi"."release_good_id" = :releaseGood')
|
|
145
|
+
.andWhere('"oi"."status" != :status')
|
|
146
|
+
.setParameters({
|
|
147
|
+
domain: domain.id,
|
|
148
|
+
bizplace: worksheet.bizplace.id,
|
|
149
|
+
releaseGood: worksheet.releaseGood.id,
|
|
150
|
+
status: ORDER_INVENTORY_STATUS.CANCELLED
|
|
151
|
+
})
|
|
150
152
|
|
|
151
153
|
let sortingSetting: Setting = await pWorksheetPickingItemSorting
|
|
152
|
-
if(sortingSetting?.value){
|
|
154
|
+
if (sortingSetting?.value) {
|
|
153
155
|
let settingValue = JSON.parse(sortingSetting.value)
|
|
154
156
|
for (const key in settingValue) {
|
|
155
157
|
qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC')
|
|
@@ -159,10 +161,32 @@ export const worksheetResolver = {
|
|
|
159
161
|
let orderInventories: OrderInventory[] = await qbOrderInventories.getMany()
|
|
160
162
|
worksheet.orderInventories = orderInventories
|
|
161
163
|
|
|
162
|
-
worksheet.
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
164
|
+
if (worksheet.releaseGood.type == 'b2c') {
|
|
165
|
+
worksheet.marketplaceOrder = await getRepository(MarketplaceOrder).findOne({
|
|
166
|
+
where: { orderNo: worksheet.releaseGood.refNo },
|
|
167
|
+
relations: ['marketplaceOrderItems', 'marketplaceStore']
|
|
168
|
+
})
|
|
169
|
+
|
|
170
|
+
if (worksheet.marketplaceOrder) {
|
|
171
|
+
let marketplaceOrderShipping: MarketplaceOrderShipping
|
|
172
|
+
if (worksheet.marketplaceOrder.isSplitted) {
|
|
173
|
+
marketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).findOne({
|
|
174
|
+
where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
|
|
175
|
+
})
|
|
176
|
+
} else {
|
|
177
|
+
marketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).findOne({
|
|
178
|
+
where: { orderNoRef: worksheet.releaseGood.refNo }
|
|
179
|
+
})
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
worksheet.marketplaceOrder.trackingNo = marketplaceOrderShipping.ownTrackingNo
|
|
183
|
+
? marketplaceOrderShipping.ownTrackingNo
|
|
184
|
+
: marketplaceOrderShipping.trackingNo
|
|
185
|
+
worksheet.marketplaceOrder.shippingProvider = marketplaceOrderShipping.ownTransporter
|
|
186
|
+
? marketplaceOrderShipping.ownTransporter
|
|
187
|
+
: marketplaceOrderShipping.transporter
|
|
188
|
+
}
|
|
189
|
+
}
|
|
166
190
|
|
|
167
191
|
worksheet.orderVass = await getRepository(OrderVas).find({
|
|
168
192
|
where: {
|