@things-factory/worksheet-base 4.3.108 → 4.3.110

package/server/entities/warehouse-bizplace-onhand-inventory.ts

@@ -2,23 +2,55 @@ import { ViewColumn, ViewEntity } from 'typeorm'
 
 @ViewEntity({
   expression: `  
-  select d.name as "domain_name", b.name as "bizplace_name", src.* from (
+  select d.name as "domainName", b.name as "bizplaceName", src.* from (
+    WITH oi as (
+      select
+        oi.domain_id,
+        oi.bizplace_id,
+        SUM(oi.release_qty) AS release_qty,
+        SUM(oi.release_uom_value) AS release_uom_value,
+        oi.batch_id,
+        oi.batch_id_ref,
+        oi.product_id,
+        oi.packing_type,
+        oi.packing_size,
+        oi.uom
+      FROM
+        order_inventories oi
+      WHERE
+        (oi.status = 'PENDING' or oi.status = 'PENDING_RECEIVE' or oi.status = 'PENDING_WORKSHEET' or oi.status = 'PENDING_SPLIT')
+        AND oi.batch_id NOTNULL
+        AND oi.product_id NOTNULL
+        AND oi.packing_type NOTNULL
+        AND oi.packing_size NOTNULL
+        AND oi.inventory_id IS NULL
+      GROUP BY
+        oi.domain_id,
+        oi.bizplace_id,
+        oi.batch_id,
+        oi.batch_id_ref,
+        oi.product_id,
+        oi.packing_type,
+        oi.packing_size,
+        oi.uom
+    ) 
     -- SINGLE ITEM INVENTORY QUERY
     select
-    i.domain_id as "domain_id",
-    i.bizplace_id as "bizplace_id",
-    i.packing_type as "packing_type",
-    i.packing_size as "packing_size",
+    i.domain_id as "domainId",
+    i.bizplace_id as "bizplaceId",
+    i.packing_type as "packingType",
+    i.packing_size as "packingSize",
     i.uom,
-    i.product_id as "product_id",
-    null as "product_bundle_id",
-    COALESCE(SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0))) AS "remain_qty",
-    COALESCE(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0))) AS "remain_uom_value",
+    i.product_id as "productId",
+    null as "productBundleId",
+    COALESCE(SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0))) AS "remainQty",
+    COALESCE(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)), 0) AS "remainUomValue",
     COALESCE(sum(COALESCE(i.qty, 0::double precision))) AS "qty",
-    COALESCE(sum(COALESCE(i.uom_value, 0::double precision))) AS "uom_value",
-    'SINGLE' AS "group_type"
+    COALESCE(sum(COALESCE(i.uom_value, 0::double precision))) AS "uomValue",
+    'SINGLE' AS "groupType"
     FROM inventories i
     INNER JOIN locations l2 ON i.location_id = l2.id AND i.domain_id = l2.domain_id AND l2.type NOT IN ('QUARANTINE', 'RESERVE')
+    LEFT JOIN oi ON i.batch_id = oi.batch_id AND i.product_id = oi.product_id AND i.packing_type = oi.packing_type AND i.packing_size = oi.packing_size AND i.uom = oi.uom
     WHERE i.status = 'STORED'
     GROUP by
       i.domain_id,
@@ -30,28 +62,29 @@ import { ViewColumn, ViewEntity } from 'typeorm'
     union all
     -- BUNDLE ITEM INVENTORY QUERY
     SELECT 
-    pbs.domain_id as "domain_id",
-    pbs.bizplace_id as "bizplace_id",
-    pb.packing_type as "packing_type", 
-    pb.packing_size as "packing_size",
+    pbs.domain_id as "domainId",
+    pbs.bizplace_id as "bizplaceId",
+    pb.packing_type as "packingType", 
+    pb.packing_size as "packingSize",
     'UNIT' AS "uom", 
-    null as "product_id",
-    pb.id AS "product_bundle_id",
-    COALESCE(MIN(FLOOR(pbs."available_qty")),0) AS "remain_qty", 
-    COALESCE(MIN(FLOOR(pbs."available_uom_value")),0) AS "remain_uom_value",
+    null as "productId",
+    pb.id AS "productBundleId",
+    COALESCE(MIN(FLOOR(pbs."availableQty")),0) AS "remainQty", 
+    COALESCE(MIN(FLOOR(pbs."availableUomValue")),0) AS "remainUomValue",
     COALESCE(MIN(FLOOR(pbs."qty")), 0::double precision) AS "qty",
-    COALESCE(MIN(FLOOR(pbs."uom_value")), 0::double precision) AS "uom_value",
-    'BUNDLE' AS "group_type"
+    COALESCE(MIN(FLOOR(pbs."uomValue")), 0::double precision) AS "uomValue",
+    'BUNDLE' AS "groupType"
     FROM product_bundles pb
     INNER JOIN (
       SELECT i.domain_id, i.bizplace_id, pbs.product_id, pbs.product_bundle_id, min(pbs.bundle_qty),
-      (SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0))) / min(pbs.bundle_qty) AS "available_qty",
-      (SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0))) / min(pbs.bundle_qty)  AS "available_uom_value",
+      (SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0))) / min(pbs.bundle_qty) AS "availableQty",
+      (SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0))) / min(pbs.bundle_qty)  AS "availableUomValue",
       (sum(COALESCE(i.qty, 0::double precision))) / min(pbs.bundle_qty)::double precision AS "qty",
-      (sum(COALESCE(i.uom_value, 0::double precision))) / min(pbs.bundle_qty)::double precision AS "uom_value"
+      (sum(COALESCE(i.uom_value, 0::double precision))) / min(pbs.bundle_qty)::double precision AS "uomValue"
       FROM product_bundle_settings pbs 
       LEFT JOIN inventories i ON i.product_id = pbs.product_id AND i.status = 'STORED'
-      INNER JOIN locations l ON i.location_id = l.id AND i.domain_id = l.domain_id AND l.type NOT IN ('QUARANTINE', 'RESERVE') 
+      INNER JOIN locations l ON i.location_id = l.id AND i.domain_id = l.domain_id AND l.type NOT IN ('QUARANTINE', 'RESERVE')    
+      LEFT JOIN oi ON oi.product_id = i.product_id
       GROUP by
         i.domain_id, 
         i.bizplace_id,
@@ -68,13 +101,14 @@ import { ViewColumn, ViewEntity } from 'typeorm'
     pb.id
   )
   AS src 
-  inner join domains d on d.id = src."domain_id"
-  inner join bizplaces b on b.id = src."bizplace_id"
-  where src."remain_qty" >= 0
+  inner join domains d on d.id = src."domainId"
+  inner join bizplaces b on b.id = src."bizplaceId"
+  where src."remainQty" >= 0
   and src."qty" > 0
-  order by src."domain_id"
+  order by src."domainId"
   `
 })
+
 export class WarehouseBizplaceOnhandInventory {
   @ViewColumn()
   domainName: string

package/server/graphql/resolvers/worksheet/batch-picking-worksheet.ts

@@ -32,7 +32,6 @@ export const batchPickingWorksheetResolver = {
       .addSelect('"PROD".name', 'productName')
       .addSelect('"PROD".sku', 'productSku')
       .addSelect('"PROD".description', 'productDescription')
-      .addSelect('"PROD_DET".id', 'productDetailId')
       .addSelect('"INV".qty', 'qty')
       .addSelect('"INV".packing_type', 'packingType')
       .addSelect('"INV".packing_size', 'packingSize')
@@ -48,7 +47,6 @@ export const batchPickingWorksheetResolver = {
       .leftJoin('WSD.targetInventory', 'T_INV')
       .leftJoin('T_INV.inventory', 'INV')
       .leftJoin('T_INV.product', 'PROD')
-      .leftJoin('T_INV.productDetail', 'PROD_DET')
       .leftJoin('T_INV.binLocation', 'BIN_LOC')
       .leftJoin('INV.location', 'LOC')
       .where('"WSD"."worksheet_id" = :worksheetId', { worksheetId: worksheet.id })
@@ -66,7 +64,6 @@ export const batchPickingWorksheetResolver = {
       .addGroupBy('"PROD".name')
       .addGroupBy('"PROD".sku')
       .addGroupBy('"PROD".description')
-      .addGroupBy('"PROD_DET".id')
       .addGroupBy('"T_INV".batch_id')
       .addGroupBy('"T_INV".packing_type')
       .addGroupBy('BIN_LOC.name')
@@ -129,9 +126,6 @@ export const batchPickingWorksheetResolver = {
               name: item?.productName,
               description: item?.productDescription,
               sku: item?.productSku
-            },
-            productDetail: {
-              id: item?.productDetailId
             }
           }
         }

package/server/graphql/resolvers/worksheet/check-stock-take-current-location.ts

@@ -6,58 +6,56 @@ import { WorksheetDetail } from '../../../entities'
 
 export const checkStockTakeCurrentLocationResolver = {
   async checkStockTakeCurrentLocation(_: any, { palletId, cycleCountNo }, context: any) {
-    try {
-      const { domain }: { domain: Domain } = context.state
-      const invRepo: Repository<Inventory> = getRepository(Inventory)
-      const worksheetDetailRepo: Repository<WorksheetDetail> = getRepository(WorksheetDetail)
-      const inventoryCheckRepo: Repository<InventoryCheck> = getRepository(InventoryCheck)
-
-      const inventory: Inventory = await invRepo.findOne({
-        where: { domain, palletId },
-        relations: ['bizplace']
-      })
-
-      const cycleCount: InventoryCheck = await inventoryCheckRepo.findOne({
-        where: { domain, name: cycleCountNo },
-        relations: [
-          'orderInventories',
-          'orderInventories.inventory',
-          'orderInventories.inventory.location',
-          'orderInventories.inventory.product'
-        ]
-      })
-
-      const orderInventories: OrderInventory[] = cycleCount.orderInventories
-
-      const foundInventory: Inventory = orderInventories.find(
-        (oi: OrderInventory) => oi.inventory.palletId === inventory.palletId
-      )?.inventory
-
-      const foundWSD: any[] = await Promise.all(
-        orderInventories
-          .filter((oi: OrderInventory) => oi.inventory.palletId === inventory.palletId)
-          .map(async (oi: OrderInventory) => {
-            const matchingWSD = await worksheetDetailRepo.findOne({
-              where: { domain, targetInventory: oi }
-            })
-
-            return matchingWSD
+    const { domain }: { domain: Domain } = context.state
+    const invRepo: Repository<Inventory> = getRepository(Inventory)
+    const worksheetDetailRepo: Repository<WorksheetDetail> = getRepository(WorksheetDetail)
+    const inventoryCheckRepo: Repository<InventoryCheck> = getRepository(InventoryCheck)
+
+    const inventory: Inventory = await invRepo.findOne({
+      where: { domain, palletId },
+      relations: ['bizplace']
+    })
+
+    const cycleCount: InventoryCheck = await inventoryCheckRepo.findOne({
+      where: { domain, name: cycleCountNo },
+      relations: [
+        'orderInventories',
+        'orderInventories.inventory',
+        'orderInventories.inventory.location',
+        'orderInventories.inventory.product'
+      ]
+    })
+
+    const orderInventories: OrderInventory[] = cycleCount.orderInventories
+
+    const foundInventory: Inventory = orderInventories.find(
+      (oi: OrderInventory) => oi.inventory.palletId === inventory.palletId
+    ).inventory
+
+    const foundWSD: any[] = await Promise.all(
+      orderInventories
+        .filter((oi: OrderInventory) => oi.inventory.palletId === inventory.palletId)
+        .map(async (oi: OrderInventory) => {
+          const matchingWSD = await worksheetDetailRepo.findOne({
+            where: { domain, targetInventory: oi }
           })
-      )
-
-      if (!foundInventory) throw new Error(`${inventory.palletId} is not in cycle count worksheet`)
-
-      return {
-        worksheetDetailName: foundWSD[0].name,
-        currentLocation: foundInventory.location.name,
-        palletId: foundInventory.palletId,
-        batchId: foundInventory.batchId,
-        qty: foundInventory.qty,
-        uomValue: foundInventory.uomValue,
-        uom: foundInventory.uom,
-        productName: foundInventory.product.name,
-        productDescription: foundInventory.product.description
-      }
-    } catch (e) {}
+
+          return matchingWSD
+        })
+    )
+
+    if (!foundInventory) throw new Error(`${inventory.palletId} is not in cycle count worksheet`)
+
+    return {
+      worksheetDetailName: foundWSD[0].name,
+      currentLocation: foundInventory.location.name,
+      palletId: foundInventory.palletId,
+      batchId: foundInventory.batchId,
+      qty: foundInventory.qty,
+      uomValue: foundInventory.uomValue,
+      uom: foundInventory.uom,
+      productName: foundInventory.product.name,
+      productDescription: foundInventory.product.description
+    }
   }
 }

package/server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts

@@ -1,6 +1,8 @@
 import { EntityManager, In } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
+// import { logger } from '@things-factory/env'
+// import { Account, AccountingAPI } from '@things-factory/integration-accounting'
 import {
   DeliveryOrder,
   ORDER_INVENTORY_STATUS,
@@ -11,9 +13,10 @@ import {
   ReleaseGood
 } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location, generateInventoryHistory } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location } from '@things-factory/warehouse-base'
 
 import { Worksheet, WorksheetDetail } from '../../../entities'
+import { generateInventoryHistory } from '../../../utils'
 
 export const confirmCancellationReleaseOrder = {
   async confirmCancellationReleaseOrder(_: any, { name }, context: any) {
@@ -22,9 +25,13 @@ export const confirmCancellationReleaseOrder = {
       where: { domain, name, status: ORDER_STATUS.PENDING_CANCEL },
       relations: [
         'bizplace',
+        'bizplace.domain',
+        'orderProducts',
         'orderInventories',
         'orderInventories.inventory',
         'orderInventories.inventory.location',
+        'orderInventories.inventory.product',
+        'orderInventories.inventory.productDetail',
         'orderVass'
       ]
     })
@@ -189,6 +196,41 @@ export const confirmCancellationReleaseOrder = {
     releaseGood.updater = user
     await tx.getRepository(ReleaseGood).save(releaseGood)
 
+    // if (releaseGood?.refNo3 && releaseGood?.type == 'b2c') {
+    //   const account: Account = await tx
+    //     .getRepository(Account)
+    //     .findOne({ domain: releaseGood.bizplace.domain, status: 'active' })
+
+    //   // Xilnex create shipment and create sales return if sales invoice is completed
+    //   const createSalesReturn = async account => {
+    //     if (account) {
+    //       await getManager().transaction(async txMgr => {
+    //         if (account.platform == 'xilnex') {
+    //           try {
+    //             await AccountingAPI.createShipment(account, {
+    //               releaseGood,
+    //               orderProducts: releaseGood.orderProducts
+    //             })
+    //           } catch (error) {
+    //             logger.error(`confirm-cancellation-release-order[createShipment]: ${error}`)
+    //           }
+
+    //           try {
+    //             await AccountingAPI.createSalesReturn(account, {
+    //               releaseGood,
+    //               orderProducts: releaseGood.orderProducts
+    //             })
+    //           } catch (error) {
+    //             logger.error(`confirm-cancellation-release-order[createSalesReturn]: ${error}`)
+    //           }
+    //         }
+    //       })
+    //     }
+    //   }
+
+    //   createSalesReturn(account)
+    // }
+
     return
   }
 }

package/server/graphql/resolvers/worksheet/cycle-count-adjustment.ts

@@ -4,12 +4,12 @@ import { User } from '@things-factory/auth-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { InventoryCheck, ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location, generateInventoryHistory } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { SellercraftController } from '../../../controllers'
 import { Worksheet, WorksheetDetail } from '../../../entities'
-import { switchLocationStatus } from '../../../utils'
+import { generateInventoryHistory, switchLocationStatus } from '../../../utils'
 
 export const cycleCountAdjustmentResolver = {
   async cycleCountAdjustment(_: any, { cycleCountNo }, context: any) {

package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts

@@ -40,7 +40,6 @@ export const inventoriesByPalletResolver = {
     qb.leftJoinAndSelect('iv.domain', 'domain')
       .leftJoinAndSelect('iv.bizplace', 'bizplace')
       .leftJoinAndSelect('iv.product', 'product')
-      .leftJoinAndSelect('iv.productDetail', 'productDetail')
       .leftJoinAndSelect('iv.warehouse', 'warehouse')
       .leftJoinAndSelect('iv.location', 'location')
       .leftJoinAndSelect('iv.creator', 'creator')
@@ -135,8 +134,7 @@ export const inventoriesByPalletResolver = {
           productName: item.product.name,
           productSKU: item.product.sku,
           productBrand: item.product.brand,
-          productId: item.product.id,
-          productDetailId: item.productDetail.id
+          productId: item.product.id
         }
       })
     )

package/server/graphql/resolvers/worksheet/packing-worksheet.ts

@@ -14,7 +14,7 @@ import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, Location } from '@things-factory/warehouse-base'
 
-import { WORKSHEET_TYPE, WORKSHEET_STATUS } from '../../../constants'
+import { WORKSHEET_TYPE } from '../../../constants'
 import { PackingWorksheetController, SellercraftController } from '../../../controllers'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 
@@ -104,9 +104,7 @@ export const packingWorksheetResolver = {
 
       if (!worksheet) throw new Error('Worksheet does not exist')
 
-      if (worksheet.status === WORKSHEET_STATUS.DONE) {
-        throw new Error(`Worksheet is completed already`)
-      } else if (worksheet.status === WORKSHEET_STATUS.DEACTIVATED) {
+      if (worksheet.status === 'DEACTIVATED') {
         const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
 
         const directActivatePackingWorksheet: Setting = await tx.getRepository(Setting).findOne({

package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts

@@ -93,9 +93,9 @@ export async function completeBatchPicking(
           break
 
         case ApplicationType.MMS:
-          const companyDomain: Domain = releaseGood.bizplace.company.domain
+          const companyDomain: Domain = foundReleaseGood.bizplace.company.domain
           const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-            where: { orderNo: releaseGood.refNo, domain: companyDomain },
+            where: { orderNo: foundReleaseGood.refNo, domain: companyDomain },
             relations: [
               'marketplaceOrderItems',
               'marketplaceOrderItems.marketplaceOrderShippingItems',
@@ -108,7 +108,7 @@ export async function completeBatchPicking(
 
           if (marketplaceStore?.isAutoUpdateShipment) {
             const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-            await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain)
+            await ecommerceCtrl.createOrderShip(foundReleaseGood, marketplaceStore, marketplaceOrder, companyDomain)
           }
           break
 

package/server/graphql/resolvers/worksheet/picking/complete-picking.ts

@@ -2,6 +2,8 @@ import { EntityManager, getManager } from 'typeorm'
 
 import { ApplicationType, User } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint, getMyBizplace } from '@things-factory/biz-base'
+// import { logger } from '@things-factory/env'
+// import { Account, AccountingAPI } from '@things-factory/integration-accounting'
 import { LastMileAPI, LastMileDelivery } from '@things-factory/integration-lmd'
 import { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
@@ -57,7 +59,15 @@ export async function completePicking(
   const pickingWSCtrl: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
   let releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
     where: { domain, name: releaseGoodNo },
-    relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
+    relations: [
+      'bizplace',
+      'bizplace.domain',
+      'bizplace.company',
+      'bizplace.company.domain',
+      'orderProducts',
+      'orderProducts.product',
+      'orderProducts.productDetail'
+    ]
   })
 
   const worksheet: Worksheet = await pickingWSCtrl.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.PICKING, [
@@ -238,6 +248,52 @@ export async function completePicking(
       break
   }
 
+  // const account: Account = await tx
+  //   .getRepository(Account)
+  //   .findOne({ domain: releaseGood.bizplace.domain, status: 'active' })
+
+  // // Xilnex Create Sales Order and Post Sales Order to Sales Invoice
+  // const createSalesOrder = async account => {
+  //   if (account) {
+  //     try {
+  //       await getManager().transaction(async txMgr => {
+  //         if (account.platform == 'xilnex') {
+  //           const salesOrder: any = await AccountingAPI.createSalesOrder(account, {
+  //             releaseGood,
+  //             orderProducts: releaseGood.orderProducts
+  //           })
+
+  //           if (salesOrder) {
+  //             const salesInvoice: any = await AccountingAPI.postSalesOrderToSalesInvoice(account, {
+  //               orderId: salesOrder?.id || null
+  //             })
+
+  //             const salesOrderItems: any = salesInvoice.sale.items
+  //             await Promise.all(
+  //               releaseGood.orderProducts.map(async op => {
+  //                 const matchedProduct: any = salesOrderItems.find(soi => soi.itemId == op.productDetail.refCode)
+  //                 if (matchedProduct) {
+  //                   await tx.getRepository(OrderProduct).update({ id: op.id }, { refItemId: matchedProduct.id })
+  //                 }
+  //               })
+  //             )
+
+  //             await txMgr
+  //               .getRepository(ReleaseGood)
+  //               .update({ id: releaseGood.id }, { refNo3: salesInvoice.salesId, updater: releaseGood.updater })
+  //           }
+  //         }
+  //       })
+  //     } catch (error) {
+  //       logger.error(`complete-picking[createSalesOrder]: ${error}`)
+  //     }
+  //   }
+  // }
+
+  // if (releaseGood.type == 'b2c') {
+  //   createSalesOrder(account)
+  // }
+
   if (releaseGood.packingOption) {
     const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
     await packingWSCtrl.generatePackingWorksheet(releaseGoodNo)

package/server/graphql/resolvers/worksheet/picking-worksheet.ts

@@ -76,7 +76,6 @@ export async function pickingWorksheet(
     .leftJoinAndSelect('T_INV.binLocation', 'BIN_LOC')
     .leftJoinAndSelect('T_INV.inventory', 'INV')
     .leftJoinAndSelect('T_INV.product', 'PROD')
-    .leftJoinAndSelect('T_INV.productDetail', 'PROD_DET')
     .leftJoinAndSelect('INV.location', 'LOC')
 
   if (locationSortingRules?.length > 0) {
@@ -115,8 +114,8 @@ export async function pickingWorksheet(
       const inventoryChangesCount: number = await tx.getRepository(InventoryChange).count({
         where: {
           inventory: inventory.id,
-          status: 'PENDING',
-          transactionType: 'MISSING'
+          status: "PENDING",
+          transactionType: "MISSING"
         },
         relations: ['inventory', 'product']
       })

package/server/graphql/resolvers/worksheet/transfer.ts

@@ -1,36 +1,38 @@
-import { EntityManager } from 'typeorm'
-
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { ORDER_PRODUCT_STATUS, OrderInventory } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
+import { OrderInventory, ORDER_PRODUCT_STATUS } from '@things-factory/sales-base'
 import {
   Inventory,
-  INVENTORY_STATUS,
-  INVENTORY_TRANSACTION_TYPE,
   InventoryHistory,
-  InventoryNoGenerator
+  InventoryNoGenerator,
+  INVENTORY_STATUS,
+  INVENTORY_TRANSACTION_TYPE
 } from '@things-factory/warehouse-base'
-
+import { EntityManager } from 'typeorm'
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 
 export const transfer = {
   async transfer(_: any, { palletId, toPalletId, qty }, context: any) {
-    const { tx, domain, bizplace, user }: { tx: EntityManager; domain: Domain; bizplace: Bizplace; user: User } =
-      context.state
+    const {
+      tx,
+      domain,
+      bizplace,
+      user
+    }: { tx: EntityManager; domain: Domain; bizplace: Bizplace; user: User } = context.state
 
     // 1. get to inventory
     let toInventory: Inventory = await tx.getRepository(Inventory).findOne({
       where: { domain: domain, palletId: toPalletId },
-      relations: ['bizplace', 'product', 'productDetail', 'warehouse', 'location']
+      relations: ['bizplace', 'product', 'warehouse', 'location']
     })
     if (!toInventory) throw new Error(`to pallet doesn't exists`)
 
     // 2. get from inventory
     let fromInventory: Inventory = await tx.getRepository(Inventory).findOne({
       where: { domain: domain, palletId },
-      relations: ['bizplace', 'product', 'productDetail', 'warehouse', 'location']
+      relations: ['bizplace', 'product', 'warehouse', 'location']
     })
     if (!fromInventory) throw new Error(`from pallet doesn't exists`)
     if (toInventory.batchId !== fromInventory.batchId) throw new Error(`Can't transfer to different batch`)
@@ -72,7 +74,6 @@ export const transfer = {
         domain: domain,
         name: InventoryNoGenerator.inventoryHistoryName(),
         product: toInventory.product,
-        productDetail: toInventory.productDetail,
         warehouse: toInventory.warehouse,
         location: toInventory.location,
         seq: toInventory.lastSeq,
@@ -96,7 +97,7 @@ export const transfer = {
 
       fromInventory = await tx.getRepository(Inventory).findOne({
         where: { id: fromInventory.id },
-        relations: ['bizplace', 'product', 'productDetail', 'warehouse', 'location']
+        relations: ['bizplace', 'product', 'warehouse', 'location']
       })
 
       //    - add inventory history
@@ -104,7 +105,6 @@ export const transfer = {
         ...fromInventory,
         name: InventoryNoGenerator.inventoryHistoryName(),
         product: fromInventory.product,
-        productDetail: fromInventory.productDetail,
         warehouse: fromInventory.warehouse,
         location: fromInventory.location,
         seq: fromInventory.lastSeq,
@@ -131,7 +131,7 @@ export const transfer = {
 
       toInventory = await tx.getRepository(Inventory).findOne({
         where: { id: toInventory.id },
-        relations: ['bizplace', 'product', 'productDetail', 'warehouse', 'location']
+        relations: ['bizplace', 'product', 'warehouse', 'location']
       })
       //    - add inventory history
       delete toInventory.id
@@ -140,7 +140,6 @@ export const transfer = {
         domain,
         name: InventoryNoGenerator.inventoryHistoryName(),
         product: toInventory.product,
-        productDetail: toInventory.productDetail,
         warehouse: toInventory.warehouse,
         location: toInventory.location,
         seq: toInventory.lastSeq,
@@ -158,7 +157,7 @@ export const transfer = {
 
       fromInventory = await tx.getRepository(Inventory).findOne({
         where: { id: fromInventory.id },
-        relations: ['bizplace', 'product', 'productDetail', 'warehouse', 'location']
+        relations: ['bizplace', 'product', 'warehouse', 'location']
       })
 
       //    - add inventory history
@@ -166,7 +165,6 @@ export const transfer = {
         ...fromInventory,
         name: InventoryNoGenerator.inventoryHistoryName(),
         product: fromInventory.product,
-        productDetail: fromInventory.productDetail,
         warehouse: fromInventory.warehouse,
         location: fromInventory.location,
         seq: fromInventory.lastSeq,

package/server/graphql/resolvers/worksheet/unloaded-inventories.ts

@@ -44,7 +44,7 @@ export const unloadedInventories = {
           orderProductId: In(foundWorksheetDetails.map(wsd => wsd.targetProduct.id)),
           status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED])
         },
-        relations: ['reusablePallet', 'product', 'bizplace', 'inventoryItems']
+        relations: ['reusablePallet', 'product', 'bizplace']
       })
       const items = foundInv.map((inv: Inventory) => {
         const expirationDate: Date = inv.expirationDate ? new Date(inv.expirationDate) : null