@things-factory/worksheet-base 4.3.42 → 4.3.45

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-orientage-do.js +37 -5
  2. package/dist-server/controllers/render-orientage-do.js.map +1 -1
  3. package/dist-server/controllers/render-ro-do.js +117 -83
  4. package/dist-server/controllers/render-ro-do.js.map +1 -1
  5. package/dist-server/utils/inventory-util.js +2 -0
  6. package/dist-server/utils/inventory-util.js.map +1 -1
  7. package/package.json +7 -7
  8. package/server/controllers/render-orientage-do.ts +39 -5
  9. package/server/controllers/render-ro-do.ts +140 -112
  10. package/server/utils/inventory-util.ts +2 -0
package/dist-server/controllers/render-orientage-do.js CHANGED
@@ -240,8 +240,26 @@ async function renderOrientageDO({ doNo }, context) {
240
240
  company_fax: foundWarehouseCP ? foundWarehouseCP.fax : null,
241
241
  warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
242
242
  company_email: foundWarehouseCP.email,
243
- customer_name: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.name) || foundRO.attentionTo || null,
243
+ customer_name: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.name) ||
244
+ foundDO.attentionTo ||
245
+ foundDO.attentionCompany ||
246
+ (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionTo) ||
247
+ (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionCompany) ||
248
+ null,
244
249
  customer_delivery_address: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.address) ||
250
+ [
251
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress1,
252
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress2,
253
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress3,
254
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress4,
255
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress5,
256
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.postalCode,
257
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.city,
258
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.state,
259
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.country
260
+ ]
261
+ .filter(Boolean)
262
+ .join(', ') ||
245
263
  [
246
264
  foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress1,
247
265
  foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress2,
@@ -256,13 +274,27 @@ async function renderOrientageDO({ doNo }, context) {
256
274
  .filter(Boolean)
257
275
  .join(', ') ||
258
276
  null,
259
- customer_billing_address: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.billingAddress) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.billingAddress) || null,
260
- customer_phone: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.phone) || foundRO.phone1 || null,
277
+ customer_billing_address: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.billingAddress) || (foundDO === null || foundDO === void 0 ? void 0 : foundDO.billingAddress) || null,
278
+ customer_phone: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.phone) || (foundDO === null || foundDO === void 0 ? void 0 : foundDO.phone1) || foundRO.phone1 || null,
261
279
  customer_fax: foundCP ? foundCP.fax : null,
262
280
  customer_email: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.email) || foundRO.email || null,
263
- customer_company: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.companyName) || foundRO.attentionCompany || null,
281
+ customer_company: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.companyName) || foundDO.attentionCompany || foundRO.attentionCompany || null,
264
282
  own_collection: ownTransportFlag ? '[SELF-COLLECTION]' : `[${domain.brandName} TRANSPORT]`,
265
- destination: foundDO.to || '',
283
+ destination: foundDO.to ||
284
+ [
285
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress1,
286
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress2,
287
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress3,
288
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress4,
289
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress5,
290
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.postalCode,
291
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.city,
292
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.state,
293
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.country
294
+ ]
295
+ .filter(Boolean)
296
+ .join(', ') ||
297
+ '',
266
298
  ref_no: ownRefNo,
267
299
  ref_no1: ownRefNo2 ? ownRefNo2 : '',
268
300
  ref_no2: ownRefNo3 ? ownRefNo3 : '',
package/dist-server/controllers/render-orientage-do.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"render-orientage-do.js","sourceRoot":"","sources":["../../server/controllers/render-orientage-do.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render-orientage-do.js","sourceRoot":"","sources":["../../server/controllers/render-orientage-do.ts"],"names":[],"mappings":"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"}
package/dist-server/controllers/render-ro-do.js CHANGED
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.renderRODO = void 0;
7
- const lodash_1 = __importDefault(require("lodash"));
8
7
  const form_data_1 = __importDefault(require("form-data"));
9
8
  const node_fetch_1 = __importDefault(require("node-fetch"));
10
9
  const typeorm_1 = require("typeorm");
@@ -15,12 +14,12 @@ const env_1 = require("@things-factory/env");
15
14
  const sales_base_1 = require("@things-factory/sales-base");
16
15
  const shell_1 = require("@things-factory/shell");
17
16
  const warehouse_base_1 = require("@things-factory/warehouse-base");
18
- const warehouse_base_2 = require("@things-factory/warehouse-base");
19
17
  const constants_1 = require("../constants");
20
18
  const entities_1 = require("../entities");
21
19
  const datetime_util_1 = require("../utils/datetime-util");
22
20
  const REPORT_API_URL = env_1.config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html');
23
21
  async function renderRODO({ doNo }, context) {
22
+ const { user, tx } = context.state;
24
23
  const domain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne({
25
24
  where: { id: context.state.domain.id }
26
25
  }); //.. find domain
@@ -48,7 +47,24 @@ async function renderRODO({ doNo }, context) {
48
47
  const foundRO = foundDO.releaseGood;
49
48
  const partnerBiz = foundDO.bizplace; //customer bizplace
50
49
  const ownRefNo = foundRO.refNo;
51
- let foundInventoryItem = await (0, typeorm_1.getRepository)(warehouse_base_2.InventoryItem).query(`select row_number() over (partition by p.sku) as "seq",p.sku,p.brand_sku, ii.serial_number from inventory_items ii left join products p on ii.product_id = p.id where outbound_order_id = '${foundDO.releaseGood.id}' group by p.sku,ii.serial_number,p.brand_sku`);
50
+ let foundInventoryItem;
51
+ await (0, typeorm_1.getManager)().transaction(async (trxMgr) => {
52
+ foundInventoryItem = await trxMgr.query(`
53
+ SELECT seq, CASE WHEN total_count = seq THEN seq ELSE NULL END AS max_seq,sku,brand_sku,serial_number FROM (
54
+ select row_number() over(partition by p.brand_sku ORDER BY p.brand_sku, ii.serial_number) AS "seq",
55
+ count(*) over(partition by p.brand_sku) AS total_count,
56
+ p.sku,p.brand_sku, ii.serial_number
57
+ from inventory_items ii
58
+ left join products p on ii.product_id = p.id
59
+ where outbound_order_id = $1
60
+ group by p.sku,ii.serial_number,p.brand_sku
61
+ ) src
62
+ ORDER BY sku, brand_sku, serial_number, seq
63
+ `, [foundDO.releaseGoodId]);
64
+ });
65
+ if (foundInventoryItem.length > 0) {
66
+ foundInventoryItem[0].ref_no = ownRefNo || '';
67
+ }
52
68
  const partnerDomain = await (0, typeorm_1.getRepository)(auth_base_1.Partner).findOne({
53
69
  where: { partnerDomain: partnerBiz.domain, domain },
54
70
  relations: ['domain']
@@ -80,23 +96,26 @@ async function renderRODO({ doNo }, context) {
80
96
  relations: ['inventory']
81
97
  });
82
98
  const orderInvIds = targetInventories.map((oi) => oi.id);
83
- const foundWSD = await (0, typeorm_1.getRepository)(entities_1.WorksheetDetail).find({
84
- where: {
85
- domain,
86
- targetInventory: (0, typeorm_1.In)(orderInvIds),
87
- type: constants_1.WORKSHEET_TYPE.LOADING,
88
- status: (0, typeorm_1.Equal)(constants_1.WORKSHEET_STATUS.DONE)
89
- },
90
- relations: [
91
- 'targetInventory',
92
- 'targetInventory.inventory',
93
- 'targetInventory.inventory.location',
94
- 'targetInventory.inventory.product',
95
- 'targetInventory.inventory.product.productDetails',
96
- 'targetInventory.inventory.reusablePallet',
97
- 'updater'
98
- ]
99
- });
99
+ const wdQb = (0, typeorm_1.getRepository)(entities_1.WorksheetDetail).createQueryBuilder('wd');
100
+ wdQb
101
+ .leftJoinAndSelect('wd.targetInventory', 'targetInventory')
102
+ .leftJoinAndSelect('targetInventory.inventory', 'inventory')
103
+ .leftJoinAndSelect('inventory.location', 'location')
104
+ .leftJoinAndSelect('inventory.product', 'product')
105
+ .leftJoinAndSelect('product.productDetails', 'productDetails')
106
+ .leftJoinAndSelect('inventory.reusablePallet', 'reusablePallet')
107
+ .leftJoinAndSelect('wd.domain', 'domain')
108
+ .leftJoinAndSelect('wd.creator', 'creator')
109
+ .leftJoinAndSelect('wd.updater', 'updater')
110
+ .where('wd.domain_id = :domainId', { domainId: domain.id })
111
+ .andWhere('wd.target_inventory_id IN (:...orderInvIds) ', { orderInvIds })
112
+ .andWhere('wd.type = :type ', { type: constants_1.WORKSHEET_TYPE.LOADING })
113
+ .andWhere('wd.status = :status ', { status: constants_1.WORKSHEET_STATUS.DONE })
114
+ .orderBy('product.sku')
115
+ .addOrderBy('product.name')
116
+ .addOrderBy('product.description')
117
+ .addOrderBy('inventory.batch_id');
118
+ const foundWSD = await wdQb.getMany();
100
119
  const foundTemplate = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
101
120
  where: { domain, category: constants_1.TEMPLATE_TYPE.DO_TEMPLATE }
102
121
  });
@@ -193,50 +212,6 @@ async function renderRODO({ doNo }, context) {
193
212
  });
194
213
  }
195
214
  }, []);
196
- let tempFoundInventoryItem = [];
197
- const sepProductList = productList.flatMap(p => Array.from({ length: p.product_qty }, () => (Object.assign({}, p))));
198
- sepProductList.forEach((product) => {
199
- let temp = foundInventoryItem.filter((item) => {
200
- return item.sku == product.product_sku;
201
- });
202
- if (temp.length > 1) {
203
- temp.forEach(res => {
204
- console.log(res);
205
- if (tempFoundInventoryItem.length == 0) {
206
- tempFoundInventoryItem.push(res);
207
- }
208
- else {
209
- const index = tempFoundInventoryItem.findIndex(res => res.serial_number == res.serial_number);
210
- if (!index) {
211
- tempFoundInventoryItem.push(res);
212
- }
213
- }
214
- tempFoundInventoryItem = lodash_1.default.uniqWith(tempFoundInventoryItem, lodash_1.default.isEqual);
215
- });
216
- }
217
- else {
218
- tempFoundInventoryItem.push(Object.assign({}, ...temp));
219
- }
220
- });
221
- foundInventoryItem = tempFoundInventoryItem;
222
- const filterInventoryItem = lodash_1.default.groupBy(foundInventoryItem, i => i.sku);
223
- const tempIndexArr = [];
224
- const tempTotalQuantity = [];
225
- Object.keys(filterInventoryItem).forEach(k => {
226
- const tempIndex = foundInventoryItem.findIndex(i => {
227
- return i.sku == k;
228
- });
229
- tempIndexArr.push(tempIndex);
230
- });
231
- Object.values(filterInventoryItem).forEach(k => {
232
- const tempQuantity = k.length;
233
- tempTotalQuantity.push(tempQuantity);
234
- });
235
- tempIndexArr.forEach((t, index) => {
236
- if (t >= 0)
237
- foundInventoryItem[t].totalQuantity = tempTotalQuantity[index];
238
- });
239
- foundInventoryItem[0].ref_no = ownRefNo || "";
240
215
  const data = {
241
216
  logo_url: logo,
242
217
  customer_biz: partnerBiz.name,
@@ -254,28 +229,87 @@ async function renderRODO({ doNo }, context) {
254
229
  warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
255
230
  warehouse_fax: foundWarehouseCP ? foundWarehouseCP.fax : null,
256
231
  warehouse_email: foundWarehouseCP ? foundWarehouseCP.email : null,
257
- customer_name: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.name) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionTo) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionCompany) || null,
258
- customer_delivery_address: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.address) || [foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress1, foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress2, foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress3, foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress4, foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress5, foundRO === null || foundRO === void 0 ? void 0 : foundRO.postalCode, foundRO === null || foundRO === void 0 ? void 0 : foundRO.city, foundRO === null || foundRO === void 0 ? void 0 : foundRO.state, foundRO === null || foundRO === void 0 ? void 0 : foundRO.country].filter(Boolean).join(", ") || null,
259
- customer_billing_address: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.billingAddress) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.billingAddress) || null,
260
- new_billing_address: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.billingAddress) || null,
261
- new_delivery_address: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress1) || null,
262
- new_delivery_address2: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress2) || null,
263
- new_delivery_address3: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress3) || null,
264
- new_delivery_address4: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress4) || null,
265
- new_delivery_address5: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress5) || null,
266
- new_delivery_city: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.city) || null,
267
- new_delivery_state: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.state) || null,
268
- new_delivery_postal_code: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.postalCode) || null,
269
- new_delivery_country: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.country) || null,
270
- new_attention_to: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionTo) || null,
271
- new_attention_company: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionCompany) || null,
272
- new_phone_no: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.phone1) || null,
273
- customer_phone: foundCP ? foundCP.phone : null,
232
+ customer_name: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.name) ||
233
+ foundDO.attentionTo ||
234
+ foundDO.attentionCompany ||
235
+ (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionTo) ||
236
+ (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionCompany) ||
237
+ null,
238
+ customer_delivery_address: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.address) ||
239
+ [
240
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress1,
241
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress2,
242
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress3,
243
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress4,
244
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress5,
245
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.postalCode,
246
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.city,
247
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.state,
248
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.country
249
+ ]
250
+ .filter(Boolean)
251
+ .join(', ') ||
252
+ [
253
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress1,
254
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress2,
255
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress3,
256
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress4,
257
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress5,
258
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.postalCode,
259
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.city,
260
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.state,
261
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.country
262
+ ]
263
+ .filter(Boolean)
264
+ .join(', ') ||
265
+ null,
266
+ customer_billing_address: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.billingAddress) || (foundDO === null || foundDO === void 0 ? void 0 : foundDO.billingAddress) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.billingAddress) || null,
267
+ new_billing_address: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.billingAddress) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.billingAddress) || null,
268
+ new_delivery_address: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress1) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress1) || null,
269
+ new_delivery_address2: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress2) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress2) || null,
270
+ new_delivery_address3: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress3) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress3) || null,
271
+ new_delivery_address4: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress4) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress4) || null,
272
+ new_delivery_address5: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress5) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress5) || null,
273
+ new_delivery_city: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.city) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.city) || null,
274
+ new_delivery_state: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.state) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.state) || null,
275
+ new_delivery_postal_code: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.postalCode) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.postalCode) || null,
276
+ new_delivery_country: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.country) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.country) || null,
277
+ new_attention_to: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.attentionTo) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionTo) || null,
278
+ new_attention_company: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.attentionCompany) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionCompany) || null,
279
+ new_phone_no: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.phone1) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.phone1) || null,
280
+ customer_phone: foundCP ? foundCP.phone : null || (foundDO === null || foundDO === void 0 ? void 0 : foundDO.phone1),
274
281
  customer_fax: foundCP ? foundCP.fax : null,
275
282
  customer_email: foundCP ? foundCP.email : null,
276
- customer_company: foundCP ? foundCP.companyName : null,
283
+ customer_company: foundCP ? foundCP.companyName : null || foundDO.attentionCompany,
277
284
  own_collection: ownTransportFlag ? '[SELF-COLLECTION]' : `[${domain.brandName} TRANSPORT]`,
278
- destination: foundDO.to || [foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress1, foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress2, foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress3, foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress4, foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress5, foundRO === null || foundRO === void 0 ? void 0 : foundRO.postalCode, foundRO === null || foundRO === void 0 ? void 0 : foundRO.city, foundRO === null || foundRO === void 0 ? void 0 : foundRO.state, foundRO === null || foundRO === void 0 ? void 0 : foundRO.country].filter(Boolean).join(", ") || '',
285
+ destination: foundDO.to ||
286
+ [
287
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress1,
288
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress2,
289
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress3,
290
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress4,
291
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress5,
292
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.postalCode,
293
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.city,
294
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.state,
295
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.country
296
+ ]
297
+ .filter(Boolean)
298
+ .join(', ') ||
299
+ [
300
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress1,
301
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress2,
302
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress3,
303
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress4,
304
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress5,
305
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.postalCode,
306
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.city,
307
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.state,
308
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.country
309
+ ]
310
+ .filter(Boolean)
311
+ .join(', ') ||
312
+ '',
279
313
  ro_no: foundRO.name,
280
314
  ro_created_at: foundRO.createdAt ? foundRO.createdAt : '',
281
315
  ref_no: ownRefNo ? `${foundRO.name} / ${foundRO.refNo}` : `${foundRO.name}`,
package/dist-server/controllers/render-ro-do.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"render-ro-do.js","sourceRoot":"","sources":["../../server/controllers/render-ro-do.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render-ro-do.js","sourceRoot":"","sources":["../../server/controllers/render-ro-do.ts"],"names":[],"mappings":"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"}
package/dist-server/utils/inventory-util.js CHANGED
@@ -232,6 +232,7 @@ async function inventoriesByStrategy({ worksheetId, batchId, bizplaceId, product
232
232
  break;
233
233
  case 'FEFO':
234
234
  qb.orderBy('"INV"."expiration_date"', 'ASC');
235
+ qb.addOrderBy('"INV"."created_at"', 'ASC');
235
236
  if (locationSortingRules) {
236
237
  for (const key in locationSortingRules) {
237
238
  qb.addOrderBy(`LOC.${key}`, locationSortingRules[key]);
@@ -240,6 +241,7 @@ async function inventoriesByStrategy({ worksheetId, batchId, bizplaceId, product
240
241
  break;
241
242
  case 'FMFO':
242
243
  qb.orderBy('"INV"."manufacture_date"', 'ASC');
244
+ qb.addOrderBy('"INV"."created_at"', 'ASC');
243
245
  if (locationSortingRules) {
244
246
  for (const key in locationSortingRules) {
245
247
  qb.addOrderBy(`LOC.${key}`, locationSortingRules[key]);
package/dist-server/utils/inventory-util.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"inventory-util.js","sourceRoot":"","sources":["../../server/utils/inventory-util.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"inventory-util.js","sourceRoot":"","sources":["../../server/utils/inventory-util.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.42",
3
+ "version": "4.3.45",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -30,15 +30,15 @@
30
30
  "@things-factory/id-rule-base": "^4.3.40",
31
31
  "@things-factory/integration-lmd": "^4.3.40",
32
32
  "@things-factory/integration-marketplace": "^4.3.41",
33
- "@things-factory/integration-sellercraft": "^4.3.42",
34
- "@things-factory/integration-sftp": "^4.3.40",
35
- "@things-factory/marketplace-base": "^4.3.41",
33
+ "@things-factory/integration-sellercraft": "^4.3.43",
34
+ "@things-factory/integration-sftp": "^4.3.44",
35
+ "@things-factory/marketplace-base": "^4.3.43",
36
36
  "@things-factory/notification": "^4.3.40",
37
- "@things-factory/sales-base": "^4.3.42",
37
+ "@things-factory/sales-base": "^4.3.45",
38
38
  "@things-factory/setting-base": "^4.3.40",
39
39
  "@things-factory/shell": "^4.3.35",
40
40
  "@things-factory/transport-base": "^4.3.40",
41
- "@things-factory/warehouse-base": "^4.3.42"
41
+ "@things-factory/warehouse-base": "^4.3.45"
42
42
  },
43
- "gitHead": "d2e3d30572c0f968208cd4d8e9b0648986d754c3"
43
+ "gitHead": "c41fcfaaac356bc4cc8d2935d0738076bf7722c9"
44
44
  }
package/server/controllers/render-orientage-do.ts CHANGED
@@ -274,9 +274,28 @@ export async function renderOrientageDO({ doNo }, context: any) {
274
274
  company_fax: foundWarehouseCP ? foundWarehouseCP.fax : null,
275
275
  warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
276
276
  company_email: foundWarehouseCP.email,
277
- customer_name: foundCP?.name || foundRO.attentionTo || null,
277
+ customer_name:
278
+ foundCP?.name ||
279
+ foundDO.attentionTo ||
280
+ foundDO.attentionCompany ||
281
+ foundRO?.attentionTo ||
282
+ foundRO?.attentionCompany ||
283
+ null,
278
284
  customer_delivery_address:
279
285
  foundCP?.address ||
286
+ [
287
+ foundDO?.deliveryAddress1,
288
+ foundDO?.deliveryAddress2,
289
+ foundDO?.deliveryAddress3,
290
+ foundDO?.deliveryAddress4,
291
+ foundDO?.deliveryAddress5,
292
+ foundDO?.postalCode,
293
+ foundDO?.city,
294
+ foundDO?.state,
295
+ foundDO?.country
296
+ ]
297
+ .filter(Boolean)
298
+ .join(', ') ||
280
299
  [
281
300
  foundRO?.deliveryAddress1,
282
301
  foundRO?.deliveryAddress2,
@@ -291,13 +310,28 @@ export async function renderOrientageDO({ doNo }, context: any) {
291
310
  .filter(Boolean)
292
311
  .join(', ') ||
293
312
  null,
294
- customer_billing_address: foundCP?.billingAddress || foundRO?.billingAddress || null,
295
- customer_phone: foundCP?.phone || foundRO.phone1 || null,
313
+ customer_billing_address: foundCP?.billingAddress || foundDO?.billingAddress || null,
314
+ customer_phone: foundCP?.phone || foundDO?.phone1 || foundRO.phone1 || null,
296
315
  customer_fax: foundCP ? foundCP.fax : null,
297
316
  customer_email: foundCP?.email || foundRO.email || null,
298
- customer_company: foundCP?.companyName || foundRO.attentionCompany || null,
317
+ customer_company: foundCP?.companyName || foundDO.attentionCompany || foundRO.attentionCompany || null,
299
318
  own_collection: ownTransportFlag ? '[SELF-COLLECTION]' : `[${domain.brandName} TRANSPORT]`,
300
- destination: foundDO.to || '',
319
+ destination:
320
+ foundDO.to ||
321
+ [
322
+ foundDO?.deliveryAddress1,
323
+ foundDO?.deliveryAddress2,
324
+ foundDO?.deliveryAddress3,
325
+ foundDO?.deliveryAddress4,
326
+ foundDO?.deliveryAddress5,
327
+ foundDO?.postalCode,
328
+ foundDO?.city,
329
+ foundDO?.state,
330
+ foundDO?.country
331
+ ]
332
+ .filter(Boolean)
333
+ .join(', ') ||
334
+ '',
301
335
  ref_no: ownRefNo,
302
336
  ref_no1: ownRefNo2 ? ownRefNo2 : '',
303
337
  ref_no2: ownRefNo3 ? ownRefNo3 : '',
package/server/controllers/render-ro-do.ts CHANGED
@@ -1,10 +1,11 @@
1
1
  import _ from 'lodash'
2
2
  import FormData from 'form-data'
3
3
  import fetch from 'node-fetch'
4
- import { Equal, getRepository, In } from 'typeorm'
4
+ import { Equal, getRepository, In, getManager } from 'typeorm'
5
+ import { EntityManager } from 'typeorm'
5
6
 
6
7
  import { Attachment, STORAGE } from '@things-factory/attachment-base'
7
- import { Partner } from '@things-factory/auth-base'
8
+ import { Partner, User } from '@things-factory/auth-base'
8
9
  import { Bizplace, ContactPoint } from '@things-factory/biz-base'
9
10
  import { config } from '@things-factory/env'
10
11
  import { ProductDetail } from '@things-factory/product-base'
@@ -19,6 +20,8 @@ import { DateTimeConverter } from '../utils/datetime-util'
19
20
  const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
20
21
 
21
22
  export async function renderRODO({ doNo }, context: any) {
23
+ const { user, tx }: { user: User; tx: EntityManager } = context.state
24
+
22
25
  const domain: Domain = await getRepository(Domain).findOne({
23
26
  where: { id: context.state.domain.id }
24
27
  }) //.. find domain
@@ -50,9 +53,29 @@ export async function renderRODO({ doNo }, context: any) {
50
53
  const partnerBiz: Bizplace = foundDO.bizplace //customer bizplace
51
54
  const ownRefNo = foundRO.refNo
52
55
 
53
- let foundInventoryItem: InventoryItem[] = await getRepository(InventoryItem).query(
54
- `select row_number() over (partition by p.sku) as "seq",p.sku,p.brand_sku, ii.serial_number from inventory_items ii left join products p on ii.product_id = p.id where outbound_order_id = '${foundDO.releaseGood.id}' group by p.sku,ii.serial_number,p.brand_sku`
55
- )
56
+ let foundInventoryItem: any
57
+
58
+ await getManager().transaction(async (trxMgr: EntityManager) => {
59
+ foundInventoryItem = await trxMgr.query(
60
+ `
61
+ SELECT seq, CASE WHEN total_count = seq THEN seq ELSE NULL END AS max_seq,sku,brand_sku,serial_number FROM (
62
+ select row_number() over(partition by p.brand_sku ORDER BY p.brand_sku, ii.serial_number) AS "seq",
63
+ count(*) over(partition by p.brand_sku) AS total_count,
64
+ p.sku,p.brand_sku, ii.serial_number
65
+ from inventory_items ii
66
+ left join products p on ii.product_id = p.id
67
+ where outbound_order_id = $1
68
+ group by p.sku,ii.serial_number,p.brand_sku
69
+ ) src
70
+ ORDER BY sku, brand_sku, serial_number, seq
71
+ `,
72
+ [foundDO.releaseGoodId]
73
+ )
74
+ })
75
+
76
+ if (foundInventoryItem.length > 0) {
77
+ foundInventoryItem[0].ref_no = ownRefNo || ''
78
+ }
56
79
 
57
80
  const partnerDomain: Partner = await getRepository(Partner).findOne({
58
81
  where: { partnerDomain: partnerBiz.domain, domain },
@@ -93,23 +116,27 @@ export async function renderRODO({ doNo }, context: any) {
93
116
  })
94
117
  const orderInvIds: string[] = targetInventories.map((oi: any) => oi.id)
95
118
 
96
- const foundWSD: WorksheetDetail[] = await getRepository(WorksheetDetail).find({
97
- where: {
98
- domain,
99
- targetInventory: In(orderInvIds),
100
- type: WORKSHEET_TYPE.LOADING,
101
- status: Equal(WORKSHEET_STATUS.DONE)
102
- },
103
- relations: [
104
- 'targetInventory',
105
- 'targetInventory.inventory',
106
- 'targetInventory.inventory.location',
107
- 'targetInventory.inventory.product',
108
- 'targetInventory.inventory.product.productDetails',
109
- 'targetInventory.inventory.reusablePallet',
110
- 'updater'
111
- ]
112
- })
119
+ const wdQb = getRepository(WorksheetDetail).createQueryBuilder('wd')
120
+ wdQb
121
+ .leftJoinAndSelect('wd.targetInventory', 'targetInventory')
122
+ .leftJoinAndSelect('targetInventory.inventory', 'inventory')
123
+ .leftJoinAndSelect('inventory.location', 'location')
124
+ .leftJoinAndSelect('inventory.product', 'product')
125
+ .leftJoinAndSelect('product.productDetails', 'productDetails')
126
+ .leftJoinAndSelect('inventory.reusablePallet', 'reusablePallet')
127
+ .leftJoinAndSelect('wd.domain', 'domain')
128
+ .leftJoinAndSelect('wd.creator', 'creator')
129
+ .leftJoinAndSelect('wd.updater', 'updater')
130
+ .where('wd.domain_id = :domainId', { domainId: domain.id })
131
+ .andWhere('wd.target_inventory_id IN (:...orderInvIds) ', { orderInvIds })
132
+ .andWhere('wd.type = :type ', { type: WORKSHEET_TYPE.LOADING })
133
+ .andWhere('wd.status = :status ', { status: WORKSHEET_STATUS.DONE })
134
+ .orderBy('product.sku')
135
+ .addOrderBy('product.name')
136
+ .addOrderBy('product.description')
137
+ .addOrderBy('inventory.batch_id')
138
+
139
+ const foundWSD: WorksheetDetail[] = await wdQb.getMany()
113
140
 
114
141
  const foundTemplate: Attachment = await getRepository(Attachment).findOne({
115
142
  where: { domain, category: TEMPLATE_TYPE.DO_TEMPLATE }
@@ -222,68 +249,6 @@ export async function renderRODO({ doNo }, context: any) {
222
249
  }
223
250
  }, [])
224
251
 
225
-
226
-
227
- let tempFoundInventoryItem: any = []
228
-
229
- const sepProductList = productList.flatMap(p => Array.from({ length: p.product_qty }, () => ({ ...p })))
230
-
231
- sepProductList.forEach((product) => {
232
-
233
- let temp = foundInventoryItem.filter((item) => {
234
- return item.sku == product.product_sku
235
- })
236
-
237
- if (temp.length > 1) {
238
- temp.forEach(res => {
239
- console.log(res)
240
-
241
- if (tempFoundInventoryItem.length == 0) {
242
- tempFoundInventoryItem.push(res)
243
- } else {
244
- const index = tempFoundInventoryItem.findIndex(res => res.serial_number == res.serial_number)
245
-
246
- if (!index) {
247
- tempFoundInventoryItem.push(res)
248
- }
249
- }
250
-
251
- tempFoundInventoryItem = _.uniqWith(tempFoundInventoryItem, _.isEqual)
252
- })
253
- } else {
254
- tempFoundInventoryItem.push(Object.assign({}, ...temp))
255
- }
256
- })
257
-
258
- foundInventoryItem = tempFoundInventoryItem;
259
-
260
- const filterInventoryItem = _.groupBy(foundInventoryItem, i => i.sku)
261
-
262
- const tempIndexArr = []
263
-
264
- const tempTotalQuantity = []
265
-
266
- Object.keys(filterInventoryItem).forEach(k => {
267
- const tempIndex = foundInventoryItem.findIndex(i => {
268
- return i.sku == k
269
- })
270
-
271
- tempIndexArr.push(tempIndex)
272
- })
273
-
274
- Object.values(filterInventoryItem).forEach(k => {
275
- const tempQuantity = k.length
276
-
277
- tempTotalQuantity.push(tempQuantity)
278
- })
279
-
280
- tempIndexArr.forEach((t, index) => {
281
- if (t >= 0)
282
- foundInventoryItem[t].totalQuantity = tempTotalQuantity[index]
283
- })
284
-
285
- foundInventoryItem[0].ref_no = ownRefNo || ""
286
-
287
252
  const data = {
288
253
  logo_url: logo,
289
254
  customer_biz: partnerBiz.name,
@@ -301,28 +266,90 @@ export async function renderRODO({ doNo }, context: any) {
301
266
  warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
302
267
  warehouse_fax: foundWarehouseCP ? foundWarehouseCP.fax : null,
303
268
  warehouse_email: foundWarehouseCP ? foundWarehouseCP.email : null,
304
- customer_name: foundCP?.name || foundRO?.attentionTo || foundRO?.attentionCompany || null,
305
- customer_delivery_address: foundCP?.address || [foundRO?.deliveryAddress1, foundRO?.deliveryAddress2, foundRO?.deliveryAddress3, foundRO?.deliveryAddress4, foundRO?.deliveryAddress5, foundRO?.postalCode, foundRO?.city, foundRO?.state, foundRO?.country].filter(Boolean).join(", ") || null,
306
- customer_billing_address: foundCP?.billingAddress || foundRO?.billingAddress || null,
307
- new_billing_address: foundRO?.billingAddress || null,
308
- new_delivery_address: foundRO?.deliveryAddress1 || null,
309
- new_delivery_address2: foundRO?.deliveryAddress2 || null,
310
- new_delivery_address3: foundRO?.deliveryAddress3 || null,
311
- new_delivery_address4: foundRO?.deliveryAddress4 || null,
312
- new_delivery_address5: foundRO?.deliveryAddress5 || null,
313
- new_delivery_city: foundRO?.city || null,
314
- new_delivery_state: foundRO?.state || null,
315
- new_delivery_postal_code: foundRO?.postalCode || null,
316
- new_delivery_country: foundRO?.country || null,
317
- new_attention_to: foundRO?.attentionTo || null,
318
- new_attention_company: foundRO?.attentionCompany || null,
319
- new_phone_no: foundRO?.phone1 || null,
320
- customer_phone: foundCP ? foundCP.phone : null,
269
+ customer_name:
270
+ foundCP?.name ||
271
+ foundDO.attentionTo ||
272
+ foundDO.attentionCompany ||
273
+ foundRO?.attentionTo ||
274
+ foundRO?.attentionCompany ||
275
+ null,
276
+ customer_delivery_address:
277
+ foundCP?.address ||
278
+ [
279
+ foundDO?.deliveryAddress1,
280
+ foundDO?.deliveryAddress2,
281
+ foundDO?.deliveryAddress3,
282
+ foundDO?.deliveryAddress4,
283
+ foundDO?.deliveryAddress5,
284
+ foundDO?.postalCode,
285
+ foundDO?.city,
286
+ foundDO?.state,
287
+ foundDO?.country
288
+ ]
289
+ .filter(Boolean)
290
+ .join(', ') ||
291
+ [
292
+ foundRO?.deliveryAddress1,
293
+ foundRO?.deliveryAddress2,
294
+ foundRO?.deliveryAddress3,
295
+ foundRO?.deliveryAddress4,
296
+ foundRO?.deliveryAddress5,
297
+ foundRO?.postalCode,
298
+ foundRO?.city,
299
+ foundRO?.state,
300
+ foundRO?.country
301
+ ]
302
+ .filter(Boolean)
303
+ .join(', ') ||
304
+ null,
305
+ customer_billing_address: foundCP?.billingAddress || foundDO?.billingAddress || foundRO?.billingAddress || null,
306
+ new_billing_address: foundDO?.billingAddress || foundRO?.billingAddress || null,
307
+ new_delivery_address: foundDO?.deliveryAddress1 || foundRO?.deliveryAddress1 || null,
308
+ new_delivery_address2: foundDO?.deliveryAddress2 || foundRO?.deliveryAddress2 || null,
309
+ new_delivery_address3: foundDO?.deliveryAddress3 || foundRO?.deliveryAddress3 || null,
310
+ new_delivery_address4: foundDO?.deliveryAddress4 || foundRO?.deliveryAddress4 || null,
311
+ new_delivery_address5: foundDO?.deliveryAddress5 || foundRO?.deliveryAddress5 || null,
312
+ new_delivery_city: foundDO?.city || foundRO?.city || null,
313
+ new_delivery_state: foundDO?.state || foundRO?.state || null,
314
+ new_delivery_postal_code: foundDO?.postalCode || foundRO?.postalCode || null,
315
+ new_delivery_country: foundDO?.country || foundRO?.country || null,
316
+ new_attention_to: foundDO?.attentionTo || foundRO?.attentionTo || null,
317
+ new_attention_company: foundDO?.attentionCompany || foundRO?.attentionCompany || null,
318
+ new_phone_no: foundDO?.phone1 || foundRO?.phone1 || null,
319
+ customer_phone: foundCP ? foundCP.phone : null || foundDO?.phone1,
321
320
  customer_fax: foundCP ? foundCP.fax : null,
322
321
  customer_email: foundCP ? foundCP.email : null,
323
- customer_company: foundCP ? foundCP.companyName : null,
322
+ customer_company: foundCP ? foundCP.companyName : null || foundDO.attentionCompany,
324
323
  own_collection: ownTransportFlag ? '[SELF-COLLECTION]' : `[${domain.brandName} TRANSPORT]`,
325
- destination: foundDO.to || [foundRO?.deliveryAddress1, foundRO?.deliveryAddress2, foundRO?.deliveryAddress3, foundRO?.deliveryAddress4, foundRO?.deliveryAddress5, foundRO?.postalCode, foundRO?.city, foundRO?.state, foundRO?.country].filter(Boolean).join(", ") || '',
324
+ destination:
325
+ foundDO.to ||
326
+ [
327
+ foundDO?.deliveryAddress1,
328
+ foundDO?.deliveryAddress2,
329
+ foundDO?.deliveryAddress3,
330
+ foundDO?.deliveryAddress4,
331
+ foundDO?.deliveryAddress5,
332
+ foundDO?.postalCode,
333
+ foundDO?.city,
334
+ foundDO?.state,
335
+ foundDO?.country
336
+ ]
337
+ .filter(Boolean)
338
+ .join(', ') ||
339
+ [
340
+ foundRO?.deliveryAddress1,
341
+ foundRO?.deliveryAddress2,
342
+ foundRO?.deliveryAddress3,
343
+ foundRO?.deliveryAddress4,
344
+ foundRO?.deliveryAddress5,
345
+ foundRO?.postalCode,
346
+ foundRO?.city,
347
+ foundRO?.state,
348
+ foundRO?.country
349
+ ]
350
+ .filter(Boolean)
351
+ .join(', ') ||
352
+ '',
326
353
  ro_no: foundRO.name,
327
354
  ro_created_at: foundRO.createdAt ? foundRO.createdAt : '',
328
355
  ref_no: ownRefNo ? `${foundRO.name} / ${foundRO.refNo}` : `${foundRO.name}`,
@@ -348,19 +375,20 @@ export async function renderRODO({ doNo }, context: any) {
348
375
  remark: prod?.remark
349
376
  ? prod.remark
350
377
  : prod.cross_docking
351
- ? prod.pallet === ''
352
- ? `${prod.palletQty} PALLET(S) [C/D]`
353
- : `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
354
- : prod.pallet === ''
355
- ? `${prod.palletQty} PALLET(S)`
356
- : `${prod.palletQty} PALLET(S) (${prod.pallet})`,
378
+ ? prod.pallet === ''
379
+ ? `${prod.palletQty} PALLET(S) [C/D]`
380
+ : `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
381
+ : prod.pallet === ''
382
+ ? `${prod.palletQty} PALLET(S)`
383
+ : `${prod.palletQty} PALLET(S) (${prod.pallet})`,
357
384
  inventory_remark: prod?.inventory_remark ? prod.inventory_remark : '',
358
385
  batch_id_ref: prod.product_batch_ref
359
386
  }
360
387
  }),
361
- serialNumber: foundInventoryItem.map((item: any, idx) => {
362
- return { ...item, delivery_to: foundDO.to }
363
- }) || ''
388
+ serialNumber:
389
+ foundInventoryItem.map((item: any, idx) => {
390
+ return { ...item, delivery_to: foundDO.to }
391
+ }) || ''
364
392
  } //.. make data from do
365
393
  const formData = new FormData()
366
394
 
package/server/utils/inventory-util.ts CHANGED
@@ -307,6 +307,7 @@ export async function inventoriesByStrategy(
307
307
 
308
308
  case 'FEFO':
309
309
  qb.orderBy('"INV"."expiration_date"', 'ASC')
310
+ qb.addOrderBy('"INV"."created_at"', 'ASC')
310
311
  if (locationSortingRules) {
311
312
  for (const key in locationSortingRules) {
312
313
  qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
@@ -316,6 +317,7 @@ export async function inventoriesByStrategy(
316
317
 
317
318
  case 'FMFO':
318
319
  qb.orderBy('"INV"."manufacture_date"', 'ASC')
320
+ qb.addOrderBy('"INV"."created_at"', 'ASC')
319
321
  if (locationSortingRules) {
320
322
  for (const key in locationSortingRules) {
321
323
  qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])