@things-factory/sales-base 4.0.27 → 4.0.31

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 (54) hide show
  1. package/dist-server/service/arrival-notice/arrival-notice-mutation.js +2 -2
  2. package/dist-server/service/arrival-notice/arrival-notice-mutation.js.map +1 -1
  3. package/dist-server/service/arrival-notice/arrival-notice-query.js +26 -17
  4. package/dist-server/service/arrival-notice/arrival-notice-query.js.map +1 -1
  5. package/dist-server/service/arrival-notice/arrival-notice-types.js +5 -1
  6. package/dist-server/service/arrival-notice/arrival-notice-types.js.map +1 -1
  7. package/dist-server/service/arrival-notice/arrival-notice.js +1 -1
  8. package/dist-server/service/arrival-notice/arrival-notice.js.map +1 -1
  9. package/dist-server/service/delivery-order/delivery-order.js +1 -1
  10. package/dist-server/service/delivery-order/delivery-order.js.map +1 -1
  11. package/dist-server/service/job-sheet/job-sheet-mutation.js +1 -0
  12. package/dist-server/service/job-sheet/job-sheet-mutation.js.map +1 -1
  13. package/dist-server/service/order-inventory/order-inventory.js +24 -0
  14. package/dist-server/service/order-inventory/order-inventory.js.map +1 -1
  15. package/dist-server/service/others/other-query.js +5 -8
  16. package/dist-server/service/others/other-query.js.map +1 -1
  17. package/dist-server/service/purchase-order/purchase-order-mutation.js +1 -1
  18. package/dist-server/service/purchase-order/purchase-order-mutation.js.map +1 -1
  19. package/dist-server/service/purchase-order/purchase-order.js +10 -1
  20. package/dist-server/service/purchase-order/purchase-order.js.map +1 -1
  21. package/dist-server/service/release-good/release-good-mutation.js +1 -1
  22. package/dist-server/service/release-good/release-good-query.js +16 -11
  23. package/dist-server/service/release-good/release-good-query.js.map +1 -1
  24. package/dist-server/service/reverse-kitting-order/reverse-kitting-order-mutation.js +5 -4
  25. package/dist-server/service/reverse-kitting-order/reverse-kitting-order-mutation.js.map +1 -1
  26. package/dist-server/service/reverse-kitting-order/reverse-kitting-order-query.js +1 -2
  27. package/dist-server/service/reverse-kitting-order/reverse-kitting-order-query.js.map +1 -1
  28. package/dist-server/service/reverse-kitting-order/reverse-kitting-order-type.js +1 -1
  29. package/dist-server/service/reverse-kitting-order/reverse-kitting-order-type.js.map +1 -1
  30. package/dist-server/service/reverse-kitting-order/reverse-kitting-order.js +51 -4
  31. package/dist-server/service/reverse-kitting-order/reverse-kitting-order.js.map +1 -1
  32. package/dist-server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory-type.js +9 -1
  33. package/dist-server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory-type.js.map +1 -1
  34. package/dist-server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory.js +35 -3
  35. package/dist-server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory.js.map +1 -1
  36. package/package.json +12 -12
  37. package/server/service/arrival-notice/arrival-notice-mutation.ts +1 -1
  38. package/server/service/arrival-notice/arrival-notice-query.ts +28 -17
  39. package/server/service/arrival-notice/arrival-notice-types.ts +4 -1
  40. package/server/service/arrival-notice/arrival-notice.ts +1 -1
  41. package/server/service/delivery-order/delivery-order.ts +1 -1
  42. package/server/service/job-sheet/job-sheet-mutation.ts +1 -0
  43. package/server/service/order-inventory/order-inventory.ts +18 -0
  44. package/server/service/others/other-query.ts +5 -16
  45. package/server/service/purchase-order/purchase-order-mutation.ts +1 -1
  46. package/server/service/purchase-order/purchase-order.ts +8 -1
  47. package/server/service/release-good/release-good-mutation.ts +1 -1
  48. package/server/service/release-good/release-good-query.ts +18 -12
  49. package/server/service/reverse-kitting-order/reverse-kitting-order-mutation.ts +2 -1
  50. package/server/service/reverse-kitting-order/reverse-kitting-order-query.ts +1 -2
  51. package/server/service/reverse-kitting-order/reverse-kitting-order-type.ts +2 -2
  52. package/server/service/reverse-kitting-order/reverse-kitting-order.ts +39 -3
  53. package/server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory-type.ts +7 -1
  54. package/server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory.ts +25 -0
@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
8
8
  var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
10
  };
11
- var _a, _b, _c, _d;
11
+ var _a, _b, _c, _d, _e, _f;
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
13
  exports.ReverseKittingOrder = void 0;
14
14
  const type_graphql_1 = require("type-graphql");
@@ -16,6 +16,8 @@ const typeorm_1 = require("typeorm");
16
16
  const auth_base_1 = require("@things-factory/auth-base");
17
17
  const biz_base_1 = require("@things-factory/biz-base");
18
18
  const shell_1 = require("@things-factory/shell");
19
+ const warehouse_base_1 = require("@things-factory/warehouse-base");
20
+ const product_base_1 = require("@things-factory/product-base");
19
21
  const reverse_kitting_order_inventory_1 = require("../reverse-kitting-order-inventory/reverse-kitting-order-inventory");
20
22
  let ReverseKittingOrder = class ReverseKittingOrder {
21
23
  };
@@ -35,6 +37,7 @@ __decorate([
35
37
  ], ReverseKittingOrder.prototype, "domainId", void 0);
36
38
  __decorate([
37
39
  (0, typeorm_1.ManyToOne)(type => biz_base_1.Bizplace),
40
+ (0, type_graphql_1.Field)(type => biz_base_1.Bizplace, { nullable: true }),
38
41
  __metadata("design:type", typeof (_b = typeof biz_base_1.Bizplace !== "undefined" && biz_base_1.Bizplace) === "function" ? _b : Object)
39
42
  ], ReverseKittingOrder.prototype, "bizplace", void 0);
40
43
  __decorate([
@@ -57,10 +60,54 @@ __decorate([
57
60
  __metadata("design:type", String)
58
61
  ], ReverseKittingOrder.prototype, "remark", void 0);
59
62
  __decorate([
60
- (0, typeorm_1.Column)({ nullable: true }),
63
+ (0, type_graphql_1.Field)({ nullable: true }),
64
+ __metadata("design:type", String)
65
+ ], ReverseKittingOrder.prototype, "batchId", void 0);
66
+ __decorate([
67
+ (0, type_graphql_1.Field)({ nullable: true }),
68
+ __metadata("design:type", String)
69
+ ], ReverseKittingOrder.prototype, "packingType", void 0);
70
+ __decorate([
71
+ (0, type_graphql_1.Field)(type => type_graphql_1.Float, { nullable: true }),
72
+ __metadata("design:type", Number)
73
+ ], ReverseKittingOrder.prototype, "packingSize", void 0);
74
+ __decorate([
75
+ (0, typeorm_1.Column)(),
61
76
  (0, type_graphql_1.Field)({ nullable: true }),
62
77
  __metadata("design:type", String)
63
78
  ], ReverseKittingOrder.prototype, "status", void 0);
79
+ __decorate([
80
+ (0, type_graphql_1.Field)({ nullable: true }),
81
+ __metadata("design:type", String)
82
+ ], ReverseKittingOrder.prototype, "batchIdRef", void 0);
83
+ __decorate([
84
+ (0, type_graphql_1.Field)({ nullable: true }),
85
+ __metadata("design:type", String)
86
+ ], ReverseKittingOrder.prototype, "palletId", void 0);
87
+ __decorate([
88
+ (0, type_graphql_1.Field)({ nullable: true }),
89
+ __metadata("design:type", String)
90
+ ], ReverseKittingOrder.prototype, "cartonId", void 0);
91
+ __decorate([
92
+ (0, type_graphql_1.Field)(type => type_graphql_1.Int, { nullable: true }),
93
+ __metadata("design:type", Number)
94
+ ], ReverseKittingOrder.prototype, "qty", void 0);
95
+ __decorate([
96
+ (0, type_graphql_1.Field)({ nullable: true }),
97
+ __metadata("design:type", String)
98
+ ], ReverseKittingOrder.prototype, "expirationDate", void 0);
99
+ __decorate([
100
+ (0, type_graphql_1.Field)(type => warehouse_base_1.Location, { nullable: true }),
101
+ __metadata("design:type", typeof (_c = typeof warehouse_base_1.Location !== "undefined" && warehouse_base_1.Location) === "function" ? _c : Object)
102
+ ], ReverseKittingOrder.prototype, "location", void 0);
103
+ __decorate([
104
+ (0, type_graphql_1.Field)(type => product_base_1.Product, { nullable: true }),
105
+ __metadata("design:type", typeof (_d = typeof product_base_1.Product !== "undefined" && product_base_1.Product) === "function" ? _d : Object)
106
+ ], ReverseKittingOrder.prototype, "product", void 0);
107
+ __decorate([
108
+ (0, type_graphql_1.Field)({ nullable: true }),
109
+ __metadata("design:type", String)
110
+ ], ReverseKittingOrder.prototype, "productDetailId", void 0);
64
111
  __decorate([
65
112
  (0, typeorm_1.CreateDateColumn)(),
66
113
  (0, type_graphql_1.Field)({ nullable: true }),
@@ -74,7 +121,7 @@ __decorate([
74
121
  __decorate([
75
122
  (0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
76
123
  (0, type_graphql_1.Field)({ nullable: true }),
77
- __metadata("design:type", typeof (_c = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _c : Object)
124
+ __metadata("design:type", typeof (_e = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _e : Object)
78
125
  ], ReverseKittingOrder.prototype, "creator", void 0);
79
126
  __decorate([
80
127
  (0, typeorm_1.RelationId)((reverseKittingOrder) => reverseKittingOrder.creator),
@@ -83,7 +130,7 @@ __decorate([
83
130
  __decorate([
84
131
  (0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
85
132
  (0, type_graphql_1.Field)({ nullable: true }),
86
- __metadata("design:type", typeof (_d = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _d : Object)
133
+ __metadata("design:type", typeof (_f = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _f : Object)
87
134
  ], ReverseKittingOrder.prototype, "updater", void 0);
88
135
  __decorate([
89
136
  (0, typeorm_1.RelationId)((reverseKittingOrder) => reverseKittingOrder.creator),
@@ -1 +1 @@
1
- {"version":3,"file":"reverse-kitting-order.js","sourceRoot":"","sources":["../../../server/service/reverse-kitting-order/reverse-kitting-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"reverse-kitting-order.js","sourceRoot":"","sources":["../../../server/service/reverse-kitting-order/reverse-kitting-order.ts"],"names":[],"mappings":"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"}
@@ -45,7 +45,15 @@ __decorate([
45
45
  __metadata("design:type", Number)
46
46
  ], NewReverseKittingOrderInventory.prototype, "uomValue", void 0);
47
47
  __decorate([
48
- (0, type_graphql_1.Field)(type => shell_1.ObjectRef),
48
+ (0, type_graphql_1.Field)({ nullable: true }),
49
+ __metadata("design:type", String)
50
+ ], NewReverseKittingOrderInventory.prototype, "productName", void 0);
51
+ __decorate([
52
+ (0, type_graphql_1.Field)({ nullable: true }),
53
+ __metadata("design:type", String)
54
+ ], NewReverseKittingOrderInventory.prototype, "packingType", void 0);
55
+ __decorate([
56
+ (0, type_graphql_1.Field)(type => shell_1.ObjectRef, { nullable: true }),
49
57
  __metadata("design:type", typeof (_a = typeof shell_1.ObjectRef !== "undefined" && shell_1.ObjectRef) === "function" ? _a : Object)
50
58
  ], NewReverseKittingOrderInventory.prototype, "reverseKittingOrder", void 0);
51
59
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"reverse-kitting-order-inventory-type.js","sourceRoot":"","sources":["../../../server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory-type.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"reverse-kitting-order-inventory-type.js","sourceRoot":"","sources":["../../../server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory-type.ts"],"names":[],"mappings":"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"}
@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
8
8
  var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
10
  };
11
- var _a, _b, _c, _d, _e;
11
+ var _a, _b, _c, _d, _e, _f, _g;
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
13
  exports.ReverseKittingOrderInventory = void 0;
14
14
  const type_graphql_1 = require("type-graphql");
@@ -17,6 +17,8 @@ const auth_base_1 = require("@things-factory/auth-base");
17
17
  const biz_base_1 = require("@things-factory/biz-base");
18
18
  const shell_1 = require("@things-factory/shell");
19
19
  const warehouse_base_1 = require("@things-factory/warehouse-base");
20
+ const product_base_1 = require("@things-factory/product-base");
21
+ const sales_base_1 = require("@things-factory/sales-base");
20
22
  const reverse_kitting_order_1 = require("../reverse-kitting-order/reverse-kitting-order");
21
23
  let ReverseKittingOrderInventory = class ReverseKittingOrderInventory {
22
24
  };
@@ -100,6 +102,36 @@ __decorate([
100
102
  (0, type_graphql_1.Field)(),
101
103
  __metadata("design:type", String)
102
104
  ], ReverseKittingOrderInventory.prototype, "status", void 0);
105
+ __decorate([
106
+ (0, type_graphql_1.Field)({ nullable: true }),
107
+ __metadata("design:type", String)
108
+ ], ReverseKittingOrderInventory.prototype, "targetType", void 0);
109
+ __decorate([
110
+ (0, type_graphql_1.Field)({ nullable: true }),
111
+ __metadata("design:type", String)
112
+ ], ReverseKittingOrderInventory.prototype, "targetBatchId", void 0);
113
+ __decorate([
114
+ (0, typeorm_1.ManyToOne)(type => product_base_1.Product, { nullable: true }),
115
+ (0, type_graphql_1.Field)(type => product_base_1.Product, { nullable: true }),
116
+ __metadata("design:type", typeof (_d = typeof product_base_1.Product !== "undefined" && product_base_1.Product) === "function" ? _d : Object)
117
+ ], ReverseKittingOrderInventory.prototype, "targetProduct", void 0);
118
+ __decorate([
119
+ (0, typeorm_1.ManyToOne)(type => sales_base_1.Vas, { nullable: true }),
120
+ (0, type_graphql_1.Field)(type => sales_base_1.Vas, { nullable: true }),
121
+ __metadata("design:type", typeof (_e = typeof sales_base_1.Vas !== "undefined" && sales_base_1.Vas) === "function" ? _e : Object)
122
+ ], ReverseKittingOrderInventory.prototype, "vas", void 0);
123
+ __decorate([
124
+ (0, type_graphql_1.Field)({ nullable: true }),
125
+ __metadata("design:type", String)
126
+ ], ReverseKittingOrderInventory.prototype, "otherTarget", void 0);
127
+ __decorate([
128
+ (0, type_graphql_1.Field)({ nullable: true }),
129
+ __metadata("design:type", String)
130
+ ], ReverseKittingOrderInventory.prototype, "description", void 0);
131
+ __decorate([
132
+ (0, type_graphql_1.Field)({ nullable: true }),
133
+ __metadata("design:type", String)
134
+ ], ReverseKittingOrderInventory.prototype, "issue", void 0);
103
135
  __decorate([
104
136
  (0, typeorm_1.CreateDateColumn)(),
105
137
  (0, type_graphql_1.Field)({ nullable: true }),
@@ -113,7 +145,7 @@ __decorate([
113
145
  __decorate([
114
146
  (0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
115
147
  (0, type_graphql_1.Field)({ nullable: true }),
116
- __metadata("design:type", typeof (_d = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _d : Object)
148
+ __metadata("design:type", typeof (_f = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _f : Object)
117
149
  ], ReverseKittingOrderInventory.prototype, "creator", void 0);
118
150
  __decorate([
119
151
  (0, typeorm_1.RelationId)((reverseKittingOrderInventory) => reverseKittingOrderInventory.creator),
@@ -122,7 +154,7 @@ __decorate([
122
154
  __decorate([
123
155
  (0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
124
156
  (0, type_graphql_1.Field)({ nullable: true }),
125
- __metadata("design:type", typeof (_e = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _e : Object)
157
+ __metadata("design:type", typeof (_g = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _g : Object)
126
158
  ], ReverseKittingOrderInventory.prototype, "updater", void 0);
127
159
  __decorate([
128
160
  (0, typeorm_1.RelationId)((reverseKittingOrderInventory) => reverseKittingOrderInventory.creator),
@@ -1 +1 @@
1
- {"version":3,"file":"reverse-kitting-order-inventory.js","sourceRoot":"","sources":["../../../server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"reverse-kitting-order-inventory.js","sourceRoot":"","sources":["../../../server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/sales-base",
3
- "version": "4.0.27",
3
+ "version": "4.0.31",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -24,16 +24,16 @@
24
24
  "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
25
25
  },
26
26
  "dependencies": {
27
- "@things-factory/attachment-base": "^4.0.27",
28
- "@things-factory/auth-base": "^4.0.27",
29
- "@things-factory/biz-base": "^4.0.27",
30
- "@things-factory/code-base": "^4.0.27",
31
- "@things-factory/notification": "^4.0.27",
32
- "@things-factory/product-base": "^4.0.27",
33
- "@things-factory/setting-base": "^4.0.27",
34
- "@things-factory/shell": "^4.0.27",
35
- "@things-factory/transport-base": "^4.0.27",
36
- "@things-factory/warehouse-base": "^4.0.27"
27
+ "@things-factory/attachment-base": "^4.0.31",
28
+ "@things-factory/auth-base": "^4.0.31",
29
+ "@things-factory/biz-base": "^4.0.31",
30
+ "@things-factory/code-base": "^4.0.31",
31
+ "@things-factory/notification": "^4.0.31",
32
+ "@things-factory/product-base": "^4.0.31",
33
+ "@things-factory/setting-base": "^4.0.31",
34
+ "@things-factory/shell": "^4.0.31",
35
+ "@things-factory/transport-base": "^4.0.31",
36
+ "@things-factory/warehouse-base": "^4.0.31"
37
37
  },
38
- "gitHead": "276eaface2890c8f229ce6c9f64cde9c6b1e0083"
38
+ "gitHead": "6c021ffdeacc9d123298528f6bba91f61389f33d"
39
39
  }
@@ -440,7 +440,7 @@ export async function generateArrivalNoticeFunction(
440
440
 
441
441
  const settingRepo: Repository<Setting> = tx?.getRepository(Setting) || getRepository(Setting)
442
442
 
443
- if (arrivalNotice.bizplaceId) myBizplace = context.state.bizplace
443
+ if (arrivalNotice.bizplace) myBizplace = arrivalNotice.bizplace
444
444
  else if (arrivalNotice.customerBizplaceId) {
445
445
  const permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
446
446
  let foundPermittedBizplace: Bizplace = permittedBizplaces.find(biz => biz.id == arrivalNotice.customerBizplaceId)
@@ -441,18 +441,21 @@ export async function validateBulkArrivalNoticesFunction(
441
441
  tp.pack_qty,
442
442
  pd.uom_value,
443
443
  pd.uom,
444
- CONCAT(COALESCE(ROUND(pd.uom_value :: numeric, 2), 0) * tp.pack_qty, ' ', pd.uom) AS total_uom_value,
444
+ CONCAT(COALESCE(ROUND(pd.uom_value :: numeric, 2), 0) * COALESCE(tp.pack_qty, 0), ' ', pd.uom) AS total_uom_value,
445
445
  tp.pallet_qty,
446
446
  tp.unit_price,
447
447
  tp.manufacture_year,
448
- CASE WHEN an.id NOTNULL THEN CONCAT('duplicated with ', an.name) ELSE CASE WHEN pr.id ISNULL OR pd.id ISNULL OR tp.sku ISNULL THEN 'product not found'
449
- ELSE CASE WHEN tp.pack_qty <= 0 THEN 'pack qty must be integer'
450
- ELSE CASE WHEN tp.batch_id ISNULL THEN 'batch no. is required'
451
- ELSE CASE WHEN tp.ref_no ISNULL OR tp.ref_no = '' THEN 'ref no. is required'
452
- ELSE CASE WHEN tp.eta_date ISNULL OR tp.eta_date = '' THEN 'eta date is required'
453
- ELSE CASE WHEN tp.eta_date::date < now()::date THEN 'backdate is not allowed'
454
- ELSE CASE WHEN tp.container_no NOTNULL AND tp.container_size ISNULL OR tp.container_no ISNULL AND tp.container_size NOTNULL THEN 'incomplete container information'
455
- ELSE '' END END END END END END END END AS remark
448
+ CASE WHEN an.id NOTNULL THEN CONCAT('duplicated with ', an.name)
449
+ WHEN pr.id ISNULL OR pd.id ISNULL OR tp.sku ISNULL THEN 'product not found'
450
+ WHEN tp.pack_qty ISNULL OR tp.pack_qty <= 0 THEN 'invalid pack qty'
451
+ WHEN tp.batch_id ISNULL THEN 'batch no. is required'
452
+ WHEN tp.ref_no ISNULL OR tp.ref_no = '' THEN 'ref no. is required'
453
+ WHEN tp.eta_date ISNULL OR tp.eta_date = '' THEN 'eta date is required'
454
+ WHEN tp.eta_date::date < now()::date THEN 'backdate is not allowed'
455
+ WHEN tp.container_no NOTNULL AND tp.container_size ISNULL OR tp.container_no ISNULL AND tp.container_size NOTNULL THEN 'incomplete container information'
456
+ WHEN tp.unit_price < 0 THEN 'invalid unit price'
457
+ WHEN tp.pallet_qty < 0 THEN 'invalid pallet qty'
458
+ ELSE '' END AS errorMsg
456
459
  FROM
457
460
  temp_order_products tp
458
461
  LEFT JOIN arrival_notices an ON tp.ref_no = an.ref_no
@@ -465,13 +468,15 @@ export async function validateBulkArrivalNoticesFunction(
465
468
  AND CASE WHEN tp.container_size NOTNULL THEN tp.container_size = an.container_size ELSE 1 = 1 END
466
469
  AND CASE WHEN tp.loose_item NOTNULL THEN tp.loose_item = an.loose_item ELSE 1 = 1 END
467
470
  AND CASE WHEN tp.import_cargo NOTNULL THEN tp.import_cargo = an.import_cargo ELSE 1 = 1 END
468
- LEFT JOIN products pr ON pr.sku = tp.sku
469
- LEFT JOIN product_details pd ON pr.id = pd.product_id
470
- AND CASE WHEN tp.packing_type NOTNULL
471
- AND tp.packing_size NOTNULL
472
- AND tp.uom NOTNULL THEN pd.packing_type = tp.packing_type
473
- AND pd.packing_size = tp.packing_size
474
- AND pd.uom = tp.uom ELSE pd.is_default = TRUE END
471
+ LEFT JOIN products pr ON LOWER(pr.sku) = LOWER(tp.sku)
472
+ LEFT JOIN product_details pd ON pr.id = pd.product_id
473
+ AND CASE WHEN tp.packing_type NOTNULL AND tp.packing_size NOTNULL AND tp.uom NOTNULL
474
+ THEN pd.packing_type = tp.packing_type AND pd.packing_size = tp.packing_size AND pd.uom = tp.uom
475
+ WHEN tp.packing_type NOTNULL AND tp.packing_size NOTNULL AND tp.uom ISNULL
476
+ THEN pd.packing_type = tp.packing_type AND pd.packing_size = tp.packing_size AND pd.is_default IS TRUE
477
+ WHEN tp.packing_type ISNULL AND tp.packing_size ISNULL AND tp.uom NOTNULL
478
+ THEN pd.uom = tp.uom AND pd.is_default IS TRUE ELSE pd.is_default IS TRUE
479
+ END
475
480
  WHERE
476
481
  pr.bizplace_id = $1
477
482
 
@@ -482,6 +487,12 @@ export async function validateBulkArrivalNoticesFunction(
482
487
  await trxMgr.query('DROP TABLE temp_order_products')
483
488
 
484
489
  return validatedItems.map(item => {
490
+ let manufactureYear = item.manufacture_year
491
+
492
+ const regExp = /^(181[2-9]|18[2-9]\d|19\d\d|2\d{3}|30[0-3]\d|304[0-8])$/
493
+
494
+ if (manufactureYear && !regExp.test(manufactureYear) && !item.errorMsg) item.errorMsg = 'invalid manufacture year'
495
+
485
496
  return {
486
497
  refNo: item.ref_no,
487
498
  refNo2: item.ref_no_2,
@@ -508,7 +519,7 @@ export async function validateBulkArrivalNoticesFunction(
508
519
  palletQty: item.pallet_qty,
509
520
  unitPrice: item.unit_price,
510
521
  manufactureYear: item.manufacture_year,
511
- remark: item.remark
522
+ errorMsg: item.errorMsg
512
523
  }
513
524
  })
514
525
  }
@@ -121,6 +121,9 @@ export class NewArrivalNotice {
121
121
 
122
122
  @Field(type => Int, { nullable: true })
123
123
  manufactureYear?: number
124
+
125
+ @Field({ nullable: true })
126
+ errorMsg: string
124
127
  }
125
128
 
126
129
  @InputType()
@@ -288,5 +291,5 @@ export class RawArrivalNotice {
288
291
  manufactureYear?: number
289
292
 
290
293
  @Field({ nullable: true })
291
- remark?: string
294
+ errorMsg?: string
292
295
  }
@@ -145,7 +145,7 @@ export class ArrivalNotice {
145
145
 
146
146
  @OneToOne(type => PurchaseOrder, { nullable: true })
147
147
  @JoinColumn()
148
- @Field(type => [PurchaseOrder], { nullable: true })
148
+ @Field(type => PurchaseOrder, { nullable: true })
149
149
  purchaseOrder: PurchaseOrder
150
150
 
151
151
  @CreateDateColumn()
@@ -94,7 +94,7 @@ export class DeliveryOrder {
94
94
  retailReplenishmentOrderId: string
95
95
 
96
96
  @OneToMany(type => OrderInventory, orderInventory => orderInventory.deliveryOrder)
97
- @Field(type => OrderInventory, { nullable: true })
97
+ @Field(type => [OrderInventory], { nullable: true })
98
98
  orderInventories: OrderInventory[]
99
99
 
100
100
  @Field(type => [OrderInventory], { nullable: true })
@@ -18,6 +18,7 @@ export class JobSheetMutation {
18
18
  return await generateJobSheet(domain, user, arrivalNotice, tx)
19
19
  }
20
20
 
21
+ @Directive('@transaction')
21
22
  @Mutation(returns => JobSheet)
22
23
  async updateJobSheet(
23
24
  @Arg('name') name: string,
@@ -256,6 +256,9 @@ export class OrderInventory {
256
256
  @Field({ nullable: true })
257
257
  productName: string
258
258
 
259
+ @Field({ nullable: true })
260
+ productSKU: string
261
+
259
262
  @Field({ nullable: true })
260
263
  productBrand: string
261
264
 
@@ -303,6 +306,21 @@ export class OrderInventory {
303
306
  @Field({ nullable: true })
304
307
  status: string
305
308
 
309
+ @Field({ nullable: true })
310
+ remainQty: number
311
+
312
+ @Field({ nullable: true })
313
+ remainUomValue: string
314
+
315
+ @Field({ nullable: true })
316
+ remainUomValueWithUom: string
317
+
318
+ @Field({ nullable: true })
319
+ isError: boolean
320
+
321
+ @Field({ nullable: true })
322
+ groupType: string
323
+
306
324
  @CreateDateColumn()
307
325
  @Field()
308
326
  createdAt: Date
@@ -1,11 +1,11 @@
1
1
  import orderBy from 'lodash/orderBy'
2
- import { Arg, Ctx, Directive, Query, Resolver } from 'type-graphql'
2
+ import { Arg, Args, Ctx, Directive, Query, Resolver } from 'type-graphql'
3
3
  import { EntityManager } from 'typeorm'
4
4
 
5
5
  import { User } from '@things-factory/auth-base'
6
6
  import { Bizplace, getPermittedBizplaces } from '@things-factory/biz-base'
7
7
  import { Product, ProductDetail } from '@things-factory/product-base'
8
- import { Domain, Filter, Pagination, Sorting } from '@things-factory/shell'
8
+ import { Domain, ListParam } from '@things-factory/shell'
9
9
 
10
10
  import { InventoryProductGroupList, NewOrderInventory, NewOrderProduct, OrderInventory, OrderProduct } from '../'
11
11
  import { InventoryUtil } from '../../utils'
@@ -15,13 +15,7 @@ export class OtherQuery {
15
15
  @Directive('@privilege(category: "inventory", privilege: "query")')
16
16
  @Directive('@transaction')
17
17
  @Query(returns => InventoryProductGroupList)
18
- async inventoryProductGroup(
19
- @Ctx() context: any,
20
- @Arg('filters', type => [Filter], { nullable: true }) filters?: Filter[],
21
- @Arg('pagination', type => Pagination, { nullable: true }) pagination?: Pagination,
22
- @Arg('sortings', type => [Sorting], { nullable: true }) sortings?: Sorting[],
23
- @Arg('locationSortingRules', type => [Sorting], { nullable: true }) locationSortingRules?: Sorting[]
24
- ): Promise<InventoryProductGroupList> {
18
+ async inventoryProductGroup(@Ctx() context: any, @Args() params: ListParam): Promise<InventoryProductGroupList> {
25
19
  const {
26
20
  domain,
27
21
  user,
@@ -31,7 +25,7 @@ export class OtherQuery {
31
25
 
32
26
  let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
33
27
 
34
- let bizplaceId: any = filters.find(filter => filter.name === 'bizplace_id').value
28
+ let bizplaceId: any = params.filters.find(filter => filter.name === 'bizplace_id').value
35
29
  let foundPermittedBizplace: Bizplace
36
30
  let companyBizplace: Bizplace
37
31
 
@@ -52,12 +46,7 @@ export class OtherQuery {
52
46
  const bizplaces: Bizplace[] = [foundPermittedBizplace, companyBizplace]
53
47
  if (bizplace) bizplaces.push(bizplace)
54
48
 
55
- const { items, total } = await InventoryUtil.bizplaceInventoryProductGroup(
56
- bizplaces,
57
- { filters, pagination, sortings },
58
- context,
59
- tx
60
- )
49
+ const { items, total } = await InventoryUtil.bizplaceInventoryProductGroup(bizplaces, params, context, tx)
61
50
 
62
51
  return { items, total }
63
52
  }
@@ -40,7 +40,7 @@ export class PurchaseOrderMutation {
40
40
  async upsertPurchaseOrder(
41
41
  @Ctx() context: any,
42
42
  @Arg('purchaseOrder', type => PurchaseOrderPatch) purchaseOrder: PurchaseOrderPatch,
43
- @Arg('file', type => GraphQLUpload, { nullable: true }) file?: FileUpload
43
+ @Arg('file', type => [GraphQLUpload], { nullable: true }) file?: FileUpload
44
44
  ): Promise<PurchaseOrder> {
45
45
  try {
46
46
  const { tx }: { tx: EntityManager } = context.state
@@ -3,6 +3,7 @@ import { Bizplace, ContactPoint } from '@things-factory/biz-base'
3
3
  import { Domain } from '@things-factory/shell'
4
4
  import { Location } from '@things-factory/warehouse-base'
5
5
  import { Field, ID, ObjectType } from 'type-graphql'
6
+ import { Attachment } from '@things-factory/attachment-base'
6
7
  import {
7
8
  Column,
8
9
  CreateDateColumn,
@@ -53,6 +54,12 @@ export class PurchaseOrder {
53
54
  @Field()
54
55
  status: string
55
56
 
57
+ @Field({ nullable: true })
58
+ description: string
59
+
60
+ @Field(type => [Attachment], { nullable: true })
61
+ attachment: Attachment[]
62
+
56
63
  @Column({ nullable: true })
57
64
  @Field({ nullable: true })
58
65
  refNo: string
@@ -105,7 +112,7 @@ export class PurchaseOrder {
105
112
  orderProducts: OrderProduct[]
106
113
 
107
114
  @OneToMany(type => PurchaseOrderOtherCharge, otherCharge => otherCharge.purchaseOrder)
108
- @Field(type => PurchaseOrderOtherCharge, { nullable: true })
115
+ @Field(type => [PurchaseOrderOtherCharge], { nullable: true })
109
116
  otherCharges: (PurchaseOrderOtherCharge | PurchaseOrderOtherChargePatch)[]
110
117
 
111
118
  @ManyToOne(type => ContactPoint)
@@ -784,7 +784,7 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
784
784
  let matchedMarketplaceStore: MarketplaceStore
785
785
  if (foundMarketplaceOrder) {
786
786
  matchedMarketplaceStore = marketplaceStores.filter(
787
- marketplaceStore => marketplaceStore.id != foundMarketplaceOrder.marketplaceStore.id
787
+ marketplaceStore => marketplaceStore.id == foundMarketplaceOrder.marketplaceStore.id
788
788
  )[0]
789
789
  }
790
790
 
@@ -3,7 +3,7 @@ import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from
3
3
  import { EntityManager, getRepository, In, Repository, SelectQueryBuilder } from 'typeorm'
4
4
 
5
5
  import { Attachment } from '@things-factory/attachment-base'
6
- import { User } from '@things-factory/auth-base'
6
+ import { checkUserBelongsDomain, User } from '@things-factory/auth-base'
7
7
  import { Bizplace, getCompanyBizplace, getMyBizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
8
8
  import { Product } from '@things-factory/product-base'
9
9
  import { buildQuery, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
@@ -209,6 +209,8 @@ export class ReleaseGoodQuery {
209
209
  packingSize: inventory.packingSize,
210
210
  location: inventory.location,
211
211
  qty: inventory.qty,
212
+ lockedQty: inventory.lockedQty,
213
+ lockedUomValue: inventory.lockedUomValue,
212
214
  uom: inventory.uom,
213
215
  uomValue: inventory.uomValue,
214
216
  releaseQty: orderInv.releaseQty,
@@ -265,13 +267,15 @@ export class ReleaseGoodQuery {
265
267
  const statusFilter = params.filters.some(e => e.name === 'status')
266
268
  const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId')
267
269
 
268
- if (!statusFilter) {
269
- params.filters.push({
270
- name: 'status',
271
- operator: 'notin',
272
- value: [ORDER_STATUS.PENDING, ORDER_STATUS.EDITING],
273
- relation: false
274
- })
270
+ if (await checkUserBelongsDomain(domain, user)) {
271
+ if (!statusFilter && !params.filters.some(e => e.name === 'name')) {
272
+ params.filters.push({
273
+ name: 'status',
274
+ operator: 'notin',
275
+ value: [ORDER_STATUS.PENDING, ORDER_STATUS.EDITING, ''],
276
+ relation: false
277
+ })
278
+ }
275
279
  }
276
280
 
277
281
  if (!bizplaceFilter) {
@@ -628,7 +632,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
628
632
  CASE WHEN js.packing_type NOTNULL AND js.packing_size NOTNULL THEN js.packing_size ELSE pd.packing_size END,
629
633
  CASE WHEN js.uom NOTNULL THEN js.uom ELSE pd.uom END
630
634
  FROM JSON_POPULATE_RECORDSET(NULL::raw_release_goods, $1) js
631
- LEFT JOIN products p ON js.sku = p.sku AND p.bizplace_id = $2
635
+ LEFT JOIN products p ON LOWER(js.sku) = LOWER(p.sku) AND p.bizplace_id = $2
632
636
  LEFT JOIN product_details pd ON p.id = pd.product_id
633
637
  AND CASE WHEN js.packing_type NOTNULL AND js.packing_size NOTNULL AND js.uom NOTNULL
634
638
  THEN pd.packing_type = js.packing_type AND pd.packing_size = js.packing_size AND pd.uom = js.uom
@@ -689,6 +693,8 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
689
693
  [domain.id, bizplaceId, LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
690
694
  )
691
695
 
696
+ await tx.query(`DROP TABLE raw_release_goods`)
697
+
692
698
  availableItems = availableItems.map(item => {
693
699
  return {
694
700
  productId: item.product_id,
@@ -697,7 +703,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
697
703
  sku: item.sku,
698
704
  batchId: item.batch_id,
699
705
  packingType: item.packing_type,
700
- packingSize: item.packing_size,
706
+ packingSize: Number(item.packing_size || 0),
701
707
  uom: item.uom,
702
708
  remainQty: item.remain_qty,
703
709
  remainUomValue: item.remain_uom_value
@@ -725,7 +731,7 @@ function _extractData(rawData, validatedData) {
725
731
  a = JSON.stringify(Object.fromEntries(Object.entries(a).sort()))
726
732
  b = JSON.stringify(Object.fromEntries(Object.entries(b).sort()))
727
733
 
728
- return val.sku == raw.sku && a === b
734
+ return val.sku.toLowerCase() == raw.sku.toLowerCase() && a === b
729
735
  })
730
736
 
731
737
  let releaseUomValue = 0
@@ -773,7 +779,7 @@ function _extractData(rawData, validatedData) {
773
779
  releaseUomValue,
774
780
  errorMsg:
775
781
  !raw.productId || !raw.productDetailId
776
- ? 'product not found'
782
+ ? 'inventory or product not found'
777
783
  : raw.releaseQty <= 0
778
784
  ? 'invalid release qty'
779
785
  : raw.assignedQty < raw.releaseQty