@things-factory/worksheet-base 4.1.33 → 4.1.36

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,21 @@ 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
+    })
+
+    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/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/picking/complete-picking.ts

@@ -5,7 +5,6 @@ import { Bizplace, ContactPoint, getMyBizplace } from '@things-factory/biz-base'
 import { LastMileAPI, LastMileDelivery } from '@things-factory/integration-lmd'
 import { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import { Sftp, SftpAPI } from '@things-factory/integration-sftp'
 import {
   MarketplaceOrder,
   MarketplaceOrderItem,
@@ -213,23 +212,6 @@ export async function completePicking(
     }
   }
 
-  const customerDomain: Domain = releaseGood.bizplace.domain
-  let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
-    where: { domain: customerDomain }
-  })
-  if (customerAvailableSftp) {
-    const orderInventories: OrderInventory[] = await tx.getRepository(OrderInventory).find({
-      where: { releaseGood },
-      relations: ['product']
-    })
-    let result: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
-      releaseGood,
-      orderInventories,
-      sftp: customerAvailableSftp
-    })
-    customerAvailableSftp = await tx.getRepository(Sftp).save(result)
-  }
-
   if (releaseGood.packingOption) {
     const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
 

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

@@ -10,6 +10,7 @@ import { pickingResolver } from './picking'
 import { scanProductPickingResolver } from './scan-product-picking'
 import { scanProductBatchPickingResolver } from './scan-product-batch-picking'
 import { undoPickingAssigmentResolver } from './undo-picking-assignment'
+import { undoSerialNumberPickingResolver } from './undo-serial-number-picking'
 
 export const Mutations = {
   ...assignPickingInventoriesResolver,
@@ -23,5 +24,6 @@ export const Mutations = {
   ...completePickingResolver,
   ...completeBatchPickingResolver,
   ...assignPickingWorkerResolver,
-  ...fetchAndAssignPickingTaskResolver
+  ...fetchAndAssignPickingTaskResolver,
+  ...undoSerialNumberPickingResolver
 }

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

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

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

@@ -1,7 +1,9 @@
+import { getRepository, In } from 'typeorm'
+
 import { ArrivalNotice, Bizplace, ReturnOrder } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS } from '@things-factory/warehouse-base'
-import { getRepository, In } from 'typeorm'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { WorksheetDetail } from '../../../entities'
 
@@ -46,9 +48,11 @@ export const unloadedInventories = {
       })
       const items = foundInv.map((inv: Inventory) => {
         const expirationDate: Date = inv.expirationDate ? new Date(inv.expirationDate) : null
+        const manufactureDate: Date = inv.manufactureDate ? new Date(inv.manufactureDate) : null
         return {
           ...inv,
-          expirationDate: expirationDate
+          expirationDate: expirationDate,
+          manufactureDate: manufactureDate
         }
       })
 

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

@@ -3,14 +3,18 @@ import { completeProductScanUnloadResolver } from './complete-product-scan-unloa
 import { completeUnloadingResolver } from './complete-unloading'
 import { completeUnloadingPartiallyResolver } from './complete-unloading-partially'
 import { scanProductUnloadResolver } from './scan-product-unload'
+import { scanSerialNumberUnloadResolver } from './scan-serial-number-unload'
+import { undoSerialNumberUnloadResolver } from './undo-serial-number-unload'
 import { undoUnloadingResolver } from './undo-unloading'
 import { unloadResolver } from './unload'
 
 export const Mutations = {
   ...activateUnloadingResolver,
   ...scanProductUnloadResolver,
+  ...scanSerialNumberUnloadResolver,
   ...unloadResolver,
   ...undoUnloadingResolver,
+  ...undoSerialNumberUnloadResolver,
   ...completeProductScanUnloadResolver,
   ...completeUnloadingResolver,
   ...completeUnloadingPartiallyResolver

package/server/graphql/resolvers/worksheet/unloading/scan-serial-number-unload.ts

@@ -0,0 +1,26 @@
+import { EntityManager } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+import { Inventory } from '@things-factory/warehouse-base'
+
+import { UnloadingWorksheetController } from '../../../../controllers'
+
+export const scanSerialNumberUnloadResolver = {
+  async scanSerialNumberUnload(_: any, { worksheetDetailName, serialNumber, inventory }, context: any) {
+    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    await scanSerialNumberUnload(tx, domain, user, worksheetDetailName, serialNumber, inventory)
+  }
+}
+
+async function scanSerialNumberUnload(
+  tx: EntityManager,
+  domain: Domain,
+  user: User,
+  worksheetDetailName: string,
+  serialNumber: string,
+  inventory: Partial<Inventory>
+): Promise<void> {
+  const worksheetController: UnloadingWorksheetController = new UnloadingWorksheetController(tx, domain, user)
+  await worksheetController.scanSerialNumberUnload(worksheetDetailName, serialNumber, inventory)
+}

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

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

package/server/graphql/resolvers/worksheet/unloading/unload.ts

@@ -1,7 +1,9 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
-import { EntityManager } from 'typeorm'
+
 import { UnloadingWorksheetController } from '../../../../controllers'
 
 export const unloadResolver = {

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

@@ -59,6 +59,7 @@ export const unloadingWorksheetResolver = {
 
     return {
       worksheetInfo: {
+        arrivalNotice,
         bizplaceName: customerBizplace.name,
         partnerDomainId: customerBizplace?.domain.id,
         customerCompanyDomainId: customerCompanyDomain.id,
@@ -90,7 +91,8 @@ export const unloadingWorksheetResolver = {
           actualPackQty: targetProduct.actualPackQty,
           remark: targetProduct.remark,
           issue: productWSD.issue,
-          status: productWSD.status
+          status: productWSD.status,
+          manufactureDate: targetProduct.manufactureDate ? new Date(targetProduct.manufactureDate) : null
         }
       })
     }

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

@@ -168,6 +168,11 @@ export const Mutation = /* GraphQL */ `
     worksheetNo: String!
   ): Worksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
+  undoSerialNumberPicking (
+    worksheetDetailName: String!
+    inventoryItemId: String!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   unload (
     worksheetDetailName: String!
     inventory: InventoryPatch!
@@ -185,6 +190,12 @@ export const Mutation = /* GraphQL */ `
     inventory: InventoryPatch!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
+  scanSerialNumberUnload (
+    worksheetDetailName: String!
+    serialNumber: String!
+    inventory: InventoryPatch!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   cycleCountAdjustment (
     cycleCountNo: String!
   ): Boolean @transaction
@@ -195,6 +206,11 @@ export const Mutation = /* GraphQL */ `
     inventoryIds: [String]!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
+  undoSerialNumberUnload (
+    worksheetDetailName: String!
+    inventoryItemId: String!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   completeUnloadingPartially (
     arrivalNoticeNo: String!
     worksheetDetail: [WorksheetDetailPatch!]

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

@@ -59,5 +59,6 @@ export const WorksheetDetailInfo = gql`
     releaseGood: ReleaseGood
     actualQty: Int
     actualUomValue: Float
+    manufactureDate: String
   }
 `

package/server/graphql/types/worksheet/worksheet-info.ts

@@ -2,6 +2,7 @@ import { gql } from 'apollo-server-koa'
 
 export const WorksheetInfo = gql`
   type WorksheetInfo {
+    arrivalNotice: ArrivalNotice
     releaseGood: ReleaseGood
     returnOrder: ReturnOrder
     bizplaceName: String