@things-factory/worksheet-base 4.3.78 → 4.3.79-alpha.0
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/graphql/resolvers/worksheet/loading/complete-loading.js +67 -28
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/activate-packing.js +23 -8
- package/dist-server/graphql/resolvers/worksheet/packing/activate-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js +30 -7
- package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/packing.js +23 -8
- package/dist-server/graphql/resolvers/worksheet/packing/packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js +25 -8
- package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +59 -12
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/activate-picking.js +51 -25
- package/dist-server/graphql/resolvers/worksheet/picking/activate-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js +2 -2
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +262 -118
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/putaway/complete-putaway.js +39 -14
- package/dist-server/graphql/resolvers/worksheet/putaway/complete-putaway.js.map +1 -1
- package/package.json +17 -17
- package/server/graphql/resolvers/worksheet/loading/complete-loading.ts +77 -33
- package/server/graphql/resolvers/worksheet/packing/activate-packing.ts +26 -9
- package/server/graphql/resolvers/worksheet/packing/complete-packing.ts +34 -9
- package/server/graphql/resolvers/worksheet/packing/packing.ts +26 -9
- package/server/graphql/resolvers/worksheet/packing/scan-product-packing.ts +28 -9
- package/server/graphql/resolvers/worksheet/packing-worksheet.ts +68 -13
- package/server/graphql/resolvers/worksheet/picking/activate-picking.ts +60 -30
- package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts +2 -2
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +288 -130
- package/server/graphql/resolvers/worksheet/putaway/complete-putaway.ts +45 -15
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createReturnWorksheet = exports.completeLoading = exports.completeLoadingResolver = void 0;
|
|
4
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
4
5
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
5
6
|
const integration_fulfillment_1 = require("@things-factory/integration-fulfillment");
|
|
6
7
|
const integration_sftp_1 = require("@things-factory/integration-sftp");
|
|
@@ -39,37 +40,75 @@ async function completeLoading(tx, domain, user, releaseGoodNo) {
|
|
|
39
40
|
.find({ where: { company: warehouseCompany }, relations: ['domain'] });
|
|
40
41
|
const warehouseCompanyBizplaces = warehouseBizplaces.filter(biz => biz.domain.extType == 'company');
|
|
41
42
|
const warehouseCompanyDomain = warehouseCompanyBizplaces[0].domain;
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
.
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
let inventoryItems = await tx.getRepository(warehouse_base_1.InventoryItem).find({
|
|
53
|
-
where: { domain, outboundOrderId: releaseGood.id }
|
|
54
|
-
});
|
|
55
|
-
// if (responseFileTypes.enableShipment) {
|
|
56
|
-
// let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
|
|
57
|
-
// releaseGood,
|
|
58
|
-
// orderInventories: targetInventories,
|
|
59
|
-
// sftp: customerAvailableSftp
|
|
60
|
-
// })
|
|
61
|
-
// customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
|
|
62
|
-
// }
|
|
63
|
-
if (responseFileTypes.enableSerialNumber) {
|
|
64
|
-
let snResult = await integration_sftp_1.SftpAPI.createSerialNumber(customerAvailableSftp, {
|
|
65
|
-
releaseGood,
|
|
66
|
-
inventoryItems,
|
|
67
|
-
sftp: customerAvailableSftp
|
|
43
|
+
const orderSource = releaseGood.source;
|
|
44
|
+
switch (orderSource) {
|
|
45
|
+
case auth_base_1.ApplicationType.SFTP:
|
|
46
|
+
const customerDomain = releaseGood.bizplace.domain;
|
|
47
|
+
const fulfillmentCenter = await tx
|
|
48
|
+
.getRepository(integration_fulfillment_1.FulfillmentCenter)
|
|
49
|
+
.findOne({ domain: warehouseCompanyDomain, centerId: domain.subdomain, status: 'active' });
|
|
50
|
+
if (fulfillmentCenter) {
|
|
51
|
+
let customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).findOne({
|
|
52
|
+
where: { domain: customerDomain, status: 'ACTIVE', fulfillmentCenter }
|
|
68
53
|
});
|
|
69
|
-
|
|
54
|
+
if (customerAvailableSftp) {
|
|
55
|
+
const responseFileTypes = JSON.parse(customerAvailableSftp.responseFileTypes);
|
|
56
|
+
let inventoryItems = await tx.getRepository(warehouse_base_1.InventoryItem).find({
|
|
57
|
+
where: { domain, outboundOrderId: releaseGood.id }
|
|
58
|
+
});
|
|
59
|
+
// if (responseFileTypes.enableShipment) {
|
|
60
|
+
// let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
|
|
61
|
+
// releaseGood,
|
|
62
|
+
// orderInventories: targetInventories,
|
|
63
|
+
// sftp: customerAvailableSftp
|
|
64
|
+
// })
|
|
65
|
+
// customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
|
|
66
|
+
// }
|
|
67
|
+
if (responseFileTypes.enableSerialNumber) {
|
|
68
|
+
let snResult = await integration_sftp_1.SftpAPI.createSerialNumber(customerAvailableSftp, {
|
|
69
|
+
releaseGood,
|
|
70
|
+
inventoryItems,
|
|
71
|
+
sftp: customerAvailableSftp
|
|
72
|
+
});
|
|
73
|
+
customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).save(snResult);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
70
76
|
}
|
|
71
|
-
|
|
77
|
+
break;
|
|
78
|
+
default:
|
|
79
|
+
break;
|
|
72
80
|
}
|
|
81
|
+
// const customerDomain: Domain = releaseGood.bizplace.domain
|
|
82
|
+
// const fulfillmentCenter: FulfillmentCenter = await tx
|
|
83
|
+
// .getRepository(FulfillmentCenter)
|
|
84
|
+
// .findOne({ domain: warehouseCompanyDomain, centerId: domain.subdomain, status: 'active' })
|
|
85
|
+
// if (fulfillmentCenter) {
|
|
86
|
+
// let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
|
|
87
|
+
// where: { domain: customerDomain, status: 'ACTIVE', fulfillmentCenter }
|
|
88
|
+
// })
|
|
89
|
+
// if (customerAvailableSftp) {
|
|
90
|
+
// const responseFileTypes: any = JSON.parse(customerAvailableSftp.responseFileTypes)
|
|
91
|
+
// let inventoryItems: InventoryItem[] = await tx.getRepository(InventoryItem).find({
|
|
92
|
+
// where: { domain, outboundOrderId: releaseGood.id }
|
|
93
|
+
// })
|
|
94
|
+
// // if (responseFileTypes.enableShipment) {
|
|
95
|
+
// // let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
|
|
96
|
+
// // releaseGood,
|
|
97
|
+
// // orderInventories: targetInventories,
|
|
98
|
+
// // sftp: customerAvailableSftp
|
|
99
|
+
// // })
|
|
100
|
+
// // customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
|
|
101
|
+
// // }
|
|
102
|
+
// if (responseFileTypes.enableSerialNumber) {
|
|
103
|
+
// let snResult: Sftp = await SftpAPI.createSerialNumber(customerAvailableSftp, {
|
|
104
|
+
// releaseGood,
|
|
105
|
+
// inventoryItems,
|
|
106
|
+
// sftp: customerAvailableSftp
|
|
107
|
+
// })
|
|
108
|
+
// customerAvailableSftp = await tx.getRepository(Sftp).save(snResult)
|
|
109
|
+
// }
|
|
110
|
+
// }
|
|
111
|
+
// }
|
|
73
112
|
await worksheetController.completeLoading(releaseGoodNo);
|
|
74
113
|
if (remainInventories.length) {
|
|
75
114
|
await createReturnWorksheet(tx, domain, user, releaseGoodNo, remainInventories);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-loading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/loading/complete-loading.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"complete-loading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/loading/complete-loading.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.activatePacking = exports.activatePackingResolver = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
5
6
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
6
7
|
const controllers_1 = require("../../../../controllers");
|
|
7
8
|
exports.activatePackingResolver = {
|
|
@@ -24,15 +25,29 @@ async function activatePacking(tx, domain, user, worksheetNo) {
|
|
|
24
25
|
const worksheetController = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
25
26
|
const worksheet = await worksheetController.activatePacking(worksheetNo);
|
|
26
27
|
let releaseGood = worksheet.releaseGood;
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
28
|
+
const orderSource = releaseGood.source;
|
|
29
|
+
switch (orderSource) {
|
|
30
|
+
case auth_base_1.ApplicationType.SELLERCRAFT:
|
|
31
|
+
const sellercraft = await tx
|
|
32
|
+
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
33
|
+
.findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
34
|
+
if (sellercraft) {
|
|
35
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
36
|
+
sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood);
|
|
37
|
+
}
|
|
38
|
+
break;
|
|
39
|
+
default:
|
|
40
|
+
break;
|
|
35
41
|
}
|
|
42
|
+
// if (releaseGood.type == 'b2c') {
|
|
43
|
+
// const sellercraft: Sellercraft = await tx
|
|
44
|
+
// .getRepository(Sellercraft)
|
|
45
|
+
// .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
|
|
46
|
+
// if (sellercraft) {
|
|
47
|
+
// const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
48
|
+
// sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
|
|
49
|
+
// }
|
|
50
|
+
// }
|
|
36
51
|
return worksheet;
|
|
37
52
|
}
|
|
38
53
|
exports.activatePacking = activatePacking;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activate-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/activate-packing.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;
|
|
1
|
+
{"version":3,"file":"activate-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/activate-packing.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AAEnD,yDAAiE;AACjE,qFAAwF;AAIxF,yDAA2F;AAG9E,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,EAAE,WAAW,EAAE,EAAE,OAAY;QACzD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;QAEtE,IAAI,kBAAkB,GAAG,EAAE,CAAA;QAE3B,MAAM,OAAO,CAAC,GAAG,CACf,WAAW,CAAC,GAAG,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;YAC3B,IAAI;gBACF,MAAM,IAAA,oBAAU,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;oBAC3C,IAAI,MAAM,GAAG,MAAM,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;oBAC7D,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gBACjC,CAAC,CAAC,CAAA;aACH;YAAC,OAAO,KAAK,EAAE,GAAE;QACpB,CAAC,CAAC,CACH,CAAA;QACD,OAAO,kBAAkB,CAAA;IAC3B,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,IAAI,WAAW,GAAgB,SAAS,CAAC,WAAW,CAAA;IAEpD,MAAM,WAAW,GAAW,WAAW,CAAC,MAAM,CAAA;IAC9C,QAAQ,WAAW,EAAE;QACnB,KAAK,2BAAe,CAAC,WAAW;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,WAAW,EAAE;gBACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;gBAC1F,eAAe,CAAC,qBAAqB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;aAChE;YACD,MAAK;QAEP;YACE,MAAK;KACR;IAED,mCAAmC;IACnC,8CAA8C;IAC9C,kCAAkC;IAClC,0FAA0F;IAE1F,uBAAuB;IACvB,iGAAiG;IACjG,sEAAsE;IACtE,MAAM;IACN,IAAI;IACJ,OAAO,SAAS,CAAA;AAClB,CAAC;AAtCD,0CAsCC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.completePacking = exports.completePackingResolver = void 0;
|
|
4
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
4
5
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
5
|
-
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
6
6
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
7
7
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
8
8
|
const controllers_1 = require("../../../../controllers/");
|
|
@@ -23,11 +23,9 @@ exports.completePackingResolver = {
|
|
|
23
23
|
'orderInventories.product'
|
|
24
24
|
]
|
|
25
25
|
});
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
.findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
30
|
-
if (!sellercraft) {
|
|
26
|
+
const orderSource = releaseGood.source;
|
|
27
|
+
switch (orderSource) {
|
|
28
|
+
case auth_base_1.ApplicationType.MMS:
|
|
31
29
|
const companyDomain = releaseGood.bizplace.company.domain;
|
|
32
30
|
const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
33
31
|
where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
@@ -44,8 +42,33 @@ exports.completePackingResolver = {
|
|
|
44
42
|
const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
|
|
45
43
|
await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain);
|
|
46
44
|
}
|
|
47
|
-
|
|
45
|
+
break;
|
|
46
|
+
default:
|
|
47
|
+
break;
|
|
48
48
|
}
|
|
49
|
+
// if (releaseGood.type === 'b2c') {
|
|
50
|
+
// const sellercraft: Sellercraft = await tx
|
|
51
|
+
// .getRepository(Sellercraft)
|
|
52
|
+
// .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
|
|
53
|
+
// if (!sellercraft) {
|
|
54
|
+
// const companyDomain: Domain = releaseGood.bizplace.company.domain
|
|
55
|
+
// const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
|
|
56
|
+
// where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
57
|
+
// relations: [
|
|
58
|
+
// 'marketplaceOrderItems',
|
|
59
|
+
// 'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
60
|
+
// 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
|
|
61
|
+
// 'marketplaceStore',
|
|
62
|
+
// 'marketplaceStore.marketplaceDistributors'
|
|
63
|
+
// ]
|
|
64
|
+
// })
|
|
65
|
+
// const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
|
|
66
|
+
// if (marketplaceStore.isAutoUpdateShipment) {
|
|
67
|
+
// const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
|
|
68
|
+
// await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain)
|
|
69
|
+
// }
|
|
70
|
+
// }
|
|
71
|
+
// }
|
|
49
72
|
const bizplace = await (0, biz_base_1.getMyBizplace)(domain, user);
|
|
50
73
|
const worksheetController = new worksheet_controller_1.WorksheetController(tx, domain, user);
|
|
51
74
|
await worksheetController.notifyToCustomer(bizplace, {
|
|
@@ -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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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.packing = exports.packingResolver = void 0;
|
|
4
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
4
5
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
5
6
|
const controllers_1 = require("../../../../controllers");
|
|
6
7
|
exports.packingResolver = {
|
|
@@ -14,15 +15,29 @@ async function packing(tx, domain, user, worksheetDetailName, releaseQty, serial
|
|
|
14
15
|
const worksheetDetail = await worksheetController.packing(worksheetDetailName, releaseQty, serialNumber);
|
|
15
16
|
let releaseGood = worksheetDetail.targetInventory.releaseGood;
|
|
16
17
|
const worksheet = worksheetDetail.worksheet;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
18
|
+
const orderSource = releaseGood.source;
|
|
19
|
+
switch (orderSource) {
|
|
20
|
+
case auth_base_1.ApplicationType.SELLERCRAFT:
|
|
21
|
+
const sellercraft = await tx
|
|
22
|
+
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
23
|
+
.findOne({ domain: worksheet.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
24
|
+
if (sellercraft) {
|
|
25
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
26
|
+
await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood);
|
|
27
|
+
}
|
|
28
|
+
break;
|
|
29
|
+
default:
|
|
30
|
+
break;
|
|
25
31
|
}
|
|
32
|
+
// if (releaseGood.type === 'b2c' && !releaseGood?.airwayBill) {
|
|
33
|
+
// const sellercraft: Sellercraft = await tx
|
|
34
|
+
// .getRepository(Sellercraft)
|
|
35
|
+
// .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
|
|
36
|
+
// if (sellercraft) {
|
|
37
|
+
// const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
38
|
+
// await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
|
|
39
|
+
// }
|
|
40
|
+
// }
|
|
26
41
|
}
|
|
27
42
|
exports.packing = packing;
|
|
28
43
|
//# sourceMappingURL=packing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/packing.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/packing.ts"],"names":[],"mappings":";;;AAEA,yDAAiE;AACjE,qFAAwF;AAIxF,yDAA2F;AAG9E,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,OAAY;QACnF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;IAChF,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAC3B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,UAAkB,EAClB,YAAoB;IAEpB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,mBAAmB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;IAExG,IAAI,WAAW,GAAgB,eAAe,CAAC,eAAe,CAAC,WAAW,CAAA;IAC1E,MAAM,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;IAEtD,MAAM,WAAW,GAAW,WAAW,CAAC,MAAM,CAAA;IAC9C,QAAQ,WAAW,EAAE;QACnB,KAAK,2BAAe,CAAC,WAAW;YAC9B,MAAM,WAAW,GAAgB,MAAM,EAAE;iBACtC,aAAa,CAAC,qCAAW,CAAC;iBAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;YAEnF,IAAI,WAAW,EAAE;gBACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;gBAC1F,MAAM,eAAe,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;aACnE;YACD,MAAK;QAEP;YACE,MAAK;KACR;IAED,gEAAgE;IAChE,8CAA8C;IAC9C,kCAAkC;IAClC,wFAAwF;IAExF,uBAAuB;IACvB,iGAAiG;IACjG,yEAAyE;IACzE,MAAM;IACN,IAAI;AACN,CAAC;AAzCD,0BAyCC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.scanProductPacking = exports.scanProductPackingResolver = void 0;
|
|
4
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
4
5
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
5
6
|
const controllers_1 = require("../../../../controllers");
|
|
6
7
|
exports.scanProductPackingResolver = {
|
|
@@ -15,15 +16,31 @@ async function scanProductPacking(tx, domain, user, worksheetDetailName, product
|
|
|
15
16
|
const worksheetDetail = await worksheetController.scanProductPacking(worksheetDetailName, productBarcode, serialNumber);
|
|
16
17
|
let releaseGood = worksheetDetail.targetInventory.releaseGood;
|
|
17
18
|
const worksheet = worksheetDetail.worksheet;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
19
|
+
const orderSource = releaseGood.source;
|
|
20
|
+
switch (orderSource) {
|
|
21
|
+
case auth_base_1.ApplicationType.SELLERCRAFT:
|
|
22
|
+
if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill)) {
|
|
23
|
+
const sellercraft = await tx
|
|
24
|
+
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
25
|
+
.findOne({ domain: worksheet.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
26
|
+
if (sellercraft) {
|
|
27
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
28
|
+
sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
break;
|
|
32
|
+
default:
|
|
33
|
+
break;
|
|
26
34
|
}
|
|
35
|
+
// if (releaseGood.type === 'b2c' && !releaseGood?.airwayBill) {
|
|
36
|
+
// const sellercraft: Sellercraft = await tx
|
|
37
|
+
// .getRepository(Sellercraft)
|
|
38
|
+
// .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
|
|
39
|
+
// if (sellercraft) {
|
|
40
|
+
// const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
41
|
+
// sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
|
|
42
|
+
// }
|
|
43
|
+
// }
|
|
27
44
|
}
|
|
28
45
|
catch (error) {
|
|
29
46
|
throw error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan-product-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/scan-product-packing.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"scan-product-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/scan-product-packing.ts"],"names":[],"mappings":";;;AAEA,yDAAiE;AACjE,qFAAwF;AAIxF,yDAA2F;AAG9E,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,OAAY;QAClG,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAA;IAC/F,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CACtC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,cAAsB,EACtB,YAAqB;IAErB,IAAI;QACF,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QACxG,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,kBAAkB,CAClE,mBAAmB,EACnB,cAAc,EACd,YAAY,CACb,CAAA;QAED,IAAI,WAAW,GAAgB,eAAe,CAAC,eAAe,CAAC,WAAW,CAAA;QAC1E,MAAM,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;QAEtD,MAAM,WAAW,GAAW,WAAW,CAAC,MAAM,CAAA;QAC9C,QAAQ,WAAW,EAAE;YACnB,KAAK,2BAAe,CAAC,WAAW;gBAC9B,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAA,EAAE;oBAC5B,MAAM,WAAW,GAAgB,MAAM,EAAE;yBACtC,aAAa,CAAC,qCAAW,CAAC;yBAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;oBAEnF,IAAI,WAAW,EAAE;wBACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;wBAC1F,eAAe,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;qBAC7D;iBACF;gBAED,MAAK;YAEP;gBACE,MAAK;SACR;QAED,gEAAgE;QAChE,8CAA8C;QAC9C,kCAAkC;QAClC,wFAAwF;QAExF,uBAAuB;QACvB,iGAAiG;QACjG,mEAAmE;QACnE,MAAM;QACN,IAAI;KACL;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,KAAK,CAAA;KACZ;AACH,CAAC;AApDD,gDAoDC"}
|
|
@@ -2,15 +2,16 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getTrackingNo = exports.packingWorksheetResolver = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
5
6
|
const env_1 = require("@things-factory/env");
|
|
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");
|
|
10
|
+
const setting_base_1 = require("@things-factory/setting-base");
|
|
9
11
|
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
10
12
|
const constants_1 = require("../../../constants");
|
|
11
13
|
const controllers_1 = require("../../../controllers");
|
|
12
14
|
const utils_1 = require("../../../utils");
|
|
13
|
-
const setting_base_1 = require("@things-factory/setting-base");
|
|
14
15
|
exports.packingWorksheetResolver = {
|
|
15
16
|
async packingWorksheet(_, { releaseGoodNo }, context) {
|
|
16
17
|
var _a, _b, _c, _d;
|
|
@@ -117,16 +118,18 @@ exports.packingWorksheetResolver = {
|
|
|
117
118
|
let trackingNo;
|
|
118
119
|
let shippingProvider;
|
|
119
120
|
let marketplaceStatus;
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
121
|
+
const orderSource = releaseGood.source;
|
|
122
|
+
switch (orderSource) {
|
|
123
|
+
case auth_base_1.ApplicationType.SELLERCRAFT:
|
|
124
|
+
const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
|
|
125
|
+
domain: worksheet.bizplace.domain,
|
|
126
|
+
status: integration_sellercraft_1.SellercraftStatus.ACTIVE
|
|
127
|
+
});
|
|
128
|
+
if (sellercraft) {
|
|
129
|
+
getSellercraftDocument(sellercraft, releaseGood, domain, user);
|
|
130
|
+
}
|
|
131
|
+
break;
|
|
132
|
+
case auth_base_1.ApplicationType.MMS:
|
|
130
133
|
marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
131
134
|
where: { orderNo: releaseGood.refNo },
|
|
132
135
|
relations: [
|
|
@@ -159,8 +162,52 @@ exports.packingWorksheetResolver = {
|
|
|
159
162
|
: marketplaceOrderShipping.transporter;
|
|
160
163
|
marketplaceStore = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore;
|
|
161
164
|
marketplaceStatus = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.status;
|
|
162
|
-
|
|
165
|
+
break;
|
|
166
|
+
default:
|
|
167
|
+
break;
|
|
163
168
|
}
|
|
169
|
+
// if (releaseGood.type === 'b2c') {
|
|
170
|
+
// const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
|
|
171
|
+
// domain: worksheet.bizplace.domain,
|
|
172
|
+
// status: SellercraftStatus.ACTIVE
|
|
173
|
+
// })
|
|
174
|
+
// if (sellercraft) {
|
|
175
|
+
// // asynchronously get document from sellercraft
|
|
176
|
+
// getSellercraftDocument(sellercraft, releaseGood, domain, user)
|
|
177
|
+
// } else {
|
|
178
|
+
// marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
|
|
179
|
+
// where: { orderNo: releaseGood.refNo },
|
|
180
|
+
// relations: [
|
|
181
|
+
// 'domain',
|
|
182
|
+
// 'marketplaceStore',
|
|
183
|
+
// 'marketplaceOrderItems',
|
|
184
|
+
// 'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
185
|
+
// 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
|
|
186
|
+
// ]
|
|
187
|
+
// })
|
|
188
|
+
// if (!marketplaceOrder) {
|
|
189
|
+
// throw new Error('Failed to retrieve ecommerce information, kindly contact our support team for this issue.')
|
|
190
|
+
// }
|
|
191
|
+
// let marketplaceOrderShipping: MarketplaceOrderShipping
|
|
192
|
+
// if (marketplaceOrder.isSplitted) {
|
|
193
|
+
// marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
|
|
194
|
+
// where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
|
|
195
|
+
// })
|
|
196
|
+
// } else {
|
|
197
|
+
// marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
|
|
198
|
+
// where: { orderNoRef: worksheet.releaseGood.refNo }
|
|
199
|
+
// })
|
|
200
|
+
// }
|
|
201
|
+
// trackingNo = marketplaceOrderShipping.ownTrackingNo
|
|
202
|
+
// ? marketplaceOrderShipping.ownTrackingNo
|
|
203
|
+
// : marketplaceOrderShipping.trackingNo
|
|
204
|
+
// shippingProvider = marketplaceOrderShipping.ownTransporter
|
|
205
|
+
// ? marketplaceOrderShipping.ownTransporter
|
|
206
|
+
// : marketplaceOrderShipping.transporter
|
|
207
|
+
// marketplaceStore = marketplaceOrder?.marketplaceStore
|
|
208
|
+
// marketplaceStatus = marketplaceOrder?.status
|
|
209
|
+
// }
|
|
210
|
+
// }
|
|
164
211
|
return {
|
|
165
212
|
worksheetInfo: {
|
|
166
213
|
releaseGood,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAAuE;
|
|
1
|
+
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":"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"}
|