@things-factory/worksheet-base 4.1.26 → 4.1.27

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/controllers/inbound/unloading-worksheet-controller.js +4 -4
  2. package/dist-server/controllers/render-orientage-grn.js +1 -1
  3. package/dist-server/controllers/render-seebuu-grn.js +1 -1
  4. package/package.json +17 -17
  5. package/server/controllers/inbound/unloading-worksheet-controller.ts +4 -4
  6. package/server/controllers/render-orientage-grn.ts +1 -1
  7. package/server/controllers/render-seebuu-grn.ts +1 -1
package/dist-server/controllers/inbound/unloading-worksheet-controller.js CHANGED
@@ -67,7 +67,7 @@ class UnloadingWorksheetController extends vas_worksheet_controller_1.VasWorkshe
67
67
  const packingType = Boolean(arrivalNotice) ? targetProduct.packingType : targetInventory.packingType;
68
68
  const packingSize = Boolean(arrivalNotice) ? targetProduct.packingSize : targetInventory.packingSize;
69
69
  const remark = Boolean(arrivalNotice) ? targetProduct.remark : targetInventory.remark;
70
- const manufactureYear = Boolean(arrivalNotice) ? targetProduct.manufactureYear : null;
70
+ const manufactureDate = Boolean(arrivalNotice) ? targetProduct.manufactureDate : null;
71
71
  let qty = inventory.qty;
72
72
  let uom = Boolean(arrivalNotice) ? targetProduct.uom : originInventory.uom;
73
73
  const location = worksheet.bufferLocation;
@@ -140,7 +140,7 @@ class UnloadingWorksheetController extends vas_worksheet_controller_1.VasWorkshe
140
140
  newInventory.reusablePallet = await this.trxMgr.getRepository(warehouse_base_1.Pallet).findOne(inventory.reusablePallet.id);
141
141
  }
142
142
  if (arrivalNotice) {
143
- newInventory.manufactureYear = manufactureYear;
143
+ newInventory.manufactureDate = manufactureDate;
144
144
  newInventory.batchIdRef = batchIdRef;
145
145
  newInventory.orderProductId = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.id;
146
146
  }
@@ -266,7 +266,7 @@ class UnloadingWorksheetController extends vas_worksheet_controller_1.VasWorkshe
266
266
  let foundInventory = await invQb.getOne();
267
267
  const batchIdRef = Boolean(arrivalNotice) ? targetProduct.batchIdRef : null;
268
268
  const remark = Boolean(arrivalNotice) ? targetProduct.remark : targetInventory.remark;
269
- const manufactureYear = Boolean(arrivalNotice) ? targetProduct.manufactureYear : null;
269
+ const manufactureDate = Boolean(arrivalNotice) ? targetProduct.manufactureDate : null;
270
270
  const location = worksheet.bufferLocation;
271
271
  const warehouse = location.warehouse;
272
272
  const zone = location.zone;
@@ -298,7 +298,7 @@ class UnloadingWorksheetController extends vas_worksheet_controller_1.VasWorkshe
298
298
  ? targetProduct.uomValue
299
299
  : targetInventory.returnUomValue / targetInventory.returnQty) *
300
300
  100) / 100;
301
- newInventory.manufactureYear = manufactureYear;
301
+ newInventory.manufactureDate = manufactureDate;
302
302
  newInventory.refOrderId = orderId;
303
303
  newInventory.unitCost = unitCost;
304
304
  if ((_a = inventory.reusablePallet) === null || _a === void 0 ? void 0 : _a.id) {
package/dist-server/controllers/render-orientage-grn.js CHANGED
@@ -132,7 +132,7 @@ async function renderOrientageGRN({ grnNo }, context) {
132
132
  : ((_b = item === null || item === void 0 ? void 0 : item.product) === null || _b === void 0 ? void 0 : _b.volume)
133
133
  ? Number((item.product.volume * item.actualPackQty).toFixed(4))
134
134
  : 0,
135
- manufacture_year: item.manufactureYear ? item.manufactureYear : null,
135
+ manufacture_date: item.manufactureDate ? item.manufactureDate : null,
136
136
  literage: matchedProductDetail
137
137
  ? matchedProductDetail.packingSize
138
138
  ? parseFloat(matchedProductDetail.packingSize) * parseFloat(item.product.volumeSize)
package/dist-server/controllers/render-seebuu-grn.js CHANGED
@@ -62,7 +62,7 @@ async function renderSeebuuGRN({ grnNo }, context) {
62
62
  coalesce((select nett_weight from product_details prdw where prdw.product_id = op.product_id and prdw.packing_type = op.packing_type and prdw.packing_size = op.packing_size order by nett_weight desc limit 1),0) as unit_nett_weight,
63
63
  coalesce((select gross_weight from product_details prdw where prdw.product_id = op.product_id and prdw.packing_type = op.packing_type and prdw.packing_size = op.packing_size order by nett_weight desc limit 1),0) as unit_gross_weight,
64
64
  op.unit_price, op.unpack_uom_value, op.unpack_qty, op.discount_amt, op.tax_rate, op.misc_amt,
65
- op.adjusted_packing_type, op.manufacture_year, op.adjusted_uom, op.adjusted_uom_value, op.adjusted_pack_qty, op.adjusted_total_uom_value,
65
+ op.adjusted_packing_type, op.manufacture_date, op.adjusted_uom, op.adjusted_uom_value, op.adjusted_pack_qty, op.adjusted_total_uom_value,
66
66
  op.batch_id_ref, op.adjusted_batch_id_ref,
67
67
  op.adjusted_unit_price, op.packing_size, op.release_uom_value,
68
68
  ih.expiry_date as expiration_date, p.sku as product_sku, p.name as product_name, p.description as product_description,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/worksheet-base",
3
- "version": "4.1.26",
3
+ "version": "4.1.27",
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.1.22",
28
- "@things-factory/biz-base": "^4.1.22",
29
- "@things-factory/document-template-base": "^4.1.22",
30
- "@things-factory/id-rule-base": "^4.1.22",
31
- "@things-factory/integration-lmd": "^4.1.22",
32
- "@things-factory/integration-marketplace": "^4.1.22",
33
- "@things-factory/integration-sellercraft": "^4.1.22",
34
- "@things-factory/integration-sftp": "^4.1.24",
35
- "@things-factory/marketplace-base": "^4.1.22",
36
- "@things-factory/notification": "^4.1.22",
37
- "@things-factory/sales-base": "^4.1.24",
38
- "@things-factory/setting-base": "^4.1.22",
39
- "@things-factory/shell": "^4.1.22",
40
- "@things-factory/transport-base": "^4.1.22",
41
- "@things-factory/warehouse-base": "^4.1.22"
27
+ "@things-factory/auth-base": "^4.1.27",
28
+ "@things-factory/biz-base": "^4.1.27",
29
+ "@things-factory/document-template-base": "^4.1.27",
30
+ "@things-factory/id-rule-base": "^4.1.27",
31
+ "@things-factory/integration-lmd": "^4.1.27",
32
+ "@things-factory/integration-marketplace": "^4.1.27",
33
+ "@things-factory/integration-sellercraft": "^4.1.27",
34
+ "@things-factory/integration-sftp": "^4.1.27",
35
+ "@things-factory/marketplace-base": "^4.1.27",
36
+ "@things-factory/notification": "^4.1.27",
37
+ "@things-factory/sales-base": "^4.1.27",
38
+ "@things-factory/setting-base": "^4.1.27",
39
+ "@things-factory/shell": "^4.1.27",
40
+ "@things-factory/transport-base": "^4.1.27",
41
+ "@things-factory/warehouse-base": "^4.1.27"
42
42
  },
43
- "gitHead": "97609aeea908d153e08fc4fc8a6ded7b9443f582"
43
+ "gitHead": "d2bcc934a52e1a2f68738ec8b56ad72503172f6f"
44
44
  }
package/server/controllers/inbound/unloading-worksheet-controller.ts CHANGED
@@ -114,7 +114,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
114
114
  const packingType: string = Boolean(arrivalNotice) ? targetProduct.packingType : targetInventory.packingType
115
115
  const packingSize: number = Boolean(arrivalNotice) ? targetProduct.packingSize : targetInventory.packingSize
116
116
  const remark: string = Boolean(arrivalNotice) ? targetProduct.remark : targetInventory.remark
117
- const manufactureYear: number = Boolean(arrivalNotice) ? targetProduct.manufactureYear : null
117
+ const manufactureDate: number = Boolean(arrivalNotice) ? targetProduct.manufactureDate : null
118
118
  let qty: number = inventory.qty
119
119
  let uom: string = Boolean(arrivalNotice) ? targetProduct.uom : originInventory.uom
120
120
  const location: Location = worksheet.bufferLocation
@@ -202,7 +202,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
202
202
  newInventory.reusablePallet = await this.trxMgr.getRepository(Pallet).findOne(inventory.reusablePallet.id)
203
203
  }
204
204
  if (arrivalNotice) {
205
- newInventory.manufactureYear = manufactureYear
205
+ newInventory.manufactureDate = manufactureDate
206
206
  newInventory.batchIdRef = batchIdRef
207
207
  newInventory.orderProductId = targetProduct?.id
208
208
  } else if (returnOrder) {
@@ -351,7 +351,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
351
351
 
352
352
  const batchIdRef: string = Boolean(arrivalNotice) ? targetProduct.batchIdRef : null
353
353
  const remark: string = Boolean(arrivalNotice) ? targetProduct.remark : targetInventory.remark
354
- const manufactureYear: number = Boolean(arrivalNotice) ? targetProduct.manufactureYear : null
354
+ const manufactureDate: number = Boolean(arrivalNotice) ? targetProduct.manufactureDate : null
355
355
  const location: Location = worksheet.bufferLocation
356
356
  const warehouse: Warehouse = location.warehouse
357
357
  const zone: string = location.zone
@@ -386,7 +386,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
386
386
  : targetInventory.returnUomValue / targetInventory.returnQty) *
387
387
  100
388
388
  ) / 100
389
- newInventory.manufactureYear = manufactureYear
389
+ newInventory.manufactureDate = manufactureDate
390
390
  newInventory.refOrderId = orderId
391
391
  newInventory.unitCost = unitCost
392
392
  if (inventory.reusablePallet?.id) {
package/server/controllers/render-orientage-grn.ts CHANGED
@@ -151,7 +151,7 @@ export async function renderOrientageGRN({ grnNo }, context: any) {
151
151
  : item?.product?.volume
152
152
  ? Number((item.product.volume * item.actualPackQty).toFixed(4))
153
153
  : 0,
154
- manufacture_year: item.manufactureYear ? item.manufactureYear : null,
154
+ manufacture_date: item.manufactureDate ? item.manufactureDate : null,
155
155
  literage: matchedProductDetail
156
156
  ? matchedProductDetail.packingSize
157
157
  ? parseFloat(matchedProductDetail.packingSize) * parseFloat(item.product.volumeSize)
package/server/controllers/render-seebuu-grn.ts CHANGED
@@ -71,7 +71,7 @@ export async function renderSeebuuGRN({ grnNo }, context: any) {
71
71
  coalesce((select nett_weight from product_details prdw where prdw.product_id = op.product_id and prdw.packing_type = op.packing_type and prdw.packing_size = op.packing_size order by nett_weight desc limit 1),0) as unit_nett_weight,
72
72
  coalesce((select gross_weight from product_details prdw where prdw.product_id = op.product_id and prdw.packing_type = op.packing_type and prdw.packing_size = op.packing_size order by nett_weight desc limit 1),0) as unit_gross_weight,
73
73
  op.unit_price, op.unpack_uom_value, op.unpack_qty, op.discount_amt, op.tax_rate, op.misc_amt,
74
- op.adjusted_packing_type, op.manufacture_year, op.adjusted_uom, op.adjusted_uom_value, op.adjusted_pack_qty, op.adjusted_total_uom_value,
74
+ op.adjusted_packing_type, op.manufacture_date, op.adjusted_uom, op.adjusted_uom_value, op.adjusted_pack_qty, op.adjusted_total_uom_value,
75
75
  op.batch_id_ref, op.adjusted_batch_id_ref,
76
76
  op.adjusted_unit_price, op.packing_size, op.release_uom_value,
77
77
  ih.expiry_date as expiration_date, p.sku as product_sku, p.name as product_name, p.description as product_description,