@things-factory/operato-hub 4.3.127 → 4.3.129
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/config.development.js +26 -11
- package/dist-server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.js +7 -5
- package/dist-server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.js.map +1 -1
- package/package.json +5 -5
- package/server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.ts +7 -4
package/config.development.js
CHANGED
|
@@ -4,27 +4,42 @@ module.exports = {
|
|
|
4
4
|
useVirtualHostBasedDomain: false,
|
|
5
5
|
fallbackRoute: '/',
|
|
6
6
|
subdomainOffset: 2,
|
|
7
|
-
port:
|
|
7
|
+
port: 3000,
|
|
8
8
|
inspect: '9260',
|
|
9
9
|
ormconfig: {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
10
|
+
name: 'default',
|
|
11
|
+
type: 'postgres',
|
|
12
|
+
database: 'postgres',
|
|
13
|
+
username: 'postgres',
|
|
14
|
+
password: 'hatio',
|
|
15
|
+
host: 'localhost',
|
|
16
|
+
port: 15432,
|
|
17
|
+
synchronize: false,
|
|
18
|
+
logging: true,
|
|
19
|
+
connectTimeoutMS: 30000,
|
|
20
|
+
extra: { poolSize: 30 }
|
|
19
21
|
},
|
|
20
22
|
// ormconfig: {
|
|
21
23
|
// name: 'default',
|
|
22
24
|
// type: 'postgres',
|
|
25
|
+
// database: 'dev2', // dev2
|
|
26
|
+
// username: 'postgres',
|
|
27
|
+
// password: 'abcd1234',
|
|
23
28
|
// host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
|
|
24
29
|
// port: 55432,
|
|
30
|
+
// synchronize:false,
|
|
31
|
+
// logging: false,
|
|
32
|
+
// connectTimeoutMS: 30000,
|
|
33
|
+
// extra: { poolSize: 30 }
|
|
34
|
+
// },
|
|
35
|
+
// ormconfig: {
|
|
36
|
+
// name: 'default',
|
|
37
|
+
// type: 'postgres',
|
|
38
|
+
// host: 'localhost',
|
|
39
|
+
// port: 15432,
|
|
25
40
|
// database: 'postgres',
|
|
26
41
|
// username: 'postgres',
|
|
27
|
-
// password: '
|
|
42
|
+
// password: 'hatio',
|
|
28
43
|
// synchronize: false,
|
|
29
44
|
// logging: true,
|
|
30
45
|
// connectTimeoutMS: 30000,
|
|
@@ -21,7 +21,7 @@ exports.sellercraftPackMarketplaceOrderResolver = {
|
|
|
21
21
|
const bizplace = await tx
|
|
22
22
|
.getRepository(biz_base_1.Bizplace)
|
|
23
23
|
.findOne({ where: { domain: sellercraftDomain } });
|
|
24
|
-
let
|
|
24
|
+
let releaseGoodQb = await tx.getRepository(sales_base_1.ReleaseGood).createQueryBuilder('rg')
|
|
25
25
|
.innerJoinAndSelect('rg.orderProducts', 'op')
|
|
26
26
|
.innerJoinAndSelect('op.product', 'prd')
|
|
27
27
|
.where(`rg.bizplace_id = :bizplaceId`, { bizplaceId: bizplace.id })
|
|
@@ -32,12 +32,14 @@ exports.sellercraftPackMarketplaceOrderResolver = {
|
|
|
32
32
|
const subQuery = qb
|
|
33
33
|
.subQuery()
|
|
34
34
|
.from(worksheet_base_1.Worksheet, 'ws')
|
|
35
|
-
.
|
|
36
|
-
.
|
|
35
|
+
.innerJoin('ws.worksheetDetails', 'wsd')
|
|
36
|
+
.innerJoin('wsd.targetInventory', 'oi')
|
|
37
|
+
.where('rg.id = oi.release_good_id')
|
|
38
|
+
.andWhere('ws.type IN (:...wsType)', { wsType: ['PICKING', 'BATCH_PICKING'] })
|
|
37
39
|
.getQuery();
|
|
38
40
|
return 'EXISTS ' + subQuery;
|
|
39
|
-
})
|
|
40
|
-
|
|
41
|
+
});
|
|
42
|
+
let releaseGoodsWithoutPackageId = await releaseGoodQb.getMany();
|
|
41
43
|
if ((releaseGoodsWithoutPackageId === null || releaseGoodsWithoutPackageId === void 0 ? void 0 : releaseGoodsWithoutPackageId.length) > 0) {
|
|
42
44
|
await Promise.all(releaseGoodsWithoutPackageId.map(async (releaseGood) => {
|
|
43
45
|
const orderProducts = releaseGood.orderProducts;
|
package/dist-server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sellercraft-pack-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.ts"],"names":[],"mappings":";;;AAAA,qCAAwD;AACxD,uEAAgF;AAEhF,uDAAmD;AACnD,6CAA4C;AAC5C,qFAAwG;AAExG,2DAAoF;AACpF,mEAA0D;AAG7C,QAAA,uCAAuC,GAAG;IACrD,KAAK,CAAC,+BAA+B,CAAC,CAAO,EAAE,EAAG,EAAE,OAAY;QAC9D,IAAI;YACF,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;gBAC3C,MAAM,YAAY,GAAkB,MAAM,EAAE;qBACzC,aAAa,CAAC,qCAAW,CAAC;qBAC1B,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;gBAE/E,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;oBACtC,IAAI;wBACF,MAAM,iBAAiB,GAAW,WAAW,CAAC,MAAM,CAAA;wBACpD,MAAM,QAAQ,GAAa,MAAM,EAAE;6BAChC,aAAa,CAAC,mBAAQ,CAAC;6BACvB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,iBAAiB,EAAE,EAAE,CAAC,CAAA;wBAEpD,IAAI,
|
|
1
|
+
{"version":3,"file":"sellercraft-pack-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-hub",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.129",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
"@things-factory/pdf": "^4.3.122",
|
|
92
92
|
"@things-factory/product-ui": "^4.3.123",
|
|
93
93
|
"@things-factory/resource-ui": "^4.3.123",
|
|
94
|
-
"@things-factory/sales-base": "^4.3.
|
|
94
|
+
"@things-factory/sales-base": "^4.3.129",
|
|
95
95
|
"@things-factory/scene-data-transform": "^4.3.122",
|
|
96
96
|
"@things-factory/scene-excel": "^4.3.122",
|
|
97
97
|
"@things-factory/scene-firebase": "^4.3.122",
|
|
@@ -106,8 +106,8 @@
|
|
|
106
106
|
"@things-factory/setting-ui": "^4.3.123",
|
|
107
107
|
"@things-factory/shell": "^4.3.122",
|
|
108
108
|
"@things-factory/system-ui": "^4.3.122",
|
|
109
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
110
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
109
|
+
"@things-factory/warehouse-base": "^4.3.129",
|
|
110
|
+
"@things-factory/worksheet-base": "^4.3.129",
|
|
111
111
|
"koa2-swagger-ui": "^5.0.2",
|
|
112
112
|
"swagger-jsdoc": "^5.0.0",
|
|
113
113
|
"yamljs": "^0.3.0"
|
|
@@ -118,5 +118,5 @@
|
|
|
118
118
|
"resolutions": {
|
|
119
119
|
"core-js": "^3.16.0"
|
|
120
120
|
},
|
|
121
|
-
"gitHead": "
|
|
121
|
+
"gitHead": "e34b57b1a0974f4bcc4ef92e63e2327b800613b3"
|
|
122
122
|
}
|
|
@@ -24,7 +24,7 @@ export const sellercraftPackMarketplaceOrderResolver = {
|
|
|
24
24
|
.getRepository(Bizplace)
|
|
25
25
|
.findOne({ where: { domain: sellercraftDomain } })
|
|
26
26
|
|
|
27
|
-
let
|
|
27
|
+
let releaseGoodQb = await tx.getRepository(ReleaseGood).createQueryBuilder('rg')
|
|
28
28
|
.innerJoinAndSelect('rg.orderProducts', 'op')
|
|
29
29
|
.innerJoinAndSelect('op.product', 'prd')
|
|
30
30
|
.where(`rg.bizplace_id = :bizplaceId`, { bizplaceId: bizplace.id })
|
|
@@ -35,12 +35,15 @@ export const sellercraftPackMarketplaceOrderResolver = {
|
|
|
35
35
|
const subQuery = qb
|
|
36
36
|
.subQuery()
|
|
37
37
|
.from(Worksheet, 'ws')
|
|
38
|
-
.
|
|
39
|
-
.
|
|
38
|
+
.innerJoin('ws.worksheetDetails', 'wsd')
|
|
39
|
+
.innerJoin('wsd.targetInventory', 'oi')
|
|
40
|
+
.where('rg.id = oi.release_good_id')
|
|
41
|
+
.andWhere('ws.type IN (:...wsType)', { wsType: ['PICKING', 'BATCH_PICKING'] })
|
|
40
42
|
.getQuery()
|
|
41
43
|
return 'EXISTS ' + subQuery
|
|
42
44
|
})
|
|
43
|
-
|
|
45
|
+
|
|
46
|
+
let releaseGoodsWithoutPackageId: ReleaseGood[] = await releaseGoodQb.getMany()
|
|
44
47
|
|
|
45
48
|
if (releaseGoodsWithoutPackageId?.length > 0) {
|
|
46
49
|
await Promise.all(
|