@things-factory/worksheet-base 4.3.15 → 4.3.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-server/controllers/ecommerce/sellercraft-controller.js +6 -6
- package/dist-server/controllers/ecommerce/sellercraft-controller.js.map +1 -1
- package/dist-server/entities/index.js +2 -1
- package/dist-server/entities/index.js.map +1 -1
- package/dist-server/entities/warehouse-bizplace-onhand-inventory.js +174 -0
- package/dist-server/entities/warehouse-bizplace-onhand-inventory.js.map +1 -0
- package/package.json +5 -5
- package/server/controllers/ecommerce/sellercraft-controller.ts +19 -6
- package/server/entities/index.ts +2 -1
- package/server/entities/warehouse-bizplace-onhand-inventory.ts +147 -0
|
@@ -23,7 +23,7 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
|
|
|
23
23
|
orderId: releaseGood.refNo2,
|
|
24
24
|
sellercraftOPs
|
|
25
25
|
};
|
|
26
|
-
const packageId = await integration_sellercraft_1.SellercraftAPI.packMarketplaceOrder(sellercraft, Object.assign({}, orderInformation));
|
|
26
|
+
const packageId = await integration_sellercraft_1.SellercraftAPI.packMarketplaceOrder(sellercraft, Object.assign(Object.assign({}, orderInformation), { context: { state: { domain: this === null || this === void 0 ? void 0 : this.domain, user: this === null || this === void 0 ? void 0 : this.user } } }));
|
|
27
27
|
releaseGood.packageId = packageId;
|
|
28
28
|
releaseGood.updater = this.user;
|
|
29
29
|
return releaseGood;
|
|
@@ -67,7 +67,7 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
|
|
|
67
67
|
purchaseOrderId: purchaseOrder ? purchaseOrder.name : '',
|
|
68
68
|
sellercraftOPs
|
|
69
69
|
};
|
|
70
|
-
await integration_sellercraft_1.SellercraftAPI.addInboundOrder(sellercraft, Object.assign({}, inboundOrder));
|
|
70
|
+
await integration_sellercraft_1.SellercraftAPI.addInboundOrder(sellercraft, Object.assign(Object.assign({}, inboundOrder), { context: { state: { domain: this === null || this === void 0 ? void 0 : this.domain, user: this === null || this === void 0 ? void 0 : this.user } } }));
|
|
71
71
|
}
|
|
72
72
|
async registerProductReturn(sellercraft, returnOrder) {
|
|
73
73
|
const orderInventories = returnOrder.orderInventories;
|
|
@@ -107,7 +107,7 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
|
|
|
107
107
|
inboundType: 'sales_return',
|
|
108
108
|
sellercraftOPs
|
|
109
109
|
};
|
|
110
|
-
await integration_sellercraft_1.SellercraftAPI.addInboundOrder(sellercraft, Object.assign({}, returnInbound));
|
|
110
|
+
await integration_sellercraft_1.SellercraftAPI.addInboundOrder(sellercraft, Object.assign(Object.assign({}, returnInbound), { context: { state: { domain: this === null || this === void 0 ? void 0 : this.domain, user: this === null || this === void 0 ? void 0 : this.user } } }));
|
|
111
111
|
}
|
|
112
112
|
async updateSellercraftStock(sellercraft, inventory) {
|
|
113
113
|
const bizplace = await this.trxMgr.getRepository(biz_base_1.Bizplace).findOne({ domain: sellercraft.domain });
|
|
@@ -181,7 +181,7 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
|
|
|
181
181
|
orderId: releaseGood.refNo2,
|
|
182
182
|
packageId: releaseGood.packageId
|
|
183
183
|
};
|
|
184
|
-
const { handOverType, pickupTime, pickupAddress, dropoffAddress } = await integration_sellercraft_1.SellercraftAPI.initiateOrderShipment(sellercraft, Object.assign({}, orderInformation));
|
|
184
|
+
const { handOverType, pickupTime, pickupAddress, dropoffAddress } = await integration_sellercraft_1.SellercraftAPI.initiateOrderShipment(sellercraft, Object.assign(Object.assign({}, orderInformation), { context: { state: { domain: this === null || this === void 0 ? void 0 : this.domain, user: this === null || this === void 0 ? void 0 : this.user } } }));
|
|
185
185
|
releaseGood.handoverType = handOverType;
|
|
186
186
|
if (pickupAddress) {
|
|
187
187
|
releaseGood.pickupAddress = pickupAddress;
|
|
@@ -198,7 +198,7 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
|
|
|
198
198
|
orderId: releaseGood.refNo2,
|
|
199
199
|
packageId: releaseGood.packageId
|
|
200
200
|
};
|
|
201
|
-
await integration_sellercraft_1.SellercraftAPI.initiateOrderDocument(sellercraft, Object.assign({}, orderInformation));
|
|
201
|
+
await integration_sellercraft_1.SellercraftAPI.initiateOrderDocument(sellercraft, Object.assign(Object.assign({}, orderInformation), { context: { state: { domain: this === null || this === void 0 ? void 0 : this.domain, user: this === null || this === void 0 ? void 0 : this.user } } }));
|
|
202
202
|
}
|
|
203
203
|
async fetchOrderDocument(sellercraft, releaseGood) {
|
|
204
204
|
const orderInformation = {
|
|
@@ -206,7 +206,7 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
|
|
|
206
206
|
orderId: releaseGood.refNo2,
|
|
207
207
|
packageId: releaseGood.packageId
|
|
208
208
|
};
|
|
209
|
-
const { documents, trackingNo, transporter } = await integration_sellercraft_1.SellercraftAPI.fetchOrderDocument(sellercraft, Object.assign({}, orderInformation));
|
|
209
|
+
const { documents, trackingNo, transporter } = await integration_sellercraft_1.SellercraftAPI.fetchOrderDocument(sellercraft, Object.assign(Object.assign({}, orderInformation), { context: { state: { domain: this === null || this === void 0 ? void 0 : this.domain, user: this === null || this === void 0 ? void 0 : this.user } } }));
|
|
210
210
|
if (documents === null || documents === void 0 ? void 0 : documents.length) {
|
|
211
211
|
documents.map(document => {
|
|
212
212
|
if (document.type === 'invoice') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sellercraft-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/sellercraft-controller.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AACnD,qFAAqF;AAErF,2DAOmC;AACnC,mEAA2F;AAE3F,kEAA6D;AAE7D,MAAa,qBAAsB,SAAQ,0CAAmB;IAC5D,KAAK,CAAC,SAAS,CAAC,WAAwB,EAAE,WAAwB;QAChE,MAAM,aAAa,GAAmB,WAAW,CAAC,aAAa,CAAA;QAC/D,IAAI,cAAc,GAAU,EAAE,CAAA;QAE9B,cAAc,GAAG,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YAChD,MAAM,OAAO,GAAY,YAAY,CAAC,OAAO,CAAA;YAE7C,OAAO;gBACL,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,UAAU,EAAE,YAAY,CAAC,UAAU;gBACnC,GAAG,EAAE,IAAI;aACV,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,MAAM,gBAAgB,GAAQ;YAC5B,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,OAAO,EAAE,WAAW,CAAC,MAAM;YAC3B,cAAc;SACf,CAAA;QACD,MAAM,SAAS,GAAW,MAAM,wCAAc,CAAC,oBAAoB,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"sellercraft-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/sellercraft-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,5 +7,6 @@ const worksheet_detail_1 = require("./worksheet-detail");
|
|
|
7
7
|
Object.defineProperty(exports, "WorksheetDetail", { enumerable: true, get: function () { return worksheet_detail_1.WorksheetDetail; } });
|
|
8
8
|
const worksheet_movement_1 = require("./worksheet-movement");
|
|
9
9
|
Object.defineProperty(exports, "WorksheetMovement", { enumerable: true, get: function () { return worksheet_movement_1.WorksheetMovement; } });
|
|
10
|
-
|
|
10
|
+
const warehouse_bizplace_onhand_inventory_1 = require("./warehouse-bizplace-onhand-inventory");
|
|
11
|
+
exports.entities = [worksheet_1.Worksheet, worksheet_detail_1.WorksheetDetail, worksheet_movement_1.WorksheetMovement, warehouse_bizplace_onhand_inventory_1.WarehouseBizplaceOnhandInventory];
|
|
11
12
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/entities/index.ts"],"names":[],"mappings":";;;AAAA,2CAAuC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/entities/index.ts"],"names":[],"mappings":";;;AAAA,2CAAuC;AAO9B,0FAPA,qBAAS,OAOA;AANlB,yDAAoD;AAMhC,gGANX,kCAAe,OAMW;AALnC,6DAAwD;AAKnB,kGAL5B,sCAAiB,OAK4B;AAJtD,+FAAwF;AAE3E,QAAA,QAAQ,GAAG,CAAC,qBAAS,EAAE,kCAAe,EAAE,sCAAiB,EAAE,sEAAgC,CAAC,CAAA"}
|
|
@@ -0,0 +1,174 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.WarehouseBizplaceOnhandInventory = void 0;
|
|
13
|
+
const typeorm_1 = require("typeorm");
|
|
14
|
+
let WarehouseBizplaceOnhandInventory = class WarehouseBizplaceOnhandInventory {
|
|
15
|
+
};
|
|
16
|
+
__decorate([
|
|
17
|
+
(0, typeorm_1.ViewColumn)(),
|
|
18
|
+
__metadata("design:type", String)
|
|
19
|
+
], WarehouseBizplaceOnhandInventory.prototype, "domainName", void 0);
|
|
20
|
+
__decorate([
|
|
21
|
+
(0, typeorm_1.ViewColumn)(),
|
|
22
|
+
__metadata("design:type", String)
|
|
23
|
+
], WarehouseBizplaceOnhandInventory.prototype, "bizplaceName", void 0);
|
|
24
|
+
__decorate([
|
|
25
|
+
(0, typeorm_1.ViewColumn)(),
|
|
26
|
+
__metadata("design:type", String)
|
|
27
|
+
], WarehouseBizplaceOnhandInventory.prototype, "domainId", void 0);
|
|
28
|
+
__decorate([
|
|
29
|
+
(0, typeorm_1.ViewColumn)(),
|
|
30
|
+
__metadata("design:type", String)
|
|
31
|
+
], WarehouseBizplaceOnhandInventory.prototype, "bizplaceId", void 0);
|
|
32
|
+
__decorate([
|
|
33
|
+
(0, typeorm_1.ViewColumn)(),
|
|
34
|
+
__metadata("design:type", String)
|
|
35
|
+
], WarehouseBizplaceOnhandInventory.prototype, "packingType", void 0);
|
|
36
|
+
__decorate([
|
|
37
|
+
(0, typeorm_1.ViewColumn)(),
|
|
38
|
+
__metadata("design:type", Number)
|
|
39
|
+
], WarehouseBizplaceOnhandInventory.prototype, "packingSize", void 0);
|
|
40
|
+
__decorate([
|
|
41
|
+
(0, typeorm_1.ViewColumn)(),
|
|
42
|
+
__metadata("design:type", String)
|
|
43
|
+
], WarehouseBizplaceOnhandInventory.prototype, "uom", void 0);
|
|
44
|
+
__decorate([
|
|
45
|
+
(0, typeorm_1.ViewColumn)(),
|
|
46
|
+
__metadata("design:type", String)
|
|
47
|
+
], WarehouseBizplaceOnhandInventory.prototype, "productId", void 0);
|
|
48
|
+
__decorate([
|
|
49
|
+
(0, typeorm_1.ViewColumn)(),
|
|
50
|
+
__metadata("design:type", String)
|
|
51
|
+
], WarehouseBizplaceOnhandInventory.prototype, "productBundleId", void 0);
|
|
52
|
+
__decorate([
|
|
53
|
+
(0, typeorm_1.ViewColumn)(),
|
|
54
|
+
__metadata("design:type", Number)
|
|
55
|
+
], WarehouseBizplaceOnhandInventory.prototype, "remainQty", void 0);
|
|
56
|
+
__decorate([
|
|
57
|
+
(0, typeorm_1.ViewColumn)(),
|
|
58
|
+
__metadata("design:type", Number)
|
|
59
|
+
], WarehouseBizplaceOnhandInventory.prototype, "remainUomValue", void 0);
|
|
60
|
+
__decorate([
|
|
61
|
+
(0, typeorm_1.ViewColumn)(),
|
|
62
|
+
__metadata("design:type", String)
|
|
63
|
+
], WarehouseBizplaceOnhandInventory.prototype, "groupType", void 0);
|
|
64
|
+
WarehouseBizplaceOnhandInventory = __decorate([
|
|
65
|
+
(0, typeorm_1.ViewEntity)({
|
|
66
|
+
expression: `
|
|
67
|
+
select d.name as "domainName", b.name as "bizplaceName", src.* from (
|
|
68
|
+
WITH oi as (
|
|
69
|
+
select
|
|
70
|
+
oi.domain_id,
|
|
71
|
+
oi.bizplace_id,
|
|
72
|
+
SUM(oi.release_qty) AS release_qty,
|
|
73
|
+
SUM(oi.release_uom_value) AS release_uom_value,
|
|
74
|
+
oi.batch_id,
|
|
75
|
+
oi.batch_id_ref,
|
|
76
|
+
oi.product_id,
|
|
77
|
+
oi.packing_type,
|
|
78
|
+
oi.packing_size,
|
|
79
|
+
oi.uom
|
|
80
|
+
FROM
|
|
81
|
+
order_inventories oi
|
|
82
|
+
WHERE
|
|
83
|
+
(oi.status = 'PENDING' or oi.status = 'PENDING_RECEIVE' or oi.status = 'PENDING_WORKSHEET' or oi.status = 'PENDING_SPLIT')
|
|
84
|
+
AND oi.batch_id NOTNULL
|
|
85
|
+
AND oi.product_id NOTNULL
|
|
86
|
+
AND oi.packing_type NOTNULL
|
|
87
|
+
AND oi.packing_size NOTNULL
|
|
88
|
+
AND oi.inventory_id IS NULL
|
|
89
|
+
GROUP BY
|
|
90
|
+
oi.domain_id,
|
|
91
|
+
oi.bizplace_id,
|
|
92
|
+
oi.batch_id,
|
|
93
|
+
oi.batch_id_ref,
|
|
94
|
+
oi.product_id,
|
|
95
|
+
oi.packing_type,
|
|
96
|
+
oi.packing_size,
|
|
97
|
+
oi.uom
|
|
98
|
+
)
|
|
99
|
+
-- SINGLE ITEM INVENTORY QUERY
|
|
100
|
+
select
|
|
101
|
+
i.domain_id as "domainId",
|
|
102
|
+
i.bizplace_id as "bizplaceId",
|
|
103
|
+
i.packing_type as "packingType",
|
|
104
|
+
i.packing_size as "packingSize",
|
|
105
|
+
i.uom,
|
|
106
|
+
i.product_id as "productId",
|
|
107
|
+
null as "productBundleId",
|
|
108
|
+
COALESCE(SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0))) AS "remainQty",
|
|
109
|
+
COALESCE(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)), 0) AS "remainUomValue",
|
|
110
|
+
COALESCE(sum(COALESCE(i.qty, 0::double precision))) AS "qty",
|
|
111
|
+
COALESCE(sum(COALESCE(i.uom_value, 0::double precision))) AS "uomValue",
|
|
112
|
+
'SINGLE' AS "groupType"
|
|
113
|
+
FROM inventories i
|
|
114
|
+
INNER JOIN locations l2 ON i.location_id = l2.id AND i.domain_id = l2.domain_id AND l2.type NOT IN ('QUARANTINE', 'RESERVE')
|
|
115
|
+
LEFT JOIN oi ON i.batch_id = oi.batch_id AND i.product_id = oi.product_id AND i.packing_type = oi.packing_type AND i.packing_size = oi.packing_size AND i.uom = oi.uom
|
|
116
|
+
WHERE i.status = 'STORED'
|
|
117
|
+
GROUP by
|
|
118
|
+
i.domain_id,
|
|
119
|
+
i.bizplace_id,
|
|
120
|
+
i.product_id,
|
|
121
|
+
i.packing_type,
|
|
122
|
+
i.packing_size,
|
|
123
|
+
i.uom
|
|
124
|
+
union all
|
|
125
|
+
-- BUNDLE ITEM INVENTORY QUERY
|
|
126
|
+
SELECT
|
|
127
|
+
pbs.domain_id as "domainId",
|
|
128
|
+
pbs.bizplace_id as "bizplaceId",
|
|
129
|
+
pb.packing_type as "packingType",
|
|
130
|
+
pb.packing_size as "packingSize",
|
|
131
|
+
'UNIT' AS "uom",
|
|
132
|
+
null as "productId",
|
|
133
|
+
pb.id AS "productBundleId",
|
|
134
|
+
COALESCE(MIN(FLOOR(pbs."availableQty")),0) AS "remainQty",
|
|
135
|
+
COALESCE(MIN(FLOOR(pbs."availableUomValue")),0) AS "remainUomValue",
|
|
136
|
+
COALESCE(MIN(FLOOR(pbs."qty")), 0::double precision) AS "qty",
|
|
137
|
+
COALESCE(MIN(FLOOR(pbs."uomValue")), 0::double precision) AS "uomValue",
|
|
138
|
+
'BUNDLE' AS "groupType"
|
|
139
|
+
FROM product_bundles pb
|
|
140
|
+
INNER JOIN (
|
|
141
|
+
SELECT i.domain_id, i.bizplace_id, pbs.product_id, pbs.product_bundle_id, min(pbs.bundle_qty),
|
|
142
|
+
(SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0))) / min(pbs.bundle_qty) AS "availableQty",
|
|
143
|
+
(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0))) / min(pbs.bundle_qty) AS "availableUomValue",
|
|
144
|
+
(sum(COALESCE(i.qty, 0::double precision))) / min(pbs.bundle_qty)::double precision AS "qty",
|
|
145
|
+
(sum(COALESCE(i.uom_value, 0::double precision))) / min(pbs.bundle_qty)::double precision AS "uomValue"
|
|
146
|
+
FROM product_bundle_settings pbs
|
|
147
|
+
LEFT JOIN inventories i ON i.product_id = pbs.product_id AND i.status = 'STORED'
|
|
148
|
+
INNER JOIN locations l ON i.location_id = l.id AND i.domain_id = l.domain_id AND l.type NOT IN ('QUARANTINE', 'RESERVE')
|
|
149
|
+
LEFT JOIN oi ON oi.product_id = i.product_id
|
|
150
|
+
GROUP by
|
|
151
|
+
i.domain_id,
|
|
152
|
+
i.bizplace_id,
|
|
153
|
+
pbs.product_id,
|
|
154
|
+
pbs.product_bundle_id
|
|
155
|
+
) pbs ON pbs.product_bundle_id = pb.id
|
|
156
|
+
GROUP BY
|
|
157
|
+
pbs.domain_id,
|
|
158
|
+
pbs.bizplace_id,
|
|
159
|
+
pb.packing_type,
|
|
160
|
+
pb.packing_size,
|
|
161
|
+
pb.name,
|
|
162
|
+
pb.sku,
|
|
163
|
+
pb.id
|
|
164
|
+
)
|
|
165
|
+
AS src
|
|
166
|
+
inner join domains d on d.id = src."domainId"
|
|
167
|
+
inner join bizplaces b on b.id = src."bizplaceId"
|
|
168
|
+
where src."remainQty" > 0
|
|
169
|
+
order by src."domainId"
|
|
170
|
+
`
|
|
171
|
+
})
|
|
172
|
+
], WarehouseBizplaceOnhandInventory);
|
|
173
|
+
exports.WarehouseBizplaceOnhandInventory = WarehouseBizplaceOnhandInventory;
|
|
174
|
+
//# sourceMappingURL=warehouse-bizplace-onhand-inventory.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"warehouse-bizplace-onhand-inventory.js","sourceRoot":"","sources":["../../server/entities/warehouse-bizplace-onhand-inventory.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgD;AA8GhD,IAAa,gCAAgC,GAA7C,MAAa,gCAAgC;CAoC5C,CAAA;AAlCC;IADC,IAAA,oBAAU,GAAE;;oEACK;AAGlB;IADC,IAAA,oBAAU,GAAE;;sEACO;AAGpB;IADC,IAAA,oBAAU,GAAE;;kEACG;AAGhB;IADC,IAAA,oBAAU,GAAE;;oEACK;AAGlB;IADC,IAAA,oBAAU,GAAE;;qEACM;AAGnB;IADC,IAAA,oBAAU,GAAE;;qEACM;AAGnB;IADC,IAAA,oBAAU,GAAE;;6DACF;AAGX;IADC,IAAA,oBAAU,GAAE;;mEACI;AAGjB;IADC,IAAA,oBAAU,GAAE;;yEACU;AAGvB;IADC,IAAA,oBAAU,GAAE;;mEACI;AAGjB;IADC,IAAA,oBAAU,GAAE;;wEACS;AAGtB;IADC,IAAA,oBAAU,GAAE;;mEACI;AAnCN,gCAAgC;IA5G5C,IAAA,oBAAU,EAAC;QACV,UAAU,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwGX;KACF,CAAC;GAEW,gCAAgC,CAoC5C;AApCY,4EAAgC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worksheet-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.18",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -32,13 +32,13 @@
|
|
|
32
32
|
"@things-factory/integration-marketplace": "^4.3.15",
|
|
33
33
|
"@things-factory/integration-sellercraft": "^4.3.15",
|
|
34
34
|
"@things-factory/integration-sftp": "^4.3.15",
|
|
35
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
35
|
+
"@things-factory/marketplace-base": "^4.3.16",
|
|
36
36
|
"@things-factory/notification": "^4.3.14",
|
|
37
|
-
"@things-factory/sales-base": "^4.3.
|
|
37
|
+
"@things-factory/sales-base": "^4.3.17",
|
|
38
38
|
"@things-factory/setting-base": "^4.3.14",
|
|
39
39
|
"@things-factory/shell": "^4.3.14",
|
|
40
40
|
"@things-factory/transport-base": "^4.3.14",
|
|
41
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
41
|
+
"@things-factory/warehouse-base": "^4.3.16"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "209b65ad83d9f43a9af586e309de3a2aff4b64c3"
|
|
44
44
|
}
|
|
@@ -33,7 +33,10 @@ export class SellercraftController extends WorksheetController {
|
|
|
33
33
|
orderId: releaseGood.refNo2,
|
|
34
34
|
sellercraftOPs
|
|
35
35
|
}
|
|
36
|
-
const packageId: string = await SellercraftAPI.packMarketplaceOrder(sellercraft, {
|
|
36
|
+
const packageId: string = await SellercraftAPI.packMarketplaceOrder(sellercraft, {
|
|
37
|
+
...orderInformation,
|
|
38
|
+
context: { state: { domain: this?.domain, user: this?.user } }
|
|
39
|
+
})
|
|
37
40
|
|
|
38
41
|
releaseGood.packageId = packageId
|
|
39
42
|
releaseGood.updater = this.user
|
|
@@ -89,7 +92,10 @@ export class SellercraftController extends WorksheetController {
|
|
|
89
92
|
purchaseOrderId: purchaseOrder ? purchaseOrder.name : '',
|
|
90
93
|
sellercraftOPs
|
|
91
94
|
}
|
|
92
|
-
await SellercraftAPI.addInboundOrder(sellercraft, {
|
|
95
|
+
await SellercraftAPI.addInboundOrder(sellercraft, {
|
|
96
|
+
...inboundOrder,
|
|
97
|
+
context: { state: { domain: this?.domain, user: this?.user } }
|
|
98
|
+
})
|
|
93
99
|
}
|
|
94
100
|
|
|
95
101
|
async registerProductReturn(sellercraft: Sellercraft, returnOrder: ReturnOrder): Promise<void> {
|
|
@@ -140,7 +146,10 @@ export class SellercraftController extends WorksheetController {
|
|
|
140
146
|
inboundType: 'sales_return',
|
|
141
147
|
sellercraftOPs
|
|
142
148
|
}
|
|
143
|
-
await SellercraftAPI.addInboundOrder(sellercraft, {
|
|
149
|
+
await SellercraftAPI.addInboundOrder(sellercraft, {
|
|
150
|
+
...returnInbound,
|
|
151
|
+
context: { state: { domain: this?.domain, user: this?.user } }
|
|
152
|
+
})
|
|
144
153
|
}
|
|
145
154
|
|
|
146
155
|
async updateSellercraftStock(sellercraft: Sellercraft, inventory: Inventory): Promise<void> {
|
|
@@ -233,7 +242,7 @@ export class SellercraftController extends WorksheetController {
|
|
|
233
242
|
|
|
234
243
|
const { handOverType, pickupTime, pickupAddress, dropoffAddress } = await SellercraftAPI.initiateOrderShipment(
|
|
235
244
|
sellercraft,
|
|
236
|
-
{ ...orderInformation }
|
|
245
|
+
{ ...orderInformation, context: { state: { domain: this?.domain, user: this?.user } } }
|
|
237
246
|
)
|
|
238
247
|
|
|
239
248
|
releaseGood.handoverType = handOverType
|
|
@@ -252,7 +261,10 @@ export class SellercraftController extends WorksheetController {
|
|
|
252
261
|
orderId: releaseGood.refNo2,
|
|
253
262
|
packageId: releaseGood.packageId
|
|
254
263
|
}
|
|
255
|
-
await SellercraftAPI.initiateOrderDocument(sellercraft, {
|
|
264
|
+
await SellercraftAPI.initiateOrderDocument(sellercraft, {
|
|
265
|
+
...orderInformation,
|
|
266
|
+
context: { state: { domain: this?.domain, user: this?.user } }
|
|
267
|
+
})
|
|
256
268
|
}
|
|
257
269
|
|
|
258
270
|
async fetchOrderDocument(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<ReleaseGood> {
|
|
@@ -263,7 +275,8 @@ export class SellercraftController extends WorksheetController {
|
|
|
263
275
|
}
|
|
264
276
|
const { documents, trackingNo, transporter }: { documents: any[]; trackingNo: string; transporter: string } =
|
|
265
277
|
await SellercraftAPI.fetchOrderDocument(sellercraft, {
|
|
266
|
-
...orderInformation
|
|
278
|
+
...orderInformation,
|
|
279
|
+
context: { state: { domain: this?.domain, user: this?.user } }
|
|
267
280
|
})
|
|
268
281
|
|
|
269
282
|
if (documents?.length) {
|
package/server/entities/index.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Worksheet } from './worksheet'
|
|
2
2
|
import { WorksheetDetail } from './worksheet-detail'
|
|
3
3
|
import { WorksheetMovement } from './worksheet-movement'
|
|
4
|
+
import { WarehouseBizplaceOnhandInventory } from './warehouse-bizplace-onhand-inventory'
|
|
4
5
|
|
|
5
|
-
export const entities = [Worksheet, WorksheetDetail, WorksheetMovement]
|
|
6
|
+
export const entities = [Worksheet, WorksheetDetail, WorksheetMovement, WarehouseBizplaceOnhandInventory]
|
|
6
7
|
|
|
7
8
|
export { Worksheet, WorksheetDetail, WorksheetMovement }
|
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
import { ViewColumn, ViewEntity } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
@ViewEntity({
|
|
4
|
+
expression: `
|
|
5
|
+
select d.name as "domainName", b.name as "bizplaceName", src.* from (
|
|
6
|
+
WITH oi as (
|
|
7
|
+
select
|
|
8
|
+
oi.domain_id,
|
|
9
|
+
oi.bizplace_id,
|
|
10
|
+
SUM(oi.release_qty) AS release_qty,
|
|
11
|
+
SUM(oi.release_uom_value) AS release_uom_value,
|
|
12
|
+
oi.batch_id,
|
|
13
|
+
oi.batch_id_ref,
|
|
14
|
+
oi.product_id,
|
|
15
|
+
oi.packing_type,
|
|
16
|
+
oi.packing_size,
|
|
17
|
+
oi.uom
|
|
18
|
+
FROM
|
|
19
|
+
order_inventories oi
|
|
20
|
+
WHERE
|
|
21
|
+
(oi.status = 'PENDING' or oi.status = 'PENDING_RECEIVE' or oi.status = 'PENDING_WORKSHEET' or oi.status = 'PENDING_SPLIT')
|
|
22
|
+
AND oi.batch_id NOTNULL
|
|
23
|
+
AND oi.product_id NOTNULL
|
|
24
|
+
AND oi.packing_type NOTNULL
|
|
25
|
+
AND oi.packing_size NOTNULL
|
|
26
|
+
AND oi.inventory_id IS NULL
|
|
27
|
+
GROUP BY
|
|
28
|
+
oi.domain_id,
|
|
29
|
+
oi.bizplace_id,
|
|
30
|
+
oi.batch_id,
|
|
31
|
+
oi.batch_id_ref,
|
|
32
|
+
oi.product_id,
|
|
33
|
+
oi.packing_type,
|
|
34
|
+
oi.packing_size,
|
|
35
|
+
oi.uom
|
|
36
|
+
)
|
|
37
|
+
-- SINGLE ITEM INVENTORY QUERY
|
|
38
|
+
select
|
|
39
|
+
i.domain_id as "domainId",
|
|
40
|
+
i.bizplace_id as "bizplaceId",
|
|
41
|
+
i.packing_type as "packingType",
|
|
42
|
+
i.packing_size as "packingSize",
|
|
43
|
+
i.uom,
|
|
44
|
+
i.product_id as "productId",
|
|
45
|
+
null as "productBundleId",
|
|
46
|
+
COALESCE(SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0))) AS "remainQty",
|
|
47
|
+
COALESCE(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)), 0) AS "remainUomValue",
|
|
48
|
+
COALESCE(sum(COALESCE(i.qty, 0::double precision))) AS "qty",
|
|
49
|
+
COALESCE(sum(COALESCE(i.uom_value, 0::double precision))) AS "uomValue",
|
|
50
|
+
'SINGLE' AS "groupType"
|
|
51
|
+
FROM inventories i
|
|
52
|
+
INNER JOIN locations l2 ON i.location_id = l2.id AND i.domain_id = l2.domain_id AND l2.type NOT IN ('QUARANTINE', 'RESERVE')
|
|
53
|
+
LEFT JOIN oi ON i.batch_id = oi.batch_id AND i.product_id = oi.product_id AND i.packing_type = oi.packing_type AND i.packing_size = oi.packing_size AND i.uom = oi.uom
|
|
54
|
+
WHERE i.status = 'STORED'
|
|
55
|
+
GROUP by
|
|
56
|
+
i.domain_id,
|
|
57
|
+
i.bizplace_id,
|
|
58
|
+
i.product_id,
|
|
59
|
+
i.packing_type,
|
|
60
|
+
i.packing_size,
|
|
61
|
+
i.uom
|
|
62
|
+
union all
|
|
63
|
+
-- BUNDLE ITEM INVENTORY QUERY
|
|
64
|
+
SELECT
|
|
65
|
+
pbs.domain_id as "domainId",
|
|
66
|
+
pbs.bizplace_id as "bizplaceId",
|
|
67
|
+
pb.packing_type as "packingType",
|
|
68
|
+
pb.packing_size as "packingSize",
|
|
69
|
+
'UNIT' AS "uom",
|
|
70
|
+
null as "productId",
|
|
71
|
+
pb.id AS "productBundleId",
|
|
72
|
+
COALESCE(MIN(FLOOR(pbs."availableQty")),0) AS "remainQty",
|
|
73
|
+
COALESCE(MIN(FLOOR(pbs."availableUomValue")),0) AS "remainUomValue",
|
|
74
|
+
COALESCE(MIN(FLOOR(pbs."qty")), 0::double precision) AS "qty",
|
|
75
|
+
COALESCE(MIN(FLOOR(pbs."uomValue")), 0::double precision) AS "uomValue",
|
|
76
|
+
'BUNDLE' AS "groupType"
|
|
77
|
+
FROM product_bundles pb
|
|
78
|
+
INNER JOIN (
|
|
79
|
+
SELECT i.domain_id, i.bizplace_id, pbs.product_id, pbs.product_bundle_id, min(pbs.bundle_qty),
|
|
80
|
+
(SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0))) / min(pbs.bundle_qty) AS "availableQty",
|
|
81
|
+
(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0))) / min(pbs.bundle_qty) AS "availableUomValue",
|
|
82
|
+
(sum(COALESCE(i.qty, 0::double precision))) / min(pbs.bundle_qty)::double precision AS "qty",
|
|
83
|
+
(sum(COALESCE(i.uom_value, 0::double precision))) / min(pbs.bundle_qty)::double precision AS "uomValue"
|
|
84
|
+
FROM product_bundle_settings pbs
|
|
85
|
+
LEFT JOIN inventories i ON i.product_id = pbs.product_id AND i.status = 'STORED'
|
|
86
|
+
INNER JOIN locations l ON i.location_id = l.id AND i.domain_id = l.domain_id AND l.type NOT IN ('QUARANTINE', 'RESERVE')
|
|
87
|
+
LEFT JOIN oi ON oi.product_id = i.product_id
|
|
88
|
+
GROUP by
|
|
89
|
+
i.domain_id,
|
|
90
|
+
i.bizplace_id,
|
|
91
|
+
pbs.product_id,
|
|
92
|
+
pbs.product_bundle_id
|
|
93
|
+
) pbs ON pbs.product_bundle_id = pb.id
|
|
94
|
+
GROUP BY
|
|
95
|
+
pbs.domain_id,
|
|
96
|
+
pbs.bizplace_id,
|
|
97
|
+
pb.packing_type,
|
|
98
|
+
pb.packing_size,
|
|
99
|
+
pb.name,
|
|
100
|
+
pb.sku,
|
|
101
|
+
pb.id
|
|
102
|
+
)
|
|
103
|
+
AS src
|
|
104
|
+
inner join domains d on d.id = src."domainId"
|
|
105
|
+
inner join bizplaces b on b.id = src."bizplaceId"
|
|
106
|
+
where src."remainQty" > 0
|
|
107
|
+
order by src."domainId"
|
|
108
|
+
`
|
|
109
|
+
})
|
|
110
|
+
|
|
111
|
+
export class WarehouseBizplaceOnhandInventory {
|
|
112
|
+
@ViewColumn()
|
|
113
|
+
domainName: string
|
|
114
|
+
|
|
115
|
+
@ViewColumn()
|
|
116
|
+
bizplaceName: string
|
|
117
|
+
|
|
118
|
+
@ViewColumn()
|
|
119
|
+
domainId: string
|
|
120
|
+
|
|
121
|
+
@ViewColumn()
|
|
122
|
+
bizplaceId: string
|
|
123
|
+
|
|
124
|
+
@ViewColumn()
|
|
125
|
+
packingType: string
|
|
126
|
+
|
|
127
|
+
@ViewColumn()
|
|
128
|
+
packingSize: number
|
|
129
|
+
|
|
130
|
+
@ViewColumn()
|
|
131
|
+
uom: string
|
|
132
|
+
|
|
133
|
+
@ViewColumn()
|
|
134
|
+
productId: string
|
|
135
|
+
|
|
136
|
+
@ViewColumn()
|
|
137
|
+
productBundleId: string
|
|
138
|
+
|
|
139
|
+
@ViewColumn()
|
|
140
|
+
remainQty: number
|
|
141
|
+
|
|
142
|
+
@ViewColumn()
|
|
143
|
+
remainUomValue: number
|
|
144
|
+
|
|
145
|
+
@ViewColumn()
|
|
146
|
+
groupType: string
|
|
147
|
+
}
|