@things-factory/worksheet-base 5.0.0-alpha.3 → 5.0.0-alpha.30

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

@@ -1,3 +1,4 @@
+import _ from 'lodash'
 import FormData from 'form-data'
 import fetch from 'node-fetch'
 import { Equal, getRepository, In } from 'typeorm'
@@ -10,9 +11,10 @@ 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'
+import { DateTimeConverter } from '../utils/datetime-util'
 
 const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
 
@@ -48,6 +50,10 @@ export async function renderRODO({ doNo }, context: any) {
   const partnerBiz: Bizplace = foundDO.bizplace //customer bizplace
   const ownRefNo = foundRO.refNo
 
+  let foundInventoryItem: InventoryItem[] = await getRepository(InventoryItem).query(
+    `select row_number() over (partition by p.sku) as "seq",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 partnerDomain: Partner = await getRepository(Partner).findOne({
     where: { partnerDomain: partnerBiz.domain, domain },
     relations: ['domain']
@@ -70,6 +76,11 @@ export async function renderRODO({ doNo }, context: any) {
     relations: ['updater']
   })
 
+  const foundLoadingWS: Worksheet = await getRepository(Worksheet).findOne({
+    where: { domain, releaseGood: foundRO, type: WORKSHEET_TYPE.LOADING },
+    relations: ['updater']
+  })
+
   //find reusable pallet
   const foundRP: Pallet[] = await getRepository(Pallet).find({
     where: { domain, refOrderNo: foundRO.name }
@@ -211,6 +222,68 @@ export async function renderRODO({ doNo }, context: any) {
       }
     }, [])
 
+
+
+  let tempFoundInventoryItem: any = []
+
+  const sepProductList = productList.flatMap(p => Array.from({ length: p.product_qty }, () => ({ ...p })))
+
+  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 (tempFoundInventoryItem.length == 0) {
+          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))
+    }
+  })
+
+  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) => {
+    if (t >= 0)
+      foundInventoryItem[t].totalQuantity = tempTotalQuantity[index]
+  })
+
+  foundInventoryItem[0].ref_no = ownRefNo || ""
+
   const data = {
     logo_url: logo,
     customer_biz: partnerBiz.name,
@@ -231,9 +304,16 @@ export async function renderRODO({ doNo }, context: any) {
     customer_name: foundCP ? foundCP.name : null,
     customer_delivery_address: foundCP ? foundCP.address : null,
     customer_billing_address: foundCP ? foundCP.billingAddress : null,
+    new_billing_address: foundRO?.billingAddress || null,
     new_delivery_address: foundRO?.deliveryAddress1 || null,
     new_delivery_address2: foundRO?.deliveryAddress2 || null,
-    new_billing_address: foundRO?.billingAddress || null,
+    new_delivery_address3: foundRO?.deliveryAddress3 || null,
+    new_delivery_address4: foundRO?.deliveryAddress4 || null,
+    new_delivery_address5: foundRO?.deliveryAddress5 || null,
+    new_delivery_city: foundRO?.city || null,
+    new_delivery_state: foundRO?.state || null,
+    new_delivery_postal_code: foundRO?.postalCode || null,
+    new_delivery_country: foundRO?.country || null,
     new_attention_to: foundRO?.attentionTo || null,
     new_attention_company: foundRO?.attentionCompany || null,
     new_phone_no: foundRO?.phone1 || null,
@@ -251,6 +331,8 @@ export async function renderRODO({ doNo }, context: any) {
     ref_no3: foundRO.refNo3 ? `${foundRO.refNo3}` : '',
     order_no: foundDO.name,
     delivery_date: foundDO.deliveryDate || '',
+    complete_loading_date: DateTimeConverter.date(foundLoadingWS.endedAt),
+    ro_created_date: DateTimeConverter.date(foundRO.createdAt),
     truck_no: foundDO.truckNo,
     driver_name: foundDriver || '',
     pallet_qty: foundDO.palletQty,
@@ -266,15 +348,18 @@ 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
       }
+    }),
+    serialNumber: foundInventoryItem.map((item: any, idx) => {
+      return { ...item, delivery_to: foundDO.to }
     })
   } //.. make data from do
   const formData = new FormData()

package/server/controllers/worksheet-controller.ts

@@ -3,7 +3,7 @@ import { EntityManager, EntitySchema, Equal, FindOneOptions, In, Not } from 'typ
 import { Role, User } from '@things-factory/auth-base'
 import { Bizplace, getDomainUsers } from '@things-factory/biz-base'
 import { sendNotification } from '@things-factory/notification'
-import { ProductDetail } from '@things-factory/product-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import {
   ArrivalNotice,
   DeliveryOrder,
@@ -19,7 +19,7 @@ import {
   VasOrder
 } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, INVENTORY_STATUS, Pallet } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, InventoryItem, Pallet } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
 import { Worksheet, WorksheetDetail } from '../entities'
@@ -941,6 +941,22 @@ export class WorksheetController {
     if (duplicatedCartonCnt) throw new Error(this.ERROR_MSG.VALIDITY.DUPLICATED('Carton ID', cartonId))
   }
 
+  /**
+   * @summary Check whether passed serial number is existing already
+   * @description It will try to count inventories which has same domain and same serial number and  and not terminated one
+   * If there's positive result it will throw an error cause serial number is duplicated
+   */
+  async checkSerialNumberDuplication(serialNumber: string, product: Product): Promise<void> {
+    const duplicatedSerialNumberCnt: number = await this.trxMgr.getRepository(InventoryItem).count({
+      domain: this.domain,
+      product,
+      serialNumber,
+      status: Not(Equal(INVENTORY_STATUS.DELETED))
+    })
+
+    if (duplicatedSerialNumberCnt) throw new Error(this.ERROR_MSG.VALIDITY.DUPLICATED('Serial Number', serialNumber))
+  }
+
   /**
    * @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/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/generate-worksheet/generate-arrival-notice-worksheet.ts

@@ -8,34 +8,44 @@ import { Worksheet } from '../../../../entities'
 export const generateArrivalNoticeWorksheetResolver = {
   async generateArrivalNoticeWorksheet(_: any, { arrivalNoticeNo, bufferLocation }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    let unloadingWorksheet = await generateUnloadingWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation)
-
-    if (!unloadingWorksheet.arrivalNotice?.id) {
-      unloadingWorksheet = await tx.getRepository(Worksheet).findOne({
-        where: unloadingWorksheet,
-        relations: ['arrivalNotice']
-      })
-    }
-
-    let arrivalNotice: ArrivalNotice = unloadingWorksheet.arrivalNotice
-    const crossDocking: boolean = unloadingWorksheet.arrivalNotice.crossDocking
-
-    if (crossDocking) {
-      arrivalNotice = await tx
-        .getRepository(ArrivalNotice)
-        .findOne({ where: { domain: domain, name: arrivalNoticeNo }, relations: ['releaseGood'] })
-
-      const releaseGoodNo: string = arrivalNotice.releaseGood.name
-      const pickingWSCtrl: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
-      await pickingWSCtrl.generatePickingWorksheet(releaseGoodNo)
-    }
-
-    const vasWorksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
-      where: { domain: domain, arrivalNotice }
+    return await generateArrivalNoticeWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation)
+  }
+}
+
+export async function generateArrivalNoticeWorksheet(
+  tx: EntityManager,
+  domain: Domain,
+  user: User,
+  arrivalNoticeNo: string,
+  bufferLocation: { id: string }
+) {
+  let unloadingWorksheet = await generateUnloadingWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation)
+
+  if (!unloadingWorksheet.arrivalNotice?.id) {
+    unloadingWorksheet = await tx.getRepository(Worksheet).findOne({
+      where: unloadingWorksheet,
+      relations: ['arrivalNotice']
     })
+  }
+
+  let arrivalNotice: ArrivalNotice = unloadingWorksheet.arrivalNotice
+  const crossDocking: boolean = unloadingWorksheet.arrivalNotice.crossDocking
 
-    return { unloadingWorksheet, vasWorksheet }
+  if (crossDocking) {
+    arrivalNotice = await tx
+      .getRepository(ArrivalNotice)
+      .findOne({ where: { domain: domain, name: arrivalNoticeNo }, relations: ['releaseGood'] })
+
+    const releaseGoodNo: string = arrivalNotice.releaseGood.name
+    const pickingWSCtrl: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
+    await pickingWSCtrl.generatePickingWorksheet(releaseGoodNo)
   }
+
+  const vasWorksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
+    where: { domain: domain, arrivalNotice }
+  })
+
+  return { unloadingWorksheet, vasWorksheet }
 }
 
 async function generateUnloadingWorksheet(

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/loading/complete-loading.ts

@@ -5,6 +5,7 @@ import { EntityManager } from 'typeorm'
 import { WORKSHEET_TYPE } from '../../../../constants'
 import { LoadingWorksheetController, ReturningWorksheetController } from '../../../../controllers'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
+import { Sftp, SftpAPI } from '@things-factory/integration-sftp'
 
 export const completeLoadingResolver = {
   async completeLoading(_: any, { releaseGoodNo }, context: any) {
@@ -20,14 +21,19 @@ export async function completeLoading(
   releaseGoodNo: string
 ): Promise<void> {
   const worksheetController: LoadingWorksheetController = new LoadingWorksheetController(tx, domain, user)
-  const releaseGood: ReleaseGood = await worksheetController.findRefOrder(ReleaseGood, {
-    domain,
-    name: releaseGoodNo,
-    status: ORDER_STATUS.LOADING
-  })
+  const releaseGood: ReleaseGood = await worksheetController.findRefOrder(
+    ReleaseGood,
+    {
+      domain,
+      name: releaseGoodNo,
+      status: ORDER_STATUS.LOADING
+    },
+    ['bizplace', 'bizplace.domain']
+  )
   const worksheet: Worksheet = await worksheetController.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.LOADING, [
     'worksheetDetails',
-    'worksheetDetails.targetInventory'
+    'worksheetDetails.targetInventory',
+    'worksheetDetails.targetInventory.product'
   ])
   const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
   const targetInventories: OrderInventory[] = worksheetDetails.map((wsd: WorksheetDetail) => wsd.targetInventory)
@@ -35,6 +41,19 @@ export async function completeLoading(
     (targetInventory: OrderInventory) => targetInventory.status === ORDER_INVENTORY_STATUS.LOADING
   )
 
+  const customerDomain: Domain = releaseGood.bizplace.domain
+  let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
+    where: { domain: customerDomain }
+  })
+  if (customerAvailableSftp) {
+    let result: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
+      releaseGood,
+      orderInventories: targetInventories,
+      sftp: customerAvailableSftp
+    })
+    customerAvailableSftp = await tx.getRepository(Sftp).save(result)
+  }
+
   await worksheetController.completeLoading(releaseGoodNo)
 
   if (remainInventories.length) {

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)
+}