@things-factory/operato-hub 3.8.12 → 3.8.21
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/client/pages/sellercraft/sellercraft-store-setting.js +4 -1
- package/dist-server/controllers/bizplace-initializer/dataset/settings.js +5 -0
- package/dist-server/controllers/bizplace-initializer/dataset/settings.js.map +1 -1
- package/dist-server/graphql/resolvers/synchronization/sync-products-to-sellercraft.js +28 -34
- package/dist-server/graphql/resolvers/synchronization/sync-products-to-sellercraft.js.map +1 -1
- package/dist-server/routers/api/restful-apis/unstable/add-products.js +1 -1
- package/dist-server/routers/api/restful-apis/unstable/get-release-order-list.js +12 -16
- package/dist-server/routers/api/restful-apis/unstable/get-release-order-list.js.map +1 -1
- package/dist-server/routers/api/restful-apis/v1/add-products.js +1 -1
- package/dist-server/routers/api/restful-apis/v2/add-products.js +1 -1
- package/package.json +13 -13
- package/server/controllers/bizplace-initializer/dataset/settings.ts +5 -0
- package/server/graphql/resolvers/synchronization/sync-products-to-sellercraft.ts +34 -40
- package/server/routers/api/restful-apis/unstable/add-products.ts +1 -1
- package/server/routers/api/restful-apis/unstable/get-release-order-list.ts +14 -11
- package/server/routers/api/restful-apis/v1/add-products.ts +1 -1
- package/server/routers/api/restful-apis/v2/add-products.ts +1 -1
|
@@ -255,7 +255,10 @@ class SellercraftStoreSetting extends connect(store)(localize(i18next)(PageView)
|
|
|
255
255
|
syncProductsToSellercraft(sellercraftId: $sellercraftId, fulfillmentCenterId: $fulfillmentCenterId)
|
|
256
256
|
}
|
|
257
257
|
`,
|
|
258
|
-
variables: {
|
|
258
|
+
variables: {
|
|
259
|
+
sellercraftId: this.id,
|
|
260
|
+
fulfillmentCenterId: this.warehouseId
|
|
261
|
+
}
|
|
259
262
|
})
|
|
260
263
|
|
|
261
264
|
if (!response.errors) {
|
|
@@ -37,6 +37,11 @@ exports.SETTINGS = {
|
|
|
37
37
|
description: 'enable and disable the use of product barcode scanning',
|
|
38
38
|
category: 'id-rule'
|
|
39
39
|
},
|
|
40
|
+
{
|
|
41
|
+
name: 'batch-picking-limit',
|
|
42
|
+
description: 'maximum order per batch picking limit',
|
|
43
|
+
category: 'id-rule'
|
|
44
|
+
},
|
|
40
45
|
{
|
|
41
46
|
name: 'enable-carton-label',
|
|
42
47
|
description: 'enable and disable the use of using carton label',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../server/controllers/bizplace-initializer/dataset/settings.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../server/controllers/bizplace-initializer/dataset/settings.ts"],"names":[],"mappings":";;;AAAa,QAAA,QAAQ,GAAG;IACtB,SAAS,EAAE;QACT,EAAE,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,OAAO,EAAE;QACpF,EAAE,IAAI,EAAE,wBAAwB,EAAE,WAAW,EAAE,4BAA4B,EAAE,QAAQ,EAAE,OAAO,EAAE;QAChG,EAAE,IAAI,EAAE,wBAAwB,EAAE,WAAW,EAAE,2BAA2B,EAAE,QAAQ,EAAE,OAAO,EAAE;QAC/F,EAAE,IAAI,EAAE,uBAAuB,EAAE,WAAW,EAAE,2BAA2B,EAAE,QAAQ,EAAE,OAAO,EAAE;QAC9F,EAAE,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,6BAA6B,EAAE,QAAQ,EAAE,OAAO,EAAE;QACzF,EAAE,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,2BAA2B,EAAE,QAAQ,EAAE,OAAO,EAAE;QACrF,EAAE,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,2BAA2B,EAAE,QAAQ,EAAE,OAAO,EAAE;QACrF,EAAE,IAAI,EAAE,sBAAsB,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,UAAU,EAAE;QAC7F,EAAE,IAAI,EAAE,6BAA6B,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,UAAU,EAAE;QACpG,EAAE,IAAI,EAAE,+BAA+B,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,UAAU,EAAE;QACtG,EAAE,IAAI,EAAE,0BAA0B,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,UAAU,EAAE;QACjG;YACE,IAAI,EAAE,uCAAuC;YAC7C,WAAW,EAAE,qDAAqD;YAClE,QAAQ,EAAE,UAAU;SACrB;QACD,EAAE,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,gBAAgB,EAAE,QAAQ,EAAE,SAAS,EAAE;QAC9E,EAAE,IAAI,EAAE,2BAA2B,EAAE,WAAW,EAAE,yCAAyC,EAAE,QAAQ,EAAE,SAAS,EAAE;QAClH,EAAE,IAAI,EAAE,wBAAwB,EAAE,WAAW,EAAE,4BAA4B,EAAE,QAAQ,EAAE,SAAS,EAAE;QAClG,EAAE,IAAI,EAAE,oBAAoB,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,SAAS,EAAE;QAC1F,EAAE,IAAI,EAAE,wCAAwC,EAAE,WAAW,EAAE,4BAA4B,EAAE,QAAQ,EAAE,SAAS,EAAE;QAClH,EAAE,IAAI,EAAE,+BAA+B,EAAE,WAAW,EAAE,qBAAqB,EAAE,QAAQ,EAAE,SAAS,EAAE;QAClG,EAAE,IAAI,EAAE,iBAAiB,EAAE,WAAW,EAAE,2BAA2B,EAAE,QAAQ,EAAE,SAAS,EAAE;QAC1F;YACE,IAAI,EAAE,yBAAyB;YAC/B,WAAW,EAAE,6CAA6C;YAC1D,QAAQ,EAAE,SAAS;SACpB;QACD,EAAE,IAAI,EAAE,oBAAoB,EAAE,WAAW,EAAE,8CAA8C,EAAE,QAAQ,EAAE,SAAS,EAAE;QAChH;YACE,IAAI,EAAE,yBAAyB;YAC/B,WAAW,EAAE,wDAAwD;YACrE,QAAQ,EAAE,SAAS;SACpB;QACD;YACE,IAAI,EAAE,qBAAqB;YAC3B,WAAW,EAAE,uCAAuC;YACpD,QAAQ,EAAE,SAAS;SACpB;QACD;YACE,IAAI,EAAE,qBAAqB;YAC3B,WAAW,EAAE,kDAAkD;YAC/D,QAAQ,EAAE,SAAS;SACpB;QACD;YACE,IAAI,EAAE,qCAAqC;YAC3C,WAAW,EAAE,2FAA2F;YACxG,QAAQ,EAAE,SAAS;SACpB;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,WAAW,EAAE,kFAAkF;YAC/F,QAAQ,EAAE,SAAS;SACpB;QACD;YACE,IAAI,EAAE,sBAAsB;YAC5B,WAAW,EAAE,kCAAkC;YAC/C,QAAQ,EAAE,SAAS;SACpB;QACD;YACE,IAAI,EAAE,0CAA0C;YAChD,WAAW,EAAE,2GAA2G;YACxH,QAAQ,EAAE,SAAS;SACpB;KACF;IACD,MAAM,EAAE,EAAE;CACX,CAAA"}
|
|
@@ -5,70 +5,64 @@ const biz_base_1 = require("@things-factory/biz-base");
|
|
|
5
5
|
const integration_fulfillment_1 = require("@things-factory/integration-fulfillment");
|
|
6
6
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
7
7
|
const product_base_1 = require("@things-factory/product-base");
|
|
8
|
-
const utils_1 = require("../../../utils");
|
|
9
8
|
exports.syncProductsToSellercraftResolver = {
|
|
10
9
|
async syncProductsToSellercraft(_, { sellercraftId, fulfillmentCenterId }, context) {
|
|
11
10
|
const { domain, tx } = context.state;
|
|
12
11
|
let page = 1;
|
|
13
12
|
let hasMorePage = true;
|
|
14
|
-
const limit =
|
|
13
|
+
const limit = 10;
|
|
15
14
|
const sellercraft = await tx
|
|
16
15
|
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
17
16
|
.findOne({ where: { id: sellercraftId }, relations: ['domain'] });
|
|
18
17
|
const customerDomain = sellercraft.domain;
|
|
19
18
|
const fulfilmentCenter = await integration_fulfillment_1.FulfillmentAPI.getFulfillmentCenter(fulfillmentCenterId);
|
|
20
19
|
const customerBizplace = await tx.getRepository(biz_base_1.Bizplace).findOne({ where: { domain: customerDomain } });
|
|
21
|
-
let sellercraftOPs = [];
|
|
22
20
|
while (hasMorePage) {
|
|
23
21
|
const { items, total } = await integration_fulfillment_1.FulfillmentAPI.getInventoryProductGroup(fulfilmentCenter, {
|
|
24
22
|
warehouseId: customerBizplace.id,
|
|
25
23
|
paginationEntriesPerPage: limit,
|
|
26
24
|
paginationOffset: page
|
|
27
25
|
});
|
|
26
|
+
let sellercraftInv = [];
|
|
28
27
|
await Promise.all(items.map(async (item) => {
|
|
29
28
|
const product = await tx.getRepository(product_base_1.Product).findOne({
|
|
30
29
|
where: { domain, sku: item.productSKU },
|
|
31
30
|
relations: ['productDetails', 'productDetails.childProductDetail']
|
|
32
31
|
});
|
|
33
32
|
const productDetails = product.productDetails;
|
|
34
|
-
const inventoryPackingType = item.packingType
|
|
35
|
-
const defaultProductDetail =
|
|
33
|
+
// const inventoryPackingType: string = item.packingType
|
|
34
|
+
const defaultProductDetail = productDetails.find(productDetail => productDetail.isDefault);
|
|
36
35
|
let packingSize = 1;
|
|
37
|
-
if (inventoryPackingType !== defaultProductDetail.packingType) {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
36
|
+
// if (inventoryPackingType !== defaultProductDetail.packingType) {
|
|
37
|
+
// const unmatchingProductDetail: ProductDetail = product.productDetails.find(
|
|
38
|
+
// productDetail => productDetail.packingType === inventoryPackingType
|
|
39
|
+
// )
|
|
40
|
+
// packingSize = await getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail)
|
|
41
|
+
// }
|
|
42
|
+
sellercraftInv.push({
|
|
42
43
|
sku: item.productSKU,
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
length: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
|
|
54
|
-
width: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
|
|
55
|
-
height: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
|
|
44
|
+
gtin: (defaultProductDetail === null || defaultProductDetail === void 0 ? void 0 : defaultProductDetail.gtin) ? defaultProductDetail.gtin : '',
|
|
45
|
+
stock: {
|
|
46
|
+
quantity: item.remainQty * packingSize,
|
|
47
|
+
unit_of_measure: 'EA'
|
|
48
|
+
},
|
|
49
|
+
package_weight_gm: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
|
|
50
|
+
package_dimensions: {
|
|
51
|
+
length_mm: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
|
|
52
|
+
width_mm: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
|
|
53
|
+
height_mm: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
|
|
56
54
|
}
|
|
57
55
|
});
|
|
58
56
|
}));
|
|
59
|
-
|
|
57
|
+
const delay = (ms) => {
|
|
58
|
+
return new Promise(resolve => setTimeout(resolve, ms));
|
|
59
|
+
};
|
|
60
|
+
await delay(5000);
|
|
61
|
+
await integration_sellercraft_1.SellercraftAPI.updateProduct(sellercraft, { accountId: sellercraft.accountId, sellercraftInv });
|
|
62
|
+
if ((sellercraftInv === null || sellercraftInv === void 0 ? void 0 : sellercraftInv.length) < total)
|
|
60
63
|
page++;
|
|
61
|
-
hasMorePage = Boolean((
|
|
64
|
+
hasMorePage = Boolean((sellercraftInv === null || sellercraftInv === void 0 ? void 0 : sellercraftInv.length) < total);
|
|
62
65
|
}
|
|
63
|
-
const inboundOrder = {
|
|
64
|
-
accountId: sellercraft.accountId,
|
|
65
|
-
inboundId: utils_1.OrderNoGenerator.initialiseSynchronisation(),
|
|
66
|
-
inboundTime: Math.floor(new Date().getTime() / 1000),
|
|
67
|
-
inboundType: 'blind_receive',
|
|
68
|
-
purchaseOrderId: '',
|
|
69
|
-
sellercraftOPs
|
|
70
|
-
};
|
|
71
|
-
await integration_sellercraft_1.SellercraftAPI.addInboundOrder(sellercraft, Object.assign({}, inboundOrder));
|
|
72
66
|
}
|
|
73
67
|
};
|
|
74
68
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-products-to-sellercraft.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/sync-products-to-sellercraft.ts"],"names":[],"mappings":";;;AAEA,uDAAmD;AACnD,qFAA2F;AAC3F,qFAAqF;AACrF,+DAAqE;
|
|
1
|
+
{"version":3,"file":"sync-products-to-sellercraft.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/sync-products-to-sellercraft.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ api_1.restfulApiRouter.post('/unstable/warehouse/:warehouseId/add-products', bus
|
|
|
27
27
|
context.body = {
|
|
28
28
|
result: (await client.mutate({
|
|
29
29
|
mutation: (0, graphql_tag_1.default) `
|
|
30
|
-
mutation createProducts($products: [NewProduct]!) {
|
|
30
|
+
mutation createProducts($products: [NewProduct!]!) {
|
|
31
31
|
createProducts(products: $products) {
|
|
32
32
|
id
|
|
33
33
|
}
|
|
@@ -138,23 +138,19 @@ api_1.restfulApiRouter.get('/unstable/warehouse/:warehouseId/get-release-order-l
|
|
|
138
138
|
};
|
|
139
139
|
});
|
|
140
140
|
async function validateFilters(context, filters, fromDate, toDate) {
|
|
141
|
-
if (fromDate && fromDate !== '') {
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
}
|
|
148
|
-
|
|
141
|
+
// if (fromDate && fromDate !== '') {
|
|
142
|
+
// fromDate = new Date(`${fromDate.split(' ').join('')} 00:00:00`)
|
|
143
|
+
// if (fromDate instanceof Date && !isNaN(fromDate.getTime())) fromDate = fromDate.toLocaleString()
|
|
144
|
+
// else context.throw(400, context.t('fromDate is invalid'))
|
|
145
|
+
// } else fromDate = ''
|
|
146
|
+
// if (toDate && toDate !== '') {
|
|
147
|
+
// toDate = new Date(`${toDate.split(' ').join('')} 23:59:59`)
|
|
148
|
+
// if (toDate instanceof Date && !isNaN(toDate.getTime())) toDate = toDate.toLocaleString()
|
|
149
|
+
// else context.throw(400, context.t('toDate is invalid'))
|
|
150
|
+
// } else toDate = ''
|
|
151
|
+
if (!fromDate)
|
|
149
152
|
fromDate = '';
|
|
150
|
-
if (toDate
|
|
151
|
-
toDate = new Date(`${toDate.split(' ').join('')} 23:59:59`);
|
|
152
|
-
if (toDate instanceof Date && !isNaN(toDate.getTime()))
|
|
153
|
-
toDate = toDate.toLocaleString();
|
|
154
|
-
else
|
|
155
|
-
context.throw(400, context.t('toDate is invalid'));
|
|
156
|
-
}
|
|
157
|
-
else
|
|
153
|
+
if (!toDate)
|
|
158
154
|
toDate = '';
|
|
159
155
|
if (fromDate !== '' && toDate !== '')
|
|
160
156
|
filters = [...filters, { name: 'createdAt', operator: 'between', value: [fromDate, toDate] }];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-release-order-list.js","sourceRoot":"","sources":["../../../../../server/routers/api/restful-apis/unstable/get-release-order-list.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAE7B,6CAAgE;AAEhE,qFAAgF;AAChF,uFAAkF;AAElF,sBAAM,CAAC,GAAG,CACR,yDAAyD,EACzD,wCAAkB,EAClB,0CAAmB,EACnB,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACtB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAC7D,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;IACtC,MAAM,EAAE,CAAC,EAAE,GAAG,OAAO,CAAA;IACrB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE7F,IAAI,CAAC,WAAW;QAAE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAA;IAEvE,IAAI,OAAO,GAAQ,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IAC/F,IAAI,KAAK;QAAE,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;IACxE,IAAI,UAAU,GAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAA;IAC5C,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;IACnE,UAAU,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,wBAAwB,EAAE,gBAAgB,CAAC,CAAA;IAEtG,OAAO,CAAC,IAAI,GAAG;QACb,MAAM,EAAE,CACN,MAAM,MAAM,CAAC,KAAK,CAAC;YACjB,KAAK,EAAE,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAuGT;YACD,SAAS,EAAE;gBACT,OAAO;gBACP,UAAU;gBACV,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;aAC9C;YACD,OAAO,kCACF,OAAO,KACV,KAAK,kCACA,OAAO,CAAC,KAAK,KAChB,QAAQ;oBACR,MAAM,MAET;SACK,CAAC,CACV,CAAC,IAAI;KACP,CAAA;AACH,CAAC,CACF,CAAA;AAEM,KAAK,UAAU,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM;IACtE,
|
|
1
|
+
{"version":3,"file":"get-release-order-list.js","sourceRoot":"","sources":["../../../../../server/routers/api/restful-apis/unstable/get-release-order-list.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ api_1.restfulApiRouter.post('/v1/warehouse/:warehouseId/add-products', business_
|
|
|
27
27
|
context.body = {
|
|
28
28
|
result: (await client.mutate({
|
|
29
29
|
mutation: (0, graphql_tag_1.default) `
|
|
30
|
-
mutation createProducts($products: [NewProduct]!) {
|
|
30
|
+
mutation createProducts($products: [NewProduct!]!) {
|
|
31
31
|
createProducts(products: $products) {
|
|
32
32
|
id
|
|
33
33
|
}
|
|
@@ -27,7 +27,7 @@ api_1.restfulApiRouter.post('/v2/warehouse/:warehouseId/add-products', business_
|
|
|
27
27
|
context.body = {
|
|
28
28
|
result: (await client.mutate({
|
|
29
29
|
mutation: (0, graphql_tag_1.default) `
|
|
30
|
-
mutation createProducts($products: [NewProduct]!) {
|
|
30
|
+
mutation createProducts($products: [NewProduct!]!) {
|
|
31
31
|
createProducts(products: $products) {
|
|
32
32
|
id
|
|
33
33
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-hub",
|
|
3
|
-
"version": "3.8.
|
|
3
|
+
"version": "3.8.21",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -62,20 +62,20 @@
|
|
|
62
62
|
"@things-factory/i18n-ui": "^3.8.0",
|
|
63
63
|
"@things-factory/import-ui": "^3.8.0",
|
|
64
64
|
"@things-factory/import-ui-excel": "^3.8.0",
|
|
65
|
-
"@things-factory/integration-accounting": "^3.8.
|
|
66
|
-
"@things-factory/integration-fulfillment": "^3.8.
|
|
67
|
-
"@things-factory/integration-lmd": "^3.8.
|
|
68
|
-
"@things-factory/integration-marketplace": "^3.8.
|
|
69
|
-
"@things-factory/integration-pos": "^3.8.
|
|
70
|
-
"@things-factory/integration-sellercraft": "^3.8.
|
|
71
|
-
"@things-factory/integration-sftp": "^3.8.
|
|
65
|
+
"@things-factory/integration-accounting": "^3.8.19",
|
|
66
|
+
"@things-factory/integration-fulfillment": "^3.8.19",
|
|
67
|
+
"@things-factory/integration-lmd": "^3.8.19",
|
|
68
|
+
"@things-factory/integration-marketplace": "^3.8.19",
|
|
69
|
+
"@things-factory/integration-pos": "^3.8.19",
|
|
70
|
+
"@things-factory/integration-sellercraft": "^3.8.19",
|
|
71
|
+
"@things-factory/integration-sftp": "^3.8.21",
|
|
72
72
|
"@things-factory/lite-menu": "^3.8.0",
|
|
73
73
|
"@things-factory/more-ui": "^3.8.0",
|
|
74
74
|
"@things-factory/notification": "^3.8.0",
|
|
75
75
|
"@things-factory/pdf": "^3.7.5",
|
|
76
76
|
"@things-factory/product-ui": "^3.8.9",
|
|
77
77
|
"@things-factory/resource-ui": "^3.8.0",
|
|
78
|
-
"@things-factory/sales-base": "^3.8.
|
|
78
|
+
"@things-factory/sales-base": "^3.8.21",
|
|
79
79
|
"@things-factory/scene-chartjs": "^3.7.5",
|
|
80
80
|
"@things-factory/scene-clock": "^3.7.5",
|
|
81
81
|
"@things-factory/scene-clone": "^3.7.5",
|
|
@@ -102,11 +102,11 @@
|
|
|
102
102
|
"@things-factory/scene-table": "^3.7.5",
|
|
103
103
|
"@things-factory/scene-visualizer": "^3.7.5",
|
|
104
104
|
"@things-factory/scene-wheel-sorter": "^3.7.5",
|
|
105
|
-
"@things-factory/setting-ui": "^3.8.
|
|
105
|
+
"@things-factory/setting-ui": "^3.8.19",
|
|
106
106
|
"@things-factory/shell": "^3.8.0",
|
|
107
107
|
"@things-factory/system-ui": "^3.8.0",
|
|
108
|
-
"@things-factory/warehouse-base": "^3.8.
|
|
109
|
-
"@things-factory/worksheet-base": "^3.8.
|
|
108
|
+
"@things-factory/warehouse-base": "^3.8.21",
|
|
109
|
+
"@things-factory/worksheet-base": "^3.8.21",
|
|
110
110
|
"koa2-swagger-ui": "^5.0.2",
|
|
111
111
|
"swagger-jsdoc": "^5.0.0",
|
|
112
112
|
"yamljs": "^0.3.0"
|
|
@@ -117,5 +117,5 @@
|
|
|
117
117
|
"resolutions": {
|
|
118
118
|
"core-js": "^3.16.0"
|
|
119
119
|
},
|
|
120
|
-
"gitHead": "
|
|
120
|
+
"gitHead": "38e4bc33b7191c172a8516aac6ab3019fa12dac1"
|
|
121
121
|
}
|
|
@@ -34,6 +34,11 @@ export const SETTINGS = {
|
|
|
34
34
|
description: 'enable and disable the use of product barcode scanning',
|
|
35
35
|
category: 'id-rule'
|
|
36
36
|
},
|
|
37
|
+
{
|
|
38
|
+
name: 'batch-picking-limit',
|
|
39
|
+
description: 'maximum order per batch picking limit',
|
|
40
|
+
category: 'id-rule'
|
|
41
|
+
},
|
|
37
42
|
{
|
|
38
43
|
name: 'enable-carton-label',
|
|
39
44
|
description: 'enable and disable the use of using carton label',
|
|
@@ -6,19 +6,20 @@ import { Sellercraft, SellercraftAPI } from '@things-factory/integration-sellerc
|
|
|
6
6
|
import { Product, ProductDetail } from '@things-factory/product-base'
|
|
7
7
|
import { Domain } from '@things-factory/shell'
|
|
8
8
|
|
|
9
|
-
import { OrderNoGenerator } from '../../../utils'
|
|
10
|
-
|
|
11
9
|
export const syncProductsToSellercraftResolver = {
|
|
12
10
|
async syncProductsToSellercraft(
|
|
13
11
|
_: void,
|
|
14
|
-
{
|
|
12
|
+
{
|
|
13
|
+
sellercraftId,
|
|
14
|
+
fulfillmentCenterId
|
|
15
|
+
}: { sellercraftId: string; fulfillmentCenterId: string; toCreateSku: boolean },
|
|
15
16
|
context: any
|
|
16
17
|
): Promise<void> {
|
|
17
18
|
const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
|
|
18
19
|
|
|
19
20
|
let page: number = 1
|
|
20
21
|
let hasMorePage: boolean = true
|
|
21
|
-
const limit: number =
|
|
22
|
+
const limit: number = 10
|
|
22
23
|
|
|
23
24
|
const sellercraft: Sellercraft = await tx
|
|
24
25
|
.getRepository(Sellercraft)
|
|
@@ -27,7 +28,6 @@ export const syncProductsToSellercraftResolver = {
|
|
|
27
28
|
const fulfilmentCenter: FulfillmentCenter = await FulfillmentAPI.getFulfillmentCenter(fulfillmentCenterId)
|
|
28
29
|
const customerBizplace: Bizplace = await tx.getRepository(Bizplace).findOne({ where: { domain: customerDomain } })
|
|
29
30
|
|
|
30
|
-
let sellercraftOPs: any[] = []
|
|
31
31
|
while (hasMorePage) {
|
|
32
32
|
const { items, total } = await FulfillmentAPI.getInventoryProductGroup(fulfilmentCenter, {
|
|
33
33
|
warehouseId: customerBizplace.id,
|
|
@@ -35,6 +35,8 @@ export const syncProductsToSellercraftResolver = {
|
|
|
35
35
|
paginationOffset: page
|
|
36
36
|
})
|
|
37
37
|
|
|
38
|
+
let sellercraftInv: any[] = []
|
|
39
|
+
|
|
38
40
|
await Promise.all(
|
|
39
41
|
items.map(async item => {
|
|
40
42
|
const product: Product = await tx.getRepository(Product).findOne({
|
|
@@ -43,53 +45,45 @@ export const syncProductsToSellercraftResolver = {
|
|
|
43
45
|
})
|
|
44
46
|
|
|
45
47
|
const productDetails: ProductDetail[] = product.productDetails
|
|
46
|
-
const inventoryPackingType: string = item.packingType
|
|
47
|
-
const defaultProductDetail: ProductDetail =
|
|
48
|
-
productDetail => productDetail.isDefault
|
|
49
|
-
)
|
|
48
|
+
// const inventoryPackingType: string = item.packingType
|
|
49
|
+
const defaultProductDetail: ProductDetail = productDetails.find(productDetail => productDetail.isDefault)
|
|
50
50
|
|
|
51
51
|
let packingSize: number = 1
|
|
52
|
-
if (inventoryPackingType !== defaultProductDetail.packingType) {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
52
|
+
// if (inventoryPackingType !== defaultProductDetail.packingType) {
|
|
53
|
+
// const unmatchingProductDetail: ProductDetail = product.productDetails.find(
|
|
54
|
+
// productDetail => productDetail.packingType === inventoryPackingType
|
|
55
|
+
// )
|
|
56
56
|
|
|
57
|
-
|
|
58
|
-
}
|
|
57
|
+
// packingSize = await getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail)
|
|
58
|
+
// }
|
|
59
59
|
|
|
60
|
-
|
|
60
|
+
sellercraftInv.push({
|
|
61
61
|
sku: item.productSKU,
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
length: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
|
|
73
|
-
width: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
|
|
74
|
-
height: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
|
|
62
|
+
gtin: defaultProductDetail?.gtin ? defaultProductDetail.gtin : '',
|
|
63
|
+
stock: {
|
|
64
|
+
quantity: item.remainQty * packingSize,
|
|
65
|
+
unit_of_measure: 'EA'
|
|
66
|
+
},
|
|
67
|
+
package_weight_gm: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
|
|
68
|
+
package_dimensions: {
|
|
69
|
+
length_mm: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
|
|
70
|
+
width_mm: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
|
|
71
|
+
height_mm: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
|
|
75
72
|
}
|
|
76
73
|
})
|
|
77
74
|
})
|
|
78
75
|
)
|
|
79
76
|
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
77
|
+
const delay = (ms: number) => {
|
|
78
|
+
return new Promise(resolve => setTimeout(resolve, ms))
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
await delay(5000)
|
|
82
|
+
await SellercraftAPI.updateProduct(sellercraft, { accountId: sellercraft.accountId, sellercraftInv })
|
|
83
83
|
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
inboundId: OrderNoGenerator.initialiseSynchronisation(),
|
|
87
|
-
inboundTime: Math.floor(new Date().getTime() / 1000),
|
|
88
|
-
inboundType: 'blind_receive',
|
|
89
|
-
purchaseOrderId: '',
|
|
90
|
-
sellercraftOPs
|
|
84
|
+
if (sellercraftInv?.length < total) page++
|
|
85
|
+
hasMorePage = Boolean(sellercraftInv?.length < total)
|
|
91
86
|
}
|
|
92
|
-
await SellercraftAPI.addInboundOrder(sellercraft, { ...inboundOrder })
|
|
93
87
|
}
|
|
94
88
|
}
|
|
95
89
|
|
|
@@ -150,17 +150,20 @@ router.get(
|
|
|
150
150
|
)
|
|
151
151
|
|
|
152
152
|
export async function validateFilters(context, filters, fromDate, toDate) {
|
|
153
|
-
if (fromDate && fromDate !== '') {
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
} else fromDate = ''
|
|
158
|
-
|
|
159
|
-
if (toDate && toDate !== '') {
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
} else toDate = ''
|
|
153
|
+
// if (fromDate && fromDate !== '') {
|
|
154
|
+
// fromDate = new Date(`${fromDate.split(' ').join('')} 00:00:00`)
|
|
155
|
+
// if (fromDate instanceof Date && !isNaN(fromDate.getTime())) fromDate = fromDate.toLocaleString()
|
|
156
|
+
// else context.throw(400, context.t('fromDate is invalid'))
|
|
157
|
+
// } else fromDate = ''
|
|
158
|
+
|
|
159
|
+
// if (toDate && toDate !== '') {
|
|
160
|
+
// toDate = new Date(`${toDate.split(' ').join('')} 23:59:59`)
|
|
161
|
+
// if (toDate instanceof Date && !isNaN(toDate.getTime())) toDate = toDate.toLocaleString()
|
|
162
|
+
// else context.throw(400, context.t('toDate is invalid'))
|
|
163
|
+
// } else toDate = ''
|
|
164
|
+
|
|
165
|
+
if (!fromDate) fromDate = ''
|
|
166
|
+
if (!toDate) toDate = ''
|
|
164
167
|
|
|
165
168
|
if (fromDate !== '' && toDate !== '')
|
|
166
169
|
filters = [...filters, { name: 'createdAt', operator: 'between', value: [fromDate, toDate] }]
|