@things-factory/sales-base 4.3.544 → 4.3.546

package/server/service/vas/vas-mutation.ts

@@ -1,12 +1,34 @@
+import {
+  Arg,
+  Ctx,
+  Directive,
+  Mutation,
+  Resolver
+} from 'type-graphql'
+import { EntityManager } from 'typeorm'
+import { v4 as uuidv4 } from 'uuid'
+
 import { User } from '@things-factory/auth-base'
+import {
+  Product,
+  ProductDetail
+} from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
-import { Bizplace } from '@things-factory/biz-base'
-import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager } from 'typeorm'
-import { NewVas, VasPatch, OrderVasPatch, OrderVasItemPatch, ReleaseGood, OrderVas, OrderVasItem, NewOrderVas } from '../'
+
+import {
+  NewVas,
+  OrderVas,
+  OrderVasItem,
+  OrderVasItemPatch,
+  OrderVasPatch,
+  ReleaseGood,
+  VasPatch
+} from '../'
+import {
+  ORDER_STATUS,
+  ORDER_VAS_STATUS
+} from '../../constants'
 import { Vas } from './vas'
-import { v4 as uuidv4 } from 'uuid'
-import { ORDER_STATUS, ORDER_VAS_STATUS } from '../../constants'
 
 @Resolver(Vas)
 export class VasMutation {
@@ -424,6 +446,22 @@ async function _handleApprovedVas(tx, domain, user, releaseGood, approvedVas) {
       relations: ['product', 'productDetail', 'newProduct', 'newProductDetail', 'releaseGood', 'orderVasItems']
     })
 
+    const adjustedProduct: Product = await tx.getRepository(Product).findOne({
+      where: { id: orderVas.adjustedProductId }
+    })
+
+    const adjustedProductDetail: ProductDetail = await tx.getRepository(ProductDetail).findOne({
+      where: { id: orderVas.adjustedProductDetailId }
+    })
+
+    const adjustedNewProduct: Product = await tx.getRepository(Product).findOne({
+      where: { id: orderVas.adjustedNewProductId }
+    })
+
+    const adjustedNewProductDetail: ProductDetail = await tx.getRepository(ProductDetail).findOne({
+      where: { id: orderVas.adjustedNewProductDetailId }
+    })
+
     switch (ov.editType) {
       case ORDER_VAS_STATUS.NEW:
         await tx.getRepository(OrderVas).update(
@@ -453,15 +491,15 @@ async function _handleApprovedVas(tx, domain, user, releaseGood, approvedVas) {
         { id: ov.id },
         {
           batchId: orderVas.adjustedBatchId ? orderVas.adjustedBatchId : orderVas.batchId,
-          product: orderVas.adjustedProduct ? orderVas.adjustedProduct : orderVas.product,
-          productDetail: orderVas.adjustedProductDetail ? orderVas.adjustedProductDetail : orderVas.productDetail,
+          product: adjustedProduct ? adjustedProduct : orderVas.product,
+          productDetail: adjustedProductDetail ? adjustedProductDetail : orderVas.productDetail,
           uom: orderVas.adjustedUom ? orderVas.adjustedUom  : orderVas.uom,
           uomValue: orderVas.adjustedNewUom ? orderVas.adjustedUomValue : orderVas.uomValue,
           packingType: orderVas.adjustedPackingType ? orderVas.adjustedPackingType : orderVas.packingType,
           qty: orderVas.adjustedQty ? orderVas.adjustedQty : orderVas.qty,
           outputQty: orderVas.adjustedOutputQty ? orderVas.adjustedOutputQty : orderVas.outputQty,
-          newProduct: orderVas.adjustedNewProduct ?  orderVas.adjustedNewProduct : orderVas.newProduct,
-          newProductDetail: orderVas.adjustedNewProductDetail ? orderVas.adjustedNewProductDetail : orderVas.newProductDetail,
+          newProduct: adjustedNewProduct ?  adjustedNewProduct : orderVas.newProduct,
+          newProductDetail: adjustedNewProductDetail ? adjustedNewProductDetail : orderVas.newProductDetail,
           newBatchId: orderVas.adjustedNewBatchId ? orderVas.adjustedNewBatchId : orderVas.newBatchId,
           newPackingType: orderVas.adjustedNewPackingType ? orderVas.adjustedNewPackingType : orderVas.newPackingType,
           newUom: orderVas.adjustedNewUom ? orderVas.adjustedNewUom : orderVas.newUom,