@things-factory/worksheet-base 4.3.36 → 4.3.39
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/render-po.js +18 -9
- package/dist-server/controllers/render-po.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/confirm-cancellation-release-order.js +64 -76
- package/dist-server/graphql/resolvers/worksheet/confirm-cancellation-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/pending-cancellation-release-order.js +2 -1
- package/dist-server/graphql/resolvers/worksheet/pending-cancellation-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/reject-cancellation-release-order.js +1 -0
- package/dist-server/graphql/resolvers/worksheet/reject-cancellation-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet-detail/generate-pallet-id.js +2 -2
- package/dist-server/graphql/resolvers/worksheet-detail/generate-pallet-id.js.map +1 -1
- package/dist-server/graphql/types/worksheet-detail/inventory-detail.js +1 -0
- package/dist-server/graphql/types/worksheet-detail/inventory-detail.js.map +1 -1
- package/package.json +15 -15
- package/server/controllers/render-po.ts +30 -13
- package/server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts +92 -131
- package/server/graphql/resolvers/worksheet/pending-cancellation-release-order.ts +1 -0
- package/server/graphql/resolvers/worksheet/reject-cancellation-release-order.ts +16 -15
- package/server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts +2 -1
- package/server/graphql/types/worksheet-detail/inventory-detail.ts +1 -0
|
@@ -29,6 +29,7 @@ async function renderPO({ req, timezoneOffSet }, context) {
|
|
|
29
29
|
.innerJoinAndSelect('bizplace.company', 'company')
|
|
30
30
|
.innerJoinAndSelect('company.domain', 'company_domain')
|
|
31
31
|
.leftJoinAndSelect('contact_points', 'cp', 'po.supplier_id = cp.id')
|
|
32
|
+
.leftJoinAndSelect('arrival_notices', 'an', 'an.purchase_order_id = po.id')
|
|
32
33
|
.where('po.id = :poId')
|
|
33
34
|
.andWhere('po.domain = :domainId')
|
|
34
35
|
.setParameters({ poId, domainId: domain.id });
|
|
@@ -75,13 +76,16 @@ async function renderPO({ req, timezoneOffSet }, context) {
|
|
|
75
76
|
product_sku: item.p_sku,
|
|
76
77
|
product_name: item.p_name,
|
|
77
78
|
product_desc: item.p_description,
|
|
79
|
+
product_remark: item.op_remark,
|
|
78
80
|
product_qty: item.op_pack_qty,
|
|
79
81
|
product_uom: item.op_uom,
|
|
80
82
|
product_other_charges: item.ip_other_charges,
|
|
81
|
-
product_unit_price:
|
|
82
|
-
product_total_price: (((
|
|
83
|
+
product_unit_price: item.op_unit_price.toFixed(2),
|
|
84
|
+
product_total_price: (((item.op_unit_price || 0) * item.op_pack_qty - (item.op_discount_amt || 0)) *
|
|
85
|
+
(1 + item.op_tax_rate / 100)).toFixed(2),
|
|
83
86
|
product_tax_rate: item.op_tax_rate,
|
|
84
|
-
product_disc_amt: item.op_discount_amt
|
|
87
|
+
product_disc_amt: item.op_discount_amt,
|
|
88
|
+
ref_no: record.po_ref_no
|
|
85
89
|
};
|
|
86
90
|
});
|
|
87
91
|
let date = datetime_util_1.DateTimeConverter.date(new Date(record.po_created_at - timezoneOffSet));
|
|
@@ -94,6 +98,7 @@ async function renderPO({ req, timezoneOffSet }, context) {
|
|
|
94
98
|
company_name: record.company_description,
|
|
95
99
|
company_address: record.company_address,
|
|
96
100
|
company_postal_code: record.company_postal_code,
|
|
101
|
+
an_name: record.an_name,
|
|
97
102
|
po_number: record.po_name,
|
|
98
103
|
po_order_date: date,
|
|
99
104
|
po_delivery_date: eta,
|
|
@@ -106,14 +111,18 @@ async function renderPO({ req, timezoneOffSet }, context) {
|
|
|
106
111
|
product_list,
|
|
107
112
|
charges_list: [
|
|
108
113
|
{
|
|
109
|
-
field: 'SUBTOTAL',
|
|
114
|
+
field: 'SUBTOTAL',
|
|
115
|
+
value: subtotal.toFixed(2)
|
|
110
116
|
},
|
|
111
|
-
...poOtherCharges.map(itm => {
|
|
117
|
+
...poOtherCharges.map(itm => {
|
|
118
|
+
return { field: itm.pooc_name.toUpperCase(), value: itm.pooc_total_amt.toFixed(2) };
|
|
119
|
+
}),
|
|
112
120
|
{
|
|
113
|
-
field: 'TOTAL',
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
121
|
+
field: 'TOTAL',
|
|
122
|
+
value: (poOtherCharges.reduce((init, item) => {
|
|
123
|
+
return (init += item.pooc_total_amt);
|
|
124
|
+
}, subtotal) || 0).toFixed(2)
|
|
125
|
+
}
|
|
117
126
|
]
|
|
118
127
|
};
|
|
119
128
|
const formData = new form_data_1.default();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-po.js","sourceRoot":"","sources":["../../server/controllers/render-po.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAgC;AAChC,4DAA8B;AAC9B,qCAA2D;AAE3D,qEAAqE;AAErE,6CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"render-po.js","sourceRoot":"","sources":["../../server/controllers/render-po.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.confirmCancellationReleaseOrder = void 0;
|
|
4
|
-
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
5
4
|
const typeorm_1 = require("typeorm");
|
|
6
5
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
7
|
-
const
|
|
6
|
+
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
8
7
|
const entities_1 = require("../../../entities");
|
|
8
|
+
const utils_1 = require("../../../utils");
|
|
9
9
|
exports.confirmCancellationReleaseOrder = {
|
|
10
10
|
async confirmCancellationReleaseOrder(_, { name }, context) {
|
|
11
11
|
const { tx, domain, user } = context.state;
|
|
@@ -24,87 +24,60 @@ exports.confirmCancellationReleaseOrder = {
|
|
|
24
24
|
let targetOIs = releaseGood.orderInventories;
|
|
25
25
|
let foundOVs = releaseGood.orderVass;
|
|
26
26
|
// 1. Check Order Inventory status
|
|
27
|
-
// 1a. separate into
|
|
28
|
-
let
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
}
|
|
34
|
-
else {
|
|
35
|
-
acc.push(oi);
|
|
36
|
-
}
|
|
37
|
-
return acc;
|
|
38
|
-
}, []);
|
|
39
|
-
let pickedOI = targetOIs.filter((oi) => oi.status === sales_base_1.ORDER_INVENTORY_STATUS.PENDING_REVERSE).reduce((acc, oi) => {
|
|
40
|
-
let existingRecordIdx = acc.findIndex(i => i.inventory.id == oi.inventory.id);
|
|
41
|
-
if (existingRecordIdx >= 0) {
|
|
42
|
-
acc[existingRecordIdx].releaseQty += oi.releaseQty;
|
|
43
|
-
acc[existingRecordIdx].releaseUomValue += oi.releaseQty;
|
|
44
|
-
}
|
|
45
|
-
else {
|
|
46
|
-
acc.push(oi);
|
|
47
|
-
}
|
|
48
|
-
return acc;
|
|
49
|
-
}, []);
|
|
50
|
-
let replacedOI = targetOIs.filter((oi) => oi.status === sales_base_1.ORDER_INVENTORY_STATUS.REPLACED).reduce((acc, oi) => {
|
|
51
|
-
let existingRecordIdx = acc.findIndex(i => i.inventory.id == oi.inventory.id);
|
|
52
|
-
if (existingRecordIdx >= 0) {
|
|
53
|
-
acc[existingRecordIdx].releaseQty += oi.releaseQty;
|
|
54
|
-
acc[existingRecordIdx].releaseUomValue += oi.releaseQty;
|
|
55
|
-
}
|
|
56
|
-
else {
|
|
57
|
-
acc.push(oi);
|
|
58
|
-
}
|
|
59
|
-
return acc;
|
|
60
|
-
}, []);
|
|
61
|
-
if (pickedOI && (pickedOI === null || pickedOI === void 0 ? void 0 : pickedOI.length)) {
|
|
62
|
-
await tx.getRepository(sales_base_1.OrderInventory).save(await Promise.all(pickedOI.map(async (orderInventory) => {
|
|
27
|
+
// 1a. separate into three groups, group 1: pending cancel, group 2: picked, group 3: replaced
|
|
28
|
+
let cancelOIs = _filterOrderInventoriesByStatus(targetOIs, sales_base_1.ORDER_INVENTORY_STATUS.PENDING_CANCEL);
|
|
29
|
+
let pickedOIs = _filterOrderInventoriesByStatus(targetOIs, sales_base_1.ORDER_INVENTORY_STATUS.PENDING_REVERSE);
|
|
30
|
+
let replacedOIs = _filterOrderInventoriesByStatus(targetOIs, sales_base_1.ORDER_INVENTORY_STATUS.REPLACED);
|
|
31
|
+
if (pickedOIs && pickedOIs.length) {
|
|
32
|
+
await Promise.all(pickedOIs.map(async (orderInventory) => {
|
|
63
33
|
let inventory = orderInventory.inventory;
|
|
64
|
-
let location = inventory.location;
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
34
|
+
let location = inventory === null || inventory === void 0 ? void 0 : inventory.location;
|
|
35
|
+
if (inventory && inventory.id) {
|
|
36
|
+
await tx
|
|
37
|
+
.createQueryBuilder()
|
|
38
|
+
.update(warehouse_base_1.Inventory)
|
|
39
|
+
.set({
|
|
40
|
+
qty: () => `COALESCE("qty", 0) + ${orderInventory.releaseQty}`,
|
|
41
|
+
uomValue: () => `COALESCE("uom_value", 0) + ${orderInventory.releaseUomValue}`,
|
|
42
|
+
status: warehouse_base_1.INVENTORY_STATUS.STORED,
|
|
43
|
+
updater: user
|
|
44
|
+
})
|
|
45
|
+
.where('id = :id', { id: inventory.id })
|
|
46
|
+
.execute();
|
|
75
47
|
await (0, utils_1.generateInventoryHistory)(inventory, releaseGood, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.CANCEL_ORDER, orderInventory.releaseQty, orderInventory.releaseUomValue, user, tx);
|
|
76
48
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
}
|
|
83
|
-
return cancelledTargetInventory;
|
|
84
|
-
})));
|
|
49
|
+
return orderInventory;
|
|
50
|
+
}));
|
|
51
|
+
await tx
|
|
52
|
+
.getRepository(sales_base_1.OrderInventory)
|
|
53
|
+
.update(pickedOIs, { status: sales_base_1.ORDER_INVENTORY_STATUS.CANCELLED, updater: user });
|
|
85
54
|
}
|
|
86
|
-
// change status to cancelled for order inventory that has not executed yet
|
|
87
|
-
if (
|
|
88
|
-
await
|
|
55
|
+
// change status to cancelled for order inventory that has not executed yet and remove locked qty
|
|
56
|
+
if (cancelOIs && cancelOIs.length) {
|
|
57
|
+
await Promise.all(cancelOIs.map(async (orderInventory) => {
|
|
89
58
|
let inventory = orderInventory.inventory;
|
|
90
|
-
if (inventory) {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
59
|
+
if (inventory && inventory.id) {
|
|
60
|
+
await tx
|
|
61
|
+
.createQueryBuilder()
|
|
62
|
+
.update(warehouse_base_1.Inventory)
|
|
63
|
+
.set({
|
|
64
|
+
lockedQty: () => `COALESCE("locked_qty", 0) - ${orderInventory.releaseQty}`,
|
|
65
|
+
lockedUomValue: () => `COALESCE("locked_uom_value", 0) - ${orderInventory.releaseUomValue}`,
|
|
66
|
+
updater: user
|
|
67
|
+
})
|
|
68
|
+
.where('id = :id', { id: inventory.id })
|
|
69
|
+
.execute();
|
|
96
70
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
71
|
+
return orderInventory;
|
|
72
|
+
}));
|
|
73
|
+
await tx
|
|
74
|
+
.getRepository(sales_base_1.OrderInventory)
|
|
75
|
+
.update(cancelOIs, { status: sales_base_1.ORDER_INVENTORY_STATUS.CANCELLED, updater: user });
|
|
102
76
|
}
|
|
103
|
-
if (
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
await tx.getRepository(sales_base_1.OrderInventory).save(replacedOI);
|
|
77
|
+
if (replacedOIs && replacedOIs.length) {
|
|
78
|
+
await tx
|
|
79
|
+
.getRepository(sales_base_1.OrderInventory)
|
|
80
|
+
.update(replacedOIs, { status: sales_base_1.ORDER_INVENTORY_STATUS.CANCELLED, updater: user });
|
|
108
81
|
}
|
|
109
82
|
if (foundOVs && (foundOVs === null || foundOVs === void 0 ? void 0 : foundOVs.length)) {
|
|
110
83
|
// update status of order vass to CANCELLED
|
|
@@ -149,4 +122,19 @@ exports.confirmCancellationReleaseOrder = {
|
|
|
149
122
|
return;
|
|
150
123
|
}
|
|
151
124
|
};
|
|
125
|
+
function _filterOrderInventoriesByStatus(orderInventories, status) {
|
|
126
|
+
return orderInventories
|
|
127
|
+
.filter((oi) => oi.status === status)
|
|
128
|
+
.reduce((acc, oi) => {
|
|
129
|
+
let existingInvIdx = !oi.inventory ? -1 : acc.findIndex(i => { var _a, _b; return ((_a = i.inventory) === null || _a === void 0 ? void 0 : _a.id) == ((_b = oi.inventory) === null || _b === void 0 ? void 0 : _b.id); });
|
|
130
|
+
if (existingInvIdx >= 0) {
|
|
131
|
+
acc[existingInvIdx].releaseQty += oi.releaseQty;
|
|
132
|
+
acc[existingInvIdx].releaseUomValue += oi.releaseQty;
|
|
133
|
+
}
|
|
134
|
+
else {
|
|
135
|
+
acc.push(oi);
|
|
136
|
+
}
|
|
137
|
+
return acc;
|
|
138
|
+
}, []);
|
|
139
|
+
}
|
|
152
140
|
//# sourceMappingURL=confirm-cancellation-release-order.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confirm-cancellation-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"confirm-cancellation-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,8 @@ exports.pendingCancellationReleaseOrder = {
|
|
|
36
36
|
foundRO.status === sales_base_1.ORDER_STATUS.READY_TO_PICK ||
|
|
37
37
|
foundRO.status === sales_base_1.ORDER_STATUS.PENDING_WORKSHEET) {
|
|
38
38
|
pickingOIs = targetOIs
|
|
39
|
-
.filter((oi) => oi.status === sales_base_1.ORDER_INVENTORY_STATUS.
|
|
39
|
+
.filter((oi) => oi.status === sales_base_1.ORDER_INVENTORY_STATUS.ASSIGNED ||
|
|
40
|
+
oi.status === sales_base_1.ORDER_INVENTORY_STATUS.PICKING ||
|
|
40
41
|
oi.status === sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_PICK ||
|
|
41
42
|
oi.status === sales_base_1.ORDER_INVENTORY_STATUS.PENDING_SPLIT ||
|
|
42
43
|
oi.status === sales_base_1.ORDER_INVENTORY_STATUS.PENDING_WORKSHEET)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pending-cancellation-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/pending-cancellation-release-order.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pending-cancellation-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/pending-cancellation-release-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ exports.rejectCancellationReleaseOrder = {
|
|
|
24
24
|
let targetOIs = foundRO.orderInventories;
|
|
25
25
|
let foundOVs = foundRO.orderVass;
|
|
26
26
|
let isDeactivatedPicking = false;
|
|
27
|
+
foundRO.status = sales_base_1.ORDER_STATUS.PENDING_WORKSHEET;
|
|
27
28
|
// get the worksheet based on RO number
|
|
28
29
|
let foundWS = await tx.getRepository(entities_1.Worksheet).find({
|
|
29
30
|
where: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reject-cancellation-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/reject-cancellation-release-order.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"reject-cancellation-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/reject-cancellation-release-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ const id_rule_base_1 = require("@things-factory/id-rule-base");
|
|
|
6
6
|
const entities_1 = require("../../../entities");
|
|
7
7
|
exports.generatePalletIdResolver = {
|
|
8
8
|
async generatePalletId(_, { targets, type }, context) {
|
|
9
|
-
var _a, _b, _c;
|
|
9
|
+
var _a, _b, _c, _d;
|
|
10
10
|
const { tx, domain } = context.state;
|
|
11
11
|
// 1. get date in yymmdd format
|
|
12
12
|
const date = new Date().toJSON().slice(0, 10).replace(/-/g, '').slice(2, 8);
|
|
@@ -45,7 +45,7 @@ exports.generatePalletIdResolver = {
|
|
|
45
45
|
let result = {};
|
|
46
46
|
// 5. map all data to be returned
|
|
47
47
|
if (foundWSD.targetProduct) {
|
|
48
|
-
result = Object.assign(Object.assign({}, foundWSD.targetProduct), { bizplace: foundWSD.bizplace, orderProductRemark: foundWSD.targetProduct.remark, purchaseOrderNo: ((_b = (_a = foundWSD.targetProduct.arrivalNotice) === null || _a === void 0 ? void 0 : _a.purchaseOrder) === null || _b === void 0 ? void 0 : _b.name) || '', arrivalNoticeRefNo: ((_c = foundWSD.targetProduct.arrivalNotice) === null || _c === void 0 ? void 0 : _c.refNo) || '' });
|
|
48
|
+
result = Object.assign(Object.assign({}, foundWSD.targetProduct), { bizplace: foundWSD.bizplace, orderProductRemark: foundWSD.targetProduct.remark, purchaseOrderNo: ((_b = (_a = foundWSD.targetProduct.arrivalNotice) === null || _a === void 0 ? void 0 : _a.purchaseOrder) === null || _b === void 0 ? void 0 : _b.name) || '', arrivalNoticeRefNo: ((_c = foundWSD.targetProduct.arrivalNotice) === null || _c === void 0 ? void 0 : _c.refNo) || '', arrivalNoticeNo: ((_d = foundWSD.targetProduct.arrivalNotice) === null || _d === void 0 ? void 0 : _d.name) || '' });
|
|
49
49
|
}
|
|
50
50
|
else if (foundWSD.targetInventory) {
|
|
51
51
|
result = Object.assign(Object.assign({}, foundWSD.targetInventory), { bizplace: foundWSD.bizplace, orderProductRemark: '', purchaseOrderNo: '', arrivalNoticeRefNo: '' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-pallet-id.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;AAE3C,+DAAyD;AAGzD,gDAAmD;AAEtC,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,gBAAgB,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAY;;QAC5D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAC3E,+BAA+B;QAC/B,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAC3E,IAAI,OAAO,GAAG,EAAE,CAAA;QAEhB,2BAA2B;QAC3B,MAAM,qBAAqB,GAAsB,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,IAAI,CAAC;YAC5F,KAAK,EAAE;gBACL,MAAM;gBACN,EAAE,EAAE,IAAA,YAAE,EAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;aACzC;YACD,SAAS,EAAE;gBACT,QAAQ;gBACR,UAAU;gBACV,WAAW;gBACX,QAAQ;gBACR,eAAe;gBACf,6BAA6B;gBAC7B,2CAA2C;gBAC3C,uBAAuB;gBACvB,iBAAiB;gBACjB,yBAAyB;gBACzB,WAAW;gBACX,yBAAyB;aAC1B;SACF,CAAC,CAAA;QAEF,2FAA2F;QAC3F,IAAI,CAAC,CAAA,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,MAAM,CAAA;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;aAClF;YACH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,qBAAqB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACrD,IAAI,QAAQ,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAA;gBACvC,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;oBAC7C,IAAI,QAAQ,CAAC,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE;wBACnC,sEAAsE;wBACtE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE;4BAC9C,IAAI,MAAM,GAAQ,EAAE,CAAA;4BACpB,iCAAiC;4BACjC,IAAI,QAAQ,CAAC,aAAa,EAAE;gCAC1B,MAAM,mCACD,QAAQ,CAAC,aAAa,KACzB,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAC3B,kBAAkB,EAAE,QAAQ,CAAC,aAAa,CAAC,MAAM,EACjD,eAAe,EAAE,CAAA,MAAA,MAAA,QAAQ,CAAC,aAAa,CAAC,aAAa,0CAAE,aAAa,0CAAE,IAAI,KAAI,EAAE,EAChF,kBAAkB,EAAE,CAAA,MAAA,QAAQ,CAAC,aAAa,CAAC,aAAa,0CAAE,KAAK,KAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"generate-pallet-id.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;AAE3C,+DAAyD;AAGzD,gDAAmD;AAEtC,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,gBAAgB,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAY;;QAC5D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAC3E,+BAA+B;QAC/B,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAC3E,IAAI,OAAO,GAAG,EAAE,CAAA;QAEhB,2BAA2B;QAC3B,MAAM,qBAAqB,GAAsB,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,IAAI,CAAC;YAC5F,KAAK,EAAE;gBACL,MAAM;gBACN,EAAE,EAAE,IAAA,YAAE,EAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;aACzC;YACD,SAAS,EAAE;gBACT,QAAQ;gBACR,UAAU;gBACV,WAAW;gBACX,QAAQ;gBACR,eAAe;gBACf,6BAA6B;gBAC7B,2CAA2C;gBAC3C,uBAAuB;gBACvB,iBAAiB;gBACjB,yBAAyB;gBACzB,WAAW;gBACX,yBAAyB;aAC1B;SACF,CAAC,CAAA;QAEF,2FAA2F;QAC3F,IAAI,CAAC,CAAA,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,MAAM,CAAA;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;aAClF;YACH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,qBAAqB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACrD,IAAI,QAAQ,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAA;gBACvC,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;oBAC7C,IAAI,QAAQ,CAAC,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE;wBACnC,sEAAsE;wBACtE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE;4BAC9C,IAAI,MAAM,GAAQ,EAAE,CAAA;4BACpB,iCAAiC;4BACjC,IAAI,QAAQ,CAAC,aAAa,EAAE;gCAC1B,MAAM,mCACD,QAAQ,CAAC,aAAa,KACzB,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAC3B,kBAAkB,EAAE,QAAQ,CAAC,aAAa,CAAC,MAAM,EACjD,eAAe,EAAE,CAAA,MAAA,MAAA,QAAQ,CAAC,aAAa,CAAC,aAAa,0CAAE,aAAa,0CAAE,IAAI,KAAI,EAAE,EAChF,kBAAkB,EAAE,CAAA,MAAA,QAAQ,CAAC,aAAa,CAAC,aAAa,0CAAE,KAAK,KAAI,EAAE,EACrE,eAAe,EAAE,CAAA,MAAA,QAAQ,CAAC,aAAa,CAAC,aAAa,0CAAE,IAAI,KAAI,EAAE,GAClE,CAAA;6BACF;iCAAM,IAAI,QAAQ,CAAC,eAAe,EAAE;gCACnC,MAAM,mCACD,QAAQ,CAAC,eAAe,KAC3B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAC3B,kBAAkB,EAAE,EAAE,EACtB,eAAe,EAAE,EAAE,EACnB,kBAAkB,EAAE,EAAE,GACvB,CAAA;6BACF;iCAAM,IAAI,QAAQ,CAAC,SAAS,EAAE;gCAC7B,MAAM,mCACD,QAAQ,CAAC,SAAS,KACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAC3B,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,aAAa,EACzC,kBAAkB,EAAE,EAAE,EACtB,eAAe,EAAE,EAAE,EACnB,kBAAkB,EAAE,EAAE,GACvB,CAAA;6BACF;4BAED,OAAO,CAAC,IAAI,iCACP,MAAM,KACT,QAAQ,EAAE,MAAM,IAAA,yBAAU,EAAC;oCACzB,MAAM;oCACN,IAAI;oCACJ,IAAI,EAAE;wCACJ,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE;wCAC7B,IAAI;qCACL;iCACF,CAAC,IACF,CAAA;yBACH;qBACF;iBACF;aACF;SACF;QAED,OAAO,OAAO,CAAA;IAChB,CAAC;CACF,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inventory-detail.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet-detail/inventory-detail.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,eAAe,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"inventory-detail.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet-detail/inventory-detail.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,eAAe,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoCjC,CAAA"}
|
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.39",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,21 +24,21 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/auth-base": "^4.3.
|
|
28
|
-
"@things-factory/biz-base": "^4.3.
|
|
27
|
+
"@things-factory/auth-base": "^4.3.38",
|
|
28
|
+
"@things-factory/biz-base": "^4.3.38",
|
|
29
29
|
"@things-factory/document-template-base": "^4.3.35",
|
|
30
|
-
"@things-factory/id-rule-base": "^4.3.
|
|
31
|
-
"@things-factory/integration-lmd": "^4.3.
|
|
32
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
33
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
34
|
-
"@things-factory/integration-sftp": "^4.3.
|
|
35
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
36
|
-
"@things-factory/notification": "^4.3.
|
|
37
|
-
"@things-factory/sales-base": "^4.3.
|
|
38
|
-
"@things-factory/setting-base": "^4.3.
|
|
30
|
+
"@things-factory/id-rule-base": "^4.3.38",
|
|
31
|
+
"@things-factory/integration-lmd": "^4.3.38",
|
|
32
|
+
"@things-factory/integration-marketplace": "^4.3.39",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^4.3.39",
|
|
34
|
+
"@things-factory/integration-sftp": "^4.3.38",
|
|
35
|
+
"@things-factory/marketplace-base": "^4.3.39",
|
|
36
|
+
"@things-factory/notification": "^4.3.38",
|
|
37
|
+
"@things-factory/sales-base": "^4.3.39",
|
|
38
|
+
"@things-factory/setting-base": "^4.3.38",
|
|
39
39
|
"@things-factory/shell": "^4.3.35",
|
|
40
|
-
"@things-factory/transport-base": "^4.3.
|
|
41
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
40
|
+
"@things-factory/transport-base": "^4.3.38",
|
|
41
|
+
"@things-factory/warehouse-base": "^4.3.39"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "fb8d1e9252adad381337fe604a8eaccaaee62b77"
|
|
44
44
|
}
|
|
@@ -5,7 +5,13 @@ import { getRepository, SelectQueryBuilder } from 'typeorm'
|
|
|
5
5
|
import { Attachment, STORAGE } from '@things-factory/attachment-base'
|
|
6
6
|
import { Bizplace } from '@things-factory/biz-base'
|
|
7
7
|
import { config } from '@things-factory/env'
|
|
8
|
-
import {
|
|
8
|
+
import {
|
|
9
|
+
InvoiceProduct,
|
|
10
|
+
ReleaseGood,
|
|
11
|
+
PurchaseOrder,
|
|
12
|
+
PurchaseOrderOtherCharge,
|
|
13
|
+
OrderProduct
|
|
14
|
+
} from '@things-factory/sales-base'
|
|
9
15
|
|
|
10
16
|
import { Domain } from '@things-factory/shell'
|
|
11
17
|
|
|
@@ -31,6 +37,7 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
|
|
|
31
37
|
.innerJoinAndSelect('bizplace.company', 'company')
|
|
32
38
|
.innerJoinAndSelect('company.domain', 'company_domain')
|
|
33
39
|
.leftJoinAndSelect('contact_points', 'cp', 'po.supplier_id = cp.id')
|
|
40
|
+
.leftJoinAndSelect('arrival_notices', 'an', 'an.purchase_order_id = po.id')
|
|
34
41
|
.where('po.id = :poId')
|
|
35
42
|
.andWhere('po.domain = :domainId')
|
|
36
43
|
.setParameters({ poId, domainId: domain.id })
|
|
@@ -71,7 +78,6 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
|
|
|
71
78
|
|
|
72
79
|
let poOtherCharges: any[] = await poocQb.getRawMany()
|
|
73
80
|
|
|
74
|
-
|
|
75
81
|
const qb: SelectQueryBuilder<OrderProduct> = await getRepository(OrderProduct)
|
|
76
82
|
.createQueryBuilder('op')
|
|
77
83
|
.innerJoin('domains', 'd', 'op.domain_id = d.id')
|
|
@@ -89,17 +95,21 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
|
|
|
89
95
|
product_sku: item.p_sku,
|
|
90
96
|
product_name: item.p_name,
|
|
91
97
|
product_desc: item.p_description,
|
|
98
|
+
product_remark: item.op_remark,
|
|
92
99
|
product_qty: item.op_pack_qty,
|
|
93
100
|
product_uom: item.op_uom,
|
|
94
101
|
product_other_charges: item.ip_other_charges,
|
|
95
|
-
product_unit_price:
|
|
96
|
-
product_total_price: (
|
|
102
|
+
product_unit_price: item.op_unit_price.toFixed(2),
|
|
103
|
+
product_total_price: (
|
|
104
|
+
((item.op_unit_price || 0) * item.op_pack_qty - (item.op_discount_amt || 0)) *
|
|
105
|
+
(1 + item.op_tax_rate / 100)
|
|
106
|
+
).toFixed(2),
|
|
97
107
|
product_tax_rate: item.op_tax_rate,
|
|
98
|
-
product_disc_amt: item.op_discount_amt
|
|
108
|
+
product_disc_amt: item.op_discount_amt,
|
|
109
|
+
ref_no: record.po_ref_no
|
|
99
110
|
}
|
|
100
111
|
})
|
|
101
112
|
|
|
102
|
-
|
|
103
113
|
let date = DateTimeConverter.date(new Date(record.po_created_at - timezoneOffSet))
|
|
104
114
|
let eta = DateTimeConverter.date(new Date(record.po_eta_date))
|
|
105
115
|
|
|
@@ -114,6 +124,7 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
|
|
|
114
124
|
company_name: record.company_description,
|
|
115
125
|
company_address: record.company_address,
|
|
116
126
|
company_postal_code: record.company_postal_code,
|
|
127
|
+
an_name: record.an_name,
|
|
117
128
|
po_number: record.po_name,
|
|
118
129
|
po_order_date: date,
|
|
119
130
|
po_delivery_date: eta,
|
|
@@ -126,14 +137,20 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
|
|
|
126
137
|
product_list,
|
|
127
138
|
charges_list: [
|
|
128
139
|
{
|
|
129
|
-
field: 'SUBTOTAL',
|
|
140
|
+
field: 'SUBTOTAL',
|
|
141
|
+
value: subtotal.toFixed(2)
|
|
130
142
|
},
|
|
131
|
-
...poOtherCharges.map(itm => {
|
|
143
|
+
...poOtherCharges.map(itm => {
|
|
144
|
+
return { field: itm.pooc_name.toUpperCase(), value: itm.pooc_total_amt.toFixed(2) }
|
|
145
|
+
}),
|
|
132
146
|
{
|
|
133
|
-
field: 'TOTAL',
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
147
|
+
field: 'TOTAL',
|
|
148
|
+
value: (
|
|
149
|
+
poOtherCharges.reduce((init, item) => {
|
|
150
|
+
return (init += item.pooc_total_amt)
|
|
151
|
+
}, subtotal) || 0
|
|
152
|
+
).toFixed(2)
|
|
153
|
+
}
|
|
137
154
|
]
|
|
138
155
|
}
|
|
139
156
|
|
|
@@ -141,7 +158,7 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
|
|
|
141
158
|
formData.append('template', template)
|
|
142
159
|
formData.append('jsonString', JSON.stringify(data))
|
|
143
160
|
|
|
144
|
-
const response =
|
|
161
|
+
const response = await fetch(REPORT_API_URL, {
|
|
145
162
|
method: 'POST',
|
|
146
163
|
body: formData
|
|
147
164
|
})
|
|
@@ -1,24 +1,20 @@
|
|
|
1
|
-
import {
|
|
2
|
-
Inventory,
|
|
3
|
-
Location,
|
|
4
|
-
LOCATION_STATUS,
|
|
5
|
-
INVENTORY_STATUS,
|
|
6
|
-
INVENTORY_TRANSACTION_TYPE
|
|
7
|
-
} from '@things-factory/warehouse-base'
|
|
8
|
-
import { User } from '@things-factory/auth-base'
|
|
9
|
-
import { Domain } from '@things-factory/shell'
|
|
10
1
|
import { EntityManager, In } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { User } from '@things-factory/auth-base'
|
|
11
4
|
import {
|
|
5
|
+
DeliveryOrder,
|
|
12
6
|
ORDER_INVENTORY_STATUS,
|
|
13
7
|
ORDER_STATUS,
|
|
14
8
|
ORDER_VAS_STATUS,
|
|
15
9
|
OrderInventory,
|
|
16
|
-
DeliveryOrder,
|
|
17
10
|
OrderVas,
|
|
18
11
|
ReleaseGood
|
|
19
12
|
} from '@things-factory/sales-base'
|
|
20
|
-
import {
|
|
13
|
+
import { Domain } from '@things-factory/shell'
|
|
14
|
+
import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location } from '@things-factory/warehouse-base'
|
|
15
|
+
|
|
21
16
|
import { Worksheet, WorksheetDetail } from '../../../entities'
|
|
17
|
+
import { generateInventoryHistory } from '../../../utils'
|
|
22
18
|
|
|
23
19
|
export const confirmCancellationReleaseOrder = {
|
|
24
20
|
async confirmCancellationReleaseOrder(_: any, { name }, context: any) {
|
|
@@ -39,132 +35,82 @@ export const confirmCancellationReleaseOrder = {
|
|
|
39
35
|
let foundOVs: OrderVas[] = releaseGood.orderVass
|
|
40
36
|
|
|
41
37
|
// 1. Check Order Inventory status
|
|
42
|
-
// 1a. separate into
|
|
43
|
-
let
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
return acc
|
|
80
|
-
}, [])
|
|
81
|
-
|
|
82
|
-
if (pickedOI && pickedOI?.length) {
|
|
83
|
-
await tx.getRepository(OrderInventory).save(
|
|
84
|
-
await Promise.all(
|
|
85
|
-
pickedOI.map(async (orderInventory: OrderInventory) => {
|
|
86
|
-
let inventory: Inventory = orderInventory.inventory
|
|
87
|
-
let location: Location = inventory.location
|
|
88
|
-
|
|
89
|
-
let cancelledTargetInventory: OrderInventory = Object.assign({}, orderInventory)
|
|
90
|
-
cancelledTargetInventory.status = ORDER_INVENTORY_STATUS.CANCELLED
|
|
91
|
-
cancelledTargetInventory.updater = user
|
|
92
|
-
|
|
93
|
-
if (inventory) {
|
|
94
|
-
inventory = await tx.getRepository(Inventory).findOne({ id: inventory.id })
|
|
95
|
-
inventory.qty += orderInventory.releaseQty
|
|
96
|
-
inventory.uomValue += orderInventory.releaseUomValue
|
|
97
|
-
inventory.status = INVENTORY_STATUS.STORED
|
|
98
|
-
inventory.updater = user
|
|
99
|
-
inventory = await tx.getRepository(Inventory).save(inventory)
|
|
100
|
-
|
|
101
|
-
await generateInventoryHistory(
|
|
102
|
-
inventory,
|
|
103
|
-
releaseGood,
|
|
104
|
-
INVENTORY_TRANSACTION_TYPE.CANCEL_ORDER,
|
|
105
|
-
orderInventory.releaseQty,
|
|
106
|
-
orderInventory.releaseUomValue,
|
|
107
|
-
user,
|
|
108
|
-
tx
|
|
109
|
-
)
|
|
110
|
-
}
|
|
111
|
-
|
|
112
|
-
// Update status of location
|
|
113
|
-
if (location.status === LOCATION_STATUS.EMPTY) {
|
|
114
|
-
location.status = LOCATION_STATUS.OCCUPIED
|
|
115
|
-
location.updater = user
|
|
116
|
-
await tx.getRepository(Location).save(location)
|
|
117
|
-
}
|
|
118
|
-
|
|
119
|
-
return cancelledTargetInventory
|
|
120
|
-
})
|
|
121
|
-
)
|
|
38
|
+
// 1a. separate into three groups, group 1: pending cancel, group 2: picked, group 3: replaced
|
|
39
|
+
let cancelOIs: OrderInventory[] = _filterOrderInventoriesByStatus(targetOIs, ORDER_INVENTORY_STATUS.PENDING_CANCEL)
|
|
40
|
+
let pickedOIs: OrderInventory[] = _filterOrderInventoriesByStatus(targetOIs, ORDER_INVENTORY_STATUS.PENDING_REVERSE)
|
|
41
|
+
let replacedOIs: OrderInventory[] = _filterOrderInventoriesByStatus(targetOIs, ORDER_INVENTORY_STATUS.REPLACED)
|
|
42
|
+
|
|
43
|
+
if (pickedOIs && pickedOIs.length) {
|
|
44
|
+
await Promise.all(
|
|
45
|
+
pickedOIs.map(async (orderInventory: OrderInventory) => {
|
|
46
|
+
let inventory: Inventory = orderInventory.inventory
|
|
47
|
+
let location: Location = inventory?.location
|
|
48
|
+
|
|
49
|
+
if (inventory && inventory.id) {
|
|
50
|
+
await tx
|
|
51
|
+
.createQueryBuilder()
|
|
52
|
+
.update(Inventory)
|
|
53
|
+
.set({
|
|
54
|
+
qty: () => `COALESCE("qty", 0) + ${orderInventory.releaseQty}`,
|
|
55
|
+
uomValue: () => `COALESCE("uom_value", 0) + ${orderInventory.releaseUomValue}`,
|
|
56
|
+
status: INVENTORY_STATUS.STORED,
|
|
57
|
+
updater: user
|
|
58
|
+
})
|
|
59
|
+
.where('id = :id', { id: inventory.id })
|
|
60
|
+
.execute()
|
|
61
|
+
|
|
62
|
+
await generateInventoryHistory(
|
|
63
|
+
inventory,
|
|
64
|
+
releaseGood,
|
|
65
|
+
INVENTORY_TRANSACTION_TYPE.CANCEL_ORDER,
|
|
66
|
+
orderInventory.releaseQty,
|
|
67
|
+
orderInventory.releaseUomValue,
|
|
68
|
+
user,
|
|
69
|
+
tx
|
|
70
|
+
)
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
return orderInventory
|
|
74
|
+
})
|
|
122
75
|
)
|
|
76
|
+
|
|
77
|
+
await tx
|
|
78
|
+
.getRepository(OrderInventory)
|
|
79
|
+
.update(pickedOIs, { status: ORDER_INVENTORY_STATUS.CANCELLED, updater: user })
|
|
123
80
|
}
|
|
124
81
|
|
|
125
|
-
// change status to cancelled for order inventory that has not executed yet
|
|
126
|
-
if (
|
|
127
|
-
await
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
)
|
|
147
|
-
}
|
|
148
|
-
|
|
149
|
-
let cancelledTargetInventory: OrderInventory = Object.assign({}, orderInventory)
|
|
150
|
-
cancelledTargetInventory.status = ORDER_INVENTORY_STATUS.CANCELLED
|
|
151
|
-
cancelledTargetInventory.updater = user
|
|
152
|
-
|
|
153
|
-
return cancelledTargetInventory
|
|
154
|
-
})
|
|
155
|
-
)
|
|
82
|
+
// change status to cancelled for order inventory that has not executed yet and remove locked qty
|
|
83
|
+
if (cancelOIs && cancelOIs.length) {
|
|
84
|
+
await Promise.all(
|
|
85
|
+
cancelOIs.map(async (orderInventory: OrderInventory) => {
|
|
86
|
+
let inventory: Inventory = orderInventory.inventory
|
|
87
|
+
|
|
88
|
+
if (inventory && inventory.id) {
|
|
89
|
+
await tx
|
|
90
|
+
.createQueryBuilder()
|
|
91
|
+
.update(Inventory)
|
|
92
|
+
.set({
|
|
93
|
+
lockedQty: () => `COALESCE("locked_qty", 0) - ${orderInventory.releaseQty}`,
|
|
94
|
+
lockedUomValue: () => `COALESCE("locked_uom_value", 0) - ${orderInventory.releaseUomValue}`,
|
|
95
|
+
updater: user
|
|
96
|
+
})
|
|
97
|
+
.where('id = :id', { id: inventory.id })
|
|
98
|
+
.execute()
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
return orderInventory
|
|
102
|
+
})
|
|
156
103
|
)
|
|
104
|
+
|
|
105
|
+
await tx
|
|
106
|
+
.getRepository(OrderInventory)
|
|
107
|
+
.update(cancelOIs, { status: ORDER_INVENTORY_STATUS.CANCELLED, updater: user })
|
|
157
108
|
}
|
|
158
109
|
|
|
159
|
-
if (
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
status: ORDER_INVENTORY_STATUS.CANCELLED,
|
|
164
|
-
updater: user
|
|
165
|
-
}
|
|
166
|
-
})
|
|
167
|
-
await tx.getRepository(OrderInventory).save(replacedOI)
|
|
110
|
+
if (replacedOIs && replacedOIs.length) {
|
|
111
|
+
await tx
|
|
112
|
+
.getRepository(OrderInventory)
|
|
113
|
+
.update(replacedOIs, { status: ORDER_INVENTORY_STATUS.CANCELLED, updater: user })
|
|
168
114
|
}
|
|
169
115
|
|
|
170
116
|
if (foundOVs && foundOVs?.length) {
|
|
@@ -234,3 +180,18 @@ export const confirmCancellationReleaseOrder = {
|
|
|
234
180
|
return
|
|
235
181
|
}
|
|
236
182
|
}
|
|
183
|
+
|
|
184
|
+
function _filterOrderInventoriesByStatus(orderInventories: OrderInventory[], status: string): OrderInventory[] {
|
|
185
|
+
return orderInventories
|
|
186
|
+
.filter((oi: OrderInventory) => oi.status === status)
|
|
187
|
+
.reduce((acc, oi) => {
|
|
188
|
+
let existingInvIdx = !oi.inventory ? -1 : acc.findIndex(i => i.inventory?.id == oi.inventory?.id)
|
|
189
|
+
if (existingInvIdx >= 0) {
|
|
190
|
+
acc[existingInvIdx].releaseQty += oi.releaseQty
|
|
191
|
+
acc[existingInvIdx].releaseUomValue += oi.releaseQty
|
|
192
|
+
} else {
|
|
193
|
+
acc.push(oi)
|
|
194
|
+
}
|
|
195
|
+
return acc
|
|
196
|
+
}, [])
|
|
197
|
+
}
|
|
@@ -55,6 +55,7 @@ export const pendingCancellationReleaseOrder = {
|
|
|
55
55
|
pickingOIs = targetOIs
|
|
56
56
|
.filter(
|
|
57
57
|
(oi: OrderInventory) =>
|
|
58
|
+
oi.status === ORDER_INVENTORY_STATUS.ASSIGNED ||
|
|
58
59
|
oi.status === ORDER_INVENTORY_STATUS.PICKING ||
|
|
59
60
|
oi.status === ORDER_INVENTORY_STATUS.READY_TO_PICK ||
|
|
60
61
|
oi.status === ORDER_INVENTORY_STATUS.PENDING_SPLIT ||
|
|
@@ -33,6 +33,7 @@ export const rejectCancellationReleaseOrder = {
|
|
|
33
33
|
let foundOVs: OrderVas[] = foundRO.orderVass
|
|
34
34
|
let isDeactivatedPicking = false
|
|
35
35
|
|
|
36
|
+
foundRO.status = ORDER_STATUS.PENDING_WORKSHEET
|
|
36
37
|
// get the worksheet based on RO number
|
|
37
38
|
let foundWS: Worksheet[] = await tx.getRepository(Worksheet).find({
|
|
38
39
|
where: {
|
|
@@ -72,13 +73,13 @@ export const rejectCancellationReleaseOrder = {
|
|
|
72
73
|
|
|
73
74
|
// check if the worksheet is in Loading stage
|
|
74
75
|
const isLoadingStage = foundWS.some((ws: Worksheet) => ws.type === WORKSHEET_TYPE.LOADING)
|
|
75
|
-
|
|
76
|
+
|
|
76
77
|
// change the order inventory status accordingly
|
|
77
78
|
let newOrderInventories: OrderInventory[] = targetOIs.map(
|
|
78
79
|
(oi: OrderInventory) => {
|
|
79
80
|
if (isLoadingStage && oi.deliveryOrder && oi.status === ORDER_INVENTORY_STATUS.PENDING_REVERSE)
|
|
80
81
|
oi.status = ORDER_INVENTORY_STATUS.LOADED
|
|
81
|
-
|
|
82
|
+
|
|
82
83
|
else if (isLoadingStage && !oi.deliveryOrder && oi.status === ORDER_INVENTORY_STATUS.PENDING_REVERSE)
|
|
83
84
|
oi.status = ORDER_INVENTORY_STATUS.LOADING
|
|
84
85
|
|
|
@@ -98,14 +99,14 @@ export const rejectCancellationReleaseOrder = {
|
|
|
98
99
|
...oi,
|
|
99
100
|
updater: user
|
|
100
101
|
}
|
|
101
|
-
|
|
102
|
+
})
|
|
102
103
|
await tx.getRepository(OrderInventory).save(newOrderInventories)
|
|
103
104
|
|
|
104
105
|
// find the worksheet details based on order inventories
|
|
105
106
|
let foundWSD: WorksheetDetail[] = await tx.getRepository(WorksheetDetail).find({
|
|
106
107
|
where: {
|
|
107
108
|
domain,
|
|
108
|
-
targetInventory: In(newOrderInventories.map((oi: OrderInventory) => oi.id
|
|
109
|
+
targetInventory: In(newOrderInventories.map((oi: OrderInventory) => oi.id))
|
|
109
110
|
},
|
|
110
111
|
relations: ['targetInventory']
|
|
111
112
|
})
|
|
@@ -115,7 +116,7 @@ export const rejectCancellationReleaseOrder = {
|
|
|
115
116
|
|
|
116
117
|
//change the worksheet details status accordingly
|
|
117
118
|
newOrderInventories.forEach((oi: OrderInventory) => {
|
|
118
|
-
|
|
119
|
+
|
|
119
120
|
if (wsd.targetInventory?.id === oi.id && wsd.type === WORKSHEET_TYPE.PICKING) {
|
|
120
121
|
switch (oi.status) {
|
|
121
122
|
case ORDER_INVENTORY_STATUS.READY_TO_PICK:
|
|
@@ -156,7 +157,7 @@ export const rejectCancellationReleaseOrder = {
|
|
|
156
157
|
}
|
|
157
158
|
}
|
|
158
159
|
})
|
|
159
|
-
|
|
160
|
+
|
|
160
161
|
return {
|
|
161
162
|
...wsd,
|
|
162
163
|
updater: user
|
|
@@ -172,10 +173,10 @@ export const rejectCancellationReleaseOrder = {
|
|
|
172
173
|
foundOVs = foundOVs.map((orderVas: OrderVas) => {
|
|
173
174
|
if (!isLoadingStage)
|
|
174
175
|
orderVas.status = ORDER_VAS_STATUS.READY_TO_PROCESS
|
|
175
|
-
|
|
176
|
+
|
|
176
177
|
else
|
|
177
178
|
orderVas.status = ORDER_VAS_STATUS.COMPLETED
|
|
178
|
-
|
|
179
|
+
|
|
179
180
|
return {
|
|
180
181
|
...orderVas,
|
|
181
182
|
updater: user
|
|
@@ -211,33 +212,33 @@ export const rejectCancellationReleaseOrder = {
|
|
|
211
212
|
foundRO.status = ORDER_STATUS.LOADING
|
|
212
213
|
|
|
213
214
|
else {
|
|
214
|
-
var isReadyToLoadRO = foundWS.some((ws: Worksheet) =>
|
|
215
|
+
var isReadyToLoadRO = foundWS.some((ws: Worksheet) =>
|
|
215
216
|
ws.type === WORKSHEET_TYPE.LOADING &&
|
|
216
217
|
ws.status === WORKSHEET_STATUS.DEACTIVATED
|
|
217
218
|
)
|
|
218
219
|
}
|
|
219
220
|
|
|
220
|
-
if (isReadyToLoadRO)
|
|
221
|
+
if (isReadyToLoadRO)
|
|
221
222
|
foundRO.status = ORDER_STATUS.READY_TO_LOAD
|
|
222
223
|
|
|
223
224
|
else {
|
|
224
|
-
var isPickingRO = foundWS.some((ws: Worksheet) =>
|
|
225
|
+
var isPickingRO = foundWS.some((ws: Worksheet) =>
|
|
225
226
|
ws.type === WORKSHEET_TYPE.PICKING &&
|
|
226
227
|
ws.status === WORKSHEET_STATUS.EXECUTING
|
|
227
228
|
)
|
|
228
229
|
}
|
|
229
|
-
|
|
230
|
-
if (isPickingRO)
|
|
230
|
+
|
|
231
|
+
if (isPickingRO)
|
|
231
232
|
foundRO.status = ORDER_STATUS.PICKING
|
|
232
233
|
|
|
233
234
|
else {
|
|
234
|
-
var isReadyToPickRO = foundWS.some((ws: Worksheet) =>
|
|
235
|
+
var isReadyToPickRO = foundWS.some((ws: Worksheet) =>
|
|
235
236
|
ws.type === WORKSHEET_TYPE.PICKING &&
|
|
236
237
|
ws.status === WORKSHEET_STATUS.DEACTIVATED
|
|
237
238
|
)
|
|
238
239
|
}
|
|
239
240
|
|
|
240
|
-
if (isReadyToPickRO)
|
|
241
|
+
if (isReadyToPickRO)
|
|
241
242
|
foundRO.status = ORDER_STATUS.READY_TO_PICK
|
|
242
243
|
|
|
243
244
|
await tx.getRepository(ReleaseGood).save({
|
|
@@ -51,7 +51,8 @@ export const generatePalletIdResolver = {
|
|
|
51
51
|
bizplace: foundWSD.bizplace,
|
|
52
52
|
orderProductRemark: foundWSD.targetProduct.remark,
|
|
53
53
|
purchaseOrderNo: foundWSD.targetProduct.arrivalNotice?.purchaseOrder?.name || '',
|
|
54
|
-
arrivalNoticeRefNo: foundWSD.targetProduct.arrivalNotice?.refNo || ''
|
|
54
|
+
arrivalNoticeRefNo: foundWSD.targetProduct.arrivalNotice?.refNo || '',
|
|
55
|
+
arrivalNoticeNo: foundWSD.targetProduct.arrivalNotice?.name || ''
|
|
55
56
|
}
|
|
56
57
|
} else if (foundWSD.targetInventory) {
|
|
57
58
|
result = {
|