@things-factory/operato-hub 4.3.461 → 4.3.463
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/routers/api/restful-apis/v1/warehouse/get-manifest-details.js +6 -6
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-manifest-details.js.map +1 -1
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-onhand-inventory-list.js +2 -2
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-onhand-inventory-list.js.map +1 -1
- package/package.json +4 -4
- package/server/routers/api/restful-apis/v1/warehouse/get-manifest-details.ts +6 -6
- package/server/routers/api/restful-apis/v1/warehouse/get-onhand-inventory-list.ts +3 -3
|
@@ -32,10 +32,10 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-manifest-details', middlewares_1.b
|
|
|
32
32
|
.innerJoinAndSelect('mf.orderPackages', 'op')
|
|
33
33
|
.innerJoinAndSelect('op.releaseGood', 'rg')
|
|
34
34
|
.innerJoinAndSelect('op.bizplace', 'bz')
|
|
35
|
-
.
|
|
36
|
-
.
|
|
37
|
-
.
|
|
38
|
-
.
|
|
35
|
+
.leftJoinAndSelect('op.orderPackageItems', 'opi')
|
|
36
|
+
.leftJoinAndSelect('opi.orderProduct', 'opr')
|
|
37
|
+
.leftJoinAndSelect('opr.productDetail', 'pd')
|
|
38
|
+
.leftJoinAndSelect('pd.product', 'p')
|
|
39
39
|
.where(`op.bizplace_id = :bizplaceId`, { bizplaceId: filter.bizplaceId });
|
|
40
40
|
if (filter.id) {
|
|
41
41
|
rb.andWhere(`mf.id = :id`, { id: filter.id });
|
|
@@ -69,7 +69,7 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-manifest-details', middlewares_1.b
|
|
|
69
69
|
status: op.status,
|
|
70
70
|
trackingNo: op.trackingNo,
|
|
71
71
|
transporter: op.transporter,
|
|
72
|
-
orderPackageItems: op.orderPackageItems.map(opi => {
|
|
72
|
+
orderPackageItems: op.orderPackageItems.length > 0 ? op.orderPackageItems.map(opi => {
|
|
73
73
|
return {
|
|
74
74
|
name: opi.name,
|
|
75
75
|
id: opi.id,
|
|
@@ -103,7 +103,7 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-manifest-details', middlewares_1.b
|
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
};
|
|
106
|
-
}),
|
|
106
|
+
}) : [],
|
|
107
107
|
releaseGood: {
|
|
108
108
|
id: op.releaseGood.id,
|
|
109
109
|
name: op.releaseGood.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-manifest-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-manifest-details.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,qCAA2D;AAE3D,6CAAgE;AAChE,2DAAqD;AAErD,4DAA4D;AAC5D,gDAA4F;AAC5F,oDAAyF;AAEzF,sBAAM,CAAC,GAAG,CACR,oCAAoC,EACpC,gCAAkB,EAClB,kCAAoB,EACpB,+BAAiB,EACjB,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACtB,IAAI;QACF,uCAAuC;QACvC,kCAAkC;QAClC,IAAI,MAAM,qBAAQ,OAAO,CAAC,KAAK,CAAE,CAAA;QACjC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAA;QAElD,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;YACvB,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;YAC3B,OAAO,MAAM,CAAC,MAAM,CAAC,CAAA;SACtB;aAAM,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;YAChC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;YAC/B,OAAO,MAAM,CAAC,IAAI,CAAC,CAAA;SACpB;aAAM;YACL,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,CAAA;SACxC;QAED,MAAM,EAAE,GAAiC,IAAA,uBAAa,EAAC,qBAAQ,CAAC;aAC7D,kBAAkB,CAAC,IAAI,CAAC;aACxB,kBAAkB,CAAC,kBAAkB,EAAE,IAAI,CAAC;aAC5C,kBAAkB,CAAC,gBAAgB,EAAE,IAAI,CAAC;aAC1C,kBAAkB,CAAC,aAAa,EAAE,IAAI,CAAC;aACvC,
|
|
1
|
+
{"version":3,"file":"get-manifest-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-manifest-details.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-onhand-inventory-list', middleware
|
|
|
33
33
|
const sevenDaysBefore = new Date(currentDate.getTime() - 7 * 24 * 60 * 60 * 1000);
|
|
34
34
|
filter['createdAt'] = (0, typeorm_1.Between)(sevenDaysBefore, currentDate);
|
|
35
35
|
}
|
|
36
|
-
filter['status'] = '
|
|
36
|
+
filter['status'] = (0, typeorm_1.Not)((0, typeorm_1.In)(['MISSING', 'TERMINATED']));
|
|
37
37
|
delete filter['fromDate'];
|
|
38
38
|
delete filter['toDate'];
|
|
39
39
|
delete filter['limit'];
|
|
@@ -64,7 +64,7 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-onhand-inventory-list', middleware
|
|
|
64
64
|
? `${inventory.product.weight * inventory.qty} ${inventory.product.weightUnit}`
|
|
65
65
|
: null,
|
|
66
66
|
lastSeq: inventory === null || inventory === void 0 ? void 0 : inventory.lastSeq,
|
|
67
|
-
status:
|
|
67
|
+
status: inventory.status,
|
|
68
68
|
product: {
|
|
69
69
|
sku: inventory.product.sku,
|
|
70
70
|
name: inventory.product.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-onhand-inventory-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-onhand-inventory-list.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,
|
|
1
|
+
{"version":3,"file":"get-onhand-inventory-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-onhand-inventory-list.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.463",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
"@things-factory/pdf": "^4.3.381",
|
|
93
93
|
"@things-factory/product-ui": "^4.3.452",
|
|
94
94
|
"@things-factory/resource-ui": "^4.3.452",
|
|
95
|
-
"@things-factory/sales-base": "^4.3.
|
|
95
|
+
"@things-factory/sales-base": "^4.3.462",
|
|
96
96
|
"@things-factory/scene-data-transform": "^4.3.381",
|
|
97
97
|
"@things-factory/scene-excel": "^4.3.381",
|
|
98
98
|
"@things-factory/scene-firebase": "^4.3.381",
|
|
@@ -109,7 +109,7 @@
|
|
|
109
109
|
"@things-factory/system-ui": "^4.3.434",
|
|
110
110
|
"@things-factory/transport-base": "^4.3.452",
|
|
111
111
|
"@things-factory/warehouse-base": "^4.3.461",
|
|
112
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
112
|
+
"@things-factory/worksheet-base": "^4.3.462",
|
|
113
113
|
"cron-parser": "^4.7.0",
|
|
114
114
|
"koa2-swagger-ui": "^5.0.2",
|
|
115
115
|
"swagger-jsdoc": "^5.0.0",
|
|
@@ -121,5 +121,5 @@
|
|
|
121
121
|
"resolutions": {
|
|
122
122
|
"core-js": "^3.16.0"
|
|
123
123
|
},
|
|
124
|
-
"gitHead": "
|
|
124
|
+
"gitHead": "9609094deb6ad70d520a743357f7d6d8d33dccbc"
|
|
125
125
|
}
|
|
@@ -35,10 +35,10 @@ router.get(
|
|
|
35
35
|
.innerJoinAndSelect('mf.orderPackages', 'op')
|
|
36
36
|
.innerJoinAndSelect('op.releaseGood', 'rg')
|
|
37
37
|
.innerJoinAndSelect('op.bizplace', 'bz')
|
|
38
|
-
.
|
|
39
|
-
.
|
|
40
|
-
.
|
|
41
|
-
.
|
|
38
|
+
.leftJoinAndSelect('op.orderPackageItems', 'opi')
|
|
39
|
+
.leftJoinAndSelect('opi.orderProduct', 'opr')
|
|
40
|
+
.leftJoinAndSelect('opr.productDetail', 'pd')
|
|
41
|
+
.leftJoinAndSelect('pd.product', 'p')
|
|
42
42
|
.where(`op.bizplace_id = :bizplaceId`, { bizplaceId: filter.bizplaceId })
|
|
43
43
|
|
|
44
44
|
if (filter.id) {
|
|
@@ -74,7 +74,7 @@ router.get(
|
|
|
74
74
|
status: op.status,
|
|
75
75
|
trackingNo: op.trackingNo,
|
|
76
76
|
transporter: op.transporter,
|
|
77
|
-
orderPackageItems: op.orderPackageItems.map(opi => {
|
|
77
|
+
orderPackageItems: op.orderPackageItems.length > 0 ? op.orderPackageItems.map(opi => {
|
|
78
78
|
return {
|
|
79
79
|
name: opi.name,
|
|
80
80
|
id: opi.id,
|
|
@@ -108,7 +108,7 @@ router.get(
|
|
|
108
108
|
}
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
|
-
}),
|
|
111
|
+
}) : [],
|
|
112
112
|
releaseGood: {
|
|
113
113
|
id: op.releaseGood.id,
|
|
114
114
|
name: op.releaseGood.name,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import _ from 'lodash'
|
|
2
|
-
import { Between, getRepository, LessThanOrEqual } from 'typeorm'
|
|
2
|
+
import { Between, getRepository, LessThanOrEqual, Not, In } from 'typeorm'
|
|
3
3
|
|
|
4
4
|
import { restfulApiRouter as router } from '@things-factory/api'
|
|
5
5
|
import { Inventory } from '@things-factory/warehouse-base'
|
|
@@ -35,7 +35,7 @@ router.get(
|
|
|
35
35
|
filter['createdAt'] = Between(sevenDaysBefore, currentDate)
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
-
filter['status'] = '
|
|
38
|
+
filter['status'] = Not(In(['MISSING', 'TERMINATED']))
|
|
39
39
|
|
|
40
40
|
delete filter['fromDate']
|
|
41
41
|
delete filter['toDate']
|
|
@@ -69,7 +69,7 @@ router.get(
|
|
|
69
69
|
? `${inventory.product.weight * inventory.qty} ${inventory.product.weightUnit}`
|
|
70
70
|
: null,
|
|
71
71
|
lastSeq: inventory?.lastSeq,
|
|
72
|
-
status:
|
|
72
|
+
status: inventory.status,
|
|
73
73
|
product: {
|
|
74
74
|
sku: inventory.product.sku,
|
|
75
75
|
name: inventory.product.name,
|