@things-factory/worksheet-base 4.3.479 → 4.3.481
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.
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generatePalletIdResolver = void 0;
|
|
4
|
-
const typeorm_1 = require("typeorm");
|
|
5
4
|
const id_rule_base_1 = require("@things-factory/id-rule-base");
|
|
6
5
|
const entities_1 = require("../../../entities");
|
|
7
6
|
exports.generatePalletIdResolver = {
|
|
@@ -11,29 +10,28 @@ exports.generatePalletIdResolver = {
|
|
|
11
10
|
// 1. get date in yymmdd format
|
|
12
11
|
const date = new Date().toJSON().slice(0, 10).replace(/-/g, '').slice(2, 8);
|
|
13
12
|
let results = [];
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
});
|
|
13
|
+
const foundWorksheetDetails = await tx
|
|
14
|
+
.getRepository(entities_1.WorksheetDetail)
|
|
15
|
+
.createQueryBuilder('worksheetDetail')
|
|
16
|
+
.leftJoinAndSelect('worksheetDetail.domain', 'domain')
|
|
17
|
+
.leftJoinAndSelect('worksheetDetail.bizplace', 'bizplace')
|
|
18
|
+
.leftJoinAndSelect('worksheetDetail.worksheet', 'worksheet')
|
|
19
|
+
.leftJoinAndSelect('worksheetDetail.worker', 'worker')
|
|
20
|
+
.leftJoinAndSelect('worksheetDetail.targetProduct', 'targetProduct')
|
|
21
|
+
.leftJoinAndSelect('targetProduct.arrivalNotice', 'arrivalNotice')
|
|
22
|
+
.leftJoinAndSelect('arrivalNotice.purchaseOrder', 'purchaseOrder')
|
|
23
|
+
.leftJoinAndSelect('targetProduct.product', 'product')
|
|
24
|
+
.leftJoinAndSelect('targetProduct.productDetail', 'productDetail')
|
|
25
|
+
.leftJoinAndSelect('worksheetDetail.targetInventory', 'targetInventory')
|
|
26
|
+
.leftJoinAndSelect('targetInventory.product', 'inventoryProduct')
|
|
27
|
+
.leftJoinAndSelect('targetInventory.productDetail', 'inventoryProductDetail')
|
|
28
|
+
.leftJoinAndSelect('worksheetDetail.targetVas', 'targetVas')
|
|
29
|
+
.leftJoinAndSelect('targetVas.targetProduct', 'vasTargetProduct')
|
|
30
|
+
.where('worksheetDetail.domain = :domainId', { domainId: domain.id })
|
|
31
|
+
.andWhere('worksheetDetail.id IN (:...ids)', { ids: targets.map(target => target.id) })
|
|
32
|
+
.orderBy('product.sku', 'ASC')
|
|
33
|
+
.addOrderBy('targetProduct.batchId', 'ASC')
|
|
34
|
+
.getMany();
|
|
37
35
|
// 3. from worksheet detail get product name, product type, batchid, packing type, bizplace
|
|
38
36
|
if (!(foundWorksheetDetails === null || foundWorksheetDetails === void 0 ? void 0 : foundWorksheetDetails.length))
|
|
39
37
|
throw new Error('Unable to find worksheet details');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-pallet-id.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"generate-pallet-id.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts"],"names":[],"mappings":"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"}
|
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.481",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@things-factory/integration-sftp": "^4.3.479",
|
|
37
37
|
"@things-factory/marketplace-base": "^4.3.479",
|
|
38
38
|
"@things-factory/notification": "^4.3.452",
|
|
39
|
-
"@things-factory/sales-base": "^4.3.
|
|
39
|
+
"@things-factory/sales-base": "^4.3.481",
|
|
40
40
|
"@things-factory/setting-base": "^4.3.452",
|
|
41
41
|
"@things-factory/shell": "^4.3.434",
|
|
42
42
|
"@things-factory/transport-base": "^4.3.452",
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"puppeteer": "21.0.3",
|
|
46
46
|
"uuid": "^9.0.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "8a023dc284142afe63158ce1075eeaefc0f81878"
|
|
49
49
|
}
|
|
@@ -12,29 +12,28 @@ export const generatePalletIdResolver = {
|
|
|
12
12
|
const date = new Date().toJSON().slice(0, 10).replace(/-/g, '').slice(2, 8)
|
|
13
13
|
let results = []
|
|
14
14
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
})
|
|
15
|
+
const foundWorksheetDetails: WorksheetDetail[] = await tx
|
|
16
|
+
.getRepository(WorksheetDetail)
|
|
17
|
+
.createQueryBuilder('worksheetDetail')
|
|
18
|
+
.leftJoinAndSelect('worksheetDetail.domain', 'domain')
|
|
19
|
+
.leftJoinAndSelect('worksheetDetail.bizplace', 'bizplace')
|
|
20
|
+
.leftJoinAndSelect('worksheetDetail.worksheet', 'worksheet')
|
|
21
|
+
.leftJoinAndSelect('worksheetDetail.worker', 'worker')
|
|
22
|
+
.leftJoinAndSelect('worksheetDetail.targetProduct', 'targetProduct')
|
|
23
|
+
.leftJoinAndSelect('targetProduct.arrivalNotice', 'arrivalNotice')
|
|
24
|
+
.leftJoinAndSelect('arrivalNotice.purchaseOrder', 'purchaseOrder')
|
|
25
|
+
.leftJoinAndSelect('targetProduct.product', 'product')
|
|
26
|
+
.leftJoinAndSelect('targetProduct.productDetail', 'productDetail')
|
|
27
|
+
.leftJoinAndSelect('worksheetDetail.targetInventory', 'targetInventory')
|
|
28
|
+
.leftJoinAndSelect('targetInventory.product', 'inventoryProduct')
|
|
29
|
+
.leftJoinAndSelect('targetInventory.productDetail', 'inventoryProductDetail')
|
|
30
|
+
.leftJoinAndSelect('worksheetDetail.targetVas', 'targetVas')
|
|
31
|
+
.leftJoinAndSelect('targetVas.targetProduct', 'vasTargetProduct')
|
|
32
|
+
.where('worksheetDetail.domain = :domainId', { domainId: domain.id })
|
|
33
|
+
.andWhere('worksheetDetail.id IN (:...ids)', { ids: targets.map(target => target.id) })
|
|
34
|
+
.orderBy('product.sku', 'ASC')
|
|
35
|
+
.addOrderBy('targetProduct.batchId', 'ASC')
|
|
36
|
+
.getMany()
|
|
38
37
|
|
|
39
38
|
// 3. from worksheet detail get product name, product type, batchid, packing type, bizplace
|
|
40
39
|
if (!foundWorksheetDetails?.length) throw new Error('Unable to find worksheet details')
|