@things-factory/worksheet-base 4.2.3 → 4.2.6
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/graphql/resolvers/worksheet/cycle-count-adjustment.js +10 -3
- package/dist-server/graphql/resolvers/worksheet/cycle-count-adjustment.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js +13 -3
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +6 -2
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.js +49 -55
- package/dist-server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/worksheets.js +18 -0
- package/dist-server/graphql/resolvers/worksheet/worksheets.js.map +1 -1
- package/dist-server/graphql/types/worksheet/index.js +3 -2
- package/dist-server/graphql/types/worksheet/index.js.map +1 -1
- package/dist-server/graphql/types/worksheet/picking-assignment-status.js +2 -2
- package/package.json +8 -8
- package/server/graphql/resolvers/worksheet/cycle-count-adjustment.ts +13 -4
- package/server/graphql/resolvers/worksheet/loading/complete-loading.ts +19 -5
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +5 -2
- package/server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.ts +61 -58
- package/server/graphql/resolvers/worksheet/worksheets.ts +26 -0
- package/server/graphql/types/worksheet/index.ts +3 -2
- package/server/graphql/types/worksheet/picking-assignment-status.ts +2 -2
|
@@ -46,7 +46,9 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
|
|
|
46
46
|
'targetInventory.inventory.product.productDetails',
|
|
47
47
|
'targetInventory.inventory.product.productDetails.childProductDetail',
|
|
48
48
|
'targetInventory.inventory.bizplace',
|
|
49
|
+
'targetInventory.inventory.domain',
|
|
49
50
|
'targetInventory.inventory.bizplace.domain',
|
|
51
|
+
'targetInventory.inventory.warehouse',
|
|
50
52
|
'targetInventory.inventory.location',
|
|
51
53
|
'targetInventory.inspectedLocation',
|
|
52
54
|
'targetInventory.inspectedLocation.warehouse'
|
|
@@ -55,8 +57,8 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
|
|
|
55
57
|
for (let worksheetDetail of worksheetDetails) {
|
|
56
58
|
const targetInventory = worksheetDetail.targetInventory;
|
|
57
59
|
let inventory = targetInventory.inventory;
|
|
58
|
-
|
|
59
|
-
|
|
60
|
+
let transactQty = targetInventory.inspectedQty - inventory.qty;
|
|
61
|
+
let transactUomValue = targetInventory.inspectedUomValue - inventory.uomValue;
|
|
60
62
|
const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
|
|
61
63
|
where: { domain: inventory.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE }
|
|
62
64
|
});
|
|
@@ -102,8 +104,13 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
|
|
|
102
104
|
const prevLocationId = inventory.location.id;
|
|
103
105
|
if (targetInventory.inspectedBatchNo !== inventory.batchId) {
|
|
104
106
|
// generate TERMINATED, ADJUSTMENT history
|
|
107
|
+
const { qty, uomValue } = inventory;
|
|
105
108
|
inventory.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
|
|
106
|
-
|
|
109
|
+
inventory.qty = 0;
|
|
110
|
+
inventory.uomValue = 0;
|
|
111
|
+
await (0, utils_1.generateInventoryHistory)(inventory, cycleCount, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.CC_ADJUSTMENT, -qty, -uomValue, user, tx);
|
|
112
|
+
transactQty = targetInventory.inspectedQty;
|
|
113
|
+
transactUomValue = targetInventory.inspectedUomValue;
|
|
107
114
|
}
|
|
108
115
|
inventory.batchId = targetInventory.inspectedBatchNo;
|
|
109
116
|
inventory.qty = targetInventory.inspectedQty;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cycle-count-adjustment.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/cycle-count-adjustment.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;AAG3C,qFAAwF;AACxF,2DAAiH;AAEjH,mEAAkH;AAElH,kDAAqE;AACrE,sDAA4D;AAC5D,gDAA8D;AAC9D,0CAA+E;AAElE,QAAA,4BAA4B,GAAG;IAC1C,KAAK,CAAC,oBAAoB,CAAC,CAAM,EAAE,EAAE,YAAY,EAAE,EAAE,OAAY;QAC/D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,CAAA;IAC5D,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,oBAAoB,CACxC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,YAAoB;IAEpB,qBAAqB;IACrB,MAAM,UAAU,GAAmB,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,OAAO,CAAC;QAChF,KAAK,EAAE;YACL,MAAM;YACN,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,yBAAY,CAAC,cAAc;SACpC;KACF,CAAC,CAAA;IAEF,IAAI,SAAS,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;QACnE,KAAK,EAAE;YACL,MAAM;YACN,IAAI,EAAE,IAAA,YAAE,EAAC,CAAC,0BAAc,CAAC,WAAW,EAAE,0BAAc,CAAC,mBAAmB,CAAC,CAAC;YAC1E,cAAc,EAAE,UAAU;SAC3B;KACF,CAAC,CAAA;IAEF,wCAAwC;IACxC,MAAM,gBAAgB,GAAsB,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,IAAI,CAAC;QACvF,KAAK,EAAE;YACL,MAAM;YACN,SAAS;YACT,IAAI,EAAE,IAAA,YAAE,EAAC,CAAC,0BAAc,CAAC,WAAW,EAAE,0BAAc,CAAC,mBAAmB,CAAC,CAAC;YAC1E,MAAM,EAAE,4BAAgB,CAAC,SAAS;SACnC;QACD,SAAS,EAAE;YACT,iBAAiB;YACjB,2BAA2B;YAC3B,mCAAmC;YACnC,kDAAkD;YAClD,qEAAqE;YACrE,oCAAoC;YACpC,2CAA2C;YAC3C,oCAAoC;YACpC,mCAAmC;YACnC,6CAA6C;SAC9C;KACF,CAAC,CAAA;IAEF,KAAK,IAAI,eAAe,IAAI,gBAAgB,EAAE;QAC5C,MAAM,eAAe,GAAmB,eAAe,CAAC,eAAe,CAAA;QACvE,IAAI,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;QAEpD,
|
|
1
|
+
{"version":3,"file":"cycle-count-adjustment.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/cycle-count-adjustment.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createReturnWorksheet = exports.completeLoading = exports.completeLoadingResolver = void 0;
|
|
4
|
+
const integration_sftp_1 = require("@things-factory/integration-sftp");
|
|
4
5
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
6
|
+
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
5
7
|
const constants_1 = require("../../../../constants");
|
|
6
8
|
const controllers_1 = require("../../../../controllers");
|
|
7
|
-
const integration_sftp_1 = require("@things-factory/integration-sftp");
|
|
8
9
|
exports.completeLoadingResolver = {
|
|
9
10
|
async completeLoading(_, { releaseGoodNo }, context) {
|
|
10
11
|
const { tx, domain, user } = context.state;
|
|
@@ -31,12 +32,21 @@ async function completeLoading(tx, domain, user, releaseGoodNo) {
|
|
|
31
32
|
where: { domain: customerDomain }
|
|
32
33
|
});
|
|
33
34
|
if (customerAvailableSftp) {
|
|
34
|
-
let
|
|
35
|
+
let inventoryItems = await tx.getRepository(warehouse_base_1.InventoryItem).find({
|
|
36
|
+
where: { domain, outboundOrderId: releaseGood.id }
|
|
37
|
+
});
|
|
38
|
+
let shipmentResult = await integration_sftp_1.SftpAPI.createShipment(customerAvailableSftp, {
|
|
35
39
|
releaseGood,
|
|
36
40
|
orderInventories: targetInventories,
|
|
37
41
|
sftp: customerAvailableSftp
|
|
38
42
|
});
|
|
39
|
-
customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).save(
|
|
43
|
+
customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).save(shipmentResult);
|
|
44
|
+
let snResult = await integration_sftp_1.SftpAPI.createSerialNumber(customerAvailableSftp, {
|
|
45
|
+
releaseGood,
|
|
46
|
+
inventoryItems,
|
|
47
|
+
sftp: customerAvailableSftp
|
|
48
|
+
});
|
|
49
|
+
customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).save(snResult);
|
|
40
50
|
}
|
|
41
51
|
await worksheetController.completeLoading(releaseGoodNo);
|
|
42
52
|
if (remainInventories.length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-loading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/loading/complete-loading.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"complete-loading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/loading/complete-loading.ts"],"names":[],"mappings":";;;AAGA,uEAAgE;AAChE,2DAA8G;AAE9G,mEAA8D;AAE9D,qDAAsD;AACtD,yDAAkG;AAGrF,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;QAC3D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,CAAA;IACxD,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,eAAe,CACnC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAAqB;IAErB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,WAAW,GAAgB,MAAM,mBAAmB,CAAC,YAAY,CACrE,wBAAW,EACX;QACE,MAAM;QACN,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,yBAAY,CAAC,OAAO;KAC7B,EACD,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAChC,CAAA;IACD,MAAM,SAAS,GAAc,MAAM,mBAAmB,CAAC,uBAAuB,CAAC,WAAW,EAAE,0BAAc,CAAC,OAAO,EAAE;QAClH,kBAAkB;QAClB,kCAAkC;QAClC,0CAA0C;KAC3C,CAAC,CAAA;IACF,MAAM,gBAAgB,GAAsB,SAAS,CAAC,gBAAgB,CAAA;IACtE,MAAM,iBAAiB,GAAqB,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IAC/G,MAAM,iBAAiB,GAAqB,iBAAiB,CAAC,MAAM,CAClE,CAAC,eAA+B,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,KAAK,mCAAsB,CAAC,OAAO,CAC/F,CAAA;IAED,MAAM,cAAc,GAAW,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAA;IAC1D,IAAI,qBAAqB,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAI,CAAC,CAAC,OAAO,CAAC;QACrE,KAAK,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE;KAClC,CAAC,CAAA;IACF,IAAI,qBAAqB,EAAE;QACzB,IAAI,cAAc,GAAoB,MAAM,EAAE,CAAC,aAAa,CAAC,8BAAa,CAAC,CAAC,IAAI,CAAC;YAC/E,KAAK,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,WAAW,CAAC,EAAE,EAAE;SACnD,CAAC,CAAA;QAEF,IAAI,cAAc,GAAS,MAAM,0BAAO,CAAC,cAAc,CAAC,qBAAqB,EAAE;YAC7E,WAAW;YACX,gBAAgB,EAAE,iBAAiB;YACnC,IAAI,EAAE,qBAAqB;SAC5B,CAAC,CAAA;QACF,qBAAqB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAI,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAEzE,IAAI,QAAQ,GAAS,MAAM,0BAAO,CAAC,kBAAkB,CAAC,qBAAqB,EAAE;YAC3E,WAAW;YACX,cAAc;YACd,IAAI,EAAE,qBAAqB;SAC5B,CAAC,CAAA;QACF,qBAAqB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;KACpE;IAED,MAAM,mBAAmB,CAAC,eAAe,CAAC,aAAa,CAAC,CAAA;IAExD,IAAI,iBAAiB,CAAC,MAAM,EAAE;QAC5B,MAAM,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAA;KAChF;AACH,CAAC;AAxDD,0CAwDC;AAED,6CAA6C;AACtC,KAAK,UAAU,qBAAqB,CACzC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAAqB,EACrB,gBAAkC;IAElC,MAAM,mBAAmB,GAAiC,IAAI,0CAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC5G,OAAO,MAAM,mBAAmB,CAAC,0BAA0B,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAA;AAC9F,CAAC;AATD,sDASC"}
|
|
@@ -157,8 +157,12 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
157
157
|
}
|
|
158
158
|
}
|
|
159
159
|
else {
|
|
160
|
-
|
|
161
|
-
|
|
160
|
+
if ((resp === null || resp === void 0 ? void 0 : resp.AWBurl) && (resp === null || resp === void 0 ? void 0 : resp.TrackingNo))
|
|
161
|
+
await tx
|
|
162
|
+
.getRepository(marketplace_base_1.MarketplaceOrderShipping)
|
|
163
|
+
.update({ id: marketplaceOrderShipping.id }, { airwayBill: resp.AWBurl, trackingNo: resp.TrackingNo });
|
|
164
|
+
else
|
|
165
|
+
throw resp;
|
|
162
166
|
}
|
|
163
167
|
}
|
|
164
168
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
|
package/dist-server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.js
CHANGED
|
@@ -6,63 +6,57 @@ const typeorm_1 = require("typeorm");
|
|
|
6
6
|
const constants_1 = require("../../../../constants");
|
|
7
7
|
const entities_1 = require("../../../../entities");
|
|
8
8
|
exports.pickingAssignmentStatusByUsersResolver = {
|
|
9
|
-
async pickingAssignmentStatusByUsers(_,
|
|
9
|
+
async pickingAssignmentStatusByUsers(_, params, context) {
|
|
10
10
|
const { domain } = context.state;
|
|
11
|
-
const
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
11
|
+
const nameFilter = params.filters.find(p => { return p.name == "name"; });
|
|
12
|
+
const emailFilter = params.filters.find(p => { return p.name == "email"; });
|
|
13
|
+
const roleFilter = params.filters.find(p => { return p.name == 'roles'; });
|
|
14
|
+
const pendingSorter = params.sortings.find(p => { return p.name == 'pending'; });
|
|
15
|
+
const pickingSorter = params.sortings.find(p => { return p.name == 'picking'; });
|
|
16
|
+
const getUserInfoQb = await (0, typeorm_1.getRepository)(auth_base_1.User).createQueryBuilder('u');
|
|
17
|
+
getUserInfoQb.select('u.id');
|
|
18
|
+
getUserInfoQb.addSelect('u.name');
|
|
19
|
+
getUserInfoQb.addSelect('u.email');
|
|
20
|
+
getUserInfoQb.addSelect("string_agg(r.name,', ') as roles");
|
|
21
|
+
getUserInfoQb.innerJoin('u.roles', 'r');
|
|
22
|
+
getUserInfoQb.where('r.domain_id = :domainId', { domainId: domain.id });
|
|
23
|
+
roleFilter ? getUserInfoQb.andWhere('r.name ilike :userRole', { userRole: `%${roleFilter.value}%` }) : "";
|
|
24
|
+
nameFilter ? getUserInfoQb.andWhere('u.name ilike :userName', { userName: `%${nameFilter.value}%` }) : "";
|
|
25
|
+
emailFilter ? getUserInfoQb.andWhere('u.email ilike :userEmail', { userEmail: `%${emailFilter.value}%` }) : "";
|
|
26
|
+
getUserInfoQb.andWhere('r.name not ilike :userR', { userR: `%CLIENT%` });
|
|
27
|
+
getUserInfoQb.andWhere('u.user_type = :userType', { userType: "user" });
|
|
28
|
+
getUserInfoQb.groupBy('u.id');
|
|
29
|
+
getUserInfoQb.addGroupBy('u.name');
|
|
30
|
+
getUserInfoQb.addGroupBy('u.email');
|
|
31
|
+
const getAssignedWSQb = await (0, typeorm_1.getRepository)(entities_1.Worksheet).createQueryBuilder('ws');
|
|
32
|
+
getAssignedWSQb.select('ws.assignee_id');
|
|
33
|
+
getAssignedWSQb.addSelect('u.name');
|
|
34
|
+
getAssignedWSQb.addSelect("sum(case when ws.status='EXECUTING' then 1 else 0 end) as picking");
|
|
35
|
+
getAssignedWSQb.addSelect("sum(case when ws.status='DEACTIVATED' then 1 else 0 end) as pending");
|
|
36
|
+
getAssignedWSQb.innerJoin('ws.assignee', 'u');
|
|
37
|
+
getAssignedWSQb.where('ws.domain_id = :id', { id: domain.id });
|
|
38
|
+
getAssignedWSQb.andWhere('ws.type IN (:...type)', { type: [constants_1.WORKSHEET_TYPE.PICKING, constants_1.WORKSHEET_TYPE.BATCH_PICKING] });
|
|
39
|
+
getAssignedWSQb.andWhere('ws.status IN (:...status)', { status: [constants_1.WORKSHEET_STATUS.DEACTIVATED, constants_1.WORKSHEET_STATUS.EXECUTING] });
|
|
40
|
+
getAssignedWSQb.groupBy('ws.assignee_id');
|
|
41
|
+
getAssignedWSQb.addGroupBy('u.name');
|
|
42
|
+
(pendingSorter === null || pendingSorter === void 0 ? void 0 : pendingSorter.desc) ? getAssignedWSQb.orderBy('pending', 'DESC') : '';
|
|
43
|
+
(pickingSorter === null || pickingSorter === void 0 ? void 0 : pickingSorter.desc) ? getAssignedWSQb.orderBy('picking', 'DESC') : '';
|
|
44
|
+
pickingSorter && Object.keys(pickingSorter).length == 1 ? getAssignedWSQb.orderBy('picking', 'ASC') : '';
|
|
45
|
+
pendingSorter && Object.keys(pendingSorter).length == 1 ? getAssignedWSQb.orderBy('pending', 'ASC') : '';
|
|
46
|
+
const parameter1 = getUserInfoQb.getParameters();
|
|
47
|
+
const parameter2 = getAssignedWSQb.getParameters();
|
|
48
|
+
const combineParams = Object.assign(parameter1, parameter2);
|
|
49
|
+
const combineQb = (0, typeorm_1.getManager)().createQueryBuilder();
|
|
50
|
+
combineQb.select('u.*');
|
|
51
|
+
combineQb.addSelect('coalesce(ws.picking, 0) as picking');
|
|
52
|
+
combineQb.addSelect('coalesce(ws.pending, 0) as pending');
|
|
53
|
+
combineQb.from("(" + getUserInfoQb.getQuery() + ")", "u");
|
|
54
|
+
combineQb.leftJoin("(" + getAssignedWSQb.getQuery() + ")", "ws", ' ws.assignee_id = u.u_id');
|
|
55
|
+
combineQb.setParameters(combineParams);
|
|
56
|
+
const combineInfo = await combineQb.getRawMany();
|
|
57
|
+
return combineInfo.map(itm => {
|
|
58
|
+
return { user: { id: itm.u_id, email: itm.u_email, name: itm.u_name, description: itm.roles }, pending: itm.pending, picking: itm.picking };
|
|
29
59
|
});
|
|
30
|
-
const assignmentMap = assignedPickingWorksheets.reduce((assignmentMap, worksheet) => {
|
|
31
|
-
const assignee = worksheet.assignee;
|
|
32
|
-
const status = worksheet.status;
|
|
33
|
-
if (assignmentMap.has(assignee.id)) {
|
|
34
|
-
const assignment = assignmentMap.get(assignee.id);
|
|
35
|
-
if (status === constants_1.WORKSHEET_STATUS.DEACTIVATED) {
|
|
36
|
-
assignment.pending.push(worksheet);
|
|
37
|
-
}
|
|
38
|
-
else if (status === constants_1.WORKSHEET_STATUS.EXECUTING) {
|
|
39
|
-
assignment.picking.push(worksheet);
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
else {
|
|
43
|
-
if (status === constants_1.WORKSHEET_STATUS.DEACTIVATED) {
|
|
44
|
-
assignmentMap.set(assignee.id, {
|
|
45
|
-
user: assignee,
|
|
46
|
-
pending: [worksheet],
|
|
47
|
-
picking: []
|
|
48
|
-
});
|
|
49
|
-
}
|
|
50
|
-
else if (status === constants_1.WORKSHEET_STATUS.EXECUTING) {
|
|
51
|
-
assignmentMap.set(assignee.id, {
|
|
52
|
-
user: assignee,
|
|
53
|
-
pending: [],
|
|
54
|
-
picking: [worksheet]
|
|
55
|
-
});
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
return assignmentMap;
|
|
59
|
-
}, new Map());
|
|
60
|
-
users.forEach((user) => {
|
|
61
|
-
if (!assignmentMap.has(user.id)) {
|
|
62
|
-
assignmentMap.set(user.id, { user, pending: [], picking: [] });
|
|
63
|
-
}
|
|
64
|
-
});
|
|
65
|
-
return Array.from(assignmentMap.values());
|
|
66
60
|
}
|
|
67
61
|
};
|
|
68
62
|
//# sourceMappingURL=picking-assignment-status-by-user.js.map
|
package/dist-server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"picking-assignment-status-by-user.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"picking-assignment-status-by-user.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.worksheetsResolver = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
5
6
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
6
7
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
7
8
|
const shell_1 = require("@things-factory/shell");
|
|
@@ -82,6 +83,7 @@ exports.worksheetsResolver = {
|
|
|
82
83
|
const releaseGoodCrossDockingParam = params.filters.find(param => param.name === 'crossDocking');
|
|
83
84
|
const releaseGoodCourierOptionParam = params.filters.find(param => param.name === 'courierOption');
|
|
84
85
|
const releaseGoodPackingOptionParam = params.filters.find(param => param.name === 'packingOption');
|
|
86
|
+
const releaseGoodPickerOptionParam = params.filters.find(param => param.name === 'assignee');
|
|
85
87
|
if (releaseGoodParam ||
|
|
86
88
|
releaseGoodRefNoParam ||
|
|
87
89
|
releaseGoodCrossDockingParam ||
|
|
@@ -190,6 +192,22 @@ exports.worksheetsResolver = {
|
|
|
190
192
|
});
|
|
191
193
|
}
|
|
192
194
|
}
|
|
195
|
+
//find assignee
|
|
196
|
+
const assigneeParam = params.filters.find(param => param.name === 'assignee');
|
|
197
|
+
let assigneeFilter = [];
|
|
198
|
+
if (assigneeParam) {
|
|
199
|
+
params.filters.splice(params.filters.findIndex(item => item.name == 'assignee'), 1);
|
|
200
|
+
assigneeFilter.push(Object.assign(Object.assign({}, assigneeParam), { name: 'name' }));
|
|
201
|
+
const foundAssignee = await (0, typeorm_1.getRepository)(auth_base_1.User).find(Object.assign({}, (0, shell_1.convertListParams)({ filters: assigneeFilter })));
|
|
202
|
+
if (foundAssignee) {
|
|
203
|
+
params.filters.push({
|
|
204
|
+
name: 'assigneeId',
|
|
205
|
+
operator: 'in',
|
|
206
|
+
value: foundAssignee.map((foundIC) => foundIC.id),
|
|
207
|
+
relation: false
|
|
208
|
+
});
|
|
209
|
+
}
|
|
210
|
+
}
|
|
193
211
|
////Set default bizplace filter
|
|
194
212
|
const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId');
|
|
195
213
|
if (!bizplaceFilter && typeParam.value[0] !== constants_1.WORKSHEET_TYPE.BATCH_PICKING) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worksheets.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/worksheets.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"worksheets.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/worksheets.ts"],"names":[],"mappings":"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"}
|
|
@@ -682,8 +682,9 @@ exports.Query = `
|
|
|
682
682
|
): [Inventory] @privilege(category: "worksheet", privilege: "query")
|
|
683
683
|
|
|
684
684
|
pickingAssignmentStatusByUsers(
|
|
685
|
-
|
|
686
|
-
|
|
685
|
+
filters: [Filter],
|
|
686
|
+
pagination: Pagination,
|
|
687
|
+
sortings: [Sorting]
|
|
687
688
|
): [PickingAssignmentStatus] @privilege(category: "worksheet", privilege: "query")
|
|
688
689
|
|
|
689
690
|
myPickingAssignmentStatus: MyPickingAssignmentStatus @privilege(category: "worksheet", privilege: "query")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,yEAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,6DAAwD;AACxD,+DAA0D;AAC1D,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AACrE,qFAA4E;AAE/D,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+gBrC,CAAA;AAEY,QAAA,KAAK,GAAiB
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,yEAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,6DAAwD;AACxD,+DAA0D;AAC1D,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AACrE,qFAA4E;AAE/D,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+gBrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0IlC,CAAA;AAEY,QAAA,KAAK,GAAiB;IACjC,qBAAS;IACT,uBAAU;IACV,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;IACzB,0DAAyB;CAC1B,CAAA"}
|
|
@@ -5,8 +5,8 @@ const apollo_server_koa_1 = require("apollo-server-koa");
|
|
|
5
5
|
exports.PickingAssignmentStatus = (0, apollo_server_koa_1.gql) `
|
|
6
6
|
type PickingAssignmentStatus {
|
|
7
7
|
user: User
|
|
8
|
-
pending:
|
|
9
|
-
picking:
|
|
8
|
+
pending: String
|
|
9
|
+
picking: String
|
|
10
10
|
}
|
|
11
11
|
`;
|
|
12
12
|
//# sourceMappingURL=picking-assignment-status.js.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worksheet-base",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.6",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -29,16 +29,16 @@
|
|
|
29
29
|
"@things-factory/document-template-base": "^4.1.40",
|
|
30
30
|
"@things-factory/id-rule-base": "^4.2.0",
|
|
31
31
|
"@things-factory/integration-lmd": "^4.1.40",
|
|
32
|
-
"@things-factory/integration-marketplace": "^4.2.
|
|
33
|
-
"@things-factory/integration-sellercraft": "^4.2.
|
|
34
|
-
"@things-factory/integration-sftp": "^4.
|
|
35
|
-
"@things-factory/marketplace-base": "^4.2.
|
|
32
|
+
"@things-factory/integration-marketplace": "^4.2.5",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^4.2.5",
|
|
34
|
+
"@things-factory/integration-sftp": "^4.2.5",
|
|
35
|
+
"@things-factory/marketplace-base": "^4.2.6",
|
|
36
36
|
"@things-factory/notification": "^4.1.40",
|
|
37
|
-
"@things-factory/sales-base": "^4.2.
|
|
37
|
+
"@things-factory/sales-base": "^4.2.6",
|
|
38
38
|
"@things-factory/setting-base": "^4.1.40",
|
|
39
39
|
"@things-factory/shell": "^4.1.40",
|
|
40
40
|
"@things-factory/transport-base": "^4.2.0",
|
|
41
|
-
"@things-factory/warehouse-base": "^4.2.
|
|
41
|
+
"@things-factory/warehouse-base": "^4.2.6"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "a6ae8ce83ac935693632447e58012bd2d5aee512"
|
|
44
44
|
}
|
|
@@ -56,7 +56,9 @@ export async function cycleCountAdjustment(
|
|
|
56
56
|
'targetInventory.inventory.product.productDetails',
|
|
57
57
|
'targetInventory.inventory.product.productDetails.childProductDetail',
|
|
58
58
|
'targetInventory.inventory.bizplace',
|
|
59
|
+
'targetInventory.inventory.domain',
|
|
59
60
|
'targetInventory.inventory.bizplace.domain',
|
|
61
|
+
'targetInventory.inventory.warehouse',
|
|
60
62
|
'targetInventory.inventory.location',
|
|
61
63
|
'targetInventory.inspectedLocation',
|
|
62
64
|
'targetInventory.inspectedLocation.warehouse'
|
|
@@ -67,8 +69,8 @@ export async function cycleCountAdjustment(
|
|
|
67
69
|
const targetInventory: OrderInventory = worksheetDetail.targetInventory
|
|
68
70
|
let inventory: Inventory = targetInventory.inventory
|
|
69
71
|
|
|
70
|
-
|
|
71
|
-
|
|
72
|
+
let transactQty: number = targetInventory.inspectedQty - inventory.qty
|
|
73
|
+
let transactUomValue: number = targetInventory.inspectedUomValue - inventory.uomValue
|
|
72
74
|
|
|
73
75
|
const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
|
|
74
76
|
where: { domain: inventory.bizplace.domain, status: SellercraftStatus.ACTIVE }
|
|
@@ -137,16 +139,23 @@ export async function cycleCountAdjustment(
|
|
|
137
139
|
|
|
138
140
|
if (targetInventory.inspectedBatchNo !== inventory.batchId) {
|
|
139
141
|
// generate TERMINATED, ADJUSTMENT history
|
|
142
|
+
const { qty, uomValue }: { qty: number; uomValue: number } = inventory
|
|
140
143
|
inventory.status = INVENTORY_STATUS.TERMINATED
|
|
144
|
+
inventory.qty = 0
|
|
145
|
+
inventory.uomValue = 0
|
|
146
|
+
|
|
141
147
|
await generateInventoryHistory(
|
|
142
148
|
inventory,
|
|
143
149
|
cycleCount,
|
|
144
150
|
INVENTORY_TRANSACTION_TYPE.CC_ADJUSTMENT,
|
|
145
|
-
-
|
|
146
|
-
-
|
|
151
|
+
-qty,
|
|
152
|
+
-uomValue,
|
|
147
153
|
user,
|
|
148
154
|
tx
|
|
149
155
|
)
|
|
156
|
+
|
|
157
|
+
transactQty = targetInventory.inspectedQty
|
|
158
|
+
transactUomValue = targetInventory.inspectedUomValue
|
|
150
159
|
}
|
|
151
160
|
|
|
152
161
|
inventory.batchId = targetInventory.inspectedBatchNo
|
|
@@ -1,11 +1,14 @@
|
|
|
1
|
+
import { EntityManager } from 'typeorm'
|
|
2
|
+
|
|
1
3
|
import { User } from '@things-factory/auth-base'
|
|
2
|
-
import {
|
|
4
|
+
import { Sftp, SftpAPI } from '@things-factory/integration-sftp'
|
|
5
|
+
import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
|
|
3
6
|
import { Domain } from '@things-factory/shell'
|
|
4
|
-
import {
|
|
7
|
+
import { InventoryItem } from '@things-factory/warehouse-base'
|
|
8
|
+
|
|
5
9
|
import { WORKSHEET_TYPE } from '../../../../constants'
|
|
6
10
|
import { LoadingWorksheetController, ReturningWorksheetController } from '../../../../controllers'
|
|
7
11
|
import { Worksheet, WorksheetDetail } from '../../../../entities'
|
|
8
|
-
import { Sftp, SftpAPI } from '@things-factory/integration-sftp'
|
|
9
12
|
|
|
10
13
|
export const completeLoadingResolver = {
|
|
11
14
|
async completeLoading(_: any, { releaseGoodNo }, context: any) {
|
|
@@ -46,12 +49,23 @@ export async function completeLoading(
|
|
|
46
49
|
where: { domain: customerDomain }
|
|
47
50
|
})
|
|
48
51
|
if (customerAvailableSftp) {
|
|
49
|
-
let
|
|
52
|
+
let inventoryItems: InventoryItem[] = await tx.getRepository(InventoryItem).find({
|
|
53
|
+
where: { domain, outboundOrderId: releaseGood.id }
|
|
54
|
+
})
|
|
55
|
+
|
|
56
|
+
let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
|
|
50
57
|
releaseGood,
|
|
51
58
|
orderInventories: targetInventories,
|
|
52
59
|
sftp: customerAvailableSftp
|
|
53
60
|
})
|
|
54
|
-
customerAvailableSftp = await tx.getRepository(Sftp).save(
|
|
61
|
+
customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
|
|
62
|
+
|
|
63
|
+
let snResult: Sftp = await SftpAPI.createSerialNumber(customerAvailableSftp, {
|
|
64
|
+
releaseGood,
|
|
65
|
+
inventoryItems,
|
|
66
|
+
sftp: customerAvailableSftp
|
|
67
|
+
})
|
|
68
|
+
customerAvailableSftp = await tx.getRepository(Sftp).save(snResult)
|
|
55
69
|
}
|
|
56
70
|
|
|
57
71
|
await worksheetController.completeLoading(releaseGoodNo)
|
|
@@ -205,8 +205,11 @@ export async function completePicking(
|
|
|
205
205
|
}
|
|
206
206
|
}
|
|
207
207
|
} else {
|
|
208
|
-
|
|
209
|
-
|
|
208
|
+
if (resp?.AWBurl && resp?.TrackingNo)
|
|
209
|
+
await tx
|
|
210
|
+
.getRepository(MarketplaceOrderShipping)
|
|
211
|
+
.update({ id: marketplaceOrderShipping.id }, { airwayBill: resp.AWBurl, trackingNo: resp.TrackingNo })
|
|
212
|
+
else throw resp
|
|
210
213
|
}
|
|
211
214
|
}
|
|
212
215
|
}
|
|
@@ -1,79 +1,82 @@
|
|
|
1
|
-
import { getDomainUsers, User } from '@things-factory/auth-base'
|
|
2
|
-
import { Domain } from '@things-factory/shell'
|
|
3
|
-
import { FindManyOptions, getRepository, ILike, In } from 'typeorm'
|
|
1
|
+
import { getDomainUsers, User, Role } from '@things-factory/auth-base'
|
|
2
|
+
import { Domain, ListParam, buildQuery, Sorting} from '@things-factory/shell'
|
|
3
|
+
import { FindManyOptions, getRepository, ILike, In, EntityManager, getManager, SelectQueryBuilder } from 'typeorm'
|
|
4
4
|
import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../constants'
|
|
5
5
|
import { Worksheet } from '../../../../entities'
|
|
6
6
|
|
|
7
|
-
type AssignmentStatusByUserType = { user: User; pending?:
|
|
7
|
+
type AssignmentStatusByUserType = { user: User; pending?: String; picking?: String }
|
|
8
8
|
|
|
9
9
|
export const pickingAssignmentStatusByUsersResolver = {
|
|
10
10
|
async pickingAssignmentStatusByUsers(
|
|
11
11
|
_: void,
|
|
12
|
-
|
|
12
|
+
params: ListParam,
|
|
13
13
|
context: any
|
|
14
14
|
): Promise<AssignmentStatusByUserType[]> {
|
|
15
|
+
|
|
15
16
|
const { domain }: { domain: Domain } = context.state
|
|
16
|
-
const domainUsers: User[] = await getDomainUsers(domain)
|
|
17
17
|
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
const nameFilter = params.filters.find(p=>{return p.name == "name"});
|
|
19
|
+
const emailFilter = params.filters.find(p=>{return p.name == "email"});
|
|
20
|
+
const roleFilter = params.filters.find(p=>{return p.name == 'roles'});
|
|
21
21
|
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
if (email) findOneOption.where.email = ILike(`%${email}%`)
|
|
22
|
+
const pendingSorter = params.sortings.find(p=>{return p.name == 'pending'});
|
|
23
|
+
const pickingSorter = params.sortings.find(p=>{return p.name == 'picking'});
|
|
25
24
|
|
|
26
|
-
const users: User[] = await getRepository(User).find(findOneOption)
|
|
27
25
|
|
|
28
|
-
const assignedPickingWorksheets: Worksheet[] = await getRepository(Worksheet).find({
|
|
29
|
-
where: {
|
|
30
|
-
type: In([WORKSHEET_TYPE.PICKING, WORKSHEET_TYPE.BATCH_PICKING]),
|
|
31
|
-
status: In([WORKSHEET_STATUS.DEACTIVATED, WORKSHEET_STATUS.EXECUTING]),
|
|
32
|
-
assignee: In(users.map((u: User) => u.id)),
|
|
33
|
-
domain
|
|
34
|
-
},
|
|
35
|
-
relations: ['assignee']
|
|
36
|
-
})
|
|
37
26
|
|
|
38
|
-
const
|
|
39
|
-
(assignmentMap: Map<string, AssignmentStatusByUserType>, worksheet: Worksheet) => {
|
|
40
|
-
const assignee: User = worksheet.assignee
|
|
41
|
-
const status: string = worksheet.status
|
|
27
|
+
const getUserInfoQb:SelectQueryBuilder<User> = await getRepository(User).createQueryBuilder('u')
|
|
42
28
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
} else if (status === WORKSHEET_STATUS.EXECUTING) {
|
|
58
|
-
assignmentMap.set(assignee.id, {
|
|
59
|
-
user: assignee,
|
|
60
|
-
pending: [],
|
|
61
|
-
picking: [worksheet]
|
|
62
|
-
})
|
|
63
|
-
}
|
|
64
|
-
}
|
|
29
|
+
getUserInfoQb.select('u.id')
|
|
30
|
+
getUserInfoQb.addSelect('u.name')
|
|
31
|
+
getUserInfoQb.addSelect('u.email')
|
|
32
|
+
getUserInfoQb.addSelect("string_agg(r.name,', ') as roles")
|
|
33
|
+
getUserInfoQb.innerJoin('u.roles','r')
|
|
34
|
+
getUserInfoQb.where('r.domain_id = :domainId',{domainId:domain.id})
|
|
35
|
+
roleFilter? getUserInfoQb.andWhere('r.name ilike :userRole', { userRole: `%${roleFilter.value}%` }) :""
|
|
36
|
+
nameFilter? getUserInfoQb.andWhere('u.name ilike :userName', { userName: `%${nameFilter.value}%` }) :""
|
|
37
|
+
emailFilter? getUserInfoQb.andWhere('u.email ilike :userEmail', { userEmail: `%${emailFilter.value}%` }) :""
|
|
38
|
+
getUserInfoQb.andWhere('r.name not ilike :userR',{userR:`%CLIENT%`})
|
|
39
|
+
getUserInfoQb.andWhere('u.user_type = :userType',{userType:"user"})
|
|
40
|
+
getUserInfoQb.groupBy('u.id')
|
|
41
|
+
getUserInfoQb.addGroupBy('u.name')
|
|
42
|
+
getUserInfoQb.addGroupBy('u.email')
|
|
65
43
|
|
|
66
|
-
|
|
67
|
-
},
|
|
68
|
-
new Map()
|
|
69
|
-
)
|
|
44
|
+
const getAssignedWSQb = await getRepository(Worksheet).createQueryBuilder('ws')
|
|
70
45
|
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
46
|
+
getAssignedWSQb.select('ws.assignee_id')
|
|
47
|
+
getAssignedWSQb.addSelect('u.name')
|
|
48
|
+
getAssignedWSQb.addSelect("sum(case when ws.status='EXECUTING' then 1 else 0 end) as picking")
|
|
49
|
+
getAssignedWSQb.addSelect("sum(case when ws.status='DEACTIVATED' then 1 else 0 end) as pending")
|
|
50
|
+
getAssignedWSQb.innerJoin('ws.assignee','u')
|
|
51
|
+
getAssignedWSQb.where('ws.domain_id = :id',{id:domain.id})
|
|
52
|
+
getAssignedWSQb.andWhere('ws.type IN (:...type)', {type: [WORKSHEET_TYPE.PICKING, WORKSHEET_TYPE.BATCH_PICKING]})
|
|
53
|
+
getAssignedWSQb.andWhere('ws.status IN (:...status)', {status: [WORKSHEET_STATUS.DEACTIVATED, WORKSHEET_STATUS.EXECUTING]})
|
|
54
|
+
getAssignedWSQb.groupBy('ws.assignee_id')
|
|
55
|
+
getAssignedWSQb.addGroupBy('u.name')
|
|
56
|
+
pendingSorter?.desc ? getAssignedWSQb.orderBy('pending','DESC') : ''
|
|
57
|
+
pickingSorter?.desc ? getAssignedWSQb.orderBy('picking','DESC') : ''
|
|
58
|
+
pickingSorter && Object.keys(pickingSorter).length == 1 ?getAssignedWSQb.orderBy('picking','ASC') : ''
|
|
59
|
+
pendingSorter && Object.keys(pendingSorter).length == 1 ? getAssignedWSQb.orderBy('pending','ASC') : ''
|
|
60
|
+
|
|
61
|
+
|
|
62
|
+
const parameter1= getUserInfoQb.getParameters()
|
|
63
|
+
const parameter2 = getAssignedWSQb.getParameters()
|
|
76
64
|
|
|
77
|
-
|
|
65
|
+
const combineParams = Object.assign(parameter1, parameter2)
|
|
66
|
+
|
|
67
|
+
const combineQb = getManager().createQueryBuilder()
|
|
68
|
+
|
|
69
|
+
combineQb.select('u.*')
|
|
70
|
+
combineQb.addSelect('coalesce(ws.picking, 0) as picking')
|
|
71
|
+
combineQb.addSelect('coalesce(ws.pending, 0) as pending')
|
|
72
|
+
combineQb.from("(" + getUserInfoQb.getQuery() + ")","u")
|
|
73
|
+
combineQb.leftJoin("(" + getAssignedWSQb.getQuery() + ")","ws",' ws.assignee_id = u.u_id')
|
|
74
|
+
combineQb.setParameters(combineParams)
|
|
75
|
+
|
|
76
|
+
const combineInfo = await combineQb.getRawMany()
|
|
77
|
+
|
|
78
|
+
return combineInfo.map(itm => {
|
|
79
|
+
return { user: { id:itm.u_id,email:itm.u_email,name:itm.u_name, description: itm.roles },pending:itm.pending,picking:itm.picking }
|
|
80
|
+
})
|
|
78
81
|
}
|
|
79
82
|
}
|
|
@@ -99,6 +99,7 @@ export const worksheetsResolver = {
|
|
|
99
99
|
const releaseGoodCrossDockingParam = params.filters.find(param => param.name === 'crossDocking')
|
|
100
100
|
const releaseGoodCourierOptionParam = params.filters.find(param => param.name === 'courierOption')
|
|
101
101
|
const releaseGoodPackingOptionParam = params.filters.find(param => param.name === 'packingOption')
|
|
102
|
+
const releaseGoodPickerOptionParam = params.filters.find(param => param.name === 'assignee')
|
|
102
103
|
if (
|
|
103
104
|
releaseGoodParam ||
|
|
104
105
|
releaseGoodRefNoParam ||
|
|
@@ -252,6 +253,31 @@ export const worksheetsResolver = {
|
|
|
252
253
|
}
|
|
253
254
|
}
|
|
254
255
|
|
|
256
|
+
//find assignee
|
|
257
|
+
|
|
258
|
+
const assigneeParam = params.filters.find(param => param.name === 'assignee')
|
|
259
|
+
let assigneeFilter = []
|
|
260
|
+
if (assigneeParam) {
|
|
261
|
+
params.filters.splice(
|
|
262
|
+
params.filters.findIndex(item => item.name == 'assignee'),
|
|
263
|
+
1
|
|
264
|
+
)
|
|
265
|
+
assigneeFilter.push({ ...assigneeParam, name: 'name' })
|
|
266
|
+
|
|
267
|
+
const foundAssignee: User[] = await getRepository(User).find({
|
|
268
|
+
...convertListParams({ filters: assigneeFilter })
|
|
269
|
+
})
|
|
270
|
+
|
|
271
|
+
if (foundAssignee) {
|
|
272
|
+
params.filters.push({
|
|
273
|
+
name: 'assigneeId',
|
|
274
|
+
operator: 'in',
|
|
275
|
+
value: foundAssignee.map((foundIC: User) => foundIC.id),
|
|
276
|
+
relation: false
|
|
277
|
+
})
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
|
|
255
281
|
////Set default bizplace filter
|
|
256
282
|
const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId')
|
|
257
283
|
if (!bizplaceFilter && typeParam.value[0] !== WORKSHEET_TYPE.BATCH_PICKING) {
|
|
@@ -681,8 +681,9 @@ export const Query = /* GraphQL */ `
|
|
|
681
681
|
): [Inventory] @privilege(category: "worksheet", privilege: "query")
|
|
682
682
|
|
|
683
683
|
pickingAssignmentStatusByUsers(
|
|
684
|
-
|
|
685
|
-
|
|
684
|
+
filters: [Filter],
|
|
685
|
+
pagination: Pagination,
|
|
686
|
+
sortings: [Sorting]
|
|
686
687
|
): [PickingAssignmentStatus] @privilege(category: "worksheet", privilege: "query")
|
|
687
688
|
|
|
688
689
|
myPickingAssignmentStatus: MyPickingAssignmentStatus @privilege(category: "worksheet", privilege: "query")
|