@things-factory/worksheet-base 4.3.358 → 4.3.362

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 (7) hide show
  1. package/dist-server/entities/worksheet-detail.js +2 -1
  2. package/dist-server/entities/worksheet-detail.js.map +1 -1
  3. package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +199 -60
  4. package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
  5. package/package.json +3 -3
  6. package/server/entities/worksheet-detail.ts +1 -0
  7. package/server/graphql/resolvers/worksheet/packing-worksheet.ts +235 -70
package/dist-server/entities/worksheet-detail.js CHANGED
@@ -129,7 +129,8 @@ WorksheetDetail = __decorate([
129
129
  (0, typeorm_1.Index)('ix_worksheet-detail_0', (worksheetDetail) => [worksheetDetail.domain, worksheetDetail.bizplace, worksheetDetail.name], { unique: true }),
130
130
  (0, typeorm_1.Index)('ix_worksheet-detail_1', (worksheetDetail) => [worksheetDetail.targetInventory]),
131
131
  (0, typeorm_1.Index)('ix_worksheet-detail_2', (worksheetDetail) => [worksheetDetail.id], { unique: true }),
132
- (0, typeorm_1.Index)('ix_worksheet-detail_3', (worksheetDetail) => [worksheetDetail.targetInventoryCheckItem])
132
+ (0, typeorm_1.Index)('ix_worksheet-detail_3', (worksheetDetail) => [worksheetDetail.targetInventoryCheckItem]),
133
+ (0, typeorm_1.Index)('ix_worksheet-detail_4', (worksheetDetail) => [worksheetDetail.worksheet])
133
134
  ], WorksheetDetail);
134
135
  exports.WorksheetDetail = WorksheetDetail;
135
136
  //# sourceMappingURL=worksheet-detail.js.map
package/dist-server/entities/worksheet-detail.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"worksheet-detail.js","sourceRoot":"","sources":["../../server/entities/worksheet-detail.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"worksheet-detail.js","sourceRoot":"","sources":["../../server/entities/worksheet-detail.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js CHANGED
@@ -46,30 +46,34 @@ exports.packingWorksheetResolver = {
46
46
  });
47
47
  if (binLocation) {
48
48
  // find unique release goods id based on READY_TO_PACK, PACKING, PACKED order inventories within bins
49
- let orderInventoriesByBin = await queryPackingWorksheet(tx, domain, assignee, binLocation);
50
- let totalInventoriesByBin = orderInventoriesByBin.length;
51
- if (totalInventoriesByBin <= 0) {
52
- orderInventoriesByBin = await queryPackingWorksheet(tx, domain, null, binLocation);
53
- totalInventoriesByBin = orderInventoriesByBin.length;
54
- }
55
- if (totalInventoriesByBin > 0) {
49
+ console.time('query worksheet');
50
+ releaseGood = await queryPackingWorksheet(tx, domain, assignee, binLocation);
51
+ console.timeEnd('query worksheet');
52
+ // let totalInventoriesByBin = orderInventoriesByBin.length
53
+ // if (totalInventoriesByBin <= 0) {
54
+ // orderInventoriesByBin = await queryPackingWorksheet(tx, domain, null, binLocation)
55
+ // totalInventoriesByBin = orderInventoriesByBin.length
56
+ // }
57
+ console.time('query batch');
58
+ if (releaseGood) {
56
59
  //find first release good of order inventory within the bin
57
- releaseGood = await assignROFromBin(orderInventoriesByBin, domain, assignee, tx);
60
+ //releaseGood = await assignROFromBin(orderInventoriesByBin, domain, assignee, tx)
58
61
  //query worksheet to find does the order associated with batch picking
59
- let worksheet = null;
60
- if (releaseGood.orderInventories[0].refWorksheetId) {
61
- worksheet = await tx.getRepository(entities_1.Worksheet).findOne({
62
- where: { id: releaseGood.orderInventories[0].refWorksheetId, type: constants_1.WORKSHEET_TYPE.BATCH_PICKING }
63
- });
64
- }
62
+ // let worksheet: Worksheet = null
63
+ // if (releaseGood.orderInventories[0].refWorksheetId) {
64
+ // worksheet = await tx.getRepository(Worksheet).findOne({
65
+ // where: { id: releaseGood.orderInventories[0].refWorksheetId, type: WORKSHEET_TYPE.BATCH_PICKING }
66
+ // })
67
+ // }
65
68
  releaseGoodNo = releaseGood.name;
66
- isBatchPicking = worksheet ? true : false;
67
- releaseGood.totalInventoriesByBin = totalInventoriesByBin;
69
+ isBatchPicking = releaseGood.orderInventories[0].refWorksheetId ? true : false;
70
+ //releaseGood.totalInventoriesByBin = totalInventoriesByBin
68
71
  releaseGood.isOrderInventoryBin = true;
69
72
  }
70
73
  else {
71
74
  throw new Error(`Bin do not have any existing order.`);
72
75
  }
76
+ console.timeEnd('query batch');
73
77
  }
74
78
  console.timeEnd(`packingWorksheet-findingBin(${timeflag})`);
75
79
  }
@@ -81,12 +85,13 @@ exports.packingWorksheetResolver = {
81
85
  .innerJoinAndSelect('b.domain', 'd')
82
86
  .innerJoinAndSelect('w.releaseGood', 'rg')
83
87
  .innerJoinAndSelect('w.worksheetDetails', 'wd')
84
- .innerJoinAndSelect('wd.targetInventory', 'oi')
85
- .innerJoinAndSelect('oi.inventory', 'i')
86
- .leftJoinAndSelect('oi.binLocation', 'l')
87
- .innerJoinAndSelect('i.location', 'l2')
88
- .innerJoinAndSelect('i.product', 'p')
89
- .innerJoinAndSelect('p.productDetails', 'pd')
88
+ // .innerJoinAndSelect('wd.targetInventory', 'oi')
89
+ // .innerJoinAndSelect('oi.inventory', 'i')
90
+ // .leftJoinAndSelect('oi.binLocation', 'l')
91
+ // .innerJoinAndSelect('i.location', 'l2')
92
+ // .innerJoinAndSelect('i.product', 'p')
93
+ // .innerJoinAndSelect('p.productDetails', 'pd')
94
+ .leftJoinAndSelect('w.assignee', 'a')
90
95
  .where('rg.id = :id', { id: releaseGood.id })
91
96
  .andWhere('w.type = :type', { type: constants_1.WORKSHEET_TYPE.PACKING })
92
97
  .getOne();
@@ -118,12 +123,14 @@ exports.packingWorksheetResolver = {
118
123
  throw new Error(`Release good do not exist.`);
119
124
  const orderSource = releaseGood.source;
120
125
  let worksheet = releaseGood.worksheet;
126
+ console.time('assign');
121
127
  if (!worksheet.assignee) {
122
128
  await tx.getRepository(entities_1.Worksheet).update({ id: worksheet.id }, { assignee });
123
129
  }
130
+ console.timeEnd('assign');
124
131
  let orderPackages = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages;
132
+ console.time('activate');
125
133
  if (worksheet.status === constants_1.WORKSHEET_STATUS.DEACTIVATED) {
126
- const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
127
134
  const directActivatePackingWorksheet = await tx.getRepository(setting_base_1.Setting).findOne({
128
135
  where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-packing-worksheet' }
129
136
  });
@@ -140,26 +147,28 @@ exports.packingWorksheetResolver = {
140
147
  directActivatePackingWorksheet.value.toLowerCase() == 'true') {
141
148
  if (partnerDirectActivatePackingWorksheetSetting != undefined) {
142
149
  if (partnerDirectActivatePackingWorksheetSetting.value.toLowerCase() == 'true')
143
- await packingWSCtrl.activatePacking(worksheet.name);
150
+ await activatePacking(tx, worksheet, releaseGood, user, domain);
144
151
  }
145
152
  else {
146
- await packingWSCtrl.activatePacking(worksheet.name);
153
+ await activatePacking(tx, worksheet, releaseGood, user, domain);
147
154
  }
148
155
  }
149
156
  else {
150
157
  throw new Error('Kindly go to packing worksheet page to activate the packing worksheet');
151
158
  }
152
159
  }
160
+ console.timeEnd('activate');
153
161
  let marketplaceOrder = {};
154
162
  let marketplaceOrderItems = [];
155
163
  let marketplaceStore;
156
164
  let trackingNo;
157
165
  let shippingProvider;
158
166
  let marketplaceStatus;
167
+ console.time('others');
159
168
  switch (orderSource) {
160
169
  case auth_base_1.ApplicationType.SELLERCRAFT:
161
170
  const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
162
- domain: worksheet.bizplace.domain,
171
+ domain: releaseGood.bizplace.domain,
163
172
  status: integration_sellercraft_1.SellercraftStatus.ACTIVE
164
173
  });
165
174
  if (sellercraft) {
@@ -191,12 +200,12 @@ exports.packingWorksheetResolver = {
191
200
  let marketplaceOrderShipping;
192
201
  if (marketplaceOrder.isSplitted) {
193
202
  marketplaceOrderShipping = await tx.getRepository(marketplace_base_1.MarketplaceOrderShipping).findOne({
194
- where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
203
+ where: { subOrderNoRef: releaseGood.refNo2 }
195
204
  });
196
205
  }
197
206
  else {
198
207
  marketplaceOrderShipping = await tx.getRepository(marketplace_base_1.MarketplaceOrderShipping).findOne({
199
- where: { orderNoRef: worksheet.releaseGood.refNo }
208
+ where: { orderNoRef: releaseGood.refNo }
200
209
  });
201
210
  }
202
211
  trackingNo = marketplaceOrderShipping.ownTrackingNo
@@ -211,6 +220,7 @@ exports.packingWorksheetResolver = {
211
220
  default:
212
221
  break;
213
222
  }
223
+ console.timeEnd('others');
214
224
  let processingOrderPackage = orderPackages.filter(opk => opk.status == sales_base_1.ORDER_STATUS.PROCESSING) || [];
215
225
  console.timeEnd(`packingWorksheet(${timeflag})`);
216
226
  return {
@@ -403,16 +413,16 @@ async function assignROFromBin(orderInventoriesByBin, domain, assignee, tx) {
403
413
  const worksheet = await tx
404
414
  .getRepository(entities_1.Worksheet)
405
415
  .createQueryBuilder('w')
406
- .innerJoinAndSelect('w.bizplace', 'b')
407
- .innerJoinAndSelect('b.domain', 'd')
408
- .innerJoinAndSelect('w.releaseGood', 'rg')
409
- .innerJoinAndSelect('w.worksheetDetails', 'wd')
410
- .innerJoinAndSelect('wd.targetInventory', 'oi')
411
- .innerJoinAndSelect('oi.inventory', 'i')
412
- .leftJoinAndSelect('oi.binLocation', 'l')
413
- .innerJoinAndSelect('i.location', 'l2')
414
- .innerJoinAndSelect('i.product', 'p')
415
- .innerJoinAndSelect('p.productDetails', 'pd')
416
+ //.innerJoinAndSelect('w.bizplace', 'b')
417
+ //.innerJoinAndSelect('b.domain', 'd')
418
+ //.innerJoinAndSelect('w.releaseGood', 'rg')
419
+ // .innerJoinAndSelect('w.worksheetDetails', 'wd')
420
+ // .innerJoinAndSelect('wd.targetInventory', 'oi')
421
+ // .innerJoinAndSelect('oi.inventory', 'i')
422
+ // .leftJoinAndSelect('oi.binLocation', 'l')
423
+ // .innerJoinAndSelect('i.location', 'l2')
424
+ // .innerJoinAndSelect('i.product', 'p')
425
+ // .innerJoinAndSelect('p.productDetails', 'pd')
416
426
  .where('rg.id = :id', { id: releaseGood.id })
417
427
  .andWhere('w.type = :type', { type: constants_1.WORKSHEET_TYPE.PACKING })
418
428
  .getOne();
@@ -459,36 +469,165 @@ async function assignROFromBin(orderInventoriesByBin, domain, assignee, tx) {
459
469
  return assignedReleaseGood;
460
470
  }
461
471
  async function queryPackingWorksheet(tx, domain, assignee, binLocation) {
462
- let qb = tx.getRepository(sales_base_1.OrderInventory).createQueryBuilder('orderInventory');
463
- qb.select('releaseGood.id', 'id')
464
- .innerJoin('orderInventory.releaseGood', 'releaseGood')
465
- .innerJoin('releaseGood.bizplace', 'bizplace')
466
- .innerJoin('bizplace.domain', 'domain')
467
- .innerJoin('worksheets', 'ws', `orderInventory.release_good_id = ws.release_good_id AND ws.type = 'PACKING' AND (ws.status = 'EXECUTING' OR ws.status = 'DEACTIVATED')`)
468
- .where('orderInventory.domain_id = :domainId', { domainId: domain.id })
469
- .andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
472
+ var _a;
473
+ let qb = tx.getRepository(sales_base_1.ReleaseGood).createQueryBuilder('rg');
474
+ qb.innerJoinAndSelect('rg.bizplace', 'b')
475
+ .innerJoinAndSelect('b.domain', 'd')
476
+ .innerJoinAndSelect('rg.orderInventories', 'oi')
477
+ .leftJoinAndSelect('rg.orderPackages', 'op')
478
+ .innerJoinAndSelect('op.orderPackageItems', 'opi')
479
+ .innerJoinAndSelect('opi.orderProduct', 'opr')
480
+ .innerJoinAndSelect('opr.product', 'p')
481
+ .innerJoinAndSelect('p.productDetails', 'pd')
482
+ .innerJoinAndSelect('pd.productBarcodes', 'pb')
483
+ .innerJoin('worksheets', 'w', 'w.release_good_id = rg.id')
484
+ .where('rg.domain_id = :domainId', { domainId: domain.id })
485
+ .andWhere('oi.status IN (:...orderInventoryStatus)', {
470
486
  orderInventoryStatus: [
471
487
  sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_PACK,
472
488
  sales_base_1.ORDER_INVENTORY_STATUS.PACKING,
473
489
  sales_base_1.ORDER_INVENTORY_STATUS.PACKED
474
490
  ]
475
491
  })
476
- .andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
477
- .andWhere('releaseGood.status IN (:...status)', {
492
+ .andWhere('oi.bin_location_id = :locationId', { locationId: binLocation.id })
493
+ .andWhere('rg.status IN (:...status)', {
478
494
  status: [sales_base_1.ORDER_STATUS.READY_TO_PACK, sales_base_1.ORDER_STATUS.PACKING]
479
- });
480
- if (assignee) {
481
- qb.andWhere('ws.assignee_id = :assigneeId', { assigneeId: assignee.id });
495
+ })
496
+ .andWhere('w.type = :type', { type: constants_1.WORKSHEET_TYPE.PACKING })
497
+ .andWhere('(w.assignee_id in (:assigneeId) or w.assignee_id is null)', { assigneeId: assignee.id })
498
+ .orderBy('w.assignee_id', 'ASC')
499
+ .addOrderBy('op.id', 'ASC')
500
+ .addOrderBy('rg.status', 'ASC')
501
+ .addOrderBy('w.created_at', 'ASC');
502
+ // let qb: SelectQueryBuilder<OrderInventory> = tx.getRepository(OrderInventory).createQueryBuilder('orderInventory')
503
+ // qb.select('releaseGood.id', 'id')
504
+ // .innerJoinAndSelect('orderInventory.location', 'binLocation')
505
+ // .innerJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
506
+ // .innerJoinAndSelect('releaseGood.bizplace', 'bizplace')
507
+ // .innerJoinAndSelect('bizplace.domain', 'domain')
508
+ // .innerJoinAndSelect(
509
+ // 'worksheets',
510
+ // 'ws',
511
+ // `orderInventory.release_good_id = ws.release_good_id AND ws.type = 'PACKING' AND (ws.status = 'EXECUTING' OR ws.status = 'DEACTIVATED')`
512
+ // )
513
+ // .innerJoinAndSelect('releaseGood.orderPackages', 'op')
514
+ // .innerJoinAndSelect('op.orderPackageItems', 'opi')
515
+ // .innerJoinAndSelect('opi.orderProduct', 'opr')
516
+ // .innerJoinAndSelect('opr.product', 'p')
517
+ // .innerJoinAndSelect('p.productDetails', 'pd')
518
+ // .innerJoinAndSelect('pd.productBarcodes', 'pb')
519
+ // .where('orderInventory.domain_id = :domainId', { domainId: domain.id })
520
+ // .andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
521
+ // orderInventoryStatus: [
522
+ // ORDER_INVENTORY_STATUS.READY_TO_PACK,
523
+ // ORDER_INVENTORY_STATUS.PACKING,
524
+ // ORDER_INVENTORY_STATUS.PACKED
525
+ // ]
526
+ // })
527
+ // .andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
528
+ // .andWhere('releaseGood.status IN (:...status)', {
529
+ // status: [ORDER_STATUS.READY_TO_PACK, ORDER_STATUS.PACKING]
530
+ // })
531
+ // if (assignee) {
532
+ // qb.andWhere('ws.assignee_id = :assigneeId', { assigneeId: assignee.id })
533
+ // } else {
534
+ // qb.andWhere('ws.assignee_id is null')
535
+ // }
536
+ // qb.orderBy('releaseGood.status', 'ASC')
537
+ // .addOrderBy('ws.created_at', 'ASC')
538
+ // .addOrderBy('releaseGood.name', 'ASC')
539
+ // .groupBy('ws.created_at')
540
+ // .addGroupBy('releaseGood.name')
541
+ // .addGroupBy('releaseGood.id')
542
+ let releaseGood = await qb.getOne();
543
+ if (!releaseGood) {
544
+ throw new Error(`Release good do not exist.`);
545
+ }
546
+ releaseGood.totalInventoriesByBin = await qb.getCount();
547
+ if (((_a = releaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length) === 0) {
548
+ throw new Error('Waiting for packages from marketplace. Please retry in while.');
482
549
  }
483
- else {
484
- qb.andWhere('ws.assignee_id is null');
550
+ let worksheetQb = tx.getRepository(entities_1.Worksheet).createQueryBuilder('w');
551
+ worksheetQb
552
+ .innerJoin('w.releaseGood', 'rg')
553
+ .innerJoinAndSelect('w.worksheetDetails', 'wd')
554
+ .leftJoinAndSelect('w.assignee', 'a')
555
+ .where('rg.id = :id', { id: releaseGood.id })
556
+ .andWhere('w.type = :type', { type: constants_1.WORKSHEET_TYPE.PACKING });
557
+ const worksheet = await worksheetQb.getOne();
558
+ releaseGood.worksheet = worksheet;
559
+ return releaseGood;
560
+ }
561
+ async function activatePacking(tx, worksheet, releaseGood, user, domain) {
562
+ const worksheetDetails = worksheet.worksheetDetails.filter(x => x.status == 'DEACTIVATED');
563
+ // update order inventory
564
+ await tx
565
+ .getRepository(sales_base_1.OrderInventory)
566
+ .update({ releaseGood }, { status: sales_base_1.ORDER_INVENTORY_STATUS.PACKING, updater: user });
567
+ // update release order
568
+ await tx.getRepository(sales_base_1.ReleaseGood).update({ id: releaseGood.id }, { status: sales_base_1.ORDER_STATUS.PACKING, updater: user });
569
+ // activate worksheet
570
+ // update worksheet
571
+ await tx
572
+ .getRepository(entities_1.Worksheet)
573
+ .update({ id: worksheet.id }, { status: constants_1.WORKSHEET_STATUS.EXECUTING, startedAt: new Date(), updater: user });
574
+ // update worksheet detail
575
+ await tx
576
+ .getRepository(entities_1.WorksheetDetail)
577
+ .update({ id: (0, typeorm_1.In)(worksheetDetails.map(itm => itm.id)) }, { status: constants_1.WORKSHEET_STATUS.EXECUTING, updater: user });
578
+ const orderSource = releaseGood.source;
579
+ switch (orderSource) {
580
+ case auth_base_1.ApplicationType.SELLERCRAFT:
581
+ const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
582
+ domain: releaseGood.bizplace.domain,
583
+ status: integration_sellercraft_1.SellercraftStatus.ACTIVE
584
+ });
585
+ if (sellercraft) {
586
+ const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
587
+ let rtsOrderDoc = async (sellercraft, releaseGood, domain, user) => {
588
+ try {
589
+ // trigger RTS
590
+ await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
591
+ await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood);
592
+ }
593
+ catch (error) {
594
+ env_1.logger.error(`packing-worksheet-controller[activatePacking]:(data:${JSON.stringify({
595
+ sellercraft,
596
+ releaseGood,
597
+ domain,
598
+ user
599
+ })}) ${error} `);
600
+ }
601
+ };
602
+ // asynchronously trigger RTS
603
+ rtsOrderDoc(sellercraft, releaseGood, domain, user);
604
+ }
605
+ break;
606
+ case auth_base_1.ApplicationType.POWRUP:
607
+ const powrup = await tx.getRepository(integration_powrup_1.Powrup).findOne({ active: true, platform: 'POWRUP' });
608
+ if (powrup) {
609
+ const powrupCtrl = new sales_base_1.PowrupController();
610
+ let rtsOrderDoc = async (powrup, releaseGood, domain, user) => {
611
+ try {
612
+ // trigger RTS
613
+ await powrupCtrl.initiateShipment(powrup, releaseGood, domain, user, tx);
614
+ }
615
+ catch (error) {
616
+ env_1.logger.error(`packing-worksheet-controller[activatePacking]:(data:${JSON.stringify({
617
+ powrup,
618
+ releaseGood,
619
+ domain,
620
+ user
621
+ })}) ${error} `);
622
+ }
623
+ };
624
+ // asynchronously trigger RTS
625
+ rtsOrderDoc(powrup, releaseGood, domain, user);
626
+ }
627
+ break;
628
+ default:
629
+ break;
485
630
  }
486
- qb.orderBy('releaseGood.status', 'ASC')
487
- .addOrderBy('ws.created_at', 'ASC')
488
- .addOrderBy('releaseGood.name', 'ASC')
489
- .groupBy('ws.created_at')
490
- .addGroupBy('releaseGood.name')
491
- .addGroupBy('releaseGood.id');
492
- return await qb.getRawMany();
631
+ return worksheet;
493
632
  }
494
633
  //# sourceMappingURL=packing-worksheet.js.map
package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-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.358",
3
+ "version": "4.3.362",
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.344",
37
37
  "@things-factory/marketplace-base": "^4.3.358",
38
38
  "@things-factory/notification": "^4.3.281",
39
- "@things-factory/sales-base": "^4.3.358",
39
+ "@things-factory/sales-base": "^4.3.362",
40
40
  "@things-factory/setting-base": "^4.3.281",
41
41
  "@things-factory/shell": "^4.3.281",
42
42
  "@things-factory/transport-base": "^4.3.344",
@@ -45,5 +45,5 @@
45
45
  "puppeteer": "21.0.3",
46
46
  "uuid": "^9.0.0"
47
47
  },
48
- "gitHead": "d4abf15de3863600f915c3085f46a651c08c3b92"
48
+ "gitHead": "7ee78b7c4901c96c01209e579b8c4912c541e484"
49
49
  }
package/server/entities/worksheet-detail.ts CHANGED
@@ -15,6 +15,7 @@ import { Worksheet } from './worksheet'
15
15
  @Index('ix_worksheet-detail_1', (worksheetDetail: WorksheetDetail) => [worksheetDetail.targetInventory])
16
16
  @Index('ix_worksheet-detail_2', (worksheetDetail: WorksheetDetail) => [worksheetDetail.id], { unique: true })
17
17
  @Index('ix_worksheet-detail_3', (worksheetDetail: WorksheetDetail) => [worksheetDetail.targetInventoryCheckItem])
18
+ @Index('ix_worksheet-detail_4', (worksheetDetail: WorksheetDetail) => [worksheetDetail.worksheet])
18
19
  export class WorksheetDetail {
19
20
  @PrimaryGeneratedColumn('uuid')
20
21
  id: string
package/server/graphql/resolvers/worksheet/packing-worksheet.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { EntityManager, getManager, SelectQueryBuilder, getConnection } from 'typeorm'
1
+ import { EntityManager, getManager, SelectQueryBuilder, getConnection, In } from 'typeorm'
2
2
 
3
3
  import { ApplicationType, User } from '@things-factory/auth-base'
4
4
  import { logger } from '@things-factory/env'
@@ -25,7 +25,7 @@ import { Location } from '@things-factory/warehouse-base'
25
25
 
26
26
  import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
27
27
  import { PackingWorksheetController, SellercraftController } from '../../../controllers'
28
- import { Worksheet } from '../../../entities'
28
+ import { Worksheet, WorksheetDetail } from '../../../entities'
29
29
 
30
30
  export const packingWorksheetResolver = {
31
31
  async packingWorksheet(_: any, { releaseGoodNo }, context: any) {
@@ -64,34 +64,38 @@ export const packingWorksheetResolver = {
64
64
 
65
65
  if (binLocation) {
66
66
  // find unique release goods id based on READY_TO_PACK, PACKING, PACKED order inventories within bins
67
- let orderInventoriesByBin = await queryPackingWorksheet(tx, domain, assignee, binLocation)
68
67
 
69
- let totalInventoriesByBin = orderInventoriesByBin.length
68
+ console.time('query worksheet')
69
+ releaseGood = await queryPackingWorksheet(tx, domain, assignee, binLocation)
70
+ console.timeEnd('query worksheet')
71
+ // let totalInventoriesByBin = orderInventoriesByBin.length
70
72
 
71
- if (totalInventoriesByBin <= 0) {
72
- orderInventoriesByBin = await queryPackingWorksheet(tx, domain, null, binLocation)
73
- totalInventoriesByBin = orderInventoriesByBin.length
74
- }
73
+ // if (totalInventoriesByBin <= 0) {
74
+ // orderInventoriesByBin = await queryPackingWorksheet(tx, domain, null, binLocation)
75
+ // totalInventoriesByBin = orderInventoriesByBin.length
76
+ // }
75
77
 
76
- if (totalInventoriesByBin > 0) {
78
+ console.time('query batch')
79
+ if (releaseGood) {
77
80
  //find first release good of order inventory within the bin
78
- releaseGood = await assignROFromBin(orderInventoriesByBin, domain, assignee, tx)
81
+ //releaseGood = await assignROFromBin(orderInventoriesByBin, domain, assignee, tx)
79
82
 
80
83
  //query worksheet to find does the order associated with batch picking
81
- let worksheet: Worksheet = null
82
- if (releaseGood.orderInventories[0].refWorksheetId) {
83
- worksheet = await tx.getRepository(Worksheet).findOne({
84
- where: { id: releaseGood.orderInventories[0].refWorksheetId, type: WORKSHEET_TYPE.BATCH_PICKING }
85
- })
86
- }
84
+ // let worksheet: Worksheet = null
85
+ // if (releaseGood.orderInventories[0].refWorksheetId) {
86
+ // worksheet = await tx.getRepository(Worksheet).findOne({
87
+ // where: { id: releaseGood.orderInventories[0].refWorksheetId, type: WORKSHEET_TYPE.BATCH_PICKING }
88
+ // })
89
+ // }
87
90
 
88
91
  releaseGoodNo = releaseGood.name
89
- isBatchPicking = worksheet ? true : false
90
- releaseGood.totalInventoriesByBin = totalInventoriesByBin
92
+ isBatchPicking = releaseGood.orderInventories[0].refWorksheetId ? true : false
93
+ //releaseGood.totalInventoriesByBin = totalInventoriesByBin
91
94
  releaseGood.isOrderInventoryBin = true
92
95
  } else {
93
96
  throw new Error(`Bin do not have any existing order.`)
94
97
  }
98
+ console.timeEnd('query batch')
95
99
  }
96
100
  console.timeEnd(`packingWorksheet-findingBin(${timeflag})`)
97
101
  } else {
@@ -102,12 +106,13 @@ export const packingWorksheetResolver = {
102
106
  .innerJoinAndSelect('b.domain', 'd')
103
107
  .innerJoinAndSelect('w.releaseGood', 'rg')
104
108
  .innerJoinAndSelect('w.worksheetDetails', 'wd')
105
- .innerJoinAndSelect('wd.targetInventory', 'oi')
106
- .innerJoinAndSelect('oi.inventory', 'i')
107
- .leftJoinAndSelect('oi.binLocation', 'l')
108
- .innerJoinAndSelect('i.location', 'l2')
109
- .innerJoinAndSelect('i.product', 'p')
110
- .innerJoinAndSelect('p.productDetails', 'pd')
109
+ // .innerJoinAndSelect('wd.targetInventory', 'oi')
110
+ // .innerJoinAndSelect('oi.inventory', 'i')
111
+ // .leftJoinAndSelect('oi.binLocation', 'l')
112
+ // .innerJoinAndSelect('i.location', 'l2')
113
+ // .innerJoinAndSelect('i.product', 'p')
114
+ // .innerJoinAndSelect('p.productDetails', 'pd')
115
+ .leftJoinAndSelect('w.assignee', 'a')
111
116
  .where('rg.id = :id', { id: releaseGood.id })
112
117
  .andWhere('w.type = :type', { type: WORKSHEET_TYPE.PACKING })
113
118
  .getOne()
@@ -147,15 +152,15 @@ export const packingWorksheetResolver = {
147
152
  const orderSource: string = releaseGood.source
148
153
  let worksheet: Worksheet = releaseGood.worksheet
149
154
 
155
+ console.time('assign')
150
156
  if (!worksheet.assignee) {
151
157
  await tx.getRepository(Worksheet).update({ id: worksheet.id }, { assignee })
152
158
  }
153
-
159
+ console.timeEnd('assign')
154
160
  let orderPackages: OrderPackage[] = releaseGood?.orderPackages
155
161
 
162
+ console.time('activate')
156
163
  if (worksheet.status === WORKSHEET_STATUS.DEACTIVATED) {
157
- const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
158
-
159
164
  const directActivatePackingWorksheet: Setting = await tx.getRepository(Setting).findOne({
160
165
  where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-packing-worksheet' }
161
166
  })
@@ -176,15 +181,15 @@ export const packingWorksheetResolver = {
176
181
  ) {
177
182
  if (partnerDirectActivatePackingWorksheetSetting != undefined) {
178
183
  if (partnerDirectActivatePackingWorksheetSetting.value.toLowerCase() == 'true')
179
- await packingWSCtrl.activatePacking(worksheet.name)
184
+ await activatePacking(tx, worksheet, releaseGood, user, domain)
180
185
  } else {
181
- await packingWSCtrl.activatePacking(worksheet.name)
186
+ await activatePacking(tx, worksheet, releaseGood, user, domain)
182
187
  }
183
188
  } else {
184
189
  throw new Error('Kindly go to packing worksheet page to activate the packing worksheet')
185
190
  }
186
191
  }
187
-
192
+ console.timeEnd('activate')
188
193
  let marketplaceOrder: MarketplaceOrder = {}
189
194
  let marketplaceOrderItems: MarketplaceOrderItem[] = []
190
195
  let marketplaceStore
@@ -192,10 +197,11 @@ export const packingWorksheetResolver = {
192
197
  let shippingProvider: string
193
198
  let marketplaceStatus: string
194
199
 
200
+ console.time('others')
195
201
  switch (orderSource) {
196
202
  case ApplicationType.SELLERCRAFT:
197
203
  const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
198
- domain: worksheet.bizplace.domain,
204
+ domain: releaseGood.bizplace.domain,
199
205
  status: SellercraftStatus.ACTIVE
200
206
  })
201
207
 
@@ -233,11 +239,11 @@ export const packingWorksheetResolver = {
233
239
  let marketplaceOrderShipping: MarketplaceOrderShipping
234
240
  if (marketplaceOrder.isSplitted) {
235
241
  marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
236
- where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
242
+ where: { subOrderNoRef: releaseGood.refNo2 }
237
243
  })
238
244
  } else {
239
245
  marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
240
- where: { orderNoRef: worksheet.releaseGood.refNo }
246
+ where: { orderNoRef: releaseGood.refNo }
241
247
  })
242
248
  }
243
249
 
@@ -255,7 +261,7 @@ export const packingWorksheetResolver = {
255
261
  default:
256
262
  break
257
263
  }
258
-
264
+ console.timeEnd('others')
259
265
  let processingOrderPackage: OrderPackage[] =
260
266
  orderPackages.filter(opk => opk.status == ORDER_STATUS.PROCESSING) || []
261
267
 
@@ -450,16 +456,16 @@ async function assignROFromBin(orderInventoriesByBin, domain, assignee, tx) {
450
456
  const worksheet: Worksheet = await tx
451
457
  .getRepository(Worksheet)
452
458
  .createQueryBuilder('w')
453
- .innerJoinAndSelect('w.bizplace', 'b')
454
- .innerJoinAndSelect('b.domain', 'd')
455
- .innerJoinAndSelect('w.releaseGood', 'rg')
456
- .innerJoinAndSelect('w.worksheetDetails', 'wd')
457
- .innerJoinAndSelect('wd.targetInventory', 'oi')
458
- .innerJoinAndSelect('oi.inventory', 'i')
459
- .leftJoinAndSelect('oi.binLocation', 'l')
460
- .innerJoinAndSelect('i.location', 'l2')
461
- .innerJoinAndSelect('i.product', 'p')
462
- .innerJoinAndSelect('p.productDetails', 'pd')
459
+ //.innerJoinAndSelect('w.bizplace', 'b')
460
+ //.innerJoinAndSelect('b.domain', 'd')
461
+ //.innerJoinAndSelect('w.releaseGood', 'rg')
462
+ // .innerJoinAndSelect('w.worksheetDetails', 'wd')
463
+ // .innerJoinAndSelect('wd.targetInventory', 'oi')
464
+ // .innerJoinAndSelect('oi.inventory', 'i')
465
+ // .leftJoinAndSelect('oi.binLocation', 'l')
466
+ // .innerJoinAndSelect('i.location', 'l2')
467
+ // .innerJoinAndSelect('i.product', 'p')
468
+ // .innerJoinAndSelect('p.productDetails', 'pd')
463
469
  .where('rg.id = :id', { id: releaseGood.id })
464
470
  .andWhere('w.type = :type', { type: WORKSHEET_TYPE.PACKING })
465
471
  .getOne()
@@ -510,42 +516,201 @@ async function assignROFromBin(orderInventoriesByBin, domain, assignee, tx) {
510
516
  }
511
517
 
512
518
  async function queryPackingWorksheet(tx, domain, assignee, binLocation) {
513
- let qb: SelectQueryBuilder<OrderInventory> = tx.getRepository(OrderInventory).createQueryBuilder('orderInventory')
514
-
515
- qb.select('releaseGood.id', 'id')
516
- .innerJoin('orderInventory.releaseGood', 'releaseGood')
517
- .innerJoin('releaseGood.bizplace', 'bizplace')
518
- .innerJoin('bizplace.domain', 'domain')
519
- .innerJoin(
520
- 'worksheets',
521
- 'ws',
522
- `orderInventory.release_good_id = ws.release_good_id AND ws.type = 'PACKING' AND (ws.status = 'EXECUTING' OR ws.status = 'DEACTIVATED')`
523
- )
524
- .where('orderInventory.domain_id = :domainId', { domainId: domain.id })
525
- .andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
519
+ let qb: SelectQueryBuilder<ReleaseGood> = tx.getRepository(ReleaseGood).createQueryBuilder('rg')
520
+
521
+ qb.innerJoinAndSelect('rg.bizplace', 'b')
522
+ .innerJoinAndSelect('b.domain', 'd')
523
+ .innerJoinAndSelect('rg.orderInventories', 'oi')
524
+ .leftJoinAndSelect('rg.orderPackages', 'op')
525
+ .innerJoinAndSelect('op.orderPackageItems', 'opi')
526
+ .innerJoinAndSelect('opi.orderProduct', 'opr')
527
+ .innerJoinAndSelect('opr.product', 'p')
528
+ .innerJoinAndSelect('p.productDetails', 'pd')
529
+ .innerJoinAndSelect('pd.productBarcodes', 'pb')
530
+ .innerJoin('worksheets', 'w', 'w.release_good_id = rg.id')
531
+ .where('rg.domain_id = :domainId', { domainId: domain.id })
532
+ .andWhere('oi.status IN (:...orderInventoryStatus)', {
526
533
  orderInventoryStatus: [
527
534
  ORDER_INVENTORY_STATUS.READY_TO_PACK,
528
535
  ORDER_INVENTORY_STATUS.PACKING,
529
536
  ORDER_INVENTORY_STATUS.PACKED
530
537
  ]
531
538
  })
532
- .andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
533
- .andWhere('releaseGood.status IN (:...status)', {
539
+ .andWhere('oi.bin_location_id = :locationId', { locationId: binLocation.id })
540
+ .andWhere('rg.status IN (:...status)', {
534
541
  status: [ORDER_STATUS.READY_TO_PACK, ORDER_STATUS.PACKING]
535
542
  })
543
+ .andWhere('w.type = :type', { type: WORKSHEET_TYPE.PACKING })
544
+ .andWhere('(w.assignee_id in (:assigneeId) or w.assignee_id is null)', { assigneeId: assignee.id })
545
+ .orderBy('w.assignee_id', 'ASC')
546
+ .addOrderBy('op.id', 'ASC')
547
+ .addOrderBy('rg.status', 'ASC')
548
+ .addOrderBy('w.created_at', 'ASC')
549
+
550
+ // let qb: SelectQueryBuilder<OrderInventory> = tx.getRepository(OrderInventory).createQueryBuilder('orderInventory')
551
+
552
+ // qb.select('releaseGood.id', 'id')
553
+ // .innerJoinAndSelect('orderInventory.location', 'binLocation')
554
+ // .innerJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
555
+ // .innerJoinAndSelect('releaseGood.bizplace', 'bizplace')
556
+ // .innerJoinAndSelect('bizplace.domain', 'domain')
557
+ // .innerJoinAndSelect(
558
+ // 'worksheets',
559
+ // 'ws',
560
+ // `orderInventory.release_good_id = ws.release_good_id AND ws.type = 'PACKING' AND (ws.status = 'EXECUTING' OR ws.status = 'DEACTIVATED')`
561
+ // )
562
+ // .innerJoinAndSelect('releaseGood.orderPackages', 'op')
563
+ // .innerJoinAndSelect('op.orderPackageItems', 'opi')
564
+ // .innerJoinAndSelect('opi.orderProduct', 'opr')
565
+ // .innerJoinAndSelect('opr.product', 'p')
566
+ // .innerJoinAndSelect('p.productDetails', 'pd')
567
+ // .innerJoinAndSelect('pd.productBarcodes', 'pb')
568
+ // .where('orderInventory.domain_id = :domainId', { domainId: domain.id })
569
+ // .andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
570
+ // orderInventoryStatus: [
571
+ // ORDER_INVENTORY_STATUS.READY_TO_PACK,
572
+ // ORDER_INVENTORY_STATUS.PACKING,
573
+ // ORDER_INVENTORY_STATUS.PACKED
574
+ // ]
575
+ // })
576
+ // .andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
577
+ // .andWhere('releaseGood.status IN (:...status)', {
578
+ // status: [ORDER_STATUS.READY_TO_PACK, ORDER_STATUS.PACKING]
579
+ // })
580
+
581
+ // if (assignee) {
582
+ // qb.andWhere('ws.assignee_id = :assigneeId', { assigneeId: assignee.id })
583
+ // } else {
584
+ // qb.andWhere('ws.assignee_id is null')
585
+ // }
586
+
587
+ // qb.orderBy('releaseGood.status', 'ASC')
588
+ // .addOrderBy('ws.created_at', 'ASC')
589
+ // .addOrderBy('releaseGood.name', 'ASC')
590
+ // .groupBy('ws.created_at')
591
+ // .addGroupBy('releaseGood.name')
592
+ // .addGroupBy('releaseGood.id')
593
+
594
+ let releaseGood = await qb.getOne()
595
+
596
+ if (!releaseGood) {
597
+ throw new Error(`Release good do not exist.`)
598
+ }
536
599
 
537
- if (assignee) {
538
- qb.andWhere('ws.assignee_id = :assigneeId', { assigneeId: assignee.id })
539
- } else {
540
- qb.andWhere('ws.assignee_id is null')
600
+ releaseGood.totalInventoriesByBin = await qb.getCount()
601
+
602
+ if (releaseGood.orderPackages?.length === 0) {
603
+ throw new Error('Waiting for packages from marketplace. Please retry in while.')
541
604
  }
542
605
 
543
- qb.orderBy('releaseGood.status', 'ASC')
544
- .addOrderBy('ws.created_at', 'ASC')
545
- .addOrderBy('releaseGood.name', 'ASC')
546
- .groupBy('ws.created_at')
547
- .addGroupBy('releaseGood.name')
548
- .addGroupBy('releaseGood.id')
606
+ let worksheetQb = tx.getRepository(Worksheet).createQueryBuilder('w')
607
+
608
+ worksheetQb
609
+ .innerJoin('w.releaseGood', 'rg')
610
+ .innerJoinAndSelect('w.worksheetDetails', 'wd')
611
+ .leftJoinAndSelect('w.assignee', 'a')
612
+ .where('rg.id = :id', { id: releaseGood.id })
613
+ .andWhere('w.type = :type', { type: WORKSHEET_TYPE.PACKING })
614
+
615
+ const worksheet = await worksheetQb.getOne()
616
+
617
+ releaseGood.worksheet = worksheet
618
+
619
+ return releaseGood
620
+ }
621
+
622
+ async function activatePacking(
623
+ tx,
624
+ worksheet: Worksheet,
625
+ releaseGood: ReleaseGood,
626
+ user: User,
627
+ domain: Domain
628
+ ): Promise<Worksheet> {
629
+ const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails.filter(x => x.status == 'DEACTIVATED')
630
+
631
+ // update order inventory
632
+ await tx
633
+ .getRepository(OrderInventory)
634
+ .update({ releaseGood }, { status: ORDER_INVENTORY_STATUS.PACKING, updater: user })
635
+
636
+ // update release order
637
+ await tx.getRepository(ReleaseGood).update({ id: releaseGood.id }, { status: ORDER_STATUS.PACKING, updater: user })
638
+
639
+ // activate worksheet
640
+ // update worksheet
641
+ await tx
642
+ .getRepository(Worksheet)
643
+ .update({ id: worksheet.id }, { status: WORKSHEET_STATUS.EXECUTING, startedAt: new Date(), updater: user })
644
+
645
+ // update worksheet detail
646
+ await tx
647
+ .getRepository(WorksheetDetail)
648
+ .update({ id: In(worksheetDetails.map(itm => itm.id)) }, { status: WORKSHEET_STATUS.EXECUTING, updater: user })
649
+
650
+ const orderSource: string = releaseGood.source
651
+ switch (orderSource) {
652
+ case ApplicationType.SELLERCRAFT:
653
+ const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
654
+ domain: releaseGood.bizplace.domain,
655
+ status: SellercraftStatus.ACTIVE
656
+ })
657
+
658
+ if (sellercraft) {
659
+ const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
660
+
661
+ let rtsOrderDoc = async (sellercraft: any, releaseGood: any, domain: any, user: any) => {
662
+ try {
663
+ // trigger RTS
664
+ await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
665
+
666
+ await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
667
+ } catch (error) {
668
+ logger.error(
669
+ `packing-worksheet-controller[activatePacking]:(data:${JSON.stringify({
670
+ sellercraft,
671
+ releaseGood,
672
+ domain,
673
+ user
674
+ })}) ${error} `
675
+ )
676
+ }
677
+ }
678
+
679
+ // asynchronously trigger RTS
680
+ rtsOrderDoc(sellercraft, releaseGood, domain, user)
681
+ }
682
+ break
683
+
684
+ case ApplicationType.POWRUP:
685
+ const powrup: Powrup = await tx.getRepository(Powrup).findOne({ active: true, platform: 'POWRUP' })
686
+
687
+ if (powrup) {
688
+ const powrupCtrl: PowrupController = new PowrupController()
689
+
690
+ let rtsOrderDoc = async (powrup: any, releaseGood: any, domain: any, user: any) => {
691
+ try {
692
+ // trigger RTS
693
+ await powrupCtrl.initiateShipment(powrup, releaseGood, domain, user, tx)
694
+ } catch (error) {
695
+ logger.error(
696
+ `packing-worksheet-controller[activatePacking]:(data:${JSON.stringify({
697
+ powrup,
698
+ releaseGood,
699
+ domain,
700
+ user
701
+ })}) ${error} `
702
+ )
703
+ }
704
+ }
705
+
706
+ // asynchronously trigger RTS
707
+ rtsOrderDoc(powrup, releaseGood, domain, user)
708
+ }
709
+ break
710
+
711
+ default:
712
+ break
713
+ }
549
714
 
550
- return await qb.getRawMany()
715
+ return worksheet
551
716
  }