@things-factory/operato-hub 4.3.31 → 4.3.34

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.
Files changed (31) hide show
  1. package/dist-server/routers/api/restful-apis/unstable/add-products.js +32 -16
  2. package/dist-server/routers/api/restful-apis/unstable/add-products.js.map +1 -1
  3. package/dist-server/routers/api/restful-apis/unstable/add-release-order.js +88 -9
  4. package/dist-server/routers/api/restful-apis/unstable/add-release-order.js.map +1 -1
  5. package/dist-server/routers/api/restful-apis/unstable/cancel-release-order.js +23 -2
  6. package/dist-server/routers/api/restful-apis/unstable/cancel-release-order.js.map +1 -1
  7. package/dist-server/routers/api/restful-apis/unstable/get-products.js +1 -0
  8. package/dist-server/routers/api/restful-apis/unstable/get-products.js.map +1 -1
  9. package/dist-server/routers/api/restful-apis/v1/add-products.js +32 -16
  10. package/dist-server/routers/api/restful-apis/v1/add-products.js.map +1 -1
  11. package/dist-server/routers/api/restful-apis/v1/cancel-release-order.js +23 -2
  12. package/dist-server/routers/api/restful-apis/v1/cancel-release-order.js.map +1 -1
  13. package/dist-server/routers/api/restful-apis/v1/get-products.js +1 -0
  14. package/dist-server/routers/api/restful-apis/v1/get-products.js.map +1 -1
  15. package/dist-server/routers/api/restful-apis/v2/add-products.js +32 -16
  16. package/dist-server/routers/api/restful-apis/v2/add-products.js.map +1 -1
  17. package/dist-server/routers/api/restful-apis/v2/cancel-release-order.js +23 -2
  18. package/dist-server/routers/api/restful-apis/v2/cancel-release-order.js.map +1 -1
  19. package/dist-server/routers/api/restful-apis/v2/get-products.js +1 -0
  20. package/dist-server/routers/api/restful-apis/v2/get-products.js.map +1 -1
  21. package/openapi/unstable/product.yaml +9 -3
  22. package/openapi/v1/product.yaml +9 -3
  23. package/openapi/v2/product.yaml +9 -3
  24. package/package.json +54 -54
  25. package/server/routers/api/restful-apis/unstable/add-products.ts +40 -16
  26. package/server/routers/api/restful-apis/unstable/add-release-order.ts +16 -14
  27. package/server/routers/api/restful-apis/unstable/get-products.ts +1 -0
  28. package/server/routers/api/restful-apis/v1/add-products.ts +40 -16
  29. package/server/routers/api/restful-apis/v1/get-products.ts +1 -0
  30. package/server/routers/api/restful-apis/v2/add-products.ts +40 -16
  31. package/server/routers/api/restful-apis/v2/get-products.ts +1 -0
@@ -35,6 +35,7 @@ api_1.restfulApiRouter.get('/v1/warehouse/:warehouseId/get-products', business_m
35
35
  brandSku
36
36
  isRequiredCheckExpiry
37
37
  expirationPeriod
38
+ pickingStrategy
38
39
  auxUnit1
39
40
  auxValue1
40
41
  auxUnit2
@@ -1 +1 @@
1
- {"version":3,"file":"get-products.js","sourceRoot":"","sources":["../../../../../server/routers/api/restful-apis/v1/get-products.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get-products.js","sourceRoot":"","sources":["../../../../../server/routers/api/restful-apis/v1/get-products.ts"],"names":[],"mappings":"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"}
@@ -24,6 +24,7 @@ api_1.restfulApiRouter.post('/v2/warehouse/:warehouseId/add-products', business_
24
24
  const custCompanyBizplace = await (0, biz_base_1.getCompanyBizplace)(null, null, warehouseId);
25
25
  await checkMandatoryKey(context, bodyReq);
26
26
  debug('post:/add-product request.body', bodyReq);
27
+ let products = checkProductDetails(bodyReq);
27
28
  context.body = {
28
29
  result: (await client.mutate({
29
30
  mutation: (0, graphql_tag_1.default) `
@@ -33,7 +34,7 @@ api_1.restfulApiRouter.post('/v2/warehouse/:warehouseId/add-products', business_
33
34
  }
34
35
  }
35
36
  `,
36
- variables: { products: bodyReq },
37
+ variables: { products },
37
38
  context: Object.assign(Object.assign({}, context), { state: Object.assign(Object.assign({}, context.state), { bizplace: custCompanyBizplace, domain: custCompanyBizplace === null || custCompanyBizplace === void 0 ? void 0 : custCompanyBizplace.domain }) })
38
39
  })).data
39
40
  };
@@ -49,24 +50,39 @@ async function checkMandatoryKey(context, params) {
49
50
  noparams.push('type');
50
51
  if (param === null || param === void 0 ? void 0 : param.productDetails) {
51
52
  let noSubParams = [];
52
- param.productDetails.forEach((subParam, key) => {
53
- if (!subParam.gtin)
54
- noSubParams.push('gtin');
55
- if (!subParam.packingType)
56
- noSubParams.push('packingType');
57
- if (!subParam.packingSize)
58
- noSubParams.push('packingSize');
59
- if (!subParam.uom)
60
- noSubParams.push('uom');
61
- if (!subParam.uomValue)
62
- noSubParams.push('uomValue');
63
- if (noSubParams === null || noSubParams === void 0 ? void 0 : noSubParams.length)
64
- context.throw(400, context.t('error.required param x not found', { x: `${noSubParams.join(', ')}` }));
65
- });
53
+ if (param.productDetails.length == 0) {
54
+ context.throw(400, context.t('error.required param {x} not found in productDetails', {
55
+ x: 'gtin, packingType, packingSize, uom, uomValue'
56
+ }));
57
+ }
58
+ else {
59
+ param.productDetails.forEach((subParam, key) => {
60
+ if (!subParam.gtin)
61
+ noSubParams.push('gtin');
62
+ if (!subParam.packingType)
63
+ noSubParams.push('packingType');
64
+ if (!subParam.packingSize)
65
+ noSubParams.push('packingSize');
66
+ if (!subParam.uom)
67
+ noSubParams.push('uom');
68
+ if (!subParam.uomValue)
69
+ noSubParams.push('uomValue');
70
+ if (noSubParams === null || noSubParams === void 0 ? void 0 : noSubParams.length)
71
+ context.throw(400, context.t('error.required param {x} not found in productDetails', { x: `${noSubParams.join(', ')}` }));
72
+ });
73
+ }
66
74
  }
67
75
  if (noparams === null || noparams === void 0 ? void 0 : noparams.length)
68
- context.throw(400, context.t('error.required param x not found', { x: `${noparams.join(', ')}` }));
76
+ context.throw(400, context.t('error.required param {x} not found', { x: `${noparams.join(', ')}` }));
69
77
  });
70
78
  }
71
79
  exports.checkMandatoryKey = checkMandatoryKey;
80
+ function checkProductDetails(params) {
81
+ params.forEach(param => {
82
+ if (!(param === null || param === void 0 ? void 0 : param.productDetails.some(pd => pd.isDefault))) {
83
+ param.productDetails[0].isDefault = true;
84
+ }
85
+ });
86
+ return params;
87
+ }
72
88
  //# sourceMappingURL=add-products.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"add-products.js","sourceRoot":"","sources":["../../../../../server/routers/api/restful-apis/v2/add-products.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add-products.js","sourceRoot":"","sources":["../../../../../server/routers/api/restful-apis/v2/add-products.ts"],"names":[],"mappings":"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"}
@@ -26,8 +26,29 @@ api_1.restfulApiRouter.post('/v2/warehouse/:warehouseId/cancel-release-order', b
26
26
  const releaseOrder = await (0, typeorm_1.getRepository)(sales_base_1.ReleaseGood).findOne({
27
27
  where: [{ id: bodyReq.releaseOrderId }, { refNo: bodyReq.orderNo }]
28
28
  });
29
- if (!releaseOrder)
30
- context.throw(400, t('error.release order not exist'));
29
+ if (!releaseOrder) {
30
+ const draftReleaseOrder = await (0, typeorm_1.getRepository)(sales_base_1.DraftReleaseGood).findOne({
31
+ where: [{ refNo: bodyReq.orderNo }]
32
+ });
33
+ if (draftReleaseOrder) {
34
+ context.body = {
35
+ result: (await client.mutate({
36
+ mutation: (0, graphql_tag_1.default) `
37
+ mutation cancelDraftReleaseOrder($name: String!) {
38
+ cancelDraftReleaseOrder(name: $name)
39
+ }
40
+ `,
41
+ variables: { name: draftReleaseOrder.name },
42
+ context: Object.assign(Object.assign({}, context), { state: Object.assign(Object.assign({}, context.state), { customerBizplace,
43
+ domain, type: 'api' }) })
44
+ })).data
45
+ };
46
+ return;
47
+ }
48
+ else {
49
+ context.throw(400, t('error.release order not exist'));
50
+ }
51
+ }
31
52
  debug('post:/cancel-release-order body request', bodyReq);
32
53
  context.body = {
33
54
  result: (await client.mutate({
@@ -1 +1 @@
1
- {"version":3,"file":"cancel-release-order.js","sourceRoot":"","sources":["../../../../../server/routers/api/restful-apis/v2/cancel-release-order.ts"],"names":[],"mappings":";;;;;AAAA,8DAA6B;AAC7B,qCAAuC;AAEvC,6CAAgE;AAChE,uDAAmD;AACnD,2DAAwD;AAExD,qFAAgF;AAChF,uFAAkF;AAElF,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,gEAAgE,CAAC,CAAA;AAEhG,sBAAM,CAAC,IAAI,CACT,iDAAiD,EACjD,wCAAkB,EAClB,0CAAmB,EACnB,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;;IACtB,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IACxC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;IACtC,MAAM,EAAE,CAAC,EAAE,GAAG,OAAO,CAAA;IACrB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAA;IAEpC,IAAI,OAAO,OAAO,KAAK,SAAS,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,0CAAE,MAAM,CAAA,EAAE;QACjE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,mCAAmC,CAAC,CAAC,CAAA;KAC3D;IAED,MAAM,gBAAgB,GAAa,MAAM,IAAA,uBAAa,EAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC;QACvE,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE;KAC3B,CAAC,CAAA;IAEF,MAAM,YAAY,GAAgB,MAAM,IAAA,uBAAa,EAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;QACzE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,cAAc,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;KACpE,CAAC,CAAA;IAEF,IAAI,CAAC,YAAY;QAAE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAA;IAEzE,KAAK,CAAC,yCAAyC,EAAE,OAAO,CAAC,CAAA;IAEzD,OAAO,CAAC,IAAI,GAAG;QACb,MAAM,EAAE,CACN,MAAM,MAAM,CAAC,MAAM,CAAC;YAClB,QAAQ,EAAE,IAAA,qBAAG,EAAA;;;;WAIZ;YACD,SAAS,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE;YACtC,OAAO,kCACF,OAAO,KACV,KAAK,kCACA,OAAO,CAAC,KAAK,KAChB,gBAAgB;oBAChB,MAAM,EACN,IAAI,EAAE,KAAK,MAEd;SACK,CAAC,CACV,CAAC,IAAI;KACP,CAAA;AACH,CAAC,CACF,CAAA"}
1
+ {"version":3,"file":"cancel-release-order.js","sourceRoot":"","sources":["../../../../../server/routers/api/restful-apis/v2/cancel-release-order.ts"],"names":[],"mappings":";;;;;AAAA,8DAA6B;AAC7B,qCAAuC;AAEvC,6CAAgE;AAChE,uDAAmD;AACnD,2DAA0E;AAE1E,qFAAgF;AAChF,uFAAkF;AAElF,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,gEAAgE,CAAC,CAAA;AAEhG,sBAAM,CAAC,IAAI,CACT,iDAAiD,EACjD,wCAAkB,EAClB,0CAAmB,EACnB,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;;IACtB,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IACxC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;IACtC,MAAM,EAAE,CAAC,EAAE,GAAG,OAAO,CAAA;IACrB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAA;IAEpC,IAAI,OAAO,OAAO,KAAK,SAAS,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,0CAAE,MAAM,CAAA,EAAE;QACjE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,mCAAmC,CAAC,CAAC,CAAA;KAC3D;IAED,MAAM,gBAAgB,GAAa,MAAM,IAAA,uBAAa,EAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC;QACvE,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE;KAC3B,CAAC,CAAA;IAEF,MAAM,YAAY,GAAgB,MAAM,IAAA,uBAAa,EAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;QACzE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,cAAc,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;KACpE,CAAC,CAAA;IAEF,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,iBAAiB,GAAqB,MAAM,IAAA,uBAAa,EAAC,6BAAgB,CAAC,CAAC,OAAO,CAAC;YACxF,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;SACpC,CAAC,CAAA;QACF,IAAI,iBAAiB,EAAE;YACrB,OAAO,CAAC,IAAI,GAAG;gBACb,MAAM,EAAE,CACN,MAAM,MAAM,CAAC,MAAM,CAAC;oBAClB,QAAQ,EAAE,IAAA,qBAAG,EAAA;;;;eAIZ;oBACD,SAAS,EAAE,EAAE,IAAI,EAAE,iBAAiB,CAAC,IAAI,EAAE;oBAC3C,OAAO,kCACF,OAAO,KACV,KAAK,kCACA,OAAO,CAAC,KAAK,KAChB,gBAAgB;4BAChB,MAAM,EACN,IAAI,EAAE,KAAK,MAEd;iBACK,CAAC,CACV,CAAC,IAAI;aACP,CAAA;YACD,OAAM;SACP;aAAM;YACL,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAA;SACvD;KACF;IAED,KAAK,CAAC,yCAAyC,EAAE,OAAO,CAAC,CAAA;IAEzD,OAAO,CAAC,IAAI,GAAG;QACb,MAAM,EAAE,CACN,MAAM,MAAM,CAAC,MAAM,CAAC;YAClB,QAAQ,EAAE,IAAA,qBAAG,EAAA;;;;WAIZ;YACD,SAAS,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE;YACtC,OAAO,kCACF,OAAO,KACV,KAAK,kCACA,OAAO,CAAC,KAAK,KAChB,gBAAgB;oBAChB,MAAM,EACN,IAAI,EAAE,KAAK,MAEd;SACK,CAAC,CACV,CAAC,IAAI;KACP,CAAA;AACH,CAAC,CACF,CAAA"}
@@ -35,6 +35,7 @@ api_1.restfulApiRouter.get('/v2/warehouse/:warehouseId/get-products', business_m
35
35
  brandSku
36
36
  isRequiredCheckExpiry
37
37
  expirationPeriod
38
+ pickingStrategy
38
39
  auxUnit1
39
40
  auxValue1
40
41
  auxUnit2
@@ -1 +1 @@
1
- {"version":3,"file":"get-products.js","sourceRoot":"","sources":["../../../../../server/routers/api/restful-apis/v2/get-products.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAE7B,6CAAgE;AAEhE,qFAAgF;AAChF,uFAAkF;AAElF,sBAAM,CAAC,GAAG,CACR,yCAAyC,EACzC,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,KAAK,EAAE,IAAI,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAEjF,IAAI,CAAC,WAAW;QAAE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAA;IAEvE,IAAI,OAAO,GAAQ,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAA;IAChF,IAAI,UAAU,GAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAA;IAE5C,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IACrD,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAyIT;YACD,SAAS,EAAE;gBACT,OAAO;gBACP,UAAU;gBACV,QAAQ,EAAE,EAAE;aACb;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,KAAK,EAAE,IAAI;IACxD,IAAI,KAAK,IAAI,KAAK,KAAK,EAAE;QAAE,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;IAEpG,IAAI,IAAI,IAAI,IAAI,KAAK,EAAE;QAAE,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAElG,OAAO,OAAO,CAAA;AAChB,CAAC;AAND,0CAMC;AAEM,KAAK,UAAU,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM;IAC3E,IAAI,CAAC,OAAO;QAAE,OAAO,GAAG,EAAE,CAAA;IAC1B,IAAI,CAAC,MAAM;QAAE,MAAM,GAAG,EAAE,CAAA;IAExB,IAAI,OAAO,KAAK,EAAE,IAAI,MAAM,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE;QAC5F,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;QAC3B,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAA;QAEzB,IAAI,MAAM,GAAG,CAAC;YAAE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,wCAAwC,CAAC,CAAC,CAAA;aAClF,IAAI,OAAO,GAAG,CAAC;YAAE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,gDAAgD,CAAC,CAAC,CAAA;aAChG,IAAI,OAAO,GAAG,GAAG;YAAE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,kDAAkD,CAAC,CAAC,CAAA;;YACpG,UAAU,mCAAQ,UAAU,KAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAE,CAAA;KAClE;SAAM,IAAI,OAAO,KAAK,EAAE,IAAI,MAAM,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE;QACvE,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;QAE3B,IAAI,OAAO,GAAG,CAAC;YAAE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,gDAAgD,CAAC,CAAC,CAAA;aAC3F,IAAI,OAAO,GAAG,GAAG;YAAE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,kDAAkD,CAAC,CAAC,CAAA;;YACpG,UAAU,mCAAQ,UAAU,KAAE,KAAK,EAAE,OAAO,GAAE,CAAA;KACpD;IAED,OAAO,UAAU,CAAA;AACnB,CAAC;AArBD,gDAqBC"}
1
+ {"version":3,"file":"get-products.js","sourceRoot":"","sources":["../../../../../server/routers/api/restful-apis/v2/get-products.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,9 @@ definitions:
6
6
  - 'name'
7
7
  - 'type'
8
8
  properties:
9
+ id:
10
+ type: 'uuid'
11
+ example: '4550ba8e-5702-4337-bfa6-5e2718468724'
9
12
  sku:
10
13
  type: 'string'
11
14
  example: 'LB-18'
@@ -30,6 +33,9 @@ definitions:
30
33
  example: 'COLGATE MINT'
31
34
  isRequiredCheckExpiry:
32
35
  type: 'boolean'
36
+ pickingStrategy:
37
+ type: 'string'
38
+ example: 'FIFO'
33
39
  expirationPeriod:
34
40
  type: 'integer'
35
41
  description: 'value should be in days (eg:300 and half day)'
@@ -213,9 +219,9 @@ paths:
213
219
  content:
214
220
  application/json:
215
221
  schema:
216
- type: 'array'
217
- items:
218
- $ref: '#/definitions/Product'
222
+ type: 'array'
223
+ items:
224
+ $ref: '#/definitions/Product'
219
225
  '400':
220
226
  description: 'Bad request is sent'
221
227
  '401':
@@ -6,6 +6,9 @@ definitions:
6
6
  - 'name'
7
7
  - 'type'
8
8
  properties:
9
+ id:
10
+ type: 'uuid'
11
+ example: '4550ba8e-5702-4337-bfa6-5e2718468724'
9
12
  sku:
10
13
  type: 'string'
11
14
  example: 'LB-18'
@@ -30,6 +33,9 @@ definitions:
30
33
  example: 'COLGATE MINT'
31
34
  isRequiredCheckExpiry:
32
35
  type: 'boolean'
36
+ pickingStrategy:
37
+ type: 'string'
38
+ example: 'FIFO'
33
39
  expirationPeriod:
34
40
  type: 'integer'
35
41
  description: 'value should be in days (eg:300 and half day)'
@@ -213,9 +219,9 @@ paths:
213
219
  content:
214
220
  application/json:
215
221
  schema:
216
- type: 'array'
217
- items:
218
- $ref: '#/definitions/Product'
222
+ type: 'array'
223
+ items:
224
+ $ref: '#/definitions/Product'
219
225
  '400':
220
226
  description: 'Bad request is sent'
221
227
  '401':
@@ -6,6 +6,9 @@ definitions:
6
6
  - 'name'
7
7
  - 'type'
8
8
  properties:
9
+ id:
10
+ type: 'uuid'
11
+ example: '4550ba8e-5702-4337-bfa6-5e2718468724'
9
12
  sku:
10
13
  type: 'string'
11
14
  example: 'LB-18'
@@ -30,6 +33,9 @@ definitions:
30
33
  example: 'COLGATE MINT'
31
34
  isRequiredCheckExpiry:
32
35
  type: 'boolean'
36
+ pickingStrategy:
37
+ type: 'string'
38
+ example: 'FIFO'
33
39
  expirationPeriod:
34
40
  type: 'integer'
35
41
  description: 'value should be in days (eg:300 and half day)'
@@ -213,9 +219,9 @@ paths:
213
219
  content:
214
220
  application/json:
215
221
  schema:
216
- type: 'array'
217
- items:
218
- $ref: '#/definitions/Product'
222
+ type: 'array'
223
+ items:
224
+ $ref: '#/definitions/Product'
219
225
  '400':
220
226
  description: 'Bad request is sent'
221
227
  '401':
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-hub",
3
- "version": "4.3.31",
3
+ "version": "4.3.34",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -56,66 +56,66 @@
56
56
  "@operato/scene-tab": "^0.1.6",
57
57
  "@operato/scene-table": "^0.1.6",
58
58
  "@operato/scene-wheel-sorter": "^0.1.6",
59
- "@things-factory/api": "^4.3.27",
60
- "@things-factory/apptool-ui": "^4.3.27",
61
- "@things-factory/attachment-base": "^4.3.27",
62
- "@things-factory/auth-base": "^4.3.27",
63
- "@things-factory/auth-ui": "^4.3.27",
64
- "@things-factory/biz-base": "^4.3.27",
65
- "@things-factory/biz-ui": "^4.3.27",
66
- "@things-factory/board-service": "^4.3.27",
67
- "@things-factory/board-ui": "^4.3.27",
68
- "@things-factory/code-ui": "^4.3.27",
69
- "@things-factory/component-ui": "^4.3.27",
70
- "@things-factory/context-ui": "^4.3.27",
71
- "@things-factory/document-template-ui": "^4.3.27",
72
- "@things-factory/export-ui": "^4.3.27",
73
- "@things-factory/export-ui-csv": "^4.3.27",
74
- "@things-factory/export-ui-excel": "^4.3.27",
75
- "@things-factory/grist-ui": "^4.3.27",
76
- "@things-factory/help": "^4.3.27",
77
- "@things-factory/i18n-base": "^4.3.27",
78
- "@things-factory/import-ui": "^4.3.27",
79
- "@things-factory/import-ui-excel": "^4.3.27",
80
- "@things-factory/integration-accounting": "^4.3.27",
81
- "@things-factory/integration-fulfillment": "^4.3.31",
82
- "@things-factory/integration-lmd": "^4.3.27",
83
- "@things-factory/integration-marketplace": "^4.3.29",
84
- "@things-factory/integration-pos": "^4.3.27",
85
- "@things-factory/integration-sellercraft": "^4.3.29",
86
- "@things-factory/integration-sftp": "^4.3.31",
87
- "@things-factory/lite-menu": "^4.3.27",
88
- "@things-factory/more-ui": "^4.3.27",
89
- "@things-factory/notification": "^4.3.27",
90
- "@things-factory/pdf": "^4.3.27",
91
- "@things-factory/product-ui": "^4.3.27",
92
- "@things-factory/resource-ui": "^4.3.27",
93
- "@things-factory/sales-base": "^4.3.31",
94
- "@things-factory/scene-data-transform": "^4.3.27",
95
- "@things-factory/scene-excel": "^4.3.27",
96
- "@things-factory/scene-firebase": "^4.3.27",
97
- "@things-factory/scene-form": "^4.3.27",
98
- "@things-factory/scene-google-map": "^4.3.27",
99
- "@things-factory/scene-graphql": "^4.3.27",
100
- "@things-factory/scene-label": "^4.3.27",
101
- "@things-factory/scene-marker": "^4.3.27",
102
- "@things-factory/scene-mqtt": "^4.3.27",
103
- "@things-factory/scene-restful": "^4.3.27",
104
- "@things-factory/scene-visualizer": "^4.3.27",
105
- "@things-factory/setting-ui": "^4.3.27",
106
- "@things-factory/shell": "^4.3.27",
107
- "@things-factory/system-ui": "^4.3.27",
108
- "@things-factory/warehouse-base": "^4.3.31",
109
- "@things-factory/worksheet-base": "^4.3.31",
59
+ "@things-factory/api": "^4.3.32",
60
+ "@things-factory/apptool-ui": "^4.3.32",
61
+ "@things-factory/attachment-base": "^4.3.32",
62
+ "@things-factory/auth-base": "^4.3.32",
63
+ "@things-factory/auth-ui": "^4.3.32",
64
+ "@things-factory/biz-base": "^4.3.32",
65
+ "@things-factory/biz-ui": "^4.3.32",
66
+ "@things-factory/board-service": "^4.3.32",
67
+ "@things-factory/board-ui": "^4.3.32",
68
+ "@things-factory/code-ui": "^4.3.32",
69
+ "@things-factory/component-ui": "^4.3.32",
70
+ "@things-factory/context-ui": "^4.3.32",
71
+ "@things-factory/document-template-ui": "^4.3.32",
72
+ "@things-factory/export-ui": "^4.3.32",
73
+ "@things-factory/export-ui-csv": "^4.3.32",
74
+ "@things-factory/export-ui-excel": "^4.3.32",
75
+ "@things-factory/grist-ui": "^4.3.32",
76
+ "@things-factory/help": "^4.3.32",
77
+ "@things-factory/i18n-base": "^4.3.32",
78
+ "@things-factory/import-ui": "^4.3.32",
79
+ "@things-factory/import-ui-excel": "^4.3.32",
80
+ "@things-factory/integration-accounting": "^4.3.32",
81
+ "@things-factory/integration-fulfillment": "^4.3.33",
82
+ "@things-factory/integration-lmd": "^4.3.32",
83
+ "@things-factory/integration-marketplace": "^4.3.34",
84
+ "@things-factory/integration-pos": "^4.3.32",
85
+ "@things-factory/integration-sellercraft": "^4.3.34",
86
+ "@things-factory/integration-sftp": "^4.3.33",
87
+ "@things-factory/lite-menu": "^4.3.32",
88
+ "@things-factory/more-ui": "^4.3.32",
89
+ "@things-factory/notification": "^4.3.32",
90
+ "@things-factory/pdf": "^4.3.32",
91
+ "@things-factory/product-ui": "^4.3.32",
92
+ "@things-factory/resource-ui": "^4.3.32",
93
+ "@things-factory/sales-base": "^4.3.34",
94
+ "@things-factory/scene-data-transform": "^4.3.32",
95
+ "@things-factory/scene-excel": "^4.3.32",
96
+ "@things-factory/scene-firebase": "^4.3.32",
97
+ "@things-factory/scene-form": "^4.3.32",
98
+ "@things-factory/scene-google-map": "^4.3.32",
99
+ "@things-factory/scene-graphql": "^4.3.32",
100
+ "@things-factory/scene-label": "^4.3.32",
101
+ "@things-factory/scene-marker": "^4.3.32",
102
+ "@things-factory/scene-mqtt": "^4.3.32",
103
+ "@things-factory/scene-restful": "^4.3.32",
104
+ "@things-factory/scene-visualizer": "^4.3.32",
105
+ "@things-factory/setting-ui": "^4.3.32",
106
+ "@things-factory/shell": "^4.3.32",
107
+ "@things-factory/system-ui": "^4.3.32",
108
+ "@things-factory/warehouse-base": "^4.3.34",
109
+ "@things-factory/worksheet-base": "^4.3.34",
110
110
  "koa2-swagger-ui": "^5.0.2",
111
111
  "swagger-jsdoc": "^5.0.0",
112
112
  "yamljs": "^0.3.0"
113
113
  },
114
114
  "devDependencies": {
115
- "@things-factory/builder": "^4.3.27"
115
+ "@things-factory/builder": "^4.3.32"
116
116
  },
117
117
  "resolutions": {
118
118
  "core-js": "^3.16.0"
119
119
  },
120
- "gitHead": "fe90b785970aafd08592c0692df9879fb48b6b84"
120
+ "gitHead": "feaae0d28d92c8eccb6b1ae8dbedd43c460e2d32"
121
121
  }
@@ -29,6 +29,8 @@ router.post(
29
29
  await checkMandatoryKey(context, bodyReq)
30
30
  debug('post:/add-product request.body', bodyReq)
31
31
 
32
+ let products = checkProductDetails(bodyReq)
33
+
32
34
  context.body = {
33
35
  result: (
34
36
  await client.mutate({
@@ -39,7 +41,7 @@ router.post(
39
41
  }
40
42
  }
41
43
  `,
42
- variables: { products: bodyReq },
44
+ variables: { products },
43
45
  context: {
44
46
  ...context,
45
47
  state: {
@@ -66,23 +68,45 @@ export async function checkMandatoryKey(context, params) {
66
68
 
67
69
  if (param?.productDetails) {
68
70
  let noSubParams = []
69
- param.productDetails.forEach((subParam, key) => {
70
- if (!subParam.gtin) noSubParams.push('gtin')
71
-
72
- if (!subParam.packingType) noSubParams.push('packingType')
73
-
74
- if (!subParam.packingSize) noSubParams.push('packingSize')
75
-
76
- if (!subParam.uom) noSubParams.push('uom')
77
-
78
- if (!subParam.uomValue) noSubParams.push('uomValue')
79
-
80
- if (noSubParams?.length)
81
- context.throw(400, context.t('error.required param x not found', { x: `${noSubParams.join(', ')}` }))
82
- })
71
+ if (param.productDetails.length == 0) {
72
+ context.throw(
73
+ 400,
74
+ context.t('error.required param {x} not found in productDetails', {
75
+ x: 'gtin, packingType, packingSize, uom, uomValue'
76
+ })
77
+ )
78
+ } else {
79
+ param.productDetails.forEach((subParam, key) => {
80
+ if (!subParam.gtin) noSubParams.push('gtin')
81
+
82
+ if (!subParam.packingType) noSubParams.push('packingType')
83
+
84
+ if (!subParam.packingSize) noSubParams.push('packingSize')
85
+
86
+ if (!subParam.uom) noSubParams.push('uom')
87
+
88
+ if (!subParam.uomValue) noSubParams.push('uomValue')
89
+
90
+ if (noSubParams?.length)
91
+ context.throw(
92
+ 400,
93
+ context.t('error.required param {x} not found in productDetails', { x: `${noSubParams.join(', ')}` })
94
+ )
95
+ })
96
+ }
83
97
  }
84
98
 
85
99
  if (noparams?.length)
86
- context.throw(400, context.t('error.required param x not found', { x: `${noparams.join(', ')}` }))
100
+ context.throw(400, context.t('error.required param {x} not found', { x: `${noparams.join(', ')}` }))
87
101
  })
88
102
  }
103
+
104
+ function checkProductDetails(params) {
105
+ params.forEach(param => {
106
+ if (!param?.productDetails.some(pd => pd.isDefault)) {
107
+ param.productDetails[0].isDefault = true
108
+ }
109
+ })
110
+
111
+ return params
112
+ }
@@ -172,22 +172,25 @@ router.post(
172
172
  let assignedOrderProducts = await assignToInventory(massagedData.orderProducts, customerBizplace, context, tx)
173
173
  console.timeEnd('assign')
174
174
 
175
+ const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({ domain: customerBizplace.domain })
176
+ if (sellercraft) {
177
+ try {
178
+ const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
179
+ let packageInfo = await sellercraftCtrl.packOrder(sellercraft, {
180
+ ...releaseGood,
181
+ orderProducts: assignedOrderProducts
182
+ })
183
+ releaseGood.packageId = packageInfo.packageId
184
+ } catch (error) {
185
+ logger.error(`add-release-order[packageId][refNo: ${releaseGood.refNo}, refNo2: ${releaseGood.refNo2}]: ${JSON.stringify(error)}`)
186
+ }
187
+ }
188
+
175
189
  // create order
176
190
  console.time('save')
177
191
  let result = await createReleaseGood(releaseGood, assignedOrderProducts, customerBizplace, context, tx)
178
192
  console.timeEnd('save')
179
193
 
180
- const sellercraft: Sellercraft = await tx
181
- .getRepository(Sellercraft)
182
- .findOne({ domain: customerBizplace.domain })
183
-
184
- if (sellercraft) {
185
- const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
186
- await sellercraftCtrl.packOrder(sellercraft, {
187
- ...result,
188
- orderProducts: result.orderProducts
189
- })
190
- }
191
194
 
192
195
  let addReleaseGood = {
193
196
  id: result.id,
@@ -424,7 +427,6 @@ async function createReleaseGood(
424
427
  })
425
428
 
426
429
  newReleaseGood = {
427
- ...newReleaseGood,
428
430
  name: roNoSetting
429
431
  ? await generateId({ domain, type: ORDER_NUMBER_RULE_TYPE.RO_NUMBER, seed: {} })
430
432
  : OrderNoGenerator.releaseGood(),
@@ -467,6 +469,7 @@ async function createReleaseGood(
467
469
  storeId: releaseGood?.storeId,
468
470
  routeId: releaseGood?.routeId,
469
471
  stopId: releaseGood?.stopId,
472
+ packageId: releaseGood?.packageId || null,
470
473
  noOfItems: orderProducts.length,
471
474
  creator: user,
472
475
  updater: user,
@@ -909,8 +912,7 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
909
912
  sum(qty - locked_qty - release_qty) over (order by sort_seq asc rows between unbounded preceding and current row) as lock_amount
910
913
  from (
911
914
  SELECT 0 as sort_seq, null as id, null as pallet_id, null as batch_id, null as batch_id_ref,
912
- null as unit, '${orderInventory.uom}' as uom, '${orderInventory.packingType}' as packing_type, '${
913
- orderInventory.packingSize
915
+ null as unit, '${orderInventory.uom}' as uom, '${orderInventory.packingType}' as packing_type, '${orderInventory.packingSize
914
916
  }' as packing_size,
915
917
  null as manufacture_year, null as carton_id, 0 as uom_value, 0 as locked_uom_value, 0 as qty, 0 as locked_qty, null as created_at,
916
918
  '${orderInventory.releaseQty}' as release_qty, '${orderInventory.releaseUomValue}' as release_uom_value
@@ -40,6 +40,7 @@ router.get(
40
40
  brandSku
41
41
  isRequiredCheckExpiry
42
42
  expirationPeriod
43
+ pickingStrategy
43
44
  auxUnit1
44
45
  auxValue1
45
46
  auxUnit2