@things-factory/worksheet-base 4.0.0-alpha.7 → 4.0.0-beta.1

package/server/graphql/resolvers/worksheet/vas-transactions/repackaging/undo-repackaging.ts

@@ -1,20 +1,40 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Inventory } from '@things-factory/warehouse-base'
-import { OrderVas, VasOrder } from '@things-factory/sales-base'
+import {
+  OrderVas,
+  VasOrder
+} from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
-import { Worksheet, WorksheetDetail } from '../../../../../entities'
-import { dismissInventory, getWorksheetDetailByName, updateRelatedOrderVas } from '../common-utils'
+import { Inventory } from '@things-factory/warehouse-base'
+
+import {
+  Worksheet,
+  WorksheetDetail
+} from '../../../../../entities'
 import {
+  getWorksheetDetailByName,
+  updateRelatedOrderVas
+} from '../common-utils'
+import {
+  FeaturedInventoryInterface,
   OperationGuideInterface,
   PackingUnits,
-  PalletChangesInterface,
   RefOrderType,
   RepackagingGuide,
-  RepackedInvInfo
+  RepackedInvInfo,
+  TemporaryPalletChangesInterface
 } from '../interfaces'
 
+/** STEPS TO UNDO REPACKAGING
+ *  1. get the pallet id to undo (pallet id must be the LV one and not the parent)
+ *  2. revert the qty of repackedFrom into the original inventory and featuredInv (if applicable)
+ *  3. remove the repackedInv for undo item
+ *  4. update the requiredPkgQty
+ *
+ */
+
 export const undoRepackagingResolver = {
   async undoRepackaging(_: any, { worksheetDetailName, fromPalletId, toPalletId }, context: any) {
     /**
@@ -30,37 +50,49 @@ export const undoRepackagingResolver = {
     let operationGuide: OperationGuideInterface<RepackagingGuide> = JSON.parse(targetVas.operationGuide)
     let operationGuideData: RepackagingGuide = operationGuide.data
     let repackedInvs: RepackedInvInfo[] = operationGuideData.repackedInvs
+    let featuredInvs: FeaturedInventoryInterface[] = operationGuideData.featuredInvs
     let undoInventory: RepackedInvInfo = repackedInvs.find((ri: RepackedInvInfo) => ri.palletId === toPalletId)
     if (!undoInventory) throw new Error(`Couldn't find pallet, using pallet id (${toPalletId})`)
 
     const packingUnit: string = operationGuideData.packingUnit
     const stdAmount: number = operationGuideData.stdAmount
 
-    undoInventory.repackedFrom = undoInventory.repackedFrom.filter(
-      (rf: PalletChangesInterface) => rf.fromPalletId !== fromPalletId
-    )
+    // undoInventory.repackedFrom = undoInventory.repackedFrom.filter(
+    //   (rf: TemporaryPalletChangesInterface) => rf.fromPalletId !== fromPalletId
+    // )
 
     // 완전히 Repacked 상태인 pallet count
-    const repackedPkgQty: number =
-      undoInventory.repackedFrom.reduce((totalAmount: number, rf: PalletChangesInterface) => {
-        const amount: number = packingUnit === PackingUnits.QTY ? rf.reducedQty : rf.reducedUomValue
-        totalAmount += amount
-        return totalAmount
-      }, 0) / stdAmount
+    // const repackedPkgQty: number =
+    //   undoInventory.repackedFrom.reduce((totalAmount: number, rf: TemporaryPalletChangesInterface) => {
+    //     const amount: number = packingUnit === PackingUnits.QTY ? rf.reducedUnitQty : rf.reducedUomValue
+    //     totalAmount += amount
+    //     return totalAmount
+    //   }, 0) / stdAmount
 
     // Undo를 발생한 수량 차이를 계산
-    undoInventory.repackedPkgQty = repackedPkgQty
-
-    // Pallet 전체가 취소된 경우
-    let updatedRepackedInvs: RepackedInvInfo[]
-    if (!undoInventory.repackedFrom?.length) {
-      updatedRepackedInvs = repackedInvs.filter((ri: RepackedInvInfo) => ri.palletId !== toPalletId)
-    } else {
-      updatedRepackedInvs = repackedInvs.map((ri: RepackedInvInfo) => {
-        if (ri.palletId === toPalletId) ri = undoInventory
-        return ri
-      })
-    }
+    // undoInventory.repackedPkgQty = repackedPkgQty
+
+    const updatedRepackedInvs: RepackedInvInfo[] = repackedInvs.filter(
+      (ri: RepackedInvInfo) => ri.palletId !== toPalletId
+    )
+
+    const updatedFeaturedInvs: FeaturedInventoryInterface[] = featuredInvs.reduce(
+      (inventories: FeaturedInventoryInterface[], currInv: FeaturedInventoryInterface) => {
+        undoInventory.repackedFrom.forEach(undoInv => {
+          if (undoInv.fromPalletId == currInv.palletId) {
+            if (packingUnit == PackingUnits.QTY) {
+              currInv.currentUnitQty += undoInv.reducedUnitQty
+            } else if (packingUnit == PackingUnits.UOM) {
+              currInv.currentUomValue += undoInv.reducedUomValue
+            }
+          }
+        })
+
+        inventories.push(currInv)
+        return inventories
+      },
+      []
+    )
 
     const requiredPackageQty: number = await getRequiredPackageQty(
       tx,
@@ -74,17 +106,17 @@ export const undoRepackagingResolver = {
     const repackedPackageQty: number = getRepackedPackageQty(updatedRepackedInvs)
 
     operationGuide.data.requiredPackageQty = requiredPackageQty - repackedPackageQty
+    operationGuide.data.featuredInvs = updatedFeaturedInvs
     operationGuide.data.repackedInvs = updatedRepackedInvs
 
     if (!(refOrder instanceof VasOrder)) {
-      // const palletChanges: PalletChangesInterface[] = operationGuide.data.repackedInvs
+      // const palletChanges: TemporaryPalletChangesInterface[] = operationGuide.data.repackedInvs
       //   .map((ri: RepackedInvInfo) => ri.repackedFrom)
       //   .flat()
 
-      const palletChanges: PalletChangesInterface[] = []
-      await dismissInventory(tx, wsd, targetVas, palletChanges, fromPalletId)
+      const palletChanges: TemporaryPalletChangesInterface[] = []
+      // await dismissInventory(tx, wsd, targetVas, palletChanges, fromPalletId)
     }
-
     // Update every order vas to share same operation guide
     await updateRelatedOrderVas(tx, domain, bizplace, wsd, targetVas, operationGuide, user)
   }

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

@@ -1,11 +1,12 @@
-import { MarketplaceOrder } from '@things-factory/marketplace-base'
-import { OrderInventory, OrderProduct, OrderVas, ORDER_INVENTORY_STATUS } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
 import { Equal, getRepository, Not } from 'typeorm'
+
+import { MarketplaceOrder, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
+import { ORDER_INVENTORY_STATUS, OrderInventory, OrderProduct, OrderVas } from '@things-factory/sales-base'
+import { Setting } from '@things-factory/setting-base'
+import { Domain } from '@things-factory/shell'
+
 import { WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet } from '../../../entities'
-import { Setting } from '@things-factory/setting-base'
-import orderBy from 'lodash/orderBy'
 
 interface WorksheetInterface extends Worksheet {
   orderProducts: OrderProduct[]
@@ -82,34 +83,25 @@ export const worksheetResolver = {
       })
     }
 
-
     if (worksheet.type === WORKSHEET_TYPE.BATCH_PICKING) {
-      // let orderInventories: OrderInventory[] = await getRepository(OrderInventory).find({
-      //   where: {
-      //     domain,
-      //     bizplace: worksheet.bizplace,
-      //     refWorksheetId: worksheet.id
-      //   },
-      //   relations: ['releaseGood', 'inventory', 'product', 'inventory.location', 'bizplace']
-      // })
-
-      let qbOrderInventories = getRepository(OrderInventory).createQueryBuilder('oi')
-      .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
-      .leftJoinAndSelect('oi.inventory', 'inventory')
-      .leftJoinAndSelect('oi.product', 'product')
-      .leftJoinAndSelect('inventory.location', 'location')
-      .leftJoinAndSelect('oi.bizplace', 'bizplace')
-      .where('"oi"."domain_id" = :domain')
-      .andWhere('"oi"."bizplace_id" = :bizplace')
-      .andWhere('"oi"."ref_worksheet_id" = :refWorksheetId')
-      .setParameters({
-        domain: domain.id,
-        bizplace: worksheet.bizplace.id,
-        refWorksheetId: worksheet.id
-      })
-      
+      let qbOrderInventories = getRepository(OrderInventory)
+        .createQueryBuilder('oi')
+        .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
+        .leftJoinAndSelect('oi.inventory', 'inventory')
+        .leftJoinAndSelect('oi.product', 'product')
+        .leftJoinAndSelect('inventory.location', 'location')
+        .leftJoinAndSelect('oi.bizplace', 'bizplace')
+        .where('"oi"."domain_id" = :domain')
+        .andWhere('"oi"."bizplace_id" = :bizplace')
+        .andWhere('"oi"."ref_worksheet_id" = :refWorksheetId')
+        .setParameters({
+          domain: domain.id,
+          bizplace: worksheet.bizplace.id,
+          refWorksheetId: worksheet.id
+        })
+
       let sortingSetting: Setting = await pWorksheetPickingItemSorting
-      if(sortingSetting?.value){
+      if (sortingSetting?.value) {
         let settingValue = JSON.parse(sortingSetting.value)
         for (const key in settingValue) {
           qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC')
@@ -121,35 +113,26 @@ export const worksheetResolver = {
     }
 
     if (worksheet?.releaseGood?.id) {
-      // worksheet.orderInventories = await getRepository(OrderInventory).find({
-      //   where: {
-      //     domain,
-      //     bizplace: worksheet.bizplace,
-      //     releaseGood: worksheet.releaseGood,
-      //     status: Not(Equal(ORDER_INVENTORY_STATUS.CANCELLED))
-      //   },
-      //   relations: ['product', 'inventory', 'inventory.location']
-      // })
-
-      let qbOrderInventories = getRepository(OrderInventory).createQueryBuilder('oi')
-      .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
-      .leftJoinAndSelect('oi.inventory', 'inventory')
-      .leftJoinAndSelect('oi.product', 'product')
-      .leftJoinAndSelect('inventory.location', 'location')
-      .leftJoinAndSelect('oi.bizplace', 'bizplace')
-      .where('"oi"."domain_id" = :domain')
-      .andWhere('"oi"."bizplace_id" = :bizplace')
-      .andWhere('"oi"."release_good_id" = :releaseGood')
-      .andWhere('"oi"."status" != :status')
-      .setParameters({
-        domain: domain.id,
-        bizplace: worksheet.bizplace.id,
-        releaseGood: worksheet.releaseGood.id,
-        status: ORDER_INVENTORY_STATUS.CANCELLED
-      })
+      let qbOrderInventories = getRepository(OrderInventory)
+        .createQueryBuilder('oi')
+        .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
+        .leftJoinAndSelect('oi.inventory', 'inventory')
+        .leftJoinAndSelect('oi.product', 'product')
+        .leftJoinAndSelect('inventory.location', 'location')
+        .leftJoinAndSelect('oi.bizplace', 'bizplace')
+        .where('"oi"."domain_id" = :domain')
+        .andWhere('"oi"."bizplace_id" = :bizplace')
+        .andWhere('"oi"."release_good_id" = :releaseGood')
+        .andWhere('"oi"."status" NOT IN (:...statuses)')
+        .setParameters({
+          domain: domain.id,
+          bizplace: worksheet.bizplace.id,
+          releaseGood: worksheet.releaseGood.id,
+          statuses: [ORDER_INVENTORY_STATUS.CANCELLED, ORDER_INVENTORY_STATUS.REPLACED]
+        })
 
       let sortingSetting: Setting = await pWorksheetPickingItemSorting
-      if(sortingSetting?.value){
+      if (sortingSetting?.value) {
         let settingValue = JSON.parse(sortingSetting.value)
         for (const key in settingValue) {
           qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC')
@@ -159,10 +142,32 @@ export const worksheetResolver = {
       let orderInventories: OrderInventory[] = await qbOrderInventories.getMany()
       worksheet.orderInventories = orderInventories
 
-      worksheet.marketplaceOrder = await getRepository(MarketplaceOrder).findOne({
-        where: { releaseOrderId: worksheet.releaseGood.id },
-        relations: ['marketplaceOrderItems', 'marketplaceStore']
-      })
+      if (worksheet.releaseGood.type == 'b2c') {
+        worksheet.marketplaceOrder = await getRepository(MarketplaceOrder).findOne({
+          where: { orderNo: worksheet.releaseGood.refNo },
+          relations: ['marketplaceOrderItems', 'marketplaceStore']
+        })
+
+        if (worksheet.marketplaceOrder) {
+          let marketplaceOrderShipping: MarketplaceOrderShipping
+          if (worksheet.marketplaceOrder.isSplitted) {
+            marketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).findOne({
+              where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
+            })
+          } else {
+            marketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).findOne({
+              where: { orderNoRef: worksheet.releaseGood.refNo }
+            })
+          }
+
+          worksheet.marketplaceOrder.trackingNo = marketplaceOrderShipping.ownTrackingNo
+            ? marketplaceOrderShipping.ownTrackingNo
+            : marketplaceOrderShipping.trackingNo
+          worksheet.marketplaceOrder.shippingProvider = marketplaceOrderShipping.ownTransporter
+            ? marketplaceOrderShipping.ownTransporter
+            : marketplaceOrderShipping.transporter
+        }
+      }
 
       worksheet.orderVass = await getRepository(OrderVas).find({
         where: {

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

@@ -1,10 +1,11 @@
-import { getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { Brackets, getRepository, SelectQueryBuilder } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
+import { getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { ArrivalNotice, InventoryCheck, ReleaseGood, ReturnOrder } from '@things-factory/sales-base'
-import { buildQuery, convertListParams, ListParam } from '@things-factory/shell'
+import { buildQuery, convertListParams, Domain, ListParam } from '@things-factory/shell'
+
 import { WORKSHEET_TYPE } from '../../../constants'
-import { Brackets, getRepository, SelectQueryBuilder } from 'typeorm'
 import { Worksheet } from '../../../entities'
 
 export const worksheetsResolver = {
@@ -60,6 +61,38 @@ export const worksheetsResolver = {
         }
       }
 
+      const tzOffsetIdx = params.filters.findIndex(param => param.name === 'tzoffset')
+      let tzOffset = 0
+      if (tzOffsetIdx >= 0) {
+        tzOffset = params.filters[tzOffsetIdx].value
+        params.filters.splice(tzOffsetIdx, 1)
+      }
+
+      const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
+      if (fromDateParamIdx >= 0) {
+        let fromDateVal = new Date(params.filters[fromDateParamIdx].value)
+        params.filters.splice(fromDateParamIdx, 1)
+
+        params.filters.push({
+          name: 'createdAt',
+          operator: 'gte',
+          value: fromDateVal.toISOString(),
+          relation: false
+        })
+      }
+      const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate')
+      if (toDateParamIdx >= 0) {
+        let toDateVal = new Date(params.filters[toDateParamIdx].value)
+        params.filters.splice(toDateParamIdx, 1)
+
+        params.filters.push({
+          name: 'createdAt',
+          operator: 'lt',
+          value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+          relation: false
+        })
+      }
+
       ////For outbound worksheet filter
       const releaseGoodParam = params.filters.find(param => param.name === 'releaseGoodNo')
       const releaseGoodRefNoParam = params.filters.find(param => param.name === 'releaseGoodRefNo')
@@ -255,15 +288,7 @@ export const worksheetsResolver = {
         )
       }
 
-      qb.addSelect(subQuery => {
-        return subQuery
-          .select('COALESCE("ccd".rank, 99999)', 'rank')
-          .from('common_code_details', 'ccd')
-          .innerJoin('ccd.commonCode', 'cc')
-          .where('"ccd"."name" = "ws"."status"')
-          .andWhere('"ccd"."domain_id" = "ws"."domain_id"')
-          .andWhere('"cc"."name" = \'WORKSHEET_STATUS\'')
-      }, 'rank')
+      qb.addSelect('COALESCE("cc".rank, 99999)', 'rank')
       qb.leftJoinAndSelect('ws.domain', 'domain')
       qb.leftJoinAndSelect('ws.bizplace', 'bizplace')
       qb.leftJoinAndSelect('ws.arrivalNotice', 'arrivalNotice')
@@ -274,6 +299,19 @@ export const worksheetsResolver = {
       qb.leftJoinAndSelect('ws.assignee', 'assignee')
       qb.leftJoinAndSelect('ws.creator', 'creator')
       qb.leftJoinAndSelect('ws.updater', 'updater')
+      qb.leftJoin(
+        subQuery => {
+          return subQuery
+            .select(`ccd.rank`, 'rank')
+            .addSelect(`ccd.name`, 'status')
+            .from(`common_code_details`, 'ccd')
+            .innerJoin(`ccd.commonCode`, 'cc')
+            .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+            .andWhere(`cc.name = 'WORKSHEET_STATUS'`)
+        },
+        'cc',
+        'cc.status = ws.status'
+      )
 
       ////Add sorting conditions
       const arrChildSortData = ['bizplace', 'arrivalNotice', 'releaseGood', 'returnOrder', 'inventoryCheck']