@things-factory/operato-hub 3.8.24 → 3.8.25
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/get-release-order-list.js +12 -16
- package/dist-server/routers/api/restful-apis/v1/get-release-order-list.js.map +1 -1
- package/dist-server/routers/api/restful-apis/v2/get-release-order-list.js +12 -16
- package/dist-server/routers/api/restful-apis/v2/get-release-order-list.js.map +1 -1
- package/package.json +5 -5
- package/server/routers/api/restful-apis/v1/get-release-order-list.ts +14 -11
- package/server/routers/api/restful-apis/v2/get-release-order-list.ts +14 -11
|
@@ -136,23 +136,19 @@ api_1.restfulApiRouter.get('/v1/warehouse/:warehouseId/get-release-order-list',
|
|
|
136
136
|
};
|
|
137
137
|
});
|
|
138
138
|
async function validateFilters(context, filters, fromDate, toDate) {
|
|
139
|
-
if (fromDate && fromDate !== '') {
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
}
|
|
146
|
-
|
|
139
|
+
// if (fromDate && fromDate !== '') {
|
|
140
|
+
// fromDate = new Date(`${fromDate.split(' ').join('')} 00:00:00`)
|
|
141
|
+
// if (fromDate instanceof Date && !isNaN(fromDate.getTime())) fromDate = fromDate.toLocaleString()
|
|
142
|
+
// else context.throw(400, context.t('fromDate is invalid'))
|
|
143
|
+
// } else fromDate = ''
|
|
144
|
+
// if (toDate && toDate !== '') {
|
|
145
|
+
// toDate = new Date(`${toDate.split(' ').join('')} 23:59:59`)
|
|
146
|
+
// if (toDate instanceof Date && !isNaN(toDate.getTime())) toDate = toDate.toLocaleString()
|
|
147
|
+
// else context.throw(400, context.t('toDate is invalid'))
|
|
148
|
+
// } else toDate = ''
|
|
149
|
+
if (!fromDate)
|
|
147
150
|
fromDate = '';
|
|
148
|
-
if (toDate
|
|
149
|
-
toDate = new Date(`${toDate.split(' ').join('')} 23:59:59`);
|
|
150
|
-
if (toDate instanceof Date && !isNaN(toDate.getTime()))
|
|
151
|
-
toDate = toDate.toLocaleString();
|
|
152
|
-
else
|
|
153
|
-
context.throw(400, context.t('toDate is invalid'));
|
|
154
|
-
}
|
|
155
|
-
else
|
|
151
|
+
if (!toDate)
|
|
156
152
|
toDate = '';
|
|
157
153
|
if (fromDate !== '' && toDate !== '')
|
|
158
154
|
filters = [...filters, { name: 'createdAt', operator: 'between', value: [fromDate, toDate] }];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-release-order-list.js","sourceRoot":"","sources":["../../../../../server/routers/api/restful-apis/v1/get-release-order-list.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAE7B,6CAAgE;AAEhE,qFAAgF;AAChF,uFAAkF;AAElF,sBAAM,CAAC,GAAG,CACR,mDAAmD,EACnD,wCAAkB,EAClB,0CAAmB,EACnB,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACtB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAC7D,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;IACtC,MAAM,EAAE,CAAC,EAAE,GAAG,OAAO,CAAA;IACrB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAEtF,IAAI,CAAC,WAAW;QAAE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAA;IAEvE,IAAI,OAAO,GAAQ,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IAC/F,IAAI,UAAU,GAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAA;IAC5C,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;IACnE,UAAU,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,wBAAwB,EAAE,gBAAgB,CAAC,CAAA;IAEtG,OAAO,CAAC,IAAI,GAAG;QACb,MAAM,EAAE,CACN,MAAM,MAAM,CAAC,KAAK,CAAC;YACjB,KAAK,EAAE,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAuGT;YACD,SAAS,EAAE;gBACT,OAAO;gBACP,UAAU;gBACV,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;aAC9C;YACD,OAAO,kCACF,OAAO,KACV,KAAK,kCACA,OAAO,CAAC,KAAK,KAChB,QAAQ;oBACR,MAAM,MAET;SACK,CAAC,CACV,CAAC,IAAI;KACP,CAAA;AACH,CAAC,CACF,CAAA;AAEM,KAAK,UAAU,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM;IACtE,
|
|
1
|
+
{"version":3,"file":"get-release-order-list.js","sourceRoot":"","sources":["../../../../../server/routers/api/restful-apis/v1/get-release-order-list.ts"],"names":[],"mappings":"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"}
|
|
@@ -136,23 +136,19 @@ api_1.restfulApiRouter.get('/v2/warehouse/:warehouseId/get-release-order-list',
|
|
|
136
136
|
};
|
|
137
137
|
});
|
|
138
138
|
async function validateFilters(context, filters, fromDate, toDate) {
|
|
139
|
-
if (fromDate && fromDate !== '') {
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
}
|
|
146
|
-
|
|
139
|
+
// if (fromDate && fromDate !== '') {
|
|
140
|
+
// fromDate = new Date(`${fromDate.split(' ').join('')} 00:00:00`)
|
|
141
|
+
// if (fromDate instanceof Date && !isNaN(fromDate.getTime())) fromDate = fromDate.toLocaleString()
|
|
142
|
+
// else context.throw(400, context.t('fromDate is invalid'))
|
|
143
|
+
// } else fromDate = ''
|
|
144
|
+
// if (toDate && toDate !== '') {
|
|
145
|
+
// toDate = new Date(`${toDate.split(' ').join('')} 23:59:59`)
|
|
146
|
+
// if (toDate instanceof Date && !isNaN(toDate.getTime())) toDate = toDate.toLocaleString()
|
|
147
|
+
// else context.throw(400, context.t('toDate is invalid'))
|
|
148
|
+
// } else toDate = ''
|
|
149
|
+
if (!fromDate)
|
|
147
150
|
fromDate = '';
|
|
148
|
-
if (toDate
|
|
149
|
-
toDate = new Date(`${toDate.split(' ').join('')} 23:59:59`);
|
|
150
|
-
if (toDate instanceof Date && !isNaN(toDate.getTime()))
|
|
151
|
-
toDate = toDate.toLocaleString();
|
|
152
|
-
else
|
|
153
|
-
context.throw(400, context.t('toDate is invalid'));
|
|
154
|
-
}
|
|
155
|
-
else
|
|
151
|
+
if (!toDate)
|
|
156
152
|
toDate = '';
|
|
157
153
|
if (fromDate !== '' && toDate !== '')
|
|
158
154
|
filters = [...filters, { name: 'createdAt', operator: 'between', value: [fromDate, toDate] }];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-release-order-list.js","sourceRoot":"","sources":["../../../../../server/routers/api/restful-apis/v2/get-release-order-list.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAE7B,6CAAgE;AAEhE,qFAAgF;AAChF,uFAAkF;AAElF,sBAAM,CAAC,GAAG,CACR,mDAAmD,EACnD,wCAAkB,EAClB,0CAAmB,EACnB,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACtB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAC7D,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;IACtC,MAAM,EAAE,CAAC,EAAE,GAAG,OAAO,CAAA;IACrB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAEtF,IAAI,CAAC,WAAW;QAAE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAA;IAEvE,IAAI,OAAO,GAAQ,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IAC/F,IAAI,UAAU,GAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAA;IAC5C,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;IACnE,UAAU,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,wBAAwB,EAAE,gBAAgB,CAAC,CAAA;IAEtG,OAAO,CAAC,IAAI,GAAG;QACb,MAAM,EAAE,CACN,MAAM,MAAM,CAAC,KAAK,CAAC;YACjB,KAAK,EAAE,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAuGT;YACD,SAAS,EAAE;gBACT,OAAO;gBACP,UAAU;gBACV,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;aAC9C;YACD,OAAO,kCACF,OAAO,KACV,KAAK,kCACA,OAAO,CAAC,KAAK,KAChB,QAAQ;oBACR,MAAM,MAET;SACK,CAAC,CACV,CAAC,IAAI;KACP,CAAA;AACH,CAAC,CACF,CAAA;AAEM,KAAK,UAAU,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM;IACtE,
|
|
1
|
+
{"version":3,"file":"get-release-order-list.js","sourceRoot":"","sources":["../../../../../server/routers/api/restful-apis/v2/get-release-order-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": "3.8.
|
|
3
|
+
"version": "3.8.25",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
"@things-factory/pdf": "^3.7.5",
|
|
76
76
|
"@things-factory/product-ui": "^3.8.9",
|
|
77
77
|
"@things-factory/resource-ui": "^3.8.0",
|
|
78
|
-
"@things-factory/sales-base": "^3.8.
|
|
78
|
+
"@things-factory/sales-base": "^3.8.25",
|
|
79
79
|
"@things-factory/scene-chartjs": "^3.7.5",
|
|
80
80
|
"@things-factory/scene-clock": "^3.7.5",
|
|
81
81
|
"@things-factory/scene-clone": "^3.7.5",
|
|
@@ -105,8 +105,8 @@
|
|
|
105
105
|
"@things-factory/setting-ui": "^3.8.19",
|
|
106
106
|
"@things-factory/shell": "^3.8.0",
|
|
107
107
|
"@things-factory/system-ui": "^3.8.0",
|
|
108
|
-
"@things-factory/warehouse-base": "^3.8.
|
|
109
|
-
"@things-factory/worksheet-base": "^3.8.
|
|
108
|
+
"@things-factory/warehouse-base": "^3.8.25",
|
|
109
|
+
"@things-factory/worksheet-base": "^3.8.25",
|
|
110
110
|
"koa2-swagger-ui": "^5.0.2",
|
|
111
111
|
"swagger-jsdoc": "^5.0.0",
|
|
112
112
|
"yamljs": "^0.3.0"
|
|
@@ -117,5 +117,5 @@
|
|
|
117
117
|
"resolutions": {
|
|
118
118
|
"core-js": "^3.16.0"
|
|
119
119
|
},
|
|
120
|
-
"gitHead": "
|
|
120
|
+
"gitHead": "65fc6a560f15143d908bb290e70f4f87f6575c7f"
|
|
121
121
|
}
|
|
@@ -149,17 +149,20 @@ router.get(
|
|
|
149
149
|
)
|
|
150
150
|
|
|
151
151
|
export async function validateFilters(context, filters, fromDate, toDate) {
|
|
152
|
-
if (fromDate && fromDate !== '') {
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
} else fromDate = ''
|
|
157
|
-
|
|
158
|
-
if (toDate && toDate !== '') {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
} else toDate = ''
|
|
152
|
+
// if (fromDate && fromDate !== '') {
|
|
153
|
+
// fromDate = new Date(`${fromDate.split(' ').join('')} 00:00:00`)
|
|
154
|
+
// if (fromDate instanceof Date && !isNaN(fromDate.getTime())) fromDate = fromDate.toLocaleString()
|
|
155
|
+
// else context.throw(400, context.t('fromDate is invalid'))
|
|
156
|
+
// } else fromDate = ''
|
|
157
|
+
|
|
158
|
+
// if (toDate && toDate !== '') {
|
|
159
|
+
// toDate = new Date(`${toDate.split(' ').join('')} 23:59:59`)
|
|
160
|
+
// if (toDate instanceof Date && !isNaN(toDate.getTime())) toDate = toDate.toLocaleString()
|
|
161
|
+
// else context.throw(400, context.t('toDate is invalid'))
|
|
162
|
+
// } else toDate = ''
|
|
163
|
+
|
|
164
|
+
if (!fromDate) fromDate = ''
|
|
165
|
+
if (!toDate) toDate = ''
|
|
163
166
|
|
|
164
167
|
if (fromDate !== '' && toDate !== '')
|
|
165
168
|
filters = [...filters, { name: 'createdAt', operator: 'between', value: [fromDate, toDate] }]
|
|
@@ -149,17 +149,20 @@ router.get(
|
|
|
149
149
|
)
|
|
150
150
|
|
|
151
151
|
export async function validateFilters(context, filters, fromDate, toDate) {
|
|
152
|
-
if (fromDate && fromDate !== '') {
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
} else fromDate = ''
|
|
157
|
-
|
|
158
|
-
if (toDate && toDate !== '') {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
} else toDate = ''
|
|
152
|
+
// if (fromDate && fromDate !== '') {
|
|
153
|
+
// fromDate = new Date(`${fromDate.split(' ').join('')} 00:00:00`)
|
|
154
|
+
// if (fromDate instanceof Date && !isNaN(fromDate.getTime())) fromDate = fromDate.toLocaleString()
|
|
155
|
+
// else context.throw(400, context.t('fromDate is invalid'))
|
|
156
|
+
// } else fromDate = ''
|
|
157
|
+
|
|
158
|
+
// if (toDate && toDate !== '') {
|
|
159
|
+
// toDate = new Date(`${toDate.split(' ').join('')} 23:59:59`)
|
|
160
|
+
// if (toDate instanceof Date && !isNaN(toDate.getTime())) toDate = toDate.toLocaleString()
|
|
161
|
+
// else context.throw(400, context.t('toDate is invalid'))
|
|
162
|
+
// } else toDate = ''
|
|
163
|
+
|
|
164
|
+
if (!fromDate) fromDate = ''
|
|
165
|
+
if (!toDate) toDate = ''
|
|
163
166
|
|
|
164
167
|
if (fromDate !== '' && toDate !== '')
|
|
165
168
|
filters = [...filters, { name: 'createdAt', operator: 'between', value: [fromDate, toDate] }]
|