@things-factory/worksheet-base 4.3.77 → 4.3.79-alpha.1

package/server/graphql/types/worksheet-detail/index.ts

@@ -32,6 +32,7 @@ export const Mutation = /* GraphQL */ `
     worksheetNo: String!
     batchId: String!
     productId: String!
+    productDetailId: String!
     packingType: String!
     packingSize: Float!
     orderProductId: String!

package/server/utils/inventory-util.ts

@@ -4,134 +4,9 @@ import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
-import {
-  Inventory,
-  INVENTORY_STATUS,
-  InventoryHistory,
-  InventoryNoGenerator,
-  Location,
-  LOCATION_STATUS,
-  LOCATION_TYPE
-} from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, Location, LOCATION_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
 
 /**
- * @description It will insert new record into inventory histories table.
- * seq will be calculated based on number of records for one specific pallet id (provided by inventory object)
- */
-export async function generateInventoryHistory(
-  inventory: Inventory,
-  refOrder: any,
-  transactionType: string,
-  qty: number = 0,
-  uomValue: number = 0,
-  user: User,
-  trxMgr?: EntityManager,
-  targetInventory: Inventory = {}
-): Promise<InventoryHistory> {
-  const invHistoryRepo: Repository<InventoryHistory> =
-    trxMgr?.getRepository(InventoryHistory) || getRepository(InventoryHistory)
-  const invRepo: Repository<Inventory> = trxMgr?.getRepository(Inventory) || getRepository(Inventory)
-
-  if (!inventory?.id) throw new Error(`Can't find out ID of inventory.`)
-  if (!refOrder?.id || !refOrder.name) throw new Error(`Can't find out ID or Name of Reference Order`)
-  if (
-    !inventory?.domain ||
-    !inventory?.bizplace ||
-    !inventory?.product?.id ||
-    !inventory?.warehouse?.id ||
-    !inventory?.location?.id
-  ) {
-    inventory = await invRepo.findOne({
-      where: { id: inventory.id },
-      relations: ['domain', 'bizplace', 'product', 'warehouse', 'location']
-    })
-  }
-
-  const domain: Domain = inventory.domain
-  const location: Location = inventory.location
-
-  const seq: number = await invHistoryRepo.count({ domain: inventory.domain, palletId: inventory.palletId })
-  let openingQty: number = 0
-  let openingUomValue: number = 0
-
-  if (seq) {
-    const lastInvHistory: InventoryHistory = await invHistoryRepo.findOne({
-      domain: inventory.domain,
-      palletId: inventory.palletId,
-      seq: seq - 1
-    })
-
-    openingQty = lastInvHistory.openingQty + lastInvHistory.qty
-    openingUomValue = lastInvHistory.openingUomValue + lastInvHistory.uomValue
-  }
-
-  if (transactionType == 'PICKING' || transactionType == 'UNLOADING') {
-    const [findSameOrderHistory, total]: InventoryHistory = await invHistoryRepo.findAndCount({
-      domain: inventory.domain,
-      palletId: inventory.palletId,
-      refOrderId: refOrder.id
-    })
-
-    if (findSameOrderHistory) {
-      let prevTotalQty = 0
-      let prevTotalUomValue = 0
-      for (let oh of findSameOrderHistory) {
-        prevTotalQty += oh.qty
-        prevTotalUomValue += oh.uomValue
-      }
-      qty -= prevTotalQty
-      uomValue -= prevTotalUomValue
-    }
-  }
-
-  let inventoryHistory: InventoryHistory = new InventoryHistory()
-  inventoryHistory.name = InventoryNoGenerator.inventoryHistoryName()
-  inventoryHistory.description = inventory.description
-  inventoryHistory.seq = seq
-  inventoryHistory.palletId = inventory.palletId
-  inventoryHistory.cartonId = inventory.cartonId
-  inventoryHistory.batchId = inventory.batchId
-  inventoryHistory.batchIdRef = inventory.batchIdRef
-  inventoryHistory.status = inventory.status
-  inventoryHistory.transactionType = transactionType
-  inventoryHistory.refOrderId = refOrder?.id || null
-  inventoryHistory.orderNo = refOrder?.name || null
-  inventoryHistory.orderRefNo = refOrder?.refNo || null
-  inventoryHistory.inventory = inventory
-  inventoryHistory.targetInventory = targetInventory
-  inventoryHistory.product = inventory.product
-  inventoryHistory.reusablePallet = inventory.reusablePallet
-  inventoryHistory.zone = inventory.zone
-  inventoryHistory.warehouse = inventory.warehouse
-  inventoryHistory.location = inventory.location
-  inventoryHistory.expirationDate = inventory.expirationDate
-  inventoryHistory.packingType = inventory.packingType
-  inventoryHistory.packingSize = inventory.packingSize
-  inventoryHistory.uom = inventory.uom
-  inventoryHistory.qty = qty
-  inventoryHistory.openingQty = openingQty
-  inventoryHistory.uomValue = uomValue
-  inventoryHistory.openingUomValue = openingUomValue
-  inventoryHistory.unitCost = inventory.unitCost
-  inventoryHistory.domain = inventory.domain
-  inventoryHistory.bizplace = inventory.bizplace
-  inventoryHistory.creator = user
-  inventoryHistory.updater = user
-
-  inventoryHistory = await invHistoryRepo.save(inventoryHistory)
-
-  if (inventory.lastSeq !== seq) {
-    await invRepo.save({
-      id: inventory.id,
-      lastSeq: inventoryHistory.seq,
-      updater: user
-    })
-  }
-
-  await switchLocationStatus(domain, location, user, trxMgr)
-  return inventoryHistory
-}
-
 /**
  * @description: Check location emptiness and update status of location
  * @param domain

package/server/utils/worksheet-util.ts

@@ -41,7 +41,9 @@ export async function fetchExecutingWorksheet(
   } else if (worksheet.status === WORKSHEET_STATUS.DONE) {
     throw new Error(`Worksheet is completed already`)
   } else if (worksheet.status === WORKSHEET_STATUS.DEACTIVATED) {
-    throw new Error(`Worksheet is not activated yet`)
+    //@oscarchuaweiwen-fsd this function is being used in quite some place, for packing worksheet you have handled the status DEACTIVATED, but for loading worksheet it's not being handled
+    //won't there be issue if it doesn't throw error for places that didnt handle the status DEACTIVATED?
+    return worksheet
   } else {
     throw new Error(`Current worksheet status (${worksheet.status}) is not proper to execute it.`)
   }