@things-factory/worksheet-base 4.3.547 → 4.3.550

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.
Files changed (4) hide show
  1. package/dist-server/graphql/resolvers/worksheet/worksheet.js +33 -10
  2. package/dist-server/graphql/resolvers/worksheet/worksheet.js.map +1 -1
  3. package/package.json +4 -4
  4. package/server/graphql/resolvers/worksheet/worksheet.ts +28 -6
package/dist-server/graphql/resolvers/worksheet/worksheet.js CHANGED
@@ -10,7 +10,7 @@ const constants_1 = require("../../../constants");
10
10
  const entities_1 = require("../../../entities");
11
11
  exports.worksheetResolver = {
12
12
  async worksheet(_, { name }, context) {
13
- var _a, _b, _c, _d, _e, _f, _g;
13
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j;
14
14
  const { domain } = context.state;
15
15
  let worksheet;
16
16
  let thisWorksheet = await (0, typeorm_1.getRepository)(entities_1.Worksheet).findOne({
@@ -77,6 +77,9 @@ exports.worksheetResolver = {
77
77
  let pWorksheetPickingItemSorting = (0, typeorm_1.getRepository)(setting_base_1.Setting).findOne({
78
78
  where: { domain, category: 'location', name: 'rule-for-picking-product' }
79
79
  });
80
+ let worksheetItemSorting = (0, typeorm_1.getRepository)(setting_base_1.Setting).findOne({
81
+ where: { domain, name: 'rule-for-sorting-worksheet-by-product' }
82
+ });
80
83
  if ((_a = worksheet === null || worksheet === void 0 ? void 0 : worksheet.arrivalNotice) === null || _a === void 0 ? void 0 : _a.id) {
81
84
  worksheet.orderProducts = await (0, typeorm_1.getRepository)(sales_base_1.OrderProduct).find({
82
85
  where: {
@@ -131,13 +134,23 @@ exports.worksheetResolver = {
131
134
  refWorksheetId: worksheet.id
132
135
  });
133
136
  let sortingSetting = await pWorksheetPickingItemSorting;
134
- if (sortingSetting === null || sortingSetting === void 0 ? void 0 : sortingSetting.value) {
137
+ let sortingWsByProductSetting = await worksheetItemSorting;
138
+ if (((_b = sortingWsByProductSetting === null || sortingWsByProductSetting === void 0 ? void 0 : sortingWsByProductSetting.value) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'true') {
139
+ qbOrderInventories.addOrderBy(`product.name`, 'ASC');
135
140
  let settingValue = JSON.parse(sortingSetting.value);
136
141
  for (const key in settingValue) {
137
142
  qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] == 'ASC' ? 'ASC' : 'DESC');
138
143
  }
139
144
  }
140
- qbOrderInventories.addOrderBy(`product.name`, 'ASC');
145
+ else {
146
+ if (sortingSetting === null || sortingSetting === void 0 ? void 0 : sortingSetting.value) {
147
+ let settingValue = JSON.parse(sortingSetting.value);
148
+ for (const key in settingValue) {
149
+ qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] == 'ASC' ? 'ASC' : 'DESC');
150
+ }
151
+ }
152
+ qbOrderInventories.addOrderBy(`product.name`, 'ASC');
153
+ }
141
154
  let orderInventories = await qbOrderInventories.getMany();
142
155
  worksheet.orderInventories = orderInventories;
143
156
  }
@@ -158,7 +171,7 @@ exports.worksheetResolver = {
158
171
  let orderInventories = await qbOrderInventories.getMany();
159
172
  worksheet.orderInventories = orderInventories;
160
173
  }
161
- if (((_b = worksheet === null || worksheet === void 0 ? void 0 : worksheet.releaseGood) === null || _b === void 0 ? void 0 : _b.id) && ((_c = worksheet === null || worksheet === void 0 ? void 0 : worksheet.releaseGood) === null || _c === void 0 ? void 0 : _c.assignedInventory)) {
174
+ if (((_c = worksheet === null || worksheet === void 0 ? void 0 : worksheet.releaseGood) === null || _c === void 0 ? void 0 : _c.id) && ((_d = worksheet === null || worksheet === void 0 ? void 0 : worksheet.releaseGood) === null || _d === void 0 ? void 0 : _d.assignedInventory)) {
162
175
  let qbOrderInventories = (0, typeorm_1.getRepository)(sales_base_1.OrderInventory)
163
176
  .createQueryBuilder('oi')
164
177
  .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
@@ -178,13 +191,23 @@ exports.worksheetResolver = {
178
191
  statuses: [sales_base_1.ORDER_INVENTORY_STATUS.CANCELLED, sales_base_1.ORDER_INVENTORY_STATUS.REPLACED]
179
192
  });
180
193
  let sortingSetting = await pWorksheetPickingItemSorting;
181
- if (sortingSetting === null || sortingSetting === void 0 ? void 0 : sortingSetting.value) {
194
+ let sortingWsByProductSetting = await worksheetItemSorting;
195
+ if (((_e = sortingWsByProductSetting === null || sortingWsByProductSetting === void 0 ? void 0 : sortingWsByProductSetting.value) === null || _e === void 0 ? void 0 : _e.toLowerCase()) === 'true') {
196
+ qbOrderInventories.addOrderBy(`product.name`, 'ASC');
182
197
  let settingValue = JSON.parse(sortingSetting.value);
183
198
  for (const key in settingValue) {
184
199
  qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] == 'ASC' ? 'ASC' : 'DESC');
185
200
  }
186
201
  }
187
- qbOrderInventories.addOrderBy(`product.name`, 'ASC');
202
+ else {
203
+ if (sortingSetting === null || sortingSetting === void 0 ? void 0 : sortingSetting.value) {
204
+ let settingValue = JSON.parse(sortingSetting.value);
205
+ for (const key in settingValue) {
206
+ qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] == 'ASC' ? 'ASC' : 'DESC');
207
+ }
208
+ }
209
+ qbOrderInventories.addOrderBy(`product.name`, 'ASC');
210
+ }
188
211
  let orderInventories = await qbOrderInventories.getMany();
189
212
  worksheet.orderInventories = orderInventories;
190
213
  if (worksheet.releaseGood.type == 'b2c') {
@@ -222,7 +245,7 @@ exports.worksheetResolver = {
222
245
  });
223
246
  }
224
247
  // before VAS
225
- if (((_d = worksheet === null || worksheet === void 0 ? void 0 : worksheet.orderInventories) === null || _d === void 0 ? void 0 : _d.length) > 0) {
248
+ if (((_f = worksheet === null || worksheet === void 0 ? void 0 : worksheet.orderInventories) === null || _f === void 0 ? void 0 : _f.length) > 0) {
226
249
  worksheet.worksheetDetails.sort(function (a, b) {
227
250
  return (worksheet.orderInventories
228
251
  .map(oi => oi.id)
@@ -232,7 +255,7 @@ exports.worksheetResolver = {
232
255
  .indexOf(worksheet.type == 'VAS' ? b.targetVas.id : b.targetInventory.id));
233
256
  });
234
257
  }
235
- if ((_e = worksheet === null || worksheet === void 0 ? void 0 : worksheet.returnOrder) === null || _e === void 0 ? void 0 : _e.id) {
258
+ if ((_g = worksheet === null || worksheet === void 0 ? void 0 : worksheet.returnOrder) === null || _g === void 0 ? void 0 : _g.id) {
236
259
  worksheet.orderInventories = await (0, typeorm_1.getRepository)(sales_base_1.OrderInventory).find({
237
260
  where: {
238
261
  domain,
@@ -251,7 +274,7 @@ exports.worksheetResolver = {
251
274
  relations: ['targetProduct']
252
275
  });
253
276
  }
254
- if ((_f = worksheet === null || worksheet === void 0 ? void 0 : worksheet.inventoryCheck) === null || _f === void 0 ? void 0 : _f.id) {
277
+ if ((_h = worksheet === null || worksheet === void 0 ? void 0 : worksheet.inventoryCheck) === null || _h === void 0 ? void 0 : _h.id) {
255
278
  worksheet.orderInventories = await (0, typeorm_1.getRepository)(sales_base_1.OrderInventory).find({
256
279
  where: {
257
280
  domain,
@@ -261,7 +284,7 @@ exports.worksheetResolver = {
261
284
  relations: ['product', 'inventory', 'inventory.location']
262
285
  });
263
286
  }
264
- if ((_g = worksheet === null || worksheet === void 0 ? void 0 : worksheet.vasOrder) === null || _g === void 0 ? void 0 : _g.id) {
287
+ if ((_j = worksheet === null || worksheet === void 0 ? void 0 : worksheet.vasOrder) === null || _j === void 0 ? void 0 : _j.id) {
265
288
  worksheet.orderVass = await (0, typeorm_1.getRepository)(sales_base_1.OrderVas).find({
266
289
  where: {
267
290
  domain,
package/dist-server/graphql/resolvers/worksheet/worksheet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/worksheet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/worksheet.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.547",
3
+ "version": "4.3.550",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -33,10 +33,10 @@
33
33
  "@things-factory/integration-marketplace": "^4.3.544",
34
34
  "@things-factory/integration-powrup": "^4.3.544",
35
35
  "@things-factory/integration-sellercraft": "^4.3.544",
36
- "@things-factory/integration-sftp": "^4.3.544",
36
+ "@things-factory/integration-sftp": "^4.3.550",
37
37
  "@things-factory/marketplace-base": "^4.3.544",
38
38
  "@things-factory/notification": "^4.3.535",
39
- "@things-factory/sales-base": "^4.3.547",
39
+ "@things-factory/sales-base": "^4.3.550",
40
40
  "@things-factory/setting-base": "^4.3.535",
41
41
  "@things-factory/shell": "^4.3.535",
42
42
  "@things-factory/transport-base": "^4.3.535",
@@ -45,5 +45,5 @@
45
45
  "puppeteer": "21.0.3",
46
46
  "uuid": "^9.0.0"
47
47
  },
48
- "gitHead": "eb3c175f6138f529c7a7e08531a2c19815b226e7"
48
+ "gitHead": "34019fe138cf7053de639857ba7a4e3fb08665b9"
49
49
  }
package/server/graphql/resolvers/worksheet/worksheet.ts CHANGED
@@ -146,6 +146,10 @@ export const worksheetResolver = {
146
146
  where: { domain, category: 'location', name: 'rule-for-picking-product' }
147
147
  })
148
148
 
149
+ let worksheetItemSorting = getRepository(Setting).findOne({
150
+ where: { domain, name: 'rule-for-sorting-worksheet-by-product' }
151
+ })
152
+
149
153
  if (worksheet?.arrivalNotice?.id) {
150
154
  worksheet.orderProducts = await getRepository(OrderProduct).find({
151
155
  where: {
@@ -223,15 +227,24 @@ export const worksheetResolver = {
223
227
  })
224
228
 
225
229
  let sortingSetting: Setting = await pWorksheetPickingItemSorting
226
- if (sortingSetting?.value) {
230
+ let sortingWsByProductSetting: Setting = await worksheetItemSorting
231
+
232
+ if (sortingWsByProductSetting?.value?.toLowerCase() === 'true') {
233
+ qbOrderInventories.addOrderBy(`product.name`, 'ASC')
227
234
  let settingValue = JSON.parse(sortingSetting.value)
228
235
  for (const key in settingValue) {
229
236
  qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] == 'ASC' ? 'ASC' : 'DESC')
230
237
  }
238
+ } else {
239
+ if (sortingSetting?.value) {
240
+ let settingValue = JSON.parse(sortingSetting.value)
241
+ for (const key in settingValue) {
242
+ qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] == 'ASC' ? 'ASC' : 'DESC')
243
+ }
244
+ }
245
+ qbOrderInventories.addOrderBy(`product.name`, 'ASC')
231
246
  }
232
247
 
233
- qbOrderInventories.addOrderBy(`product.name`, 'ASC')
234
-
235
248
  let orderInventories: OrderInventory[] = await qbOrderInventories.getMany()
236
249
  worksheet.orderInventories = orderInventories
237
250
  }
@@ -276,15 +289,24 @@ export const worksheetResolver = {
276
289
  })
277
290
 
278
291
  let sortingSetting: Setting = await pWorksheetPickingItemSorting
279
- if (sortingSetting?.value) {
292
+ let sortingWsByProductSetting: Setting = await worksheetItemSorting
293
+
294
+ if (sortingWsByProductSetting?.value?.toLowerCase() === 'true') {
295
+ qbOrderInventories.addOrderBy(`product.name`, 'ASC')
280
296
  let settingValue = JSON.parse(sortingSetting.value)
281
297
  for (const key in settingValue) {
282
298
  qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] == 'ASC' ? 'ASC' : 'DESC')
283
299
  }
300
+ } else {
301
+ if (sortingSetting?.value) {
302
+ let settingValue = JSON.parse(sortingSetting.value)
303
+ for (const key in settingValue) {
304
+ qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] == 'ASC' ? 'ASC' : 'DESC')
305
+ }
306
+ }
307
+ qbOrderInventories.addOrderBy(`product.name`, 'ASC')
284
308
  }
285
309
 
286
- qbOrderInventories.addOrderBy(`product.name`, 'ASC')
287
-
288
310
  let orderInventories: OrderInventory[] = await qbOrderInventories.getMany()
289
311
  worksheet.orderInventories = orderInventories
290
312