@things-factory/operato-hub 4.3.435 → 4.3.437

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.
@@ -10,6 +10,7 @@ exports.SETTINGS = {
10
10
  { name: 'location-label', description: 'board id for location label', category: 'board' },
11
11
  { name: 'pallet-label', description: 'board id for pallet label', category: 'board' },
12
12
  { name: 'carton-label', description: 'board id for carton label', category: 'board' },
13
+ { name: 'item-label', description: 'board id for item label', category: 'board' },
13
14
  { name: 'rule-for-creating-ro', description: 'location sorting rules', category: 'location' },
14
15
  { name: 'rule-for-inspecting-product', description: 'location sorting rules', category: 'location' },
15
16
  { name: 'rule-for-inventory-assignment', description: 'location sorting rules', category: 'location' },
@@ -44,6 +45,11 @@ exports.SETTINGS = {
44
45
  },
45
46
  {
46
47
  name: 'enable-carton-label',
48
+ description: 'enable and disable the use of using item label',
49
+ category: 'id-rule'
50
+ },
51
+ {
52
+ name: 'enable-item-label',
47
53
  description: 'enable and disable the use of using carton label',
48
54
  category: 'id-rule'
49
55
  },
@@ -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":"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"}
@@ -9,6 +9,7 @@ const settings = [
9
9
  { name: 'location-label', description: 'board id for location label', category: 'board' },
10
10
  { name: 'pallet-label', description: 'board id for pallet label', category: 'board' },
11
11
  { name: 'carton-label', description: 'board id for carton label', category: 'board' },
12
+ { name: 'item-label', description: 'board id for item label', category: 'board' },
12
13
  { name: 'rule-for-creating-ro', description: 'location sorting rules', category: 'location' },
13
14
  { name: 'rule-for-inspecting-product', description: 'location sorting rules', category: 'location' },
14
15
  { name: 'rule-for-inventory-assignment', description: 'location sorting rules', category: 'location' },
@@ -1 +1 @@
1
- {"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../server/controllers/company-initializer/settings.ts"],"names":[],"mappings":";;;AAAA,MAAM,QAAQ,GAAG;IACf,EAAE,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,OAAO,EAAE;IACpF,EAAE,IAAI,EAAE,wBAAwB,EAAE,WAAW,EAAE,4BAA4B,EAAE,QAAQ,EAAE,OAAO,EAAE;IAChG,EAAE,IAAI,EAAE,wBAAwB,EAAE,WAAW,EAAE,2BAA2B,EAAE,QAAQ,EAAE,OAAO,EAAE;IAC/F,EAAE,IAAI,EAAE,uBAAuB,EAAE,WAAW,EAAE,2BAA2B,EAAE,QAAQ,EAAE,OAAO,EAAE;IAC9F,EAAE,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,6BAA6B,EAAE,QAAQ,EAAE,OAAO,EAAE;IACzF,EAAE,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,2BAA2B,EAAE,QAAQ,EAAE,OAAO,EAAE;IACrF,EAAE,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,2BAA2B,EAAE,QAAQ,EAAE,OAAO,EAAE;IACrF,EAAE,IAAI,EAAE,sBAAsB,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,UAAU,EAAE;IAC7F,EAAE,IAAI,EAAE,6BAA6B,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,UAAU,EAAE;IACpG,EAAE,IAAI,EAAE,+BAA+B,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,UAAU,EAAE;IACtG,EAAE,IAAI,EAAE,0BAA0B,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,UAAU,EAAE;IACjG,EAAE,IAAI,EAAE,uCAAuC,EAAE,WAAW,EAAE,qDAAqD,EAAE,QAAQ,EAAE,UAAU,EAAE;IAC3I,EAAE,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,gBAAgB,EAAE,QAAQ,EAAE,SAAS,EAAE;IAC9E,EAAE,IAAI,EAAE,wCAAwC,EAAE,WAAW,EAAE,4BAA4B,EAAE,QAAQ,EAAE,SAAS,EAAE;IAClH,EAAE,IAAI,EAAE,+BAA+B,EAAE,WAAW,EAAE,qBAAqB,EAAE,QAAQ,EAAE,SAAS,EAAE;IAClG,EAAE,IAAI,EAAE,iBAAiB,EAAE,WAAW,EAAE,2BAA2B,EAAE,QAAQ,EAAE,SAAS,EAAE;IAC1F,EAAE,IAAI,EAAE,yBAAyB,EAAE,WAAW,EAAE,6CAA6C,EAAE,QAAQ,EAAE,SAAS,EAAE;CACrH,CAAA;AAED,+DAAsD;AAE/C,KAAK,UAAU,YAAY,CAAC,EAAE,EAAE,MAAM;IAC3C,MAAM,WAAW,GAAG,EAAE,CAAC,aAAa,CAAC,sBAAO,CAAC,CAAA;IAC7C,OAAO,MAAM,WAAW,CAAC,IAAI,CAC3B,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACrB,uCACK,OAAO,KACV,MAAM,IACP;IACH,CAAC,CAAC,CACH,CAAA;AACH,CAAC;AAVD,oCAUC"}
1
+ {"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../server/controllers/company-initializer/settings.ts"],"names":[],"mappings":";;;AAAA,MAAM,QAAQ,GAAG;IACf,EAAE,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,OAAO,EAAE;IACpF,EAAE,IAAI,EAAE,wBAAwB,EAAE,WAAW,EAAE,4BAA4B,EAAE,QAAQ,EAAE,OAAO,EAAE;IAChG,EAAE,IAAI,EAAE,wBAAwB,EAAE,WAAW,EAAE,2BAA2B,EAAE,QAAQ,EAAE,OAAO,EAAE;IAC/F,EAAE,IAAI,EAAE,uBAAuB,EAAE,WAAW,EAAE,2BAA2B,EAAE,QAAQ,EAAE,OAAO,EAAE;IAC9F,EAAE,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,6BAA6B,EAAE,QAAQ,EAAE,OAAO,EAAE;IACzF,EAAE,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,2BAA2B,EAAE,QAAQ,EAAE,OAAO,EAAE;IACrF,EAAE,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,2BAA2B,EAAE,QAAQ,EAAE,OAAO,EAAE;IACrF,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,yBAAyB,EAAE,QAAQ,EAAE,OAAO,EAAE;IACjF,EAAE,IAAI,EAAE,sBAAsB,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,UAAU,EAAE;IAC7F,EAAE,IAAI,EAAE,6BAA6B,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,UAAU,EAAE;IACpG,EAAE,IAAI,EAAE,+BAA+B,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,UAAU,EAAE;IACtG,EAAE,IAAI,EAAE,0BAA0B,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,UAAU,EAAE;IACjG,EAAE,IAAI,EAAE,uCAAuC,EAAE,WAAW,EAAE,qDAAqD,EAAE,QAAQ,EAAE,UAAU,EAAE;IAC3I,EAAE,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,gBAAgB,EAAE,QAAQ,EAAE,SAAS,EAAE;IAC9E,EAAE,IAAI,EAAE,wCAAwC,EAAE,WAAW,EAAE,4BAA4B,EAAE,QAAQ,EAAE,SAAS,EAAE;IAClH,EAAE,IAAI,EAAE,+BAA+B,EAAE,WAAW,EAAE,qBAAqB,EAAE,QAAQ,EAAE,SAAS,EAAE;IAClG,EAAE,IAAI,EAAE,iBAAiB,EAAE,WAAW,EAAE,2BAA2B,EAAE,QAAQ,EAAE,SAAS,EAAE;IAC1F,EAAE,IAAI,EAAE,yBAAyB,EAAE,WAAW,EAAE,6CAA6C,EAAE,QAAQ,EAAE,SAAS,EAAE;CACrH,CAAA;AAED,+DAAsD;AAE/C,KAAK,UAAU,YAAY,CAAC,EAAE,EAAE,MAAM;IAC3C,MAAM,WAAW,GAAG,EAAE,CAAC,aAAa,CAAC,sBAAO,CAAC,CAAA;IAC7C,OAAO,MAAM,WAAW,CAAC,IAAI,CAC3B,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACrB,uCACK,OAAO,KACV,MAAM,IACP;IACH,CAAC,CAAC,CACH,CAAA;AACH,CAAC;AAVD,oCAUC"}
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const typeorm_1 = require("typeorm");
4
4
  const api_1 = require("@things-factory/api");
5
5
  const sales_base_1 = require("@things-factory/sales-base");
6
- const error_util_1 = require("../utils/error-util");
7
6
  const middlewares_1 = require("../middlewares");
7
+ const error_util_1 = require("../utils/error-util");
8
8
  api_1.restfulApiRouter.get('/v1/warehouse/get-goods-received-note-list', middlewares_1.businessMiddleware, middlewares_1.validationMiddleware, middlewares_1.loggingMiddleware, async (context, next) => {
9
9
  try {
10
10
  // get contact points for that bizplace
@@ -24,8 +24,9 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-goods-received-note-list', middlew
24
24
  'bizplace',
25
25
  'domain',
26
26
  'arrivalNotice',
27
- 'arrivalNotice.orderProducts',
28
- 'arrivalNotice.orderProducts.product'
27
+ 'arrivalNotice.orderInventories',
28
+ 'arrivalNotice.orderInventories.product',
29
+ 'arrivalNotice.orderInventories.inventory'
29
30
  ],
30
31
  skip: offset,
31
32
  take: limit,
@@ -35,9 +36,10 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-goods-received-note-list', middlew
35
36
  let data = [];
36
37
  for (const goodsReceivedNote of goodsReceivedNotes) {
37
38
  let orderProducts = [];
38
- for (const orderProduct of goodsReceivedNote.arrivalNotice.orderProducts) {
39
- const orderProductsDataPoint = {
39
+ orderProducts = goodsReceivedNote.arrivalNotice.orderInventories.map(orderProduct => {
40
+ return {
40
41
  product: {
42
+ id: orderProduct.product.id,
41
43
  sku: orderProduct.product.sku,
42
44
  brandSku: orderProduct.product.brandSku,
43
45
  name: orderProduct.product.name,
@@ -47,12 +49,13 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-goods-received-note-list', middlew
47
49
  batchId: orderProduct.batchId,
48
50
  packingType: orderProduct.packingType,
49
51
  packingSize: orderProduct.packingSize,
50
- releaseQty: orderProduct.releaseQty,
51
- releaseUomValue: orderProduct.releaseUomValue,
52
- status: orderProduct.status
52
+ status: orderProduct.status,
53
+ qty: orderProduct.actualPackQty,
54
+ uom: orderProduct.uom,
55
+ uomValue: orderProduct.uomValue,
56
+ expirationDate: orderProduct.inventory.expirationDate
53
57
  };
54
- orderProducts.push(orderProductsDataPoint);
55
- }
58
+ });
56
59
  const datapoint = {
57
60
  id: goodsReceivedNote.id,
58
61
  grnNo: goodsReceivedNote.grnNo,
@@ -1 +1 @@
1
- {"version":3,"file":"get-goods-received-note-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-goods-received-note-list.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get-goods-received-note-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-goods-received-note-list.ts"],"names":[],"mappings":"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"}
@@ -414,6 +414,9 @@ definitions:
414
414
  product:
415
415
  type: 'object'
416
416
  properties:
417
+ id:
418
+ type: 'string'
419
+ example: '89317220-b5f5-4e63-a748-6ac599ff288e'
417
420
  sku:
418
421
  type: 'string'
419
422
  example: 'string'
@@ -438,16 +441,21 @@ definitions:
438
441
  packingSize:
439
442
  type: 'integer'
440
443
  example: 24
441
- releaseQty:
444
+ status:
445
+ type: 'string'
446
+ example: 'ACTIVE'
447
+ qty:
442
448
  type: 'integer'
443
449
  example: 1
444
- releaseUomValue:
450
+ uom:
451
+ type: 'string'
452
+ example: 'UN'
453
+ uomValue:
445
454
  type: 'integer'
446
455
  format: 'double'
447
456
  example: 1
448
- status:
457
+ expirationDate:
449
458
  type: 'string'
450
- example: 'ACTIVE'
451
459
  attachments:
452
460
  type: 'string'
453
461
  example: 'string'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-hub",
3
- "version": "4.3.435",
3
+ "version": "4.3.437",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -77,22 +77,22 @@
77
77
  "@things-factory/i18n-base": "^4.3.434",
78
78
  "@things-factory/import-ui": "^4.3.434",
79
79
  "@things-factory/import-ui-excel": "^4.3.434",
80
- "@things-factory/integration-accounting": "^4.3.434",
81
- "@things-factory/integration-fulfillment": "^4.3.434",
82
- "@things-factory/integration-lmd": "^4.3.434",
83
- "@things-factory/integration-marketplace": "^4.3.434",
84
- "@things-factory/integration-pos": "^4.3.434",
85
- "@things-factory/integration-powrup": "^4.3.434",
86
- "@things-factory/integration-sellercraft": "^4.3.434",
87
- "@things-factory/integration-sftp": "^4.3.434",
88
- "@things-factory/lite-menu": "^4.3.434",
89
- "@things-factory/marketplace-base": "^4.3.434",
80
+ "@things-factory/integration-accounting": "^4.3.437",
81
+ "@things-factory/integration-fulfillment": "^4.3.437",
82
+ "@things-factory/integration-lmd": "^4.3.437",
83
+ "@things-factory/integration-marketplace": "^4.3.437",
84
+ "@things-factory/integration-pos": "^4.3.437",
85
+ "@things-factory/integration-powrup": "^4.3.437",
86
+ "@things-factory/integration-sellercraft": "^4.3.437",
87
+ "@things-factory/integration-sftp": "^4.3.437",
88
+ "@things-factory/lite-menu": "^4.3.437",
89
+ "@things-factory/marketplace-base": "^4.3.437",
90
90
  "@things-factory/more-ui": "^4.3.434",
91
- "@things-factory/notification": "^4.3.434",
91
+ "@things-factory/notification": "^4.3.437",
92
92
  "@things-factory/pdf": "^4.3.381",
93
93
  "@things-factory/product-ui": "^4.3.434",
94
94
  "@things-factory/resource-ui": "^4.3.434",
95
- "@things-factory/sales-base": "^4.3.435",
95
+ "@things-factory/sales-base": "^4.3.437",
96
96
  "@things-factory/scene-data-transform": "^4.3.381",
97
97
  "@things-factory/scene-excel": "^4.3.381",
98
98
  "@things-factory/scene-firebase": "^4.3.381",
@@ -104,12 +104,12 @@
104
104
  "@things-factory/scene-mqtt": "^4.3.381",
105
105
  "@things-factory/scene-restful": "^4.3.381",
106
106
  "@things-factory/scene-visualizer": "^4.3.381",
107
- "@things-factory/setting-ui": "^4.3.434",
107
+ "@things-factory/setting-ui": "^4.3.437",
108
108
  "@things-factory/shell": "^4.3.434",
109
109
  "@things-factory/system-ui": "^4.3.434",
110
110
  "@things-factory/transport-base": "^4.3.434",
111
- "@things-factory/warehouse-base": "^4.3.435",
112
- "@things-factory/worksheet-base": "^4.3.435",
111
+ "@things-factory/warehouse-base": "^4.3.437",
112
+ "@things-factory/worksheet-base": "^4.3.437",
113
113
  "cron-parser": "^4.7.0",
114
114
  "koa2-swagger-ui": "^5.0.2",
115
115
  "swagger-jsdoc": "^5.0.0",
@@ -121,5 +121,5 @@
121
121
  "resolutions": {
122
122
  "core-js": "^3.16.0"
123
123
  },
124
- "gitHead": "09c994cfecf6cc1d5091b0fb8db637ea00956f51"
124
+ "gitHead": "943a024dfb0194f842b97405190fc1e438f8a0dd"
125
125
  }
@@ -7,6 +7,7 @@ export const SETTINGS = {
7
7
  { name: 'location-label', description: 'board id for location label', category: 'board' },
8
8
  { name: 'pallet-label', description: 'board id for pallet label', category: 'board' },
9
9
  { name: 'carton-label', description: 'board id for carton label', category: 'board' },
10
+ { name: 'item-label', description: 'board id for item label', category: 'board'},
10
11
  { name: 'rule-for-creating-ro', description: 'location sorting rules', category: 'location' },
11
12
  { name: 'rule-for-inspecting-product', description: 'location sorting rules', category: 'location' },
12
13
  { name: 'rule-for-inventory-assignment', description: 'location sorting rules', category: 'location' },
@@ -41,6 +42,11 @@ export const SETTINGS = {
41
42
  },
42
43
  {
43
44
  name: 'enable-carton-label',
45
+ description: 'enable and disable the use of using item label',
46
+ category: 'id-rule'
47
+ },
48
+ {
49
+ name: 'enable-item-label',
44
50
  description: 'enable and disable the use of using carton label',
45
51
  category: 'id-rule'
46
52
  },
@@ -6,6 +6,7 @@ const settings = [
6
6
  { name: 'location-label', description: 'board id for location label', category: 'board' },
7
7
  { name: 'pallet-label', description: 'board id for pallet label', category: 'board' },
8
8
  { name: 'carton-label', description: 'board id for carton label', category: 'board' },
9
+ { name: 'item-label', description: 'board id for item label', category: 'board' },
9
10
  { name: 'rule-for-creating-ro', description: 'location sorting rules', category: 'location' },
10
11
  { name: 'rule-for-inspecting-product', description: 'location sorting rules', category: 'location' },
11
12
  { name: 'rule-for-inventory-assignment', description: 'location sorting rules', category: 'location' },
@@ -3,8 +3,8 @@ import { Between, getRepository } from 'typeorm'
3
3
  import { restfulApiRouter as router } from '@things-factory/api'
4
4
  import { GoodsReceivalNote } from '@things-factory/sales-base'
5
5
 
6
+ import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
6
7
  import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
7
- import { businessMiddleware, validationMiddleware, loggingMiddleware } from '../middlewares'
8
8
 
9
9
  router.get(
10
10
  '/v1/warehouse/get-goods-received-note-list',
@@ -32,8 +32,9 @@ router.get(
32
32
  'bizplace',
33
33
  'domain',
34
34
  'arrivalNotice',
35
- 'arrivalNotice.orderProducts',
36
- 'arrivalNotice.orderProducts.product'
35
+ 'arrivalNotice.orderInventories',
36
+ 'arrivalNotice.orderInventories.product',
37
+ 'arrivalNotice.orderInventories.inventory'
37
38
  ],
38
39
  skip: offset,
39
40
  take: limit,
@@ -45,9 +46,10 @@ router.get(
45
46
  let data = []
46
47
  for (const goodsReceivedNote of goodsReceivedNotes) {
47
48
  let orderProducts = []
48
- for (const orderProduct of goodsReceivedNote.arrivalNotice.orderProducts) {
49
- const orderProductsDataPoint = {
49
+ orderProducts = goodsReceivedNote.arrivalNotice.orderInventories.map(orderProduct => {
50
+ return {
50
51
  product: {
52
+ id: orderProduct.product.id,
51
53
  sku: orderProduct.product.sku,
52
54
  brandSku: orderProduct.product.brandSku,
53
55
  name: orderProduct.product.name,
@@ -57,12 +59,14 @@ router.get(
57
59
  batchId: orderProduct.batchId,
58
60
  packingType: orderProduct.packingType,
59
61
  packingSize: orderProduct.packingSize,
60
- releaseQty: orderProduct.releaseQty,
61
- releaseUomValue: orderProduct.releaseUomValue,
62
- status: orderProduct.status
62
+ status: orderProduct.status,
63
+ qty: orderProduct.actualPackQty,
64
+ uom: orderProduct.uom,
65
+ uomValue: orderProduct.uomValue,
66
+ expirationDate: orderProduct.inventory.expirationDate
63
67
  }
64
- orderProducts.push(orderProductsDataPoint)
65
- }
68
+ })
69
+
66
70
  const datapoint = {
67
71
  id: goodsReceivedNote.id,
68
72
  grnNo: goodsReceivedNote.grnNo,