@things-factory/sales-base 4.3.816 → 4.3.817

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.
@@ -167,8 +167,8 @@ let GoodsReceivalNoteQuery = class GoodsReceivalNoteQuery {
167
167
  .addSelect('sum(uom_value)', 'uomValue')
168
168
  .addSelect('uom', 'uom')
169
169
  .addSelect('count(distinct pallet_id)', 'pallet')
170
- .addSelect(`string_agg(distinct expiration_date::varchar,', ' order by expiration_date::varchar)`, 'expiryDate')
171
- .addSelect(`string_agg(distinct manufacture_date::varchar,', ' order by manufacture_date::varchar)`, 'manufactureDate')
170
+ .addSelect('expiration_date', 'expiryDate')
171
+ .addSelect('manufacture_date', 'manufactureDate')
172
172
  .addSelect(`string_agg(distinct pallet_id::varchar,', ' order by pallet_id::varchar)`, 'palletId')
173
173
  .where('ivh.domain_id = :domainId', { domainId: domain.id })
174
174
  .andWhere('ivh.ref_order_id = :refOrderId', { refOrderId: foundGAN.id })
@@ -178,6 +178,8 @@ let GoodsReceivalNoteQuery = class GoodsReceivalNoteQuery {
178
178
  .addGroupBy('batch_id')
179
179
  .addGroupBy('packing_type')
180
180
  .addGroupBy('uom')
181
+ .addGroupBy('expiration_date')
182
+ .addGroupBy('manufacture_date')
181
183
  .getRawMany();
182
184
  // 5. find domain contact point
183
185
  const foundCP = await (0, typeorm_1.getRepository)(biz_base_1.ContactPoint).findOne({
@@ -198,30 +200,72 @@ let GoodsReceivalNoteQuery = class GoodsReceivalNoteQuery {
198
200
  companyDomain: domainBizplace.company.name,
199
201
  supplier: foundCP.name || '',
200
202
  date: foundGAN.acceptedAt ? datetime_util_1.DateTimeConverter.datetime(foundGAN.acceptedAt, timezoneOffSet) : '',
201
- productLists: targetProducts.map((item, idx) => {
202
- var _a, _b, _c;
203
- let unloadInvHistory = inboundInventories.find(ih => ih.productId == item.product.id &&
204
- ih.batchId == item.batchId &&
205
- ih.packingType == item.packingType &&
206
- ih.uom == item.uom);
207
- return {
208
- list_no: idx + 1,
209
- po: ((_b = (_a = item === null || item === void 0 ? void 0 : item.arrivalNotice) === null || _a === void 0 ? void 0 : _a.purchaseOrder) === null || _b === void 0 ? void 0 : _b.name) ? (_c = item === null || item === void 0 ? void 0 : item.arrivalNotice) === null || _c === void 0 ? void 0 : _c.purchaseOrder.name : '',
210
- batchNo: item.batchId || '',
211
- productSKU: `${item.product.sku}`,
212
- productName: `${item.product.name}(${item.product.description})`,
213
- productType: item.packingType,
214
- productBatch: item.batchId,
215
- expectedQty: item.packQty,
216
- actualQty: unloadInvHistory.qty || item.actualPackQty,
217
- actualUomValue: item.uomValue * item.actualPackQty,
218
- productUom: `${unloadInvHistory.uom || item.uom}`,
219
- expiryDate: unloadInvHistory.expiryDate || '',
220
- unitPrice: item.unitPrice.toFixed(2) || 0.0,
221
- manufactureDate: unloadInvHistory.manufactureDate || item.manufactureDate || '',
222
- remark: (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '')
203
+ productLists: (() => {
204
+ let listNo = 0;
205
+ const formatDate = (val) => {
206
+ if (!val)
207
+ return '';
208
+ const d = val instanceof Date ? val : new Date(val);
209
+ if (isNaN(d.getTime()))
210
+ return String(val);
211
+ const dd = String(d.getDate()).padStart(2, '0');
212
+ const mm = String(d.getMonth() + 1).padStart(2, '0');
213
+ const yyyy = d.getFullYear();
214
+ return `${dd}/${mm}/${yyyy}`;
223
215
  };
224
- })
216
+ return targetProducts.flatMap(item => {
217
+ var _a, _b, _c;
218
+ let matchingHistories = inboundInventories.filter(ih => ih.productId == item.product.id &&
219
+ ih.batchId == item.batchId &&
220
+ ih.packingType == item.packingType &&
221
+ ih.uom == item.uom);
222
+ // If no matching histories found, return a single row with order product data
223
+ if (!matchingHistories.length) {
224
+ listNo++;
225
+ return [{
226
+ list_no: listNo,
227
+ po: ((_b = (_a = item === null || item === void 0 ? void 0 : item.arrivalNotice) === null || _a === void 0 ? void 0 : _a.purchaseOrder) === null || _b === void 0 ? void 0 : _b.name) ? (_c = item === null || item === void 0 ? void 0 : item.arrivalNotice) === null || _c === void 0 ? void 0 : _c.purchaseOrder.name : '',
228
+ batchNo: item.batchId || '',
229
+ productSKU: `${item.product.sku}`,
230
+ productName: item.product.name,
231
+ productDescription: item.product.description || '',
232
+ productType: item.packingType,
233
+ productBatch: item.batchId,
234
+ expectedQty: item.packQty,
235
+ actualQty: item.actualPackQty,
236
+ actualUomValue: item.uomValue * item.actualPackQty,
237
+ productUom: `${item.uom}`,
238
+ expiryDate: formatDate(item.expDate) || '',
239
+ unitPrice: item.unitPrice != null ? parseFloat(item.unitPrice.toFixed(2)) : 0.0,
240
+ manufactureDate: formatDate(item.manufactureDate) || '',
241
+ remark: (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '')
242
+ }];
243
+ }
244
+ // Return one row per expiration/manufacture date group
245
+ return matchingHistories.map(unloadInvHistory => {
246
+ var _a, _b, _c;
247
+ listNo++;
248
+ return {
249
+ list_no: listNo,
250
+ po: ((_b = (_a = item === null || item === void 0 ? void 0 : item.arrivalNotice) === null || _a === void 0 ? void 0 : _a.purchaseOrder) === null || _b === void 0 ? void 0 : _b.name) ? (_c = item === null || item === void 0 ? void 0 : item.arrivalNotice) === null || _c === void 0 ? void 0 : _c.purchaseOrder.name : '',
251
+ batchNo: item.batchId || '',
252
+ productSKU: `${item.product.sku}`,
253
+ productName: item.product.name,
254
+ productDescription: item.product.description || '',
255
+ productType: item.packingType,
256
+ productBatch: item.batchId,
257
+ expectedQty: matchingHistories.length === 1 ? item.packQty : null,
258
+ actualQty: unloadInvHistory.qty,
259
+ actualUomValue: unloadInvHistory.uomValue,
260
+ productUom: `${unloadInvHistory.uom || item.uom}`,
261
+ expiryDate: formatDate(unloadInvHistory.expiryDate),
262
+ unitPrice: item.unitPrice != null ? parseFloat(item.unitPrice.toFixed(2)) : 0.0,
263
+ manufactureDate: formatDate(unloadInvHistory.manufactureDate) || formatDate(item.manufactureDate) || '',
264
+ remark: (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '')
265
+ };
266
+ });
267
+ });
268
+ })()
225
269
  };
226
270
  return data;
227
271
  }
@@ -1 +1 @@
1
- {"version":3,"file":"goods-receival-note-query.js","sourceRoot":"","sources":["../../../server/service/goods-receival-note/goods-receival-note-query.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"goods-receival-note-query.js","sourceRoot":"","sources":["../../../server/service/goods-receival-note/goods-receival-note-query.ts"],"names":[],"mappings":"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"}
@@ -47,6 +47,10 @@ __decorate([
47
47
  (0, type_graphql_1.Field)({ nullable: true }),
48
48
  __metadata("design:type", String)
49
49
  ], ProductListsType.prototype, "productName", void 0);
50
+ __decorate([
51
+ (0, type_graphql_1.Field)({ nullable: true }),
52
+ __metadata("design:type", String)
53
+ ], ProductListsType.prototype, "productDescription", void 0);
50
54
  __decorate([
51
55
  (0, type_graphql_1.Field)({ nullable: true }),
52
56
  __metadata("design:type", String)
@@ -1 +1 @@
1
- {"version":3,"file":"goods-receival-note-types.js","sourceRoot":"","sources":["../../../server/service/goods-receival-note/goods-receival-note-types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"goods-receival-note-types.js","sourceRoot":"","sources":["../../../server/service/goods-receival-note/goods-receival-note-types.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/sales-base",
3
- "version": "4.3.816",
3
+ "version": "4.3.817",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -40,5 +40,5 @@
40
40
  "@things-factory/warehouse-base": "^4.3.815",
41
41
  "axios": "1.7.7"
42
42
  },
43
- "gitHead": "a8de177d8e01a3d7fb6af50656a9c1430fd9bdc3"
43
+ "gitHead": "1df87b891f86bf497c74d5228f9ced4d5714ddce"
44
44
  }
@@ -220,8 +220,8 @@ export class GoodsReceivalNoteQuery {
220
220
  .addSelect('sum(uom_value)', 'uomValue')
221
221
  .addSelect('uom', 'uom')
222
222
  .addSelect('count(distinct pallet_id)', 'pallet')
223
- .addSelect(`string_agg(distinct expiration_date::varchar,', ' order by expiration_date::varchar)`, 'expiryDate')
224
- .addSelect(`string_agg(distinct manufacture_date::varchar,', ' order by manufacture_date::varchar)`, 'manufactureDate')
223
+ .addSelect('expiration_date', 'expiryDate')
224
+ .addSelect('manufacture_date', 'manufactureDate')
225
225
  .addSelect(`string_agg(distinct pallet_id::varchar,', ' order by pallet_id::varchar)`, 'palletId')
226
226
  .where('ivh.domain_id = :domainId', { domainId: domain.id })
227
227
  .andWhere('ivh.ref_order_id = :refOrderId', { refOrderId: foundGAN.id })
@@ -231,6 +231,8 @@ export class GoodsReceivalNoteQuery {
231
231
  .addGroupBy('batch_id')
232
232
  .addGroupBy('packing_type')
233
233
  .addGroupBy('uom')
234
+ .addGroupBy('expiration_date')
235
+ .addGroupBy('manufacture_date')
234
236
  .getRawMany()
235
237
 
236
238
  // 5. find domain contact point
@@ -255,33 +257,73 @@ export class GoodsReceivalNoteQuery {
255
257
  companyDomain: domainBizplace.company.name,
256
258
  supplier: foundCP.name || '',
257
259
  date: foundGAN.acceptedAt ? DateTimeConverter.datetime(foundGAN.acceptedAt, timezoneOffSet) : '',
258
- productLists: targetProducts.map((item, idx) => {
259
- let unloadInvHistory = inboundInventories.find(
260
- ih =>
261
- ih.productId == item.product.id &&
262
- ih.batchId == item.batchId &&
263
- ih.packingType == item.packingType &&
264
- ih.uom == item.uom
265
- )
266
-
267
- return {
268
- list_no: idx + 1,
269
- po: item?.arrivalNotice?.purchaseOrder?.name ? item?.arrivalNotice?.purchaseOrder.name : '',
270
- batchNo: item.batchId || '',
271
- productSKU: `${item.product.sku}`,
272
- productName: `${item.product.name}(${item.product.description})`,
273
- productType: item.packingType,
274
- productBatch: item.batchId,
275
- expectedQty: item.packQty,
276
- actualQty: unloadInvHistory.qty || item.actualPackQty,
277
- actualUomValue: item.uomValue * item.actualPackQty,
278
- productUom: `${unloadInvHistory.uom || item.uom}`,
279
- expiryDate: unloadInvHistory.expiryDate || '',
280
- unitPrice: item.unitPrice.toFixed(2) || 0.0,
281
- manufactureDate: unloadInvHistory.manufactureDate || item.manufactureDate || '',
282
- remark: (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '')
260
+ productLists: (() => {
261
+ let listNo = 0
262
+ const formatDate = (val) => {
263
+ if (!val) return ''
264
+ const d = val instanceof Date ? val : new Date(val)
265
+ if (isNaN(d.getTime())) return String(val)
266
+ const dd = String(d.getDate()).padStart(2, '0')
267
+ const mm = String(d.getMonth() + 1).padStart(2, '0')
268
+ const yyyy = d.getFullYear()
269
+ return `${dd}/${mm}/${yyyy}`
283
270
  }
284
- })
271
+ return targetProducts.flatMap(item => {
272
+ let matchingHistories = inboundInventories.filter(
273
+ ih =>
274
+ ih.productId == item.product.id &&
275
+ ih.batchId == item.batchId &&
276
+ ih.packingType == item.packingType &&
277
+ ih.uom == item.uom
278
+ )
279
+
280
+ // If no matching histories found, return a single row with order product data
281
+ if (!matchingHistories.length) {
282
+ listNo++
283
+ return [{
284
+ list_no: listNo,
285
+ po: item?.arrivalNotice?.purchaseOrder?.name ? item?.arrivalNotice?.purchaseOrder.name : '',
286
+ batchNo: item.batchId || '',
287
+ productSKU: `${item.product.sku}`,
288
+ productName: item.product.name,
289
+ productDescription: item.product.description || '',
290
+ productType: item.packingType,
291
+ productBatch: item.batchId,
292
+ expectedQty: item.packQty,
293
+ actualQty: item.actualPackQty,
294
+ actualUomValue: item.uomValue * item.actualPackQty,
295
+ productUom: `${item.uom}`,
296
+ expiryDate: formatDate(item.expDate) || '',
297
+ unitPrice: item.unitPrice != null ? parseFloat(item.unitPrice.toFixed(2)) : 0.0,
298
+ manufactureDate: formatDate(item.manufactureDate) || '',
299
+ remark: (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '')
300
+ }]
301
+ }
302
+
303
+ // Return one row per expiration/manufacture date group
304
+ return matchingHistories.map(unloadInvHistory => {
305
+ listNo++
306
+ return {
307
+ list_no: listNo,
308
+ po: item?.arrivalNotice?.purchaseOrder?.name ? item?.arrivalNotice?.purchaseOrder.name : '',
309
+ batchNo: item.batchId || '',
310
+ productSKU: `${item.product.sku}`,
311
+ productName: item.product.name,
312
+ productDescription: item.product.description || '',
313
+ productType: item.packingType,
314
+ productBatch: item.batchId,
315
+ expectedQty: matchingHistories.length === 1 ? item.packQty : null,
316
+ actualQty: unloadInvHistory.qty,
317
+ actualUomValue: unloadInvHistory.uomValue,
318
+ productUom: `${unloadInvHistory.uom || item.uom}`,
319
+ expiryDate: formatDate(unloadInvHistory.expiryDate),
320
+ unitPrice: item.unitPrice != null ? parseFloat(item.unitPrice.toFixed(2)) : 0.0,
321
+ manufactureDate: formatDate(unloadInvHistory.manufactureDate) || formatDate(item.manufactureDate) || '',
322
+ remark: (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '')
323
+ }
324
+ })
325
+ })
326
+ })()
285
327
  }
286
328
 
287
329
  return data
@@ -34,6 +34,9 @@ export class ProductListsType {
34
34
  @Field({ nullable: true })
35
35
  productName: string
36
36
 
37
+ @Field({ nullable: true })
38
+ productDescription: string
39
+
37
40
  @Field({ nullable: true })
38
41
  productType: string
39
42