@things-factory/worksheet-base 4.3.26 → 4.3.29

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 (10) hide show
  1. package/dist-server/controllers/render-grn.js +35 -27
  2. package/dist-server/controllers/render-grn.js.map +1 -1
  3. package/package.json +17 -17
  4. package/server/controllers/outbound/picking-worksheet-controller.ts +11 -2
  5. package/server/graphql/resolvers/worksheet/putaway/complete-putaway.ts +45 -2
  6. package/server/graphql/resolvers/worksheet/unloading/complete-unloading.ts +0 -25
  7. package/server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details-by-bulk.ts +9 -0
  8. package/server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details.ts +17 -4
  9. package/server/graphql/resolvers/worksheet-detail/generate-picking-worksheet-details.ts +8 -2
  10. package/server/graphql/resolvers/worksheet-detail/generate-release-good-worksheet-details.ts +12 -1
package/dist-server/controllers/render-grn.js CHANGED
@@ -65,6 +65,7 @@ async function renderGRN({ grnNo, timezoneOffSet }, context) {
65
65
  .addGroupBy('batch_id')
66
66
  .addGroupBy('packing_type')
67
67
  .addGroupBy('uom')
68
+ .addGroupBy('expiration_date')
68
69
  .getRawMany();
69
70
  // 5. find domain contact point
70
71
  const foundCP = await (0, typeorm_1.getRepository)(biz_base_1.ContactPoint).findOne({
@@ -178,35 +179,42 @@ async function renderGRN({ grnNo, timezoneOffSet }, context) {
178
179
  account_no: foundPartnerCP ? foundPartnerCP.accountNo : '',
179
180
  unloaded_by: foundWS ? foundWS.updater.name : '',
180
181
  putaway_by: foundPutawayWS ? foundPutawayWS.updater.name : '',
181
- product_list: targetProducts.map((item, idx) => {
182
- let unloadInvHistory = inboundInventories.find(ih => ih.productId == item.product.id &&
182
+ product_list: targetProducts
183
+ .reduce((acc, item) => {
184
+ acc.push(...inboundInventories
185
+ .filter(ih => ih.productId == item.product.id &&
183
186
  ih.batchId == item.batchId &&
184
187
  ih.packingType == item.packingType &&
185
- ih.uom == item.uom);
186
- return {
187
- list_no: idx + 1,
188
- product_sku: `${item.product.sku}`,
189
- product_brand_sku: `${item.product.brandSku}`,
190
- product_name: `${item.product.name}(${item.product.description})`,
191
- product_desc: item.product.description,
192
- product_nameOnly: item.product.name,
193
- product_type: item.packingType,
194
- product_size: item.packingSize,
195
- product_batch: item.batchId,
196
- batch_id_ref: (item === null || item === void 0 ? void 0 : item.batchIdRef) ? item.batchIdRef : '',
197
- pallet_qty: item.actualPalletQty,
198
- product_qty: unloadInvHistory.qty || item.actualPackQty,
199
- product_unit_uom_value: `${Math.round(item.uomValue * 100) / 100}`,
200
- product_total_uom_value: `${Math.round((unloadInvHistory.uomValue || item.uomValue * item.actualPackQty) * 100) / 100}`,
201
- product_uom: `${unloadInvHistory.uom || item.uom}`,
202
- product_gross_weight: item.product.grossWeight || null,
203
- unit_price: item.unitPrice || null,
204
- expiry_date: unloadInvHistory.expiryDate || '',
205
- manufacture_date: item.manufactureDate,
206
- reusable_pallet_id: unloadInvHistory.reusablePalletId || '',
207
- remark: (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '')
208
- };
209
- }),
188
+ ih.uom == item.uom)
189
+ .map(unloadInvHistory => {
190
+ return {
191
+ product_sku: `${item.product.sku}`,
192
+ product_brand_sku: `${item.product.brandSku}`,
193
+ product_name: `${item.product.name}(${item.product.description})`,
194
+ product_desc: item.product.description,
195
+ product_nameOnly: item.product.name,
196
+ product_type: item.packingType,
197
+ product_size: item.packingSize,
198
+ product_batch: item.batchId,
199
+ batch_id_ref: (item === null || item === void 0 ? void 0 : item.batchIdRef) ? item.batchIdRef : '',
200
+ pallet_qty: item.actualPalletQty,
201
+ product_qty: unloadInvHistory.qty || item.actualPackQty,
202
+ product_unit_uom_value: `${Math.round(item.uomValue * 100) / 100}`,
203
+ product_total_uom_value: `${Math.round((unloadInvHistory.uomValue || item.uomValue * item.actualPackQty) * 100) / 100}`,
204
+ product_uom: `${unloadInvHistory.uom || item.uom}`,
205
+ product_gross_weight: item.product.grossWeight || null,
206
+ unit_price: item.unitPrice || null,
207
+ expiry_date: unloadInvHistory.expiryDate && unloadInvHistory.expiryDate != ''
208
+ ? new Date(unloadInvHistory.expiryDate).toISOString().split('T')[0]
209
+ : '',
210
+ manufacture_date: item.manufactureDate,
211
+ reusable_pallet_id: unloadInvHistory.reusablePalletId || '',
212
+ remark: (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '')
213
+ };
214
+ }));
215
+ return acc;
216
+ }, [])
217
+ .map((item, idx) => (Object.assign({ list_no: idx + 1 }, item))),
210
218
  serialNumber: foundInventoryItem
211
219
  };
212
220
  const formData = new form_data_1.default();
package/dist-server/controllers/render-grn.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"render-grn.js","sourceRoot":"","sources":["../../server/controllers/render-grn.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render-grn.js","sourceRoot":"","sources":["../../server/controllers/render-grn.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.26",
3
+ "version": "4.3.29",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -24,21 +24,21 @@
24
24
  "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
25
25
  },
26
26
  "dependencies": {
27
- "@things-factory/auth-base": "^4.3.24",
28
- "@things-factory/biz-base": "^4.3.24",
29
- "@things-factory/document-template-base": "^4.3.23",
30
- "@things-factory/id-rule-base": "^4.3.24",
31
- "@things-factory/integration-lmd": "^4.3.24",
32
- "@things-factory/integration-marketplace": "^4.3.25",
33
- "@things-factory/integration-sellercraft": "^4.3.26",
34
- "@things-factory/integration-sftp": "^4.3.25",
35
- "@things-factory/marketplace-base": "^4.3.25",
36
- "@things-factory/notification": "^4.3.24",
37
- "@things-factory/sales-base": "^4.3.26",
38
- "@things-factory/setting-base": "^4.3.24",
39
- "@things-factory/shell": "^4.3.23",
40
- "@things-factory/transport-base": "^4.3.24",
41
- "@things-factory/warehouse-base": "^4.3.26"
27
+ "@things-factory/auth-base": "^4.3.27",
28
+ "@things-factory/biz-base": "^4.3.27",
29
+ "@things-factory/document-template-base": "^4.3.27",
30
+ "@things-factory/id-rule-base": "^4.3.27",
31
+ "@things-factory/integration-lmd": "^4.3.27",
32
+ "@things-factory/integration-marketplace": "^4.3.29",
33
+ "@things-factory/integration-sellercraft": "^4.3.29",
34
+ "@things-factory/integration-sftp": "^4.3.27",
35
+ "@things-factory/marketplace-base": "^4.3.29",
36
+ "@things-factory/notification": "^4.3.27",
37
+ "@things-factory/sales-base": "^4.3.29",
38
+ "@things-factory/setting-base": "^4.3.27",
39
+ "@things-factory/shell": "^4.3.27",
40
+ "@things-factory/transport-base": "^4.3.27",
41
+ "@things-factory/warehouse-base": "^4.3.29"
42
42
  },
43
- "gitHead": "dbb4dc519a8a7bd8fd295ec91f2f80ba6b1b3250"
43
+ "gitHead": "417b3e85239034d3c37502fc8d9c5ae42c97dedb"
44
44
  }
package/server/controllers/outbound/picking-worksheet-controller.ts CHANGED
@@ -5,6 +5,7 @@ import { generateId } from '@things-factory/id-rule-base'
5
5
  import { Product, ProductDetail } from '@things-factory/product-base'
6
6
  import {
7
7
  ORDER_INVENTORY_STATUS,
8
+ ORDER_PRODUCT_STATUS,
8
9
  ORDER_STATUS,
9
10
  OrderInventory,
10
11
  OrderNoGenerator,
@@ -344,7 +345,8 @@ export class PickingWorksheetController extends VasWorksheetController {
344
345
  'worksheetDetails',
345
346
  'worksheetDetails.targetInventory',
346
347
  'worksheetDetails.targetInventory.inventory',
347
- 'worksheetDetails.targetInventory.product'
348
+ 'worksheetDetails.targetInventory.product',
349
+ 'worksheetDetails.targetInventory.orderProduct'
348
350
  ])
349
351
 
350
352
  const worksheetDetails: WorksheetDetail[] = await this.extractMatchedWorksheetDetails(
@@ -353,7 +355,7 @@ export class PickingWorksheetController extends VasWorksheetController {
353
355
  productId,
354
356
  packingType,
355
357
  packingSize,
356
- ['targetInventory', 'targetInventory.inventory']
358
+ ['targetInventory', 'targetInventory.inventory', 'targetInventory.orderProduct']
357
359
  )
358
360
 
359
361
  let worksheetDetailIds: string[] = []
@@ -370,6 +372,13 @@ export class PickingWorksheetController extends VasWorksheetController {
370
372
  inventory.lockedQty = inventory.lockedQty - targetInventory.releaseQty
371
373
  inventory.lockedUomValue = inventory.lockedUomValue - targetInventory.releaseUomValue
372
374
  await this.updateInventory(inventory)
375
+
376
+ await this.trxMgr
377
+ .getRepository(OrderProduct)
378
+ .update(
379
+ { id: targetInventory.orderProduct.id },
380
+ { status: ORDER_PRODUCT_STATUS.PENDING_ASSIGN, updater: this.user }
381
+ )
373
382
  }
374
383
 
375
384
  await this.trxMgr.getRepository(WorksheetDetail).delete(worksheetDetailIds)
package/server/graphql/resolvers/worksheet/putaway/complete-putaway.ts CHANGED
@@ -1,13 +1,56 @@
1
+ import { EntityManager } from 'typeorm'
2
+
1
3
  import { User } from '@things-factory/auth-base'
4
+ import { MarketplaceStore } from '@things-factory/integration-marketplace'
5
+ import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
6
+ import { ArrivalNotice } from '@things-factory/sales-base'
2
7
  import { Domain } from '@things-factory/shell'
3
- import { EntityManager } from 'typeorm'
8
+
4
9
  import { PutawayWorksheetController } from '../../../../controllers'
10
+ import { EcommerceController, SellercraftController } from '../../../../controllers/ecommerce'
5
11
  import { Worksheet } from '../../../../entities'
6
12
 
7
13
  export const completePutawayResolver = {
8
14
  async completePutaway(_: any, { arrivalNoticeNo }, context: any) {
9
15
  const { tx, user, domain }: { tx: EntityManager; user: User; domain: Domain } = context.state
10
16
  await completePutaway(tx, domain, user, arrivalNoticeNo)
17
+
18
+ const arrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
19
+ where: { domain, name: arrivalNoticeNo },
20
+ relations: [
21
+ 'purchaseOrder',
22
+ 'bizplace',
23
+ 'bizplace.domain',
24
+ 'bizplace.company',
25
+ 'bizplace.company.domain',
26
+ 'orderProducts',
27
+ 'orderProducts.product',
28
+ 'orderProducts.product.productDetails',
29
+ 'orderProducts.product.productDetails.childProductDetail'
30
+ ]
31
+ })
32
+
33
+ // search for any active marketplace connection
34
+ const companyDomain: Domain = arrivalNotice.bizplace.company.domain
35
+ const customerDomain: Domain = arrivalNotice.bizplace.domain
36
+ const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
37
+ where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
38
+ relations: ['marketplaceDistributors']
39
+ })
40
+
41
+ const sellercraft: Sellercraft = await tx
42
+ .getRepository(Sellercraft)
43
+ .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
44
+
45
+ if (sellercraft) {
46
+ const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
47
+ await sellercraftCtrl.registerProductInbound(sellercraft, arrivalNotice)
48
+ }
49
+
50
+ if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
51
+ const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
52
+ await ecommerceCtrl.updateProductVariationStock(marketplaceStores, arrivalNotice.orderProducts, companyDomain)
53
+ }
11
54
  }
12
55
  }
13
56
 
@@ -28,4 +71,4 @@ export async function completePutaway(
28
71
  relations: ['bizplace', 'arrivalNotice']
29
72
  })
30
73
  }
31
- }
74
+ }
package/server/graphql/resolvers/worksheet/unloading/complete-unloading.ts CHANGED
@@ -2,15 +2,12 @@ import { EntityManager, In } from 'typeorm'
2
2
 
3
3
  import { User } from '@things-factory/auth-base'
4
4
  import { Bizplace } from '@things-factory/biz-base'
5
- import { MarketplaceStore } from '@things-factory/integration-marketplace'
6
- import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
7
5
  import { ArrivalNotice, generateGoodsReceivalNote } from '@things-factory/sales-base'
8
6
  import { Domain } from '@things-factory/shell'
9
7
  import { Inventory, INVENTORY_STATUS } from '@things-factory/warehouse-base'
10
8
 
11
9
  import { WORKSHEET_STATUS } from '../../../../constants'
12
10
  import { PutawayWorksheetController, UnloadingWorksheetController } from '../../../../controllers'
13
- import { EcommerceController, SellercraftController } from '../../../../controllers/ecommerce'
14
11
  import { Worksheet, WorksheetDetail } from '../../../../entities'
15
12
 
16
13
  export const completeUnloadingResolver = {
@@ -40,28 +37,6 @@ export const completeUnloadingResolver = {
40
37
  where: { domain, refOrderId: arrivalNotice.id, status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED]) }
41
38
  })
42
39
 
43
- // search for any active marketplace connection
44
- const companyDomain: Domain = arrivalNotice.bizplace.company.domain
45
- const customerDomain: Domain = arrivalNotice.bizplace.domain
46
- const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
47
- where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
48
- relations: ['marketplaceDistributors']
49
- })
50
-
51
- const sellercraft: Sellercraft = await tx
52
- .getRepository(Sellercraft)
53
- .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
54
-
55
- if (sellercraft) {
56
- const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
57
- await sellercraftCtrl.registerProductInbound(sellercraft, arrivalNotice)
58
- }
59
-
60
- if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
61
- const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
62
- await ecommerceCtrl.updateProductVariationStock(marketplaceStores, arrivalNotice.orderProducts, companyDomain)
63
- }
64
-
65
40
  putawayWorksheet = await putawayWSCtrl.generatePutawayWorksheet(arrivalNotice.name, inventories)
66
41
 
67
42
  if (putawayWorksheet.status === WORKSHEET_STATUS.DEACTIVATED) {
package/server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details-by-bulk.ts CHANGED
@@ -3,6 +3,7 @@ import { EntityManager, getRepository } from 'typeorm'
3
3
  import { User } from '@things-factory/auth-base'
4
4
  import {
5
5
  ORDER_INVENTORY_STATUS,
6
+ ORDER_PRODUCT_STATUS,
6
7
  ORDER_TYPES,
7
8
  OrderInventory,
8
9
  OrderNoGenerator,
@@ -126,6 +127,14 @@ export const generateBatchPickingWorksheetDetailsByBulkResolver = {
126
127
  .where('id = :id', { id: targetInventory.id })
127
128
  await qbInv.execute()
128
129
 
130
+ // update order product status to ASSIGNED
131
+ await tx
132
+ .getRepository(OrderProduct)
133
+ .update(
134
+ { id: orderInventory.orderProduct.id },
135
+ { status: ORDER_PRODUCT_STATUS.ASSIGNED, updater: user }
136
+ )
137
+
129
138
  // Create new order inventory with status -> READY_TO_PICK, type -> RELEASE_OF_GOODS
130
139
  let newTargetInventory: OrderInventory = new OrderInventory()
131
140
  newTargetInventory = {
package/server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details.ts CHANGED
@@ -1,12 +1,20 @@
1
+ import { EntityManager } from 'typeorm'
2
+
3
+ import { User } from '@things-factory/auth-base'
1
4
  import { Product } from '@things-factory/product-base'
2
- import { OrderInventory, OrderNoGenerator, ORDER_INVENTORY_STATUS } from '@things-factory/sales-base'
5
+ import {
6
+ ORDER_INVENTORY_STATUS,
7
+ ORDER_PRODUCT_STATUS,
8
+ OrderInventory,
9
+ OrderNoGenerator,
10
+ OrderProduct
11
+ } from '@things-factory/sales-base'
12
+ import { Domain } from '@things-factory/shell'
3
13
  import { Inventory } from '@things-factory/warehouse-base'
4
- import { EntityManager } from 'typeorm'
14
+
5
15
  import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
6
16
  import { Worksheet, WorksheetDetail } from '../../../entities'
7
17
  import { WorksheetNoGenerator } from '../../../utils'
8
- import { User } from '@things-factory/auth-base'
9
- import { Domain } from '@things-factory/shell'
10
18
 
11
19
  export const generateBatchPickingWorksheetDetailsResolver = {
12
20
  async generateBatchPickingWorksheetDetails(
@@ -124,6 +132,11 @@ export const generateBatchPickingWorksheetDetailsResolver = {
124
132
  }
125
133
  )
126
134
 
135
+ // update order product status to ASSIGNED
136
+ await tx
137
+ .getRepository(OrderProduct)
138
+ .update({ id: prevOrdInv.orderProduct.id }, { status: ORDER_PRODUCT_STATUS.ASSIGNED, updater: user })
139
+
127
140
  // Generate Worksheet Detail
128
141
  let newWorksheetDetail: WorksheetDetail = new WorksheetDetail()
129
142
  newWorksheetDetail = {
package/server/graphql/resolvers/worksheet-detail/generate-picking-worksheet-details.ts CHANGED
@@ -3,12 +3,13 @@ import { EntityManager } from 'typeorm'
3
3
  import { User } from '@things-factory/auth-base'
4
4
  import {
5
5
  ORDER_INVENTORY_STATUS,
6
+ ORDER_PRODUCT_STATUS,
6
7
  ORDER_TYPES,
7
8
  OrderInventory,
8
9
  OrderInventoryPatch,
9
10
  OrderNoGenerator,
10
- ReleaseGood,
11
- OrderProduct
11
+ OrderProduct,
12
+ ReleaseGood
12
13
  } from '@things-factory/sales-base'
13
14
  import { Setting } from '@things-factory/setting-base'
14
15
  import { Domain } from '@things-factory/shell'
@@ -117,6 +118,11 @@ export const generatePickingWorksheetDetailsResolver = {
117
118
  .where('id = :id', { id: targetInventory.inventory.id })
118
119
  .execute()
119
120
 
121
+ // update order product status to ASSIGNED
122
+ await tx
123
+ .getRepository(OrderProduct)
124
+ .update({ id: targetInventory.orderProduct.id }, { status: ORDER_PRODUCT_STATUS.ASSIGNED, updater: user })
125
+
120
126
  // 7. collect new worksheet details records
121
127
  const worksheetDetail: WorksheetDetail = Object.assign(new WorksheetDetail(), {
122
128
  domain,
package/server/graphql/resolvers/worksheet-detail/generate-release-good-worksheet-details.ts CHANGED
@@ -2,7 +2,13 @@ import { EntityManager } from 'typeorm'
2
2
 
3
3
  import { User } from '@things-factory/auth-base'
4
4
  import { Product } from '@things-factory/product-base'
5
- import { ORDER_INVENTORY_STATUS, OrderInventory, OrderNoGenerator, OrderProduct } from '@things-factory/sales-base'
5
+ import {
6
+ ORDER_INVENTORY_STATUS,
7
+ ORDER_PRODUCT_STATUS,
8
+ OrderInventory,
9
+ OrderNoGenerator,
10
+ OrderProduct
11
+ } from '@things-factory/sales-base'
6
12
  import { Domain } from '@things-factory/shell'
7
13
  import { Inventory } from '@things-factory/warehouse-base'
8
14
 
@@ -110,6 +116,11 @@ export async function generateReleaseGoodWorksheetDetails(
110
116
  updater: user
111
117
  })
112
118
 
119
+ // update order product status to ASSIGNED
120
+ await tx
121
+ .getRepository(OrderProduct)
122
+ .update({ id: targetProduct.id }, { status: ORDER_PRODUCT_STATUS.ASSIGNED, updater: user })
123
+
113
124
  // 3. Create worksheet details
114
125
  await tx.getRepository(WorksheetDetail).save({
115
126
  ...wsd,