@things-factory/worksheet-base 4.3.37 → 4.3.38

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-po.js +18 -9
  2. package/dist-server/controllers/render-po.js.map +1 -1
  3. package/dist-server/graphql/resolvers/worksheet-detail/generate-pallet-id.js +2 -2
  4. package/dist-server/graphql/resolvers/worksheet-detail/generate-pallet-id.js.map +1 -1
  5. package/dist-server/graphql/types/worksheet-detail/inventory-detail.js +1 -0
  6. package/dist-server/graphql/types/worksheet-detail/inventory-detail.js.map +1 -1
  7. package/package.json +15 -15
  8. package/server/controllers/render-po.ts +30 -13
  9. package/server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts +2 -1
  10. package/server/graphql/types/worksheet-detail/inventory-detail.ts +1 -0
package/dist-server/controllers/render-po.js CHANGED
@@ -29,6 +29,7 @@ async function renderPO({ req, timezoneOffSet }, context) {
29
29
  .innerJoinAndSelect('bizplace.company', 'company')
30
30
  .innerJoinAndSelect('company.domain', 'company_domain')
31
31
  .leftJoinAndSelect('contact_points', 'cp', 'po.supplier_id = cp.id')
32
+ .leftJoinAndSelect('arrival_notices', 'an', 'an.purchase_order_id = po.id')
32
33
  .where('po.id = :poId')
33
34
  .andWhere('po.domain = :domainId')
34
35
  .setParameters({ poId, domainId: domain.id });
@@ -75,13 +76,16 @@ async function renderPO({ req, timezoneOffSet }, context) {
75
76
  product_sku: item.p_sku,
76
77
  product_name: item.p_name,
77
78
  product_desc: item.p_description,
79
+ product_remark: item.op_remark,
78
80
  product_qty: item.op_pack_qty,
79
81
  product_uom: item.op_uom,
80
82
  product_other_charges: item.ip_other_charges,
81
- product_unit_price: (item.op_unit_price).toFixed(2),
82
- product_total_price: ((((item.op_unit_price || 0) * item.op_pack_qty) - (item.op_discount_amt || 0)) * (1 + (item.op_tax_rate / 100))).toFixed(2),
83
+ product_unit_price: item.op_unit_price.toFixed(2),
84
+ product_total_price: (((item.op_unit_price || 0) * item.op_pack_qty - (item.op_discount_amt || 0)) *
85
+ (1 + item.op_tax_rate / 100)).toFixed(2),
83
86
  product_tax_rate: item.op_tax_rate,
84
- product_disc_amt: item.op_discount_amt
87
+ product_disc_amt: item.op_discount_amt,
88
+ ref_no: record.po_ref_no
85
89
  };
86
90
  });
87
91
  let date = datetime_util_1.DateTimeConverter.date(new Date(record.po_created_at - timezoneOffSet));
@@ -94,6 +98,7 @@ async function renderPO({ req, timezoneOffSet }, context) {
94
98
  company_name: record.company_description,
95
99
  company_address: record.company_address,
96
100
  company_postal_code: record.company_postal_code,
101
+ an_name: record.an_name,
97
102
  po_number: record.po_name,
98
103
  po_order_date: date,
99
104
  po_delivery_date: eta,
@@ -106,14 +111,18 @@ async function renderPO({ req, timezoneOffSet }, context) {
106
111
  product_list,
107
112
  charges_list: [
108
113
  {
109
- field: 'SUBTOTAL', value: subtotal.toFixed(2)
114
+ field: 'SUBTOTAL',
115
+ value: subtotal.toFixed(2)
110
116
  },
111
- ...poOtherCharges.map(itm => { return { field: itm.pooc_name.toUpperCase(), value: itm.pooc_total_amt.toFixed(2) }; }),
117
+ ...poOtherCharges.map(itm => {
118
+ return { field: itm.pooc_name.toUpperCase(), value: itm.pooc_total_amt.toFixed(2) };
119
+ }),
112
120
  {
113
- field: 'TOTAL', value: (poOtherCharges.reduce((init, item) => {
114
- return init += (item.pooc_total_amt);
115
- }, subtotal) || 0).toFixed(2),
116
- },
121
+ field: 'TOTAL',
122
+ value: (poOtherCharges.reduce((init, item) => {
123
+ return (init += item.pooc_total_amt);
124
+ }, subtotal) || 0).toFixed(2)
125
+ }
117
126
  ]
118
127
  };
119
128
  const formData = new form_data_1.default();
package/dist-server/controllers/render-po.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"render-po.js","sourceRoot":"","sources":["../../server/controllers/render-po.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render-po.js","sourceRoot":"","sources":["../../server/controllers/render-po.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/worksheet-detail/generate-pallet-id.js CHANGED
@@ -6,7 +6,7 @@ const id_rule_base_1 = require("@things-factory/id-rule-base");
6
6
  const entities_1 = require("../../../entities");
7
7
  exports.generatePalletIdResolver = {
8
8
  async generatePalletId(_, { targets, type }, context) {
9
- var _a, _b, _c;
9
+ var _a, _b, _c, _d;
10
10
  const { tx, domain } = context.state;
11
11
  // 1. get date in yymmdd format
12
12
  const date = new Date().toJSON().slice(0, 10).replace(/-/g, '').slice(2, 8);
@@ -45,7 +45,7 @@ exports.generatePalletIdResolver = {
45
45
  let result = {};
46
46
  // 5. map all data to be returned
47
47
  if (foundWSD.targetProduct) {
48
- result = Object.assign(Object.assign({}, foundWSD.targetProduct), { bizplace: foundWSD.bizplace, orderProductRemark: foundWSD.targetProduct.remark, purchaseOrderNo: ((_b = (_a = foundWSD.targetProduct.arrivalNotice) === null || _a === void 0 ? void 0 : _a.purchaseOrder) === null || _b === void 0 ? void 0 : _b.name) || '', arrivalNoticeRefNo: ((_c = foundWSD.targetProduct.arrivalNotice) === null || _c === void 0 ? void 0 : _c.refNo) || '' });
48
+ result = Object.assign(Object.assign({}, foundWSD.targetProduct), { bizplace: foundWSD.bizplace, orderProductRemark: foundWSD.targetProduct.remark, purchaseOrderNo: ((_b = (_a = foundWSD.targetProduct.arrivalNotice) === null || _a === void 0 ? void 0 : _a.purchaseOrder) === null || _b === void 0 ? void 0 : _b.name) || '', arrivalNoticeRefNo: ((_c = foundWSD.targetProduct.arrivalNotice) === null || _c === void 0 ? void 0 : _c.refNo) || '', arrivalNoticeNo: ((_d = foundWSD.targetProduct.arrivalNotice) === null || _d === void 0 ? void 0 : _d.name) || '' });
49
49
  }
50
50
  else if (foundWSD.targetInventory) {
51
51
  result = Object.assign(Object.assign({}, foundWSD.targetInventory), { bizplace: foundWSD.bizplace, orderProductRemark: '', purchaseOrderNo: '', arrivalNoticeRefNo: '' });
package/dist-server/graphql/resolvers/worksheet-detail/generate-pallet-id.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate-pallet-id.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate-pallet-id.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/types/worksheet-detail/inventory-detail.js CHANGED
@@ -39,6 +39,7 @@ exports.InventoryDetail = (0, graphql_tag_1.default) `
39
39
  orderProductRemark: String
40
40
  purchaseOrderNo: String
41
41
  arrivalNoticeRefNo: String
42
+ arrivalNoticeNo: String
42
43
  }
43
44
  `;
44
45
  //# sourceMappingURL=inventory-detail.js.map
package/dist-server/graphql/types/worksheet-detail/inventory-detail.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"inventory-detail.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet-detail/inventory-detail.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,eAAe,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmCjC,CAAA"}
1
+ {"version":3,"file":"inventory-detail.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet-detail/inventory-detail.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,eAAe,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoCjC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/worksheet-base",
3
- "version": "4.3.37",
3
+ "version": "4.3.38",
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.35",
28
- "@things-factory/biz-base": "^4.3.35",
27
+ "@things-factory/auth-base": "^4.3.38",
28
+ "@things-factory/biz-base": "^4.3.38",
29
29
  "@things-factory/document-template-base": "^4.3.35",
30
- "@things-factory/id-rule-base": "^4.3.35",
31
- "@things-factory/integration-lmd": "^4.3.35",
32
- "@things-factory/integration-marketplace": "^4.3.37",
33
- "@things-factory/integration-sellercraft": "^4.3.37",
34
- "@things-factory/integration-sftp": "^4.3.37",
35
- "@things-factory/marketplace-base": "^4.3.37",
36
- "@things-factory/notification": "^4.3.35",
37
- "@things-factory/sales-base": "^4.3.37",
38
- "@things-factory/setting-base": "^4.3.35",
30
+ "@things-factory/id-rule-base": "^4.3.38",
31
+ "@things-factory/integration-lmd": "^4.3.38",
32
+ "@things-factory/integration-marketplace": "^4.3.38",
33
+ "@things-factory/integration-sellercraft": "^4.3.38",
34
+ "@things-factory/integration-sftp": "^4.3.38",
35
+ "@things-factory/marketplace-base": "^4.3.38",
36
+ "@things-factory/notification": "^4.3.38",
37
+ "@things-factory/sales-base": "^4.3.38",
38
+ "@things-factory/setting-base": "^4.3.38",
39
39
  "@things-factory/shell": "^4.3.35",
40
- "@things-factory/transport-base": "^4.3.35",
41
- "@things-factory/warehouse-base": "^4.3.37"
40
+ "@things-factory/transport-base": "^4.3.38",
41
+ "@things-factory/warehouse-base": "^4.3.38"
42
42
  },
43
- "gitHead": "63cc1d86f82b002d7bd96a72347e8d333c1b696a"
43
+ "gitHead": "d0abc65661e7d6ddf1e89788e2775f90ead2393f"
44
44
  }
package/server/controllers/render-po.ts CHANGED
@@ -5,7 +5,13 @@ import { getRepository, SelectQueryBuilder } from 'typeorm'
5
5
  import { Attachment, STORAGE } from '@things-factory/attachment-base'
6
6
  import { Bizplace } from '@things-factory/biz-base'
7
7
  import { config } from '@things-factory/env'
8
- import { InvoiceProduct, ReleaseGood, PurchaseOrder, PurchaseOrderOtherCharge, OrderProduct } from '@things-factory/sales-base'
8
+ import {
9
+ InvoiceProduct,
10
+ ReleaseGood,
11
+ PurchaseOrder,
12
+ PurchaseOrderOtherCharge,
13
+ OrderProduct
14
+ } from '@things-factory/sales-base'
9
15
 
10
16
  import { Domain } from '@things-factory/shell'
11
17
 
@@ -31,6 +37,7 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
31
37
  .innerJoinAndSelect('bizplace.company', 'company')
32
38
  .innerJoinAndSelect('company.domain', 'company_domain')
33
39
  .leftJoinAndSelect('contact_points', 'cp', 'po.supplier_id = cp.id')
40
+ .leftJoinAndSelect('arrival_notices', 'an', 'an.purchase_order_id = po.id')
34
41
  .where('po.id = :poId')
35
42
  .andWhere('po.domain = :domainId')
36
43
  .setParameters({ poId, domainId: domain.id })
@@ -71,7 +78,6 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
71
78
 
72
79
  let poOtherCharges: any[] = await poocQb.getRawMany()
73
80
 
74
-
75
81
  const qb: SelectQueryBuilder<OrderProduct> = await getRepository(OrderProduct)
76
82
  .createQueryBuilder('op')
77
83
  .innerJoin('domains', 'd', 'op.domain_id = d.id')
@@ -89,17 +95,21 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
89
95
  product_sku: item.p_sku,
90
96
  product_name: item.p_name,
91
97
  product_desc: item.p_description,
98
+ product_remark: item.op_remark,
92
99
  product_qty: item.op_pack_qty,
93
100
  product_uom: item.op_uom,
94
101
  product_other_charges: item.ip_other_charges,
95
- product_unit_price: (item.op_unit_price).toFixed(2),
96
- product_total_price: ((((item.op_unit_price || 0) * item.op_pack_qty) - (item.op_discount_amt || 0)) * (1 + (item.op_tax_rate / 100))).toFixed(2),
102
+ product_unit_price: item.op_unit_price.toFixed(2),
103
+ product_total_price: (
104
+ ((item.op_unit_price || 0) * item.op_pack_qty - (item.op_discount_amt || 0)) *
105
+ (1 + item.op_tax_rate / 100)
106
+ ).toFixed(2),
97
107
  product_tax_rate: item.op_tax_rate,
98
- product_disc_amt: item.op_discount_amt
108
+ product_disc_amt: item.op_discount_amt,
109
+ ref_no: record.po_ref_no
99
110
  }
100
111
  })
101
112
 
102
-
103
113
  let date = DateTimeConverter.date(new Date(record.po_created_at - timezoneOffSet))
104
114
  let eta = DateTimeConverter.date(new Date(record.po_eta_date))
105
115
 
@@ -114,6 +124,7 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
114
124
  company_name: record.company_description,
115
125
  company_address: record.company_address,
116
126
  company_postal_code: record.company_postal_code,
127
+ an_name: record.an_name,
117
128
  po_number: record.po_name,
118
129
  po_order_date: date,
119
130
  po_delivery_date: eta,
@@ -126,14 +137,20 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
126
137
  product_list,
127
138
  charges_list: [
128
139
  {
129
- field: 'SUBTOTAL', value: subtotal.toFixed(2)
140
+ field: 'SUBTOTAL',
141
+ value: subtotal.toFixed(2)
130
142
  },
131
- ...poOtherCharges.map(itm => { return { field: itm.pooc_name.toUpperCase(), value: itm.pooc_total_amt.toFixed(2) } }),
143
+ ...poOtherCharges.map(itm => {
144
+ return { field: itm.pooc_name.toUpperCase(), value: itm.pooc_total_amt.toFixed(2) }
145
+ }),
132
146
  {
133
- field: 'TOTAL', value: (poOtherCharges.reduce((init, item) => {
134
- return init += (item.pooc_total_amt)
135
- }, subtotal) || 0).toFixed(2),
136
- },
147
+ field: 'TOTAL',
148
+ value: (
149
+ poOtherCharges.reduce((init, item) => {
150
+ return (init += item.pooc_total_amt)
151
+ }, subtotal) || 0
152
+ ).toFixed(2)
153
+ }
137
154
  ]
138
155
  }
139
156
 
@@ -141,7 +158,7 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
141
158
  formData.append('template', template)
142
159
  formData.append('jsonString', JSON.stringify(data))
143
160
 
144
- const response = await fetch(REPORT_API_URL, {
161
+ const response = await fetch(REPORT_API_URL, {
145
162
  method: 'POST',
146
163
  body: formData
147
164
  })
package/server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts CHANGED
@@ -51,7 +51,8 @@ export const generatePalletIdResolver = {
51
51
  bizplace: foundWSD.bizplace,
52
52
  orderProductRemark: foundWSD.targetProduct.remark,
53
53
  purchaseOrderNo: foundWSD.targetProduct.arrivalNotice?.purchaseOrder?.name || '',
54
- arrivalNoticeRefNo: foundWSD.targetProduct.arrivalNotice?.refNo || ''
54
+ arrivalNoticeRefNo: foundWSD.targetProduct.arrivalNotice?.refNo || '',
55
+ arrivalNoticeNo: foundWSD.targetProduct.arrivalNotice?.name || ''
55
56
  }
56
57
  } else if (foundWSD.targetInventory) {
57
58
  result = {
package/server/graphql/types/worksheet-detail/inventory-detail.ts CHANGED
@@ -34,5 +34,6 @@ export const InventoryDetail = gql`
34
34
  orderProductRemark: String
35
35
  purchaseOrderNo: String
36
36
  arrivalNoticeRefNo: String
37
+ arrivalNoticeNo: String
37
38
  }
38
39
  `