@things-factory/worksheet-base 4.3.448 → 4.3.452

package/server/graphql/resolvers/worksheet/vas/complete-vas.ts

@@ -1,5 +1,5 @@
 import { User } from '@things-factory/auth-base'
-import { ArrivalNotice, ReleaseGood } from '@things-factory/sales-base'
+import { ArrivalNotice, ReleaseGood, OrderVas, OrderVasItem } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { EntityManager, getRepository, In } from 'typeorm'
 import { WORKSHEET_TYPE } from '../../../../constants'
@@ -65,9 +65,46 @@ export async function completeVAS(
   //   await activateLoadingWorksheet(tx, domain, user, releaseGood)
   // }
 
+  await setOrderVasStatus(tx, domain, user, orderNo)
+
   return worksheet
 }
 
+export async function setOrderVasStatus(tx: EntityManager, domain: Domain, user: User, orderNo: string): Promise<void> {
+  const orderVasRepo: OrderVas = tx.getRepository(OrderVas)
+  const orderVasItemRepo: OrderVasItem = tx.getRepository(OrderVasItem)
+
+  const releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({
+    where: { name: orderNo, domain: domain.id }
+  })
+
+  const orderVasList = await orderVasRepo.find({
+    where: {
+      releaseGood: releaseGood
+    }
+  })
+
+  // Update the status of each OrderVas to TERMINATED
+  for (const orderVas of orderVasList) {
+    orderVas.status = 'TERMINATED'
+    orderVas.updater = user
+    await orderVasRepo.save(orderVas)
+
+    // Find and update OrderVasItems
+    const orderVasItems = await orderVasItemRepo.find({
+      where: { orderVas: orderVas }
+    })
+
+    for (const item of orderVasItems) {
+      if (item.executedAt === null) {
+        item.executedAt = orderVas.updatedAt
+        item.updater = user
+        await orderVasItemRepo.save(item)
+      }
+    }
+  }
+}
+
 async function activatePutawayWorksheet(
   tx: EntityManager,
   domain: Domain,

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

@@ -68,6 +68,7 @@ export const vasWorksheetResolver = {
 
     return {
       worksheetInfo: {
+        bizplaceId: refOrder.bizplace.id,
         bizplaceName: refOrder.bizplace.name,
         containerNo: refOrder?.containerNo,
         startedAt: worksheet.startedAt

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

@@ -1,32 +1,13 @@
-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 { 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 {
-  Inventory,
-  INVENTORY_STATUS,
-  InventoryHistory
-} from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, InventoryHistory } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_TYPE } from '../../../constants'
-import {
-  Worksheet,
-  WorksheetDetail
-} from '../../../entities'
+import { Worksheet, WorksheetDetail } from '../../../entities'
 
 interface WorksheetInterface extends Worksheet {
   orderProducts: OrderProduct[]
@@ -95,6 +76,8 @@ export const worksheetResolver = {
           'worksheetDetails.targetInventory.inventory.location',
           'worksheetDetails.targetVas',
           'worksheetDetails.targetVas.product',
+          'worksheetDetails.targetVas.newProduct',
+          'worksheetDetails.targetVas.newProductDetail',
           'worksheetDetails.targetVas.orderVasItems',
           'worksheetDetails.targetVas.orderVasItems.vas',
           'creator',

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

@@ -6,6 +6,7 @@ export const WorksheetInfo = gql`
     releaseGood: ReleaseGood
     replenishment: Replenishment
     returnOrder: ReturnOrder
+    bizplaceId: String
     bizplaceName: String
     partnerDomainId: String
     marketplaceStatus: String