@things-factory/worksheet-base 4.1.40 → 4.2.1

package/server/controllers/render-orientage-do.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash'
 import FormData from 'form-data'
 import fetch from 'node-fetch'
 import { Equal, getRepository, In } from 'typeorm'
@@ -11,7 +10,7 @@ import { ProductDetail } from '@things-factory/product-base'
 import { DeliveryOrder, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, Pallet } from '@things-factory/warehouse-base'
-import { InventoryItem } from '@things-factory/warehouse-base'
+
 import { TEMPLATE_TYPE, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
 import { Worksheet, WorksheetDetail } from '../entities'
 
@@ -36,10 +35,6 @@ export async function renderOrientageDO({ doNo }, context: any) {
     ]
   }) // .. find do from deliveryOrderId
 
-  let foundInventoryItem: InventoryItem[] = await getRepository(InventoryItem).query(
-    `select row_number() over (partition by p.sku),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`
-  )
-
   const ownTransportFlag: Boolean = foundDO.ownCollection
 
   let foundCP: ContactPoint = null
@@ -155,20 +150,20 @@ export async function renderOrientageDO({ doNo }, context: any) {
         pack_size: matchedProductDetail
           ? matchedProductDetail.uomValue
             ? matchedProductDetail.uomValue +
-              ' ' +
-              matchedProductDetail.uom +
-              (inventory.product.volumeSize
-                ? ' x ' + (parseFloat(inventory.product.volumeSize) / 100).toFixed(2) + ' L'
-                : '')
+            ' ' +
+            matchedProductDetail.uom +
+            (inventory.product.volumeSize
+              ? ' x ' + (parseFloat(inventory.product.volumeSize) / 100).toFixed(2) + ' L'
+              : '')
             : null
           : inventory.product.primaryValue
-          ? inventory.product.primaryValue +
+            ? inventory.product.primaryValue +
             ' ' +
             inventory.product.primaryUnit +
             (inventory.product.volumeSize
               ? ' x ' + (parseFloat(inventory.product.volumeSize) / 100).toFixed(2) + ' L'
               : '')
-          : null,
+            : null,
         aux_value_3: matchedProductDetail ? matchedProductDetail.auxValue3 : inventory.product.auxValue3,
         product_qty: targetInventory.inventory.warehouse !== 'DAMAGE ZONE' ? targetInventory.releaseQty : 0,
         product_qty_damage: targetInventory.inventory.warehouse === 'DAMAGE ZONE' ? targetInventory.releaseQty : 0,
@@ -181,15 +176,15 @@ export async function renderOrientageDO({ doNo }, context: any) {
             ? matchedProductDetail.volume
             : 0
           : inventory?.product?.volume
-          ? inventory.product.volume
-          : 0,
+            ? inventory.product.volume
+            : 0,
         total_volume: matchedProductDetail
           ? matchedProductDetail.volume
             ? Number((matchedProductDetail.volume * targetInventory.releaseQty).toFixed(4))
             : 0
           : inventory?.product?.volume
-          ? Number((inventory.product.volume * targetInventory.releaseQty).toFixed(4))
-          : 0,
+            ? Number((inventory.product.volume * targetInventory.releaseQty).toFixed(4))
+            : 0,
         remark: targetInventory.remark,
         inventory_remark: inventory.remark,
         cross_docking: targetInventory.crossDocking,
@@ -268,47 +263,6 @@ export async function renderOrientageDO({ doNo }, context: any) {
         })
       }
     }, [])
-    
-    let tempFoundInventoryItem:any = []
-
-    productList.forEach((product) => {
-
-       tempFoundInventoryItem = foundInventoryItem.filter((item) =>{
-        return item.sku == product.product_sku
-      })
-
-      tempFoundInventoryItem.concat(tempFoundInventoryItem);
-    })
-
-    foundInventoryItem = tempFoundInventoryItem;
-
-  const filterInventoryItem = _.groupBy(foundInventoryItem, i => i.sku)
-
-  const tempIndexArr = []
-
-  const tempTotalQuantity = []
-
-  Object.keys(filterInventoryItem).forEach(k => {
-    const tempIndex = foundInventoryItem.findIndex(i => {
-      return i.sku == k
-    })
-
-    tempIndexArr.push(tempIndex)
-  })
-
-  Object.values(filterInventoryItem).forEach(k => {
-    const tempQuantity = k.length
-
-    tempTotalQuantity.push(tempQuantity)
-  })
-
-  tempIndexArr.forEach((t, index) => {
-    foundInventoryItem[t].totalQuantity = tempTotalQuantity[index]
-  })
-
-  foundInventoryItem[0].ref_no = ownRefNo
-
-
 
   const data = {
     // logo_url: logo,
@@ -351,9 +305,6 @@ export async function renderOrientageDO({ doNo }, context: any) {
         batch_id_ref: prod.product_batch_ref,
         batch_id: prod.product_batch
       }
-    }),
-    serialNumber: foundInventoryItem.map((item: any, idx) => {
-      return { ...item, delivery_to: foundDO.to }
     })
   } //.. make data from do
   const formData = new FormData()

package/server/controllers/render-orientage-grn.ts

@@ -1,7 +1,7 @@
-import _ from 'lodash'
 import FormData from 'form-data'
 import fetch from 'node-fetch'
 import { getRepository, IsNull, Not } from 'typeorm'
+
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
 import { Partner } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint } from '@things-factory/biz-base'
@@ -14,7 +14,6 @@ import {
   ORDER_STATUS,
   OrderProduct
 } from '@things-factory/sales-base'
-import { InventoryItem } from '@things-factory/warehouse-base'
 import { Domain } from '@things-factory/shell'
 
 import { TEMPLATE_TYPE } from '../constants'
@@ -41,10 +40,6 @@ export async function renderOrientageGRN({ grnNo }, context: any) {
   const ownRefNo2 = foundGAN.refNo2
   const ownRefNo3 = foundGAN.refNo3
 
-  const foundInventoryItem: InventoryItem[] = await getRepository(InventoryItem).query(
-    `select row_number() over (partition by p.sku),p.sku,p.brand_sku, ii.serial_number from inventory_items ii left join products p on ii.product_id = p.id where inbound_order_id = '${foundGAN.id}' group by p.sku,ii.serial_number,p.brand_sku`
-  )
-
   // 4. find customer bizplace
   const partnerBiz: Bizplace = foundGRN.bizplace
 
@@ -95,31 +90,6 @@ export async function renderOrientageGRN({ grnNo }, context: any) {
     logo = 'data:' + foundLogo.mimetype + ';base64,' + (await STORAGE.readFile(foundLogo.path, 'base64'))
   }
 
-  const filterInventoryItem = _.groupBy(foundInventoryItem, i => i.sku)
-
-  const tempIndexArr = []
-
-  const tempTotalQuantity = []
-
-  Object.keys(filterInventoryItem).forEach(k => {
-    const tempIndex = foundInventoryItem.findIndex(i => {
-      return i.sku == k
-    })
-
-    tempIndexArr.push(tempIndex)
-  })
-
-  Object.values(filterInventoryItem).forEach(k => {
-    const tempQuantity = k.length
-
-    tempTotalQuantity.push(tempQuantity)
-  })
-
-  tempIndexArr.forEach((t, index) => {
-    foundInventoryItem[t].totalQuantity = tempTotalQuantity[index]
-  })
-
-
   const data = {
     logo_url: logo,
     customer_biz: partnerBiz.name,
@@ -153,16 +123,16 @@ export async function renderOrientageGRN({ grnNo }, context: any) {
         pack_size: matchedProductDetail
           ? matchedProductDetail.uomValue
             ? matchedProductDetail.uomValue +
-              ' ' +
-              matchedProductDetail.uom +
-              (item.product.volumeSize ? ' x ' + (parseFloat(item.product.volumeSize) / 100).toFixed(2) + ' L' : '')
+            ' ' +
+            matchedProductDetail.uom +
+            (item.product.volumeSize ? ' x ' + (parseFloat(item.product.volumeSize) / 100).toFixed(2) + ' L' : '')
             : null
           : item.product.primaryValue
-          ? item.product.primaryValue +
+            ? item.product.primaryValue +
             ' ' +
             item.product.primaryUnit +
             (item.product.volumeSize ? ' x ' + (parseFloat(item.product.volumeSize) / 100).toFixed(2) + ' L' : '')
-          : null,
+            : null,
         pack_qty: item.packQty ? item.packQty : 0,
         actual_pack_qty: item.actualPackQty ? item.actualPackQty : 0,
         container_no: foundGAN.containerNo ? foundGAN.containerNo : '',
@@ -172,15 +142,15 @@ export async function renderOrientageGRN({ grnNo }, context: any) {
             ? matchedProductDetail.volume
             : 0
           : item?.product?.volume
-          ? item.product.volume
-          : 0,
+            ? item.product.volume
+            : 0,
         total_volume: matchedProductDetail
           ? matchedProductDetail.volume
             ? Number((matchedProductDetail.volume * item.actualPackQty).toFixed(4))
             : 0
           : item?.product?.volume
-          ? Number((item.product.volume * item.actualPackQty).toFixed(4))
-          : 0,
+            ? Number((item.product.volume * item.actualPackQty).toFixed(4))
+            : 0,
         manufacture_year: item.manufactureDate ? new Date(item.manufactureDate).getFullYear() : null,
         manufacture_date: item.manufactureDate ? item.manufactureDate : null,
         literage: matchedProductDetail
@@ -188,12 +158,11 @@ export async function renderOrientageGRN({ grnNo }, context: any) {
             ? parseFloat(matchedProductDetail.packingSize) * parseFloat(item.product.volumeSize)
             : 0
           : item.packingSize
-          ? parseFloat(item.packingSize) * parseFloat(item.product.volumeSize)
-          : 0,
+            ? parseFloat(item.packingSize) * parseFloat(item.product.volumeSize)
+            : 0,
         remark: item.remark || ''
       }
-    }),
-    serialNumber: foundInventoryItem
+    })
   }
 
   const formData = new FormData()

package/server/controllers/render-ro-do.ts

@@ -223,39 +223,39 @@ export async function renderRODO({ doNo }, context: any) {
     }, [])
 
 
-        
-    let tempFoundInventoryItem:any = []
 
-    const sepProductList = productList.flatMap(p=>Array.from({length:p.product_qty},()=>({...p})))
+  let tempFoundInventoryItem: any = []
 
-    sepProductList.forEach((product) => {
+  const sepProductList = productList.flatMap(p => Array.from({ length: p.product_qty }, () => ({ ...p })))
 
-       let temp = foundInventoryItem.filter((item) =>{
-        return item.sku == product.product_sku
-      })
+  sepProductList.forEach((product) => {
+
+    let temp = foundInventoryItem.filter((item) => {
+      return item.sku == product.product_sku
+    })
+
+    if (temp.length > 1) {
+      temp.forEach(res => {
+        console.log(res)
 
-      if(temp.length>1){
-        temp.forEach(res=>{
-          console.log(res)
-    
-          if(tempFoundInventoryItem.length==0){
+        if (tempFoundInventoryItem.length == 0) {
+          tempFoundInventoryItem.push(res)
+        } else {
+          const index = tempFoundInventoryItem.findIndex(res => res.serial_number == res.serial_number)
+
+          if (!index) {
             tempFoundInventoryItem.push(res)
-          }else{
-            const index = tempFoundInventoryItem.findIndex(res=>res.serial_number == res.serial_number)
-    
-            if(!index){
-              tempFoundInventoryItem.push(res)
-            }
           }
-    
-          tempFoundInventoryItem = _.uniqWith(tempFoundInventoryItem,_.isEqual)
-        })
-     }else{
-       tempFoundInventoryItem.push(Object.assign({}, ...temp))
-     }
-    })
+        }
+
+        tempFoundInventoryItem = _.uniqWith(tempFoundInventoryItem, _.isEqual)
+      })
+    } else {
+      tempFoundInventoryItem.push(Object.assign({}, ...temp))
+    }
+  })
 
-    foundInventoryItem = tempFoundInventoryItem;
+  foundInventoryItem = tempFoundInventoryItem;
 
   const filterInventoryItem = _.groupBy(foundInventoryItem, i => i.sku)
 
@@ -278,7 +278,8 @@ export async function renderRODO({ doNo }, context: any) {
   })
 
   tempIndexArr.forEach((t, index) => {
-    foundInventoryItem[t].totalQuantity = tempTotalQuantity[index]
+    if (t >= 0)
+      foundInventoryItem[t].totalQuantity = tempTotalQuantity[index]
   })
 
   foundInventoryItem[0].ref_no = ownRefNo || ""
@@ -347,12 +348,12 @@ export async function renderRODO({ doNo }, context: any) {
         remark: prod?.remark
           ? prod.remark
           : prod.cross_docking
-          ? prod.pallet === ''
-            ? `${prod.palletQty} PALLET(S) [C/D]`
-            : `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
-          : prod.pallet === ''
-          ? `${prod.palletQty} PALLET(S)`
-          : `${prod.palletQty} PALLET(S) (${prod.pallet})`,
+            ? prod.pallet === ''
+              ? `${prod.palletQty} PALLET(S) [C/D]`
+              : `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
+            : prod.pallet === ''
+              ? `${prod.palletQty} PALLET(S)`
+              : `${prod.palletQty} PALLET(S) (${prod.pallet})`,
         inventory_remark: prod?.inventory_remark ? prod.inventory_remark : '',
         batch_id_ref: prod.product_batch_ref
       }

package/server/controllers/worksheet-controller.ts

@@ -950,7 +950,8 @@ export class WorksheetController {
     const duplicatedSerialNumberCnt: number = await this.trxMgr.getRepository(InventoryItem).count({
       domain: this.domain,
       product,
-      serialNumber
+      serialNumber,
+      status: Not(Equal(INVENTORY_STATUS.DELETED))
     })
 
     if (duplicatedSerialNumberCnt) throw new Error(this.ERROR_MSG.VALIDITY.DUPLICATED('Serial Number', serialNumber))

package/server/graphql/resolvers/worksheet/find-release-orders-by-task-no.ts

@@ -1,11 +1,12 @@
 import { EntityManager, SelectQueryBuilder } from 'typeorm'
 
 import {
-  ORDER_STATUS,
+  ORDER_STATUS, ORDER_INVENTORY_STATUS,
   OrderInventory as OrderInventoryEntity,
   ReleaseGood as ReleaseGoodEntity
 } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
+import { Location } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet as WorksheetEntity, WorksheetDetail as WorksheetDetailEntity } from '../../../entities'
@@ -16,6 +17,38 @@ export const findReleaseOrdersByTaskNoResolver = {
     let task = await tx.getRepository(WorksheetEntity).findOne({
       where: { taskNo, status: WORKSHEET_STATUS.EXECUTING, type: WORKSHEET_TYPE.SORTING }
     })
+
+    // Find Task based on Bin
+    if (!task) {
+      const binLocation: Location = await tx.getRepository(Location).findOne({
+        where: { domain, name: taskNo }
+      })
+
+      const qb: SelectQueryBuilder<OrderInventoryEntity> = tx.getRepository(OrderInventoryEntity).createQueryBuilder('orderInventory')
+
+      qb.innerJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
+        .innerJoinAndSelect('worksheets', 'ws', `orderInventory.ref_worksheet_id = ws.id AND ws.type = 'BATCH_PICKING'`)
+        .innerJoinAndSelect('worksheets', 'ws2', `ws2.task_no = ws.task_no AND ws2.type = 'SORTING'`)
+        .innerJoinAndSelect('releaseGood.bizplace', 'bizplace')
+        .innerJoinAndSelect('bizplace.domain', 'domain')
+        .where('orderInventory.domain_id = :domainId', { domainId: domain.id })
+        .andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
+          orderInventoryStatus: [ORDER_INVENTORY_STATUS.SORTING]
+        })
+        .andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
+        .andWhere('releaseGood.status = :status', { status: ORDER_STATUS.SORTING })
+
+      const orderInventoryByBin = await qb.getRawOne()
+      if (orderInventoryByBin?.releaseGood_id) {
+        taskNo = orderInventoryByBin.ws_task_no
+        task = await tx.getRepository(WorksheetEntity).findOne({
+          where: { taskNo, status: WORKSHEET_STATUS.EXECUTING, type: WORKSHEET_TYPE.SORTING }
+        })
+      } else {
+        throw new Error(`Bin do not have any batch picking order.`)
+      }
+    }
+
     if (!task) throw new Error('Unable to find task no.')
 
     const qb: SelectQueryBuilder<WorksheetEntity> = tx
@@ -38,6 +71,6 @@ export const findReleaseOrdersByTaskNoResolver = {
       .addGroupBy('rg.status')
 
     const releaseGoods: ReleaseGoodEntity[] = await qb.getRawMany()
-    return releaseGoods
+    return { releaseGoods, taskNo }
   }
 }

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

@@ -78,6 +78,8 @@ export const inventoriesByPalletResolver = {
       locationSortingRules.forEach((rule: { name: string; desc: boolean }) => {
         qb.addOrderBy(`location.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
       })
+    } else {
+      qb.addOrderBy('location.name', 'DESC')
     }
 
     if (productFilters && productFilters.length > 0) {

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

@@ -2,10 +2,12 @@ import { activatePackingResolver } from './activate-packing'
 import { completePackingResolver } from './complete-packing'
 import { packingResolver } from './packing'
 import { scanProductPackingResolver } from './scan-product-packing'
+import { undoSerialNumberPackingResolver } from './undo-serial-number-packing'
 
 export const Mutations = {
   ...activatePackingResolver,
   ...completePackingResolver,
   ...packingResolver,
-  ...scanProductPackingResolver
+  ...scanProductPackingResolver,
+  ...undoSerialNumberPackingResolver
 }

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

@@ -9,9 +9,9 @@ import { PackingWorksheetController, SellercraftController } from '../../../../c
 import { Worksheet } from '../../../../entities'
 
 export const packingResolver = {
-  async packing(_: any, { worksheetDetailName, releaseQty }, context: any) {
+  async packing(_: any, { worksheetDetailName, releaseQty, serialNumber }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    await packing(tx, domain, user, worksheetDetailName, releaseQty)
+    await packing(tx, domain, user, worksheetDetailName, releaseQty, serialNumber)
   }
 }
 
@@ -20,10 +20,11 @@ export async function packing(
   domain: Domain,
   user: User,
   worksheetDetailName: string,
-  releaseQty: number
+  releaseQty: number,
+  serialNumber: string
 ) {
   const worksheetController: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
-  const worksheetDetail = await worksheetController.packing(worksheetDetailName, releaseQty)
+  const worksheetDetail = await worksheetController.packing(worksheetDetailName, releaseQty, serialNumber)
 
   let releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
   const worksheet: Worksheet = worksheetDetail.worksheet

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

@@ -9,9 +9,9 @@ import { PackingWorksheetController, SellercraftController } from '../../../../c
 import { Worksheet } from '../../../../entities'
 
 export const scanProductPackingResolver = {
-  async scanProductPacking(_: any, { worksheetDetailName, productBarcode }, context: any) {
+  async scanProductPacking(_: any, { worksheetDetailName, productBarcode, serialNumber }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    await scanProductPacking(tx, domain, user, worksheetDetailName, productBarcode)
+    await scanProductPacking(tx, domain, user, worksheetDetailName, productBarcode, serialNumber)
   }
 }
 
@@ -20,10 +20,15 @@ export async function scanProductPacking(
   domain: Domain,
   user: User,
   worksheetDetailName: string,
-  productBarcode: string
+  productBarcode: string,
+  serialNumber?: string
 ) {
   const worksheetController: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
-  const worksheetDetail = await worksheetController.scanProductPacking(worksheetDetailName, productBarcode)
+  const worksheetDetail = await worksheetController.scanProductPacking(
+    worksheetDetailName,
+    productBarcode,
+    serialNumber
+  )
 
   let releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
   const worksheet: Worksheet = worksheetDetail.worksheet

package/server/graphql/resolvers/worksheet/packing/undo-serial-number-packing.ts

@@ -0,0 +1,24 @@
+import { EntityManager } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+
+import { PackingWorksheetController } from '../../../../controllers'
+
+export const undoSerialNumberPackingResolver = {
+  async undoSerialNumberPacking(_: any, { worksheetDetailName, inventoryItemId }, context: any) {
+    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    await undoSerialNumberPacking(tx, domain, user, worksheetDetailName, inventoryItemId)
+  }
+}
+
+async function undoSerialNumberPacking(
+  tx: EntityManager,
+  domain: Domain,
+  user: User,
+  worksheetDetailName: string,
+  inventoryItemId: string
+): Promise<void> {
+  const worksheetController: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
+  await worksheetController.undoSerialNumberPacking(worksheetDetailName, inventoryItemId)
+}