@things-factory/worksheet-base 4.3.69 → 4.3.70
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/constants/index.js +1 -5
- package/dist-server/constants/index.js.map +1 -1
- package/dist-server/controllers/ecommerce/index.js +1 -5
- package/dist-server/controllers/ecommerce/index.js.map +1 -1
- package/dist-server/controllers/inbound/index.js +1 -5
- package/dist-server/controllers/inbound/index.js.map +1 -1
- package/dist-server/controllers/index.js +1 -5
- package/dist-server/controllers/index.js.map +1 -1
- package/dist-server/controllers/inspect/index.js +1 -5
- package/dist-server/controllers/inspect/index.js.map +1 -1
- package/dist-server/controllers/outbound/index.js +1 -5
- package/dist-server/controllers/outbound/index.js.map +1 -1
- package/dist-server/controllers/vas/index.js +1 -5
- package/dist-server/controllers/vas/index.js.map +1 -1
- package/dist-server/graphql/index.js +1 -5
- package/dist-server/graphql/index.js.map +1 -1
- package/dist-server/graphql/resolvers/index.js +1 -5
- package/dist-server/graphql/resolvers/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/delivery-order-by-worksheet.js +81 -52
- package/dist-server/graphql/resolvers/worksheet/delivery-order-by-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js +2 -3
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/index.js +1 -5
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/interfaces/index.js +1 -5
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/interfaces/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/relabeling/index.js +1 -5
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/relabeling/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/repackaging/index.js +1 -5
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/repackaging/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/repalletizing/index.js +1 -5
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/repalletizing/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/unpacking/index.js +1 -5
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/unpacking/index.js.map +1 -1
- package/dist-server/graphql/types/index.js +1 -5
- package/dist-server/graphql/types/index.js.map +1 -1
- package/dist-server/graphql/types/worksheet/delivery-order-info.js +3 -0
- package/dist-server/graphql/types/worksheet/delivery-order-info.js.map +1 -1
- package/dist-server/graphql/types/worksheet/index.js +1 -1
- package/dist-server/index.js +1 -5
- package/dist-server/index.js.map +1 -1
- package/dist-server/utils/index.js +1 -5
- package/dist-server/utils/index.js.map +1 -1
- package/package.json +3 -3
- package/server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts +86 -51
- package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts +2 -5
- package/server/graphql/types/worksheet/delivery-order-info.ts +3 -0
- package/server/graphql/types/worksheet/index.ts +1 -1
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/constants/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/constants/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA2B;AAC3B,6CAA0B;AAC1B,qDAAkC;AAClC,gDAA6B;AAC7B,8CAA2B"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAsC;AACtC,2DAAwC"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/controllers/inbound/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/controllers/inbound/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mEAAgD;AAChD,iEAA8C;AAC9C,6EAA0D;AAC1D,2EAAwD"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/controllers/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/controllers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA8B;AAC9B,+CAA4B;AAC5B,qDAAkC;AAClC,qDAAkC;AAClC,qDAAkC;AAClC,sDAAmC;AACnC,yDAAsC;AACtC,wDAAqC;AACrC,sDAAmC;AACnC,kDAA+B;AAC/B,oDAAiC;AACjC,8CAA2B;AAG3B,2BAA2B;AAC3B,yDAAsC;AACtC,8CAA2B;AAC3B,4CAAyB;AACzB,4CAAyB;AACzB,6CAA0B;AAC1B,wCAAqB"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/controllers/inspect/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/controllers/inspect/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qEAAkD"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/controllers/outbound/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/controllers/outbound/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAA8C;AAC9C,iEAA8C;AAC9C,iEAA8C;AAC9C,mEAAgD;AAChD,iEAA8C"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/controllers/vas/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/controllers/vas/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAA0C"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/graphql/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/graphql/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAmC;AACnC,uDAAwC;AAE3B,QAAA,MAAM,GAAG;IACpB,QAAQ;IACR,SAAS;CACV,CAAA"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/resolvers/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/resolvers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAwC;AACxC,oEAAqD;AACrD,wEAAyD;AACzD,iDAAkC;AAErB,QAAA,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAA;AAE3E,QAAA,SAAS,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,eAAe,CAAC,QAAQ,EAAE,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAA"}
|
|
@@ -3,63 +3,92 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.deliveryOrderByWorksheetResolver = void 0;
|
|
4
4
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
5
5
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
6
|
-
const typeorm_1 = require("typeorm");
|
|
7
6
|
const transport_base_1 = require("@things-factory/transport-base");
|
|
7
|
+
const env_1 = require("@things-factory/env");
|
|
8
8
|
exports.deliveryOrderByWorksheetResolver = {
|
|
9
9
|
async deliveryOrderByWorksheet(_, { name }, context) {
|
|
10
|
-
const { domain } = context.state;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
if (!foundDO)
|
|
19
|
-
throw new Error('Delivery order not found!');
|
|
20
|
-
const partnerBiz = await (0, typeorm_1.getRepository)(biz_base_1.Bizplace).findOne({
|
|
21
|
-
where: { id: foundDO.bizplace.id }
|
|
22
|
-
});
|
|
23
|
-
const partnerContactPoint = await (0, typeorm_1.getRepository)(biz_base_1.ContactPoint).find({
|
|
24
|
-
where: { domain, bizplace: partnerBiz }
|
|
25
|
-
});
|
|
26
|
-
let foundTransportDriver = { name: '' };
|
|
27
|
-
if (foundDO.transportDriver) {
|
|
28
|
-
foundTransportDriver = await (0, typeorm_1.getRepository)(transport_base_1.TransportDriver).findOne({
|
|
29
|
-
where: { domain, id: foundDO.transportDriver.id }
|
|
10
|
+
const { domain, tx } = context.state;
|
|
11
|
+
try {
|
|
12
|
+
const foundDO = await tx.getRepository(sales_base_1.DeliveryOrder).findOne({
|
|
13
|
+
where: {
|
|
14
|
+
domain,
|
|
15
|
+
name
|
|
16
|
+
},
|
|
17
|
+
relations: ['domain', 'bizplace', 'transportDriver', 'transportVehicle', 'releaseGood', 'creator', 'updater']
|
|
30
18
|
});
|
|
31
|
-
if (!
|
|
32
|
-
throw new Error('
|
|
19
|
+
if (!foundDO)
|
|
20
|
+
throw new Error('Delivery order not found!');
|
|
21
|
+
const foundOI = await tx.getRepository(sales_base_1.OrderInventory).createQueryBuilder('oi')
|
|
22
|
+
.select('p.name', 'name')
|
|
23
|
+
.addSelect('p.sku', 'sku')
|
|
24
|
+
.addSelect('p.type', 'type')
|
|
25
|
+
.addSelect('oi.batch_id', 'batchNo')
|
|
26
|
+
.addSelect('oi.uom', 'uom')
|
|
27
|
+
.addSelect('sum(oi.release_qty)', 'loadedQty')
|
|
28
|
+
.addSelect('sum(oi.release_uom_value)', 'uomValue')
|
|
29
|
+
.innerJoin('products', 'p', 'p.id = oi.product_id')
|
|
30
|
+
.groupBy('p.name')
|
|
31
|
+
.addGroupBy('p.sku')
|
|
32
|
+
.addGroupBy('p.type')
|
|
33
|
+
.addGroupBy('oi.batch_id')
|
|
34
|
+
.addGroupBy('oi.uom')
|
|
35
|
+
.where('oi.domain_id = :domainId', { domainId: domain.id })
|
|
36
|
+
.andWhere('oi.delivery_order_id = :deliveryOrderId', { deliveryOrderId: foundDO.id })
|
|
37
|
+
.orderBy('p.sku')
|
|
38
|
+
.addOrderBy('oi.batch_id')
|
|
39
|
+
.getRawMany();
|
|
40
|
+
const partnerBiz = await tx.getRepository(biz_base_1.Bizplace).findOne({
|
|
41
|
+
where: { id: foundDO.bizplace.id }
|
|
42
|
+
});
|
|
43
|
+
const partnerContactPoint = await tx.getRepository(biz_base_1.ContactPoint).find({
|
|
44
|
+
where: { domain, bizplace: partnerBiz }
|
|
45
|
+
});
|
|
46
|
+
let foundTransportDriver = { name: '' };
|
|
47
|
+
if (foundDO.transportDriver) {
|
|
48
|
+
foundTransportDriver = await tx.getRepository(transport_base_1.TransportDriver).findOne({
|
|
49
|
+
where: { domain, id: foundDO.transportDriver.id }
|
|
50
|
+
});
|
|
51
|
+
if (!foundTransportDriver)
|
|
52
|
+
throw new Error('transport driver is not found');
|
|
53
|
+
}
|
|
54
|
+
return {
|
|
55
|
+
deliveryOrderInfo: {
|
|
56
|
+
name: foundDO.name,
|
|
57
|
+
ownCollection: foundDO.ownCollection,
|
|
58
|
+
doStatus: foundDO.status,
|
|
59
|
+
truckNo: foundDO.truckNo,
|
|
60
|
+
bizplace: foundDO.bizplace,
|
|
61
|
+
deliverTo: foundDO.contactPointRefId || '',
|
|
62
|
+
deliveryDate: foundDO.deliveryDate || '',
|
|
63
|
+
driverName: foundTransportDriver.name,
|
|
64
|
+
otherDestination: foundDO.otherDestination || false,
|
|
65
|
+
contactName: foundDO.contactName || '',
|
|
66
|
+
otherDriver: foundDO.otherDriver || '',
|
|
67
|
+
looseItem: foundDO.looseItem || false,
|
|
68
|
+
remark: foundDO.remark || '',
|
|
69
|
+
reusablePallet: foundDO.reusablePallet || '',
|
|
70
|
+
createdDate: foundDO.createdAt.toISOString().split('T')[0],
|
|
71
|
+
isManualDo: foundDO.releaseGood ? false : true,
|
|
72
|
+
attentionTo: foundDO.attentionTo,
|
|
73
|
+
releaseGood: Object.assign(Object.assign({}, foundDO.releaseGood), { attentionTo: foundDO.attentionTo || foundDO.releaseGood.attentionTo, bizplace: partnerBiz }),
|
|
74
|
+
productList: foundOI
|
|
75
|
+
},
|
|
76
|
+
contactPointInfo: partnerContactPoint.map(async (cp) => {
|
|
77
|
+
return {
|
|
78
|
+
id: cp.id,
|
|
79
|
+
address: cp.address || '',
|
|
80
|
+
email: cp.email || '',
|
|
81
|
+
fax: cp.fax || '',
|
|
82
|
+
phone: cp.phone || '',
|
|
83
|
+
contactName: cp.name || ''
|
|
84
|
+
};
|
|
85
|
+
}),
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
catch (error) {
|
|
89
|
+
env_1.logger.error(`delivery-order-by-worksheet:(data:${JSON.stringify({ name, domain })}) ${error} `);
|
|
90
|
+
throw new Error('Something went wrong. Please contact support.');
|
|
33
91
|
}
|
|
34
|
-
return {
|
|
35
|
-
deliveryOrderInfo: {
|
|
36
|
-
ownCollection: foundDO.ownCollection,
|
|
37
|
-
doStatus: foundDO.status,
|
|
38
|
-
truckNo: foundDO.truckNo,
|
|
39
|
-
bizplace: foundDO.bizplace,
|
|
40
|
-
deliverTo: foundDO.contactPointRefId || '',
|
|
41
|
-
deliveryDate: foundDO.deliveryDate || '',
|
|
42
|
-
driverName: foundTransportDriver.name,
|
|
43
|
-
otherDestination: foundDO.otherDestination || false,
|
|
44
|
-
contactName: foundDO.contactName || '',
|
|
45
|
-
otherDriver: foundDO.otherDriver || '',
|
|
46
|
-
looseItem: foundDO.looseItem || false,
|
|
47
|
-
remark: foundDO.remark || '',
|
|
48
|
-
reusablePallet: foundDO.reusablePallet || '',
|
|
49
|
-
createdDate: foundDO.createdAt.toISOString().split('T')[0],
|
|
50
|
-
isManualDo: foundDO.releaseGood ? false : true
|
|
51
|
-
},
|
|
52
|
-
contactPointInfo: partnerContactPoint.map(async (cp) => {
|
|
53
|
-
return {
|
|
54
|
-
id: cp.id,
|
|
55
|
-
address: cp.address || '',
|
|
56
|
-
email: cp.email || '',
|
|
57
|
-
fax: cp.fax || '',
|
|
58
|
-
phone: cp.phone || '',
|
|
59
|
-
contactName: cp.name || ''
|
|
60
|
-
};
|
|
61
|
-
})
|
|
62
|
-
};
|
|
63
92
|
}
|
|
64
93
|
};
|
|
65
94
|
//# sourceMappingURL=delivery-order-by-worksheet.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-order-by-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts"],"names":[],"mappings":";;;AAAA,uDAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"delivery-order-by-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,9 +29,8 @@ exports.inventoriesByPalletResolver = {
|
|
|
29
29
|
permittedBizplaceIds = params.filters.find(filter => filter.name === 'bizplace').value;
|
|
30
30
|
params.filters.find(filter => filter.name === 'bizplace').relation = true;
|
|
31
31
|
}
|
|
32
|
-
const locationFilters = params.filters.find(x => x.name == '
|
|
33
|
-
|
|
34
|
-
params.filters.splice(removeLocationIndex, 1);
|
|
32
|
+
const locationFilters = params.filters.find(x => x.name == 'locationName');
|
|
33
|
+
params.filters = params.filters.filter(x => x.name != 'locationName');
|
|
35
34
|
const qb = (0, typeorm_1.getRepository)(warehouse_base_1.Inventory).createQueryBuilder('iv');
|
|
36
35
|
(0, shell_1.buildQuery)(qb, params, context);
|
|
37
36
|
qb.leftJoinAndSelect('iv.domain', 'domain')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inventories-by-pallet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/inventories-by-pallet.ts"],"names":[],"mappings":";;;AAAA,qCAAqE;AAGrE,uDAAkE;AAClE,2DAAmE;AACnE,iDAA0E;AAC1E,mEAAyE;AAE5D,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,oBAAoB,EAAE,EAAE,OAAY;QACrG,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;QACtE,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,CAAA;QACtC,IAAI,oBAAoB,GAAa,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAChF,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,aAAa,CAAC,CAAA;QAC1E,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;QACnE,MAAM,oBAAoB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,CAAA;QACjF,IAAI,aAAa,GACf,oBAAoB,KAAI,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,KAAK,CAAA,CAAC,CAAC,CAAC,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAA;QAC3F,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;QAC5F,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,aAAa,CAAC,CAAA;QAEpE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,EAAE;YACrE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;gBAClB,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE,oBAAoB;gBAC3B,QAAQ,EAAE,IAAI;aACf,CAAC,CAAA;SACH;aAAM;YACL,oBAAoB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,KAAK,CAAA;YACtF,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAA;SAC1E;QAED,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,
|
|
1
|
+
{"version":3,"file":"inventories-by-pallet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/inventories-by-pallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/vas-transactions/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/vas-transactions/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA4B;AAC5B,+CAA4B;AAC5B,gDAA6B;AAC7B,kDAA+B;AAC/B,8CAA2B"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/interfaces/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/interfaces/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,kDAA+B;AAC/B,gDAA6B;AAC7B,+CAA4B;AAC5B,8CAA2B"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/relabeling/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/relabeling/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAAmC;AACnC,wDAAqC;AACrC,+CAA4B;AAC5B,oDAAiC"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/repackaging/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/repackaging/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAsC;AACtC,gDAA6B;AAC7B,qDAAkC"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/repalletizing/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/repalletizing/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAAwC;AACxC,kDAA+B;AAC/B,uDAAoC"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/unpacking/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/unpacking/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAoC;AACpC,8CAA2B"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/types/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAwC;AACxC,oEAAqD;AACrD,wEAAyD;AACzD,yDAA0C;AAE7B,QAAA,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE,iBAAiB,CAAC,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC,CAAA;AAEjG,QAAA,SAAS,GAAG;IACvB,SAAS,CAAC,QAAQ;IAClB,eAAe,CAAC,QAAQ;IACxB,iBAAiB,CAAC,QAAQ;IAC1B,cAAc,CAAC,QAAQ;CACxB,CAAA;AAEY,QAAA,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,EAAE,GAAG,eAAe,CAAC,KAAK,EAAE,GAAG,iBAAiB,CAAC,KAAK,EAAE,GAAG,cAAc,CAAC,KAAK,CAAC,CAAA"}
|
|
@@ -4,6 +4,7 @@ exports.DeliveryOrderInfo = void 0;
|
|
|
4
4
|
const apollo_server_koa_1 = require("apollo-server-koa");
|
|
5
5
|
exports.DeliveryOrderInfo = (0, apollo_server_koa_1.gql) `
|
|
6
6
|
type DeliveryOrderInfo {
|
|
7
|
+
name: String
|
|
7
8
|
ownCollection: Boolean
|
|
8
9
|
doStatus: String
|
|
9
10
|
truckNo: String
|
|
@@ -19,6 +20,8 @@ exports.DeliveryOrderInfo = (0, apollo_server_koa_1.gql) `
|
|
|
19
20
|
reusablePallet: String
|
|
20
21
|
createdDate: String
|
|
21
22
|
isManualDo: Boolean
|
|
23
|
+
releaseGood: ReleaseGood
|
|
24
|
+
productList: [Product]
|
|
22
25
|
}
|
|
23
26
|
`;
|
|
24
27
|
//# sourceMappingURL=delivery-order-info.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-order-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/delivery-order-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,iBAAiB,GAAG,IAAA,uBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"delivery-order-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/delivery-order-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,iBAAiB,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;CAqBnC,CAAA"}
|
|
@@ -629,7 +629,7 @@ exports.Query = `
|
|
|
629
629
|
|
|
630
630
|
deliveryOrderByWorksheet (
|
|
631
631
|
name: String!
|
|
632
|
-
): GoodsDeliveryNote @privilege(category: "worksheet", privilege: "query")
|
|
632
|
+
): GoodsDeliveryNote @privilege(category: "worksheet", privilege: "query") @transaction
|
|
633
633
|
|
|
634
634
|
fetchDeliveryOrderRO (
|
|
635
635
|
name: String!
|
package/dist-server/index.js
CHANGED
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
package/dist-server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oBAAiB;AAEjB,8CAA2B;AAC3B,6CAA0B;AAC1B,4CAAyB;AACzB,mHAAgG;AAChG,+GAA4F;AAC5F,+CAA4B"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/utils/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAgC;AAChC,2DAAwC;AACxC,kDAA+B;AAC/B,mDAAgC"}
|
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.70",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -34,11 +34,11 @@
|
|
|
34
34
|
"@things-factory/integration-sftp": "^4.3.69",
|
|
35
35
|
"@things-factory/marketplace-base": "^4.3.69",
|
|
36
36
|
"@things-factory/notification": "^4.3.69",
|
|
37
|
-
"@things-factory/sales-base": "^4.3.
|
|
37
|
+
"@things-factory/sales-base": "^4.3.70",
|
|
38
38
|
"@things-factory/setting-base": "^4.3.69",
|
|
39
39
|
"@things-factory/shell": "^4.3.69",
|
|
40
40
|
"@things-factory/transport-base": "^4.3.69",
|
|
41
41
|
"@things-factory/warehouse-base": "^4.3.69"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "635bb41ac43a80787b3d21812a1f44156037a6c5"
|
|
44
44
|
}
|
|
@@ -1,67 +1,102 @@
|
|
|
1
1
|
import { Bizplace, ContactPoint } from '@things-factory/biz-base'
|
|
2
|
-
import { DeliveryOrder } from '@things-factory/sales-base'
|
|
2
|
+
import { DeliveryOrder, OrderInventory } from '@things-factory/sales-base'
|
|
3
3
|
import { Domain } from '@things-factory/shell'
|
|
4
|
-
import {
|
|
4
|
+
import { EntityManager } from 'typeorm'
|
|
5
5
|
import { TransportDriver } from '@things-factory/transport-base'
|
|
6
|
+
import { logger } from '@things-factory/env'
|
|
6
7
|
|
|
7
8
|
export const deliveryOrderByWorksheetResolver = {
|
|
8
9
|
async deliveryOrderByWorksheet(_: any, { name }, context: any) {
|
|
9
|
-
const { domain }: { domain: Domain } = context.state
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
10
|
+
const { domain, tx }: { domain: Domain, tx: EntityManager } = context.state
|
|
11
|
+
try {
|
|
12
|
+
const foundDO: DeliveryOrder = await tx.getRepository(DeliveryOrder).findOne({
|
|
13
|
+
where: {
|
|
14
|
+
domain,
|
|
15
|
+
name
|
|
16
|
+
},
|
|
17
|
+
relations: ['domain', 'bizplace', 'transportDriver', 'transportVehicle', 'releaseGood', 'creator', 'updater']
|
|
18
|
+
})
|
|
17
19
|
|
|
18
|
-
|
|
20
|
+
if (!foundDO) throw new Error('Delivery order not found!')
|
|
19
21
|
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
22
|
+
const foundOI: any = await tx.getRepository(OrderInventory).createQueryBuilder('oi')
|
|
23
|
+
.select('p.name', 'name')
|
|
24
|
+
.addSelect('p.sku', 'sku')
|
|
25
|
+
.addSelect('p.type', 'type')
|
|
26
|
+
.addSelect('oi.batch_id', 'batchNo')
|
|
27
|
+
.addSelect('oi.uom', 'uom')
|
|
28
|
+
.addSelect('sum(oi.release_qty)', 'loadedQty')
|
|
29
|
+
.addSelect('sum(oi.release_uom_value)', 'uomValue')
|
|
30
|
+
.innerJoin('products', 'p', 'p.id = oi.product_id')
|
|
31
|
+
.groupBy('p.name')
|
|
32
|
+
.addGroupBy('p.sku')
|
|
33
|
+
.addGroupBy('p.type')
|
|
34
|
+
.addGroupBy('oi.batch_id')
|
|
35
|
+
.addGroupBy('oi.uom')
|
|
36
|
+
.where('oi.domain_id = :domainId', { domainId: domain.id })
|
|
37
|
+
.andWhere('oi.delivery_order_id = :deliveryOrderId', { deliveryOrderId: foundDO.id })
|
|
38
|
+
.orderBy('p.sku')
|
|
39
|
+
.addOrderBy('oi.batch_id')
|
|
40
|
+
.getRawMany()
|
|
23
41
|
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
42
|
+
const partnerBiz: Bizplace = await tx.getRepository(Bizplace).findOne({
|
|
43
|
+
where: { id: foundDO.bizplace.id }
|
|
44
|
+
})
|
|
27
45
|
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
foundTransportDriver = await getRepository(TransportDriver).findOne({
|
|
31
|
-
where: { domain, id: foundDO.transportDriver.id }
|
|
46
|
+
const partnerContactPoint: ContactPoint[] = await tx.getRepository(ContactPoint).find({
|
|
47
|
+
where: { domain, bizplace: partnerBiz }
|
|
32
48
|
})
|
|
33
49
|
|
|
34
|
-
|
|
35
|
-
|
|
50
|
+
let foundTransportDriver: TransportDriver = { name: '' }
|
|
51
|
+
if (foundDO.transportDriver) {
|
|
52
|
+
foundTransportDriver = await tx.getRepository(TransportDriver).findOne({
|
|
53
|
+
where: { domain, id: foundDO.transportDriver.id }
|
|
54
|
+
})
|
|
36
55
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
56
|
+
if (!foundTransportDriver) throw new Error('transport driver is not found')
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
return {
|
|
60
|
+
deliveryOrderInfo: {
|
|
61
|
+
name: foundDO.name,
|
|
62
|
+
ownCollection: foundDO.ownCollection,
|
|
63
|
+
doStatus: foundDO.status,
|
|
64
|
+
truckNo: foundDO.truckNo,
|
|
65
|
+
bizplace: foundDO.bizplace,
|
|
66
|
+
deliverTo: foundDO.contactPointRefId || '',
|
|
67
|
+
deliveryDate: foundDO.deliveryDate || '',
|
|
68
|
+
driverName: foundTransportDriver.name,
|
|
69
|
+
otherDestination: foundDO.otherDestination || false,
|
|
70
|
+
contactName: foundDO.contactName || '',
|
|
71
|
+
otherDriver: foundDO.otherDriver || '',
|
|
72
|
+
looseItem: foundDO.looseItem || false,
|
|
73
|
+
remark: foundDO.remark || '',
|
|
74
|
+
reusablePallet: foundDO.reusablePallet || '',
|
|
75
|
+
createdDate: foundDO.createdAt.toISOString().split('T')[0],
|
|
76
|
+
isManualDo: foundDO.releaseGood ? false : true,
|
|
77
|
+
attentionTo: foundDO.attentionTo,
|
|
78
|
+
releaseGood: {
|
|
79
|
+
...foundDO.releaseGood,
|
|
80
|
+
attentionTo: foundDO.attentionTo || foundDO.releaseGood.attentionTo,
|
|
81
|
+
bizplace: partnerBiz
|
|
82
|
+
},
|
|
83
|
+
productList: foundOI
|
|
84
|
+
},
|
|
85
|
+
contactPointInfo: partnerContactPoint.map(async (cp: ContactPoint) => {
|
|
86
|
+
return {
|
|
87
|
+
id: cp.id,
|
|
88
|
+
address: cp.address || '',
|
|
89
|
+
email: cp.email || '',
|
|
90
|
+
fax: cp.fax || '',
|
|
91
|
+
phone: cp.phone || '',
|
|
92
|
+
contactName: cp.name || ''
|
|
93
|
+
}
|
|
94
|
+
}),
|
|
95
|
+
}
|
|
96
|
+
} catch (error) {
|
|
97
|
+
logger.error(`delivery-order-by-worksheet:(data:${JSON.stringify({ name, domain })}) ${error} `)
|
|
98
|
+
throw new Error('Something went wrong. Please contact support.')
|
|
65
99
|
}
|
|
100
|
+
|
|
66
101
|
}
|
|
67
102
|
}
|
|
@@ -31,11 +31,8 @@ export const inventoriesByPalletResolver = {
|
|
|
31
31
|
params.filters.find(filter => filter.name === 'bizplace').relation = true
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
const locationFilters = params.filters.find(x => x.name == '
|
|
35
|
-
|
|
36
|
-
const removeLocationIndex = params.filters.findIndex(x => x.name == 'location')
|
|
37
|
-
|
|
38
|
-
params.filters.splice(removeLocationIndex, 1)
|
|
34
|
+
const locationFilters = params.filters.find(x => x.name == 'locationName')
|
|
35
|
+
params.filters = params.filters.filter(x => x.name != 'locationName')
|
|
39
36
|
|
|
40
37
|
const qb: SelectQueryBuilder<Inventory> = getRepository(Inventory).createQueryBuilder('iv')
|
|
41
38
|
buildQuery(qb, params, context)
|
|
@@ -2,6 +2,7 @@ import { gql } from 'apollo-server-koa'
|
|
|
2
2
|
|
|
3
3
|
export const DeliveryOrderInfo = gql`
|
|
4
4
|
type DeliveryOrderInfo {
|
|
5
|
+
name: String
|
|
5
6
|
ownCollection: Boolean
|
|
6
7
|
doStatus: String
|
|
7
8
|
truckNo: String
|
|
@@ -17,5 +18,7 @@ export const DeliveryOrderInfo = gql`
|
|
|
17
18
|
reusablePallet: String
|
|
18
19
|
createdDate: String
|
|
19
20
|
isManualDo: Boolean
|
|
21
|
+
releaseGood: ReleaseGood
|
|
22
|
+
productList: [Product]
|
|
20
23
|
}
|
|
21
24
|
`
|
|
@@ -628,7 +628,7 @@ export const Query = /* GraphQL */ `
|
|
|
628
628
|
|
|
629
629
|
deliveryOrderByWorksheet (
|
|
630
630
|
name: String!
|
|
631
|
-
): GoodsDeliveryNote @privilege(category: "worksheet", privilege: "query")
|
|
631
|
+
): GoodsDeliveryNote @privilege(category: "worksheet", privilege: "query") @transaction
|
|
632
632
|
|
|
633
633
|
fetchDeliveryOrderRO (
|
|
634
634
|
name: String!
|