@things-factory/worksheet-base 4.3.81 → 4.3.86

package/server/controllers/worksheet-controller.ts

@@ -393,7 +393,7 @@ export class WorksheetController {
     let existingWorksheet: Worksheet
     try {
       existingWorksheet = await this.findWorksheetByRefOrder(refOrder, type)
-    } catch (e) {}
+    } catch (e) { }
 
     if (existingWorksheet)
       throw new Error(
@@ -1054,6 +1054,48 @@ export class WorksheetController {
     return childQty
   }
 
+  public async getDirectQty(
+    productDetail: ProductDetail,
+    productBarcode: string,
+    qty: number
+  ): Promise<any> {
+    try {
+      console.time('getDirectQty')
+      let results = await this.trxMgr.query(`
+        WITH RECURSIVE cte as (
+          select * from (
+            select pd.product_id as "productId", id, pd.packing_size as "packingSize",
+            pd.packing_type as "packingType", pd.uom as "uom", (pd.uom_value * $2::float) as "uomValue", $2::float as "qty", pd.gtin            
+            from product_details pd 
+            where pd.id = $1
+          ) as dt
+          union all
+          select pd.product_id as "productId", pd.id, pd.packing_size as "packingSize",
+          pd.packing_type as "packingType", pd.uom,
+          dt1.qty * pd.packing_size * pd.uom_value as "uomValue", dt1.qty * pd.packing_size as "qty", pd.gtin
+          from product_details pd
+          inner join cte dt1 on dt1.id = pd.child_product_detail_id 
+          where pd.deleted_at is null
+        )
+        select * from cte where gtin = $3
+      `, [
+        productDetail.id,
+        qty,
+        productBarcode
+      ])
+
+      if (results.length <= 0)
+        throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+
+      console.timeEnd('getDirectQty')
+      return results[0]
+    } catch (error) {
+      throw error
+    }
+  }
+
+
+
   /**
    * @summary Check for product child qty at any scanned level
    * @description It will check every level of product detail by comparing scanned level and GAN registered level.

package/server/entities/worksheet-detail.ts

@@ -16,6 +16,11 @@ import { Worksheet } from './worksheet'
   'ix_worksheet-detail_1',
   (worksheetDetail: WorksheetDetail) => [worksheetDetail.targetInventory]
 )
+@Index(
+  'ix_worksheet-detail_2',
+  (worksheetDetail: WorksheetDetail) => [worksheetDetail.id],
+  { unique: true }
+)
 export class WorksheetDetail {
   @PrimaryGeneratedColumn('uuid')
   id: string

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

@@ -3,6 +3,9 @@ import { Domain } from '@things-factory/shell'
 import { EntityManager } from 'typeorm'
 import { PickingWorksheetController } from '../../../../controllers'
 
+import { pickingWorksheet } from '../picking-worksheet'
+
+
 export const scanProductPickingResolver = {
   async scanProductPicking(
     _: any,
@@ -10,10 +13,9 @@ export const scanProductPickingResolver = {
     context: any
   ) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    await scanProductPicking(
-      tx,
-      domain,
-      user,
+
+    const worksheetController: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
+    let ws = await worksheetController.scanProductPicking(
       worksheetDetailName,
       worksheetType,
       productBarcode,
@@ -23,31 +25,9 @@ export const scanProductPickingResolver = {
       toteNo,
       pickingQty
     )
-  }
-}
 
-export async function scanProductPicking(
-  tx: EntityManager,
-  domain: Domain,
-  user: User,
-  worksheetDetailName: string,
-  worksheetType: string,
-  productBarcode: string,
-  cartonId: string,
-  binLocation?: string,
-  serialNumber?: string,
-  toteNo?: string,
-  pickingQty?: number
-) {
-  const worksheetController: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
-  await worksheetController.scanProductPicking(
-    worksheetDetailName,
-    worksheetType,
-    productBarcode,
-    cartonId,
-    binLocation,
-    serialNumber,
-    toteNo,
-    pickingQty
-  )
+
+    // return await pickingWorksheet(domain, releaseGoodNo, locationSortingRule, tx)
+
+  }
 }