@things-factory/warehouse-base 4.3.107 → 4.3.108

package/server/utils/inventory-util.ts

@@ -131,7 +131,7 @@ export async function generateInventoryHistory(
 
   inventory = await invRepo.findOne({
     where: { id: inventory.id },
-    relations: ['domain', 'bizplace', 'product', 'warehouse', 'location']
+    relations: ['domain', 'bizplace', 'product', 'warehouse', 'location', 'productDetail']
   })
 
   const domain: Domain = inventory.domain
@@ -147,68 +147,133 @@ export async function generateInventoryHistory(
     }
   })
 
-  let seq: number = 0
-  let openingQty: number = 0
-  let openingUomValue: number = 0
-
-  if (lastInvHistory) {
-    openingQty = lastInvHistory.openingQty + lastInvHistory.qty
-    openingUomValue = lastInvHistory.openingUomValue + lastInvHistory.uomValue
-    seq = lastInvHistory.seq + 1
-  }
-
-  let remainQty = (openingQty || 0) + (qty || 0)
-
-  let inventoryHistory: any = new InventoryHistory()
-
-  inventoryHistory = {
-    ...inventory,
-    name: InventoryNoGenerator.inventoryHistoryName(),
-    inventory,
-    seq: seq,
-    status: remainQty == 0 ? INVENTORY_STATUS.TERMINATED : inventory.status,
-    transactionType,
+  let lastSeq: number
+  let res: any
+  let inventoryHistoryFields: any = {
     refOrderId: refOrder?.id || null,
     orderNo: refOrder?.name || null,
     orderRefNo: refOrder?.refNo || null,
-    qty,
-    openingQty,
-    uomValue,
-    openingUomValue: openingUomValue,
+    uom: inventory?.uom,
+
     creator: user,
-    updater: user
+    updater: user,
+    domain: inventory?.domain,
+    bizplace: inventory?.bizplace,
+    reusablePallet: inventory?.reusablePallet,
+    inventory: inventory,
+    product: inventory?.product,
+    productDetail: inventory?.productDetail,
+    warehouse: inventory?.warehouse,
+    location: inventory?.location,
+
+    palletId: inventory?.palletId,
+    batchId: inventory?.batchId,
+    zone: inventory?.zone,
+    packingType: inventory?.packingType,
+    description: inventory?.description,
+    expirationDate: inventory?.expirationDate,
+    unitCost: inventory?.unitCost,
+    batchIdRef: inventory?.batchIdRef,
+    cartonId: inventory?.cartonId,
+    manufactureYear: inventory?.manufactureYear,
+    packingSize: inventory?.packingSize,
+    manufactureDate: inventory?.manufactureDate,
+    status: inventory.status
   }
 
-  delete inventoryHistory.updatedAt
-  delete inventoryHistory.createdAt
-  delete inventoryHistory.id
-
-  let newInventoryHistory = await invHistoryRepo.save(inventoryHistory)
-
-  if (remainQty == 0) {
-    seq = seq + 1
-    let terminatedHistory = {
-      ...newInventoryHistory,
-      name: InventoryNoGenerator.inventoryHistoryName(),
-      seq: seq,
-      status: INVENTORY_STATUS.TERMINATED,
-      transactionType: INVENTORY_TRANSACTION_TYPE.TERMINATED,
-      uom: inventory.uom,
-      qty: 0,
-      openingQty: 0,
-      uomValue: 0,
-      openingUomValue: 0
+  if (!lastInvHistory) {
+    res = await invHistoryRepo
+      .createQueryBuilder()
+      .insert()
+      .into(InventoryHistory)
+      .values([
+        {
+          ...inventoryHistoryFields,
+          name: InventoryNoGenerator.inventoryHistoryName(),
+          status: inventory.status,
+          transactionType,
+          qty,
+          openingQty: 0,
+          uomValue,
+          openingUomValue: 0,
+          seq: 0
+        }
+      ])
+      .returning('*')
+      .execute()
+  } else {
+    if (transactionType == 'PICKING' || transactionType == 'UNLOADING') {
+      const findSameOrderHistory: InventoryHistory[] = await invHistoryRepo.find({
+        domain: inventory.domain,
+        palletId: inventory.palletId,
+        refOrderId: refOrder.id
+      })
+
+      if (findSameOrderHistory.length > 0) {
+        let prevTotalQty = 0
+        let prevTotalUomValue = 0
+        for (let oh of findSameOrderHistory) {
+          prevTotalQty += oh.qty
+          prevTotalUomValue += oh.uomValue
+        }
+        qty -= prevTotalQty
+        uomValue -= prevTotalUomValue
+      }
     }
 
-    delete terminatedHistory.id
+    res = await invHistoryRepo
+      .createQueryBuilder()
+      .insert()
+      .into(InventoryHistory)
+      .values([
+        {
+          ...inventoryHistoryFields,
+          name: InventoryNoGenerator.inventoryHistoryName(),
+          transactionType,
+          qty,
+          openingQty: () =>
+            `(select opening_qty from inventory_histories where pallet_id = '${inventory.palletId}' and domain_id = '${domain.id}' order by seq desc limit 1) + (select qty from inventory_histories where pallet_id = '${inventory.palletId}' and domain_id = '${domain.id}' order by seq desc limit 1)`,
+          uomValue,
+          openingUomValue: () =>
+            `(select opening_uom_value from inventory_histories where pallet_id = '${inventory.palletId}' and domain_id = '${domain.id}' order by seq desc limit 1) + ${uomValue}`,
+          seq: () =>
+            `(select seq from inventory_histories where pallet_id = '${inventory.palletId}' and domain_id = '${domain.id}' order by seq desc limit 1) + 1`
+        }
+      ])
+      .returning('*')
+      .execute()
+  }
 
-    newInventoryHistory = await invHistoryRepo.save(terminatedHistory)
+  let newInventoryHistory: InventoryHistory = res.generatedMaps[0]
+  lastSeq = newInventoryHistory.seq
+
+  if (newInventoryHistory.openingQty + qty == 0 && transactionType != 'UNDO_UNLOADING') {
+    let terminatedRes = await invHistoryRepo
+      .createQueryBuilder()
+      .insert()
+      .into(InventoryHistory)
+      .values([
+        {
+          ...inventoryHistoryFields,
+          name: InventoryNoGenerator.inventoryHistoryName(),
+          status: INVENTORY_STATUS.TERMINATED,
+          transactionType: INVENTORY_TRANSACTION_TYPE.TERMINATED,
+          qty: 0,
+          openingQty: 0,
+          uomValue: 0,
+          openingUomValue: 0,
+          seq: () =>
+            `(select seq from inventory_histories where inventory_id = '${inventory.id}' order by seq desc limit 1) + 1`
+        }
+      ])
+      .returning('seq')
+      .execute()
+
+    lastSeq = terminatedRes.generatedMaps[0].seq
     inventory.status = INVENTORY_STATUS.TERMINATED
   }
 
-  if (inventory.lastSeq !== seq) {
-    await invRepo.update(inventory.id, { lastSeq: newInventoryHistory.seq, updater: user })
-  }
+  await invRepo.update(inventory.id, { lastSeq, updater: user })
 
   await switchLocationStatus(domain, location, user, trxMgr)
   return newInventoryHistory

package/translations/en.json

@@ -1,4 +1,7 @@
 {
+  "error.no_location_found": "no location found",
+  "error.pallet (x) already exists": "Pallet ({x}) already exists",
+  "error.warehouse (x) already exists": "Warehouse ({x}) already exists",
   "field.location": "location",
   "field.product_batch": "product batch",
   "field.lot": "lot",
@@ -16,6 +19,5 @@
   "field.qty": "qty",
   "field.state": "state",
   "field.date": "date",
-  "field.type": "type",
-  "error.no_location_found": "no location found"
+  "field.type": "type"
 }

package/translations/ko.json

@@ -1,4 +1,7 @@
 {
+  "error.no_location_found": "발견된 로케이션이 없습니다",
+  "error.pallet (x) already exists": "[ko] Pallet ({x}) already exists",
+  "error.warehouse (x) already exists": "[ko] Warehouse ({x}) already exists",
   "field.location": "로케이션",
   "field.product_batch": "제품 배치",
   "field.lot": "롯트",
@@ -16,6 +19,5 @@
   "field.qty": "수량",
   "field.state": "국가",
   "field.date": "날짜",
-  "field.type": "유형",
-  "error.no_location_found": "발견된 로케이션이 없습니다"
+  "field.type": "유형"
 }

package/translations/ms.json

@@ -1,4 +1,7 @@
 {
+  "error.no_location_found": "[ms]no location found",
+  "error.pallet (x) already exists": "[ms] Pallet ({x}) already exists",
+  "error.warehouse (x) already exists": "[ko] Warehouse ({x}) already exists",
   "field.location": "lokasi",
   "field.product_batch": "kumpulan produk",
   "field.lot": "lot",
@@ -16,6 +19,5 @@
   "field.qty": "kuantiti",
   "field.state": "keadaan",
   "field.date": "tarikh",
-  "field.type": "jenis",
-  "error.no_location_found": "[ms]no location found"
+  "field.type": "jenis"
 }

package/translations/zh.json

@@ -1,21 +1,23 @@
 {
-  "field.location": "位置",
-  "field.product_batch": "产品批次",
-  "field.lot": "地块",
-  "field.warehouse": "仓库",
-  "field.zone": "区",
-  "field.section": "段",
-  "field.unit": "单元",
-  "field.shelf": "架子",
+  "error.no_location_found": "[zh]no location found",
+  "error.pallet (x) already exists": "[zh] Pallet ({x}) already exists",
+  "error.warehouse (x) already exists": "[ko] Warehouse ({x}) already exists",
   "field.bizplace": "分部",
-  "field.start_qty": "开始数量",
+  "field.date": "日期",
+  "field.end_qty": "最终数量",
   "field.in_qty": "进口数量",
+  "field.location": "位置",
+  "field.lot": "地块",
   "field.out_qty": "出口数量",
-  "field.end_qty": "最终数量",
+  "field.product_batch": "产品批次",
   "field.product": "产品",
   "field.qty": "数量",
+  "field.section": "段",
+  "field.shelf": "架子",
+  "field.start_qty": "开始数量",
   "field.state": "状态",
-  "field.date": "日期",
   "field.type": "类型",
-  "error.no_location_found": "[zh]no location found"
+  "field.unit": "单元",
+  "field.warehouse": "仓库",
+  "field.zone": "区"
 }