@things-factory/sales-base 4.3.651 → 4.3.653

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

@@ -1,33 +1,13 @@
-import {
-  Arg,
-  Ctx,
-  Directive,
-  Mutation,
-  Resolver
-} from 'type-graphql'
+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 { Product, ProductDetail } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 
-import {
-  NewVas,
-  OrderVas,
-  OrderVasItem,
-  OrderVasItemPatch,
-  OrderVasPatch,
-  ReleaseGood,
-  VasPatch
-} from '../'
-import {
-  ORDER_STATUS,
-  ORDER_VAS_STATUS
-} from '../../constants'
+import { NewVas, OrderVas, OrderVasItem, OrderVasItemPatch, OrderVasPatch, ReleaseGood, VasPatch } from '../'
+import { ORDER_STATUS, ORDER_VAS_STATUS } from '../../constants'
 import { Vas } from './vas'
 
 @Resolver(Vas)
@@ -141,7 +121,7 @@ export class VasMutation {
   ): Promise<Boolean> {
     const response = await editVas(orderVasPatch, orderVasItemPatch, context)
 
-    return response ?  true : false
+    return response ? true : false
   }
 
   @Directive('@privilege(category: "vas", privilege: "mutation")')
@@ -154,7 +134,7 @@ export class VasMutation {
     @Arg('rejectedVas', type => [OrderVasPatch], { nullable: true }) rejectedVas: OrderVasPatch[],
     @Ctx() context: any
   ): Promise<Boolean> {
-    await proceedVasChanges({releaseOrderNo, bizplaceId, approvedVas, rejectedVas}, context) 
+    await proceedVasChanges({ releaseOrderNo, bizplaceId, approvedVas, rejectedVas }, context)
     return true
   }
 }
@@ -168,7 +148,7 @@ export async function editVas(
   let results = []
   const orderVasRepo = tx.getRepository(OrderVas)
   const orderVasItemRepo = tx.getRepository(OrderVasItem)
-  
+
   // Order Vas
   if (orderVasPatch?.length > 0) {
     const _deleteRecords = orderVasPatch.filter((patch: any) => patch.cuFlag?.toUpperCase() === '-')
@@ -201,10 +181,12 @@ export async function editVas(
         // create new ovi
         for (let ii = 0; ii < newRecord.orderVasItemsPatch.length; ii++) {
           await orderVasItemRepo.save({
-            orderVas: result.id,
+            orderVas: { id: result.id },
             name: `${newRecord.orderVasItemsPatch[ii].vas.name} (${newRecord.orderVasItemsPatch[ii].vas.description})- ${result.id}`,
             vas: newRecord.orderVasItemsPatch[ii].vas,
-            itemEditType: newRecord.orderVasItemsPatch[ii].itemEditType ? newRecord.orderVasItemsPatch[ii].itemEditType : undefined,
+            itemEditType: newRecord.orderVasItemsPatch[ii].itemEditType
+              ? newRecord.orderVasItemsPatch[ii].itemEditType
+              : undefined,
             vasQty: newRecord.orderVasItemsPatch[ii].vasQty,
             vasRemark: newRecord.orderVasItemsPatch[ii]?.vasRemark,
             domain: domain,
@@ -223,15 +205,16 @@ export async function editVas(
           relations: ['product', 'productDetail', 'newProduct', 'newProductDetail', 'releaseGood', 'orderVasItems']
         })
 
-        if (newRecord.editType === ORDER_VAS_STATUS.REMOVED) {  
+        if (newRecord.editType === ORDER_VAS_STATUS.REMOVED) {
           const result = await orderVasRepo.update(
-          { id: newRecord.id },
-          {
-            editType: newRecord.editType,
-            status: newRecord.status,
-            updater: user,
-            updatedAt: new Date()
-          })
+            { id: newRecord.id },
+            {
+              editType: newRecord.editType,
+              status: newRecord.status,
+              updater: user,
+              updatedAt: new Date()
+            }
+          )
 
           results.push({ ...result, cuFlag: 'M' })
 
@@ -248,27 +231,28 @@ export async function editVas(
           }
         } else if (newRecord.editType === ORDER_VAS_STATUS.CHANGES) {
           const result = await orderVasRepo.update(
-          { id: newRecord.id },
-          {
-            adjustedBatchId: newRecord.batchId,
-            adjustedProduct: newRecord.product,
-            adjustedProductDetail: newRecord.productDetail,
-            adjustedPackingType: newRecord.packingType,
-            adjustedUom: newRecord.uom,
-            adjustedUomValue: newRecord.uomValue,
-            adjustedNewProduct: newRecord.newProduct,
-            adjustedNewProductDetail: newRecord.newProductDetail,
-            adjustedQty: newRecord.qty,
-            adjustedNewBatchId: newRecord.newBatchId,
-            adjustedNewPackingType: newRecord.newPackingType,
-            adjustedNewUom: newRecord.newUom,
-            adjustedNewUomValue: newRecord.newUomValue,
-            adjustedOutputQty: newRecord.outputQty,
-            status: newRecord.status,
-            editType: newRecord.editType,
-            updater: user,
-            updatedAt: new Date()
-          })
+            { id: newRecord.id },
+            {
+              adjustedBatchId: newRecord.batchId,
+              adjustedProduct: newRecord.product,
+              adjustedProductDetail: newRecord.productDetail,
+              adjustedPackingType: newRecord.packingType,
+              adjustedUom: newRecord.uom,
+              adjustedUomValue: newRecord.uomValue,
+              adjustedNewProduct: newRecord.newProduct,
+              adjustedNewProductDetail: newRecord.newProductDetail,
+              adjustedQty: newRecord.qty,
+              adjustedNewBatchId: newRecord.newBatchId,
+              adjustedNewPackingType: newRecord.newPackingType,
+              adjustedNewUom: newRecord.newUom,
+              adjustedNewUomValue: newRecord.newUomValue,
+              adjustedOutputQty: newRecord.outputQty,
+              status: newRecord.status,
+              editType: newRecord.editType,
+              updater: user,
+              updatedAt: new Date()
+            }
+          )
 
           results.push({ ...result, cuFlag: 'M' })
 
@@ -288,8 +272,8 @@ export async function editVas(
                   creator: user,
                   createdAt: new Date()
                 })
-                break;
-              
+                break
+
               case ORDER_VAS_STATUS.CHANGES:
                 await orderVasItemRepo.update(
                   { id: ovi.id },
@@ -305,7 +289,7 @@ export async function editVas(
                     updatedAt: new Date()
                   }
                 )
-                break;
+                break
 
               case ORDER_VAS_STATUS.REMOVED:
                 await orderVasItemRepo.update(
@@ -322,14 +306,13 @@ export async function editVas(
                     updatedAt: new Date()
                   }
                 )
-                
             }
           }
         }
       }
     }
   }
-  
+
   // order Vas Item
   if (orderVasItemPatch?.length > 0) {
     const _deleteRecords = orderVasItemPatch.filter((patch: any) => patch.cuFlag.toUpperCase() === '-')
@@ -363,13 +346,14 @@ export async function editVas(
         results.push({ ...result, cuFlag: '+' })
 
         await orderVasRepo.update(
-        { id: newRecord.orderVas.id },
-        {
-          editType: ORDER_VAS_STATUS.CHANGES,
-          status: ORDER_VAS_STATUS.PENDING_APPROVE,
-          updater: user,
-          updatedAt: new Date()
-        })
+          { id: newRecord.orderVas.id },
+          {
+            editType: ORDER_VAS_STATUS.CHANGES,
+            status: ORDER_VAS_STATUS.PENDING_APPROVE,
+            updater: user,
+            updatedAt: new Date()
+          }
+        )
       }
     }
 
@@ -378,34 +362,37 @@ export async function editVas(
         const newRecord = _updateRecords[i]
         if (newRecord.itemEditType === ORDER_VAS_STATUS.CHANGES) {
           const result = await orderVasItemRepo.update(
-          { id: newRecord.id },
-          { 
-            adjustedVasQty: newRecord.vasQty,
-            adjustedVasRemark: newRecord?.vasRemark, 
-            itemEditType: newRecord.itemEditType,
-            updater: user, 
-            updatedAt: new Date()
-          })
+            { id: newRecord.id },
+            {
+              adjustedVasQty: newRecord.vasQty,
+              adjustedVasRemark: newRecord?.vasRemark,
+              itemEditType: newRecord.itemEditType,
+              updater: user,
+              updatedAt: new Date()
+            }
+          )
           results.push({ ...result, cuFlag: 'M' })
         } else if (newRecord.itemEditType === ORDER_VAS_STATUS.REMOVED) {
           const result = await orderVasItemRepo.update(
-          { id: newRecord.id },
-          {
-            itemEditType: newRecord.itemEditType,
-            updater: user,
-            updatedAt: new Date()
-          })
+            { id: newRecord.id },
+            {
+              itemEditType: newRecord.itemEditType,
+              updater: user,
+              updatedAt: new Date()
+            }
+          )
           results.push({ ...result, cuFlag: 'M' })
         }
 
         await orderVasRepo.update(
-        { id: newRecord.orderVas.id },
-        {
-          editType: ORDER_VAS_STATUS.CHANGES,
-          status: ORDER_VAS_STATUS.PENDING_APPROVE,
-          updater: user,
-          updatedAt: new Date()
-        })
+          { id: newRecord.orderVas.id },
+          {
+            editType: ORDER_VAS_STATUS.CHANGES,
+            status: ORDER_VAS_STATUS.PENDING_APPROVE,
+            updater: user,
+            updatedAt: new Date()
+          }
+        )
       }
     }
   }
@@ -413,7 +400,7 @@ export async function editVas(
 }
 
 export async function proceedVasChanges(
-  { releaseOrderNo, bizplaceId, approvedVas, rejectedVas }, 
+  { releaseOrderNo, bizplaceId, approvedVas, rejectedVas },
   context: any
 ): Promise<void> {
   const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
@@ -440,7 +427,7 @@ export async function proceedVasChanges(
 }
 
 async function _handleApprovedVas(tx, domain, user, releaseGood, approvedVas) {
-  for(const ov of approvedVas) {
+  for (const ov of approvedVas) {
     const orderVas: OrderVas = await tx.getRepository(OrderVas).findOne({
       where: { domain, id: ov.id },
       relations: ['product', 'productDetail', 'newProduct', 'newProductDetail', 'releaseGood', 'orderVasItems']
@@ -465,50 +452,53 @@ async function _handleApprovedVas(tx, domain, user, releaseGood, approvedVas) {
     switch (ov.editType) {
       case ORDER_VAS_STATUS.NEW:
         await tx.getRepository(OrderVas).update(
-        { id: ov.id},
-        {
-          editType: undefined,
-          status: await _getNewStatus(releaseGood),
-          updater: user,
-          updatedAt: new Date(),
-        })
-        
+          { id: ov.id },
+          {
+            editType: undefined,
+            status: await _getNewStatus(releaseGood),
+            updater: user,
+            updatedAt: new Date()
+          }
+        )
+
         for (const ovi of ov.orderVasItemsPatch) {
           if (ovi.itemEditType === ORDER_VAS_STATUS.NEW) {
             await tx.getRepository(OrderVasItem).update(
-            { id: ovi.id },
-            {
-              itemEditType: undefined,
-              updater: user,
-              updatedAt: new Date()
-            })
+              { id: ovi.id },
+              {
+                itemEditType: undefined,
+                updater: user,
+                updatedAt: new Date()
+              }
+            )
           }
         }
-        break;
-        
+        break
+
       case ORDER_VAS_STATUS.CHANGES:
         await tx.getRepository(OrderVas).update(
-        { id: ov.id },
-        {
-          batchId: orderVas.adjustedBatchId ? orderVas.adjustedBatchId : orderVas.batchId,
-          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: 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,
-          newUomValue: orderVas.adjustedNewUomValue ? orderVas.adjustedNewUomValue : orderVas.newUomValue,
-          editType: undefined,
-          status: await _getNewStatus(releaseGood),
-          updater: user,
-          updatedAt: new Date(),
-        })
+          { id: ov.id },
+          {
+            batchId: orderVas.adjustedBatchId ? orderVas.adjustedBatchId : orderVas.batchId,
+            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: 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,
+            newUomValue: orderVas.adjustedNewUomValue ? orderVas.adjustedNewUomValue : orderVas.newUomValue,
+            editType: undefined,
+            status: await _getNewStatus(releaseGood),
+            updater: user,
+            updatedAt: new Date()
+          }
+        )
 
         for (const ovi of ov.orderVasItemsPatch) {
           const orderVasItem: OrderVasItem = await tx.getRepository(OrderVasItem).findOne({
@@ -518,32 +508,34 @@ async function _handleApprovedVas(tx, domain, user, releaseGood, approvedVas) {
           switch (ovi.itemEditType) {
             case ORDER_VAS_STATUS.NEW:
               await tx.getRepository(OrderVasItem).update(
-              { id: ovi.id },
-              {
-                itemEditType: undefined,
-                updater: user,
-                updatedAt: new Date()
-              })
-              break;
-            
+                { id: ovi.id },
+                {
+                  itemEditType: undefined,
+                  updater: user,
+                  updatedAt: new Date()
+                }
+              )
+              break
+
             case ORDER_VAS_STATUS.CHANGES:
               await tx.getRepository(OrderVasItem).update(
-              { id: ovi.id },
-              {
-                orderVas: {id: orderVas.id},
-                vasRemark: orderVasItem.adjustedVasRemark ? orderVasItem.adjustedVasRemark : orderVasItem.vasRemark,
-                vasQty: orderVasItem.adjustedVasQty ? orderVasItem.adjustedVasQty : orderVasItem.vasQty,
-                itemEditType: undefined,
-                updater: user,
-                updatedAt: new Date()
-              })
-              break;
+                { id: ovi.id },
+                {
+                  orderVas: { id: orderVas.id },
+                  vasRemark: orderVasItem.adjustedVasRemark ? orderVasItem.adjustedVasRemark : orderVasItem.vasRemark,
+                  vasQty: orderVasItem.adjustedVasQty ? orderVasItem.adjustedVasQty : orderVasItem.vasQty,
+                  itemEditType: undefined,
+                  updater: user,
+                  updatedAt: new Date()
+                }
+              )
+              break
 
             case ORDER_VAS_STATUS.REMOVED:
               await tx.getRepository(OrderVasItem).delete(ovi.id)
           }
         }
-        break;
+        break
 
       case ORDER_VAS_STATUS.REMOVED:
         await tx.getRepository(OrderVasItem).delete({ orderVas: { id: ov.id } })
@@ -561,86 +553,91 @@ async function _handleRejectedVas(tx, domain, user, releaseGood, rejectedVas) {
     })
 
     switch (ov.editType) {
-    case ORDER_VAS_STATUS.NEW:
-      await tx.getRepository(OrderVasItem).delete({ orderVas: { id: ov.id } })
-      await tx.getRepository(OrderVas).delete(ov.id)
-      break;
-
-    case ORDER_VAS_STATUS.CHANGES:
-      await tx.getRepository(OrderVas).update(
-      { id: ov.id },
-      {
-        adjustedProduct: undefined,
-        adjustedProductDetail: undefined,
-        adjustedBatchId: undefined,
-        adjustedQty: undefined,
-        adjustedOutputQty: undefined,
-        adjustedPackingType: undefined,
-        adjustedUom: undefined,
-        adjustedUomValue: undefined,
-        adjustedNewProduct: undefined,
-        adjustedNewProductDetail: undefined,
-        adjustedNewBatchId: undefined,
-        adjustedNewPackingType: undefined,
-        adjustedNewUom: undefined,
-        adjustedNewUomValue: undefined,
-        editType: undefined,
-        status: await _getNewStatus(releaseGood),
-        updater: user,
-        updatedAt: new Date(),
-      })
-
-      for (const ovi of ov.orderVasItemsPatch) {
-        switch (ovi.itemEditType) {
-          case ORDER_VAS_STATUS.NEW:
-            await tx.getRepository(OrderVasItem).delete(ovi.id)
-            break;
-          
-          case ORDER_VAS_STATUS.CHANGES:
-            await tx.getRepository(OrderVasItem).update(
+      case ORDER_VAS_STATUS.NEW:
+        await tx.getRepository(OrderVasItem).delete({ orderVas: { id: ov.id } })
+        await tx.getRepository(OrderVas).delete(ov.id)
+        break
+
+      case ORDER_VAS_STATUS.CHANGES:
+        await tx.getRepository(OrderVas).update(
+          { id: ov.id },
+          {
+            adjustedProduct: undefined,
+            adjustedProductDetail: undefined,
+            adjustedBatchId: undefined,
+            adjustedQty: undefined,
+            adjustedOutputQty: undefined,
+            adjustedPackingType: undefined,
+            adjustedUom: undefined,
+            adjustedUomValue: undefined,
+            adjustedNewProduct: undefined,
+            adjustedNewProductDetail: undefined,
+            adjustedNewBatchId: undefined,
+            adjustedNewPackingType: undefined,
+            adjustedNewUom: undefined,
+            adjustedNewUomValue: undefined,
+            editType: undefined,
+            status: await _getNewStatus(releaseGood),
+            updater: user,
+            updatedAt: new Date()
+          }
+        )
+
+        for (const ovi of ov.orderVasItemsPatch) {
+          switch (ovi.itemEditType) {
+            case ORDER_VAS_STATUS.NEW:
+              await tx.getRepository(OrderVasItem).delete(ovi.id)
+              break
+
+            case ORDER_VAS_STATUS.CHANGES:
+              await tx.getRepository(OrderVasItem).update(
+                { id: ovi.id },
+                {
+                  orderVas: { id: orderVas.id },
+                  adjustedVasRemark: undefined,
+                  adjustedVasQty: undefined,
+                  itemEditType: undefined,
+                  updater: user,
+                  updatedAt: new Date()
+                }
+              )
+              break
+
+            case ORDER_VAS_STATUS.REMOVED:
+              await tx.getRepository(OrderVasItem).update(
+                { id: ovi.id },
+                {
+                  itemEditType: undefined,
+                  updater: user,
+                  updatedAt: new Date()
+                }
+              )
+          }
+        }
+        break
+
+      case ORDER_VAS_STATUS.REMOVED:
+        await tx.getRepository(OrderVas).update(
+          { id: orderVas.id },
+          {
+            status: await _getNewStatus(releaseGood),
+            editType: undefined,
+            updater: user,
+            updatedAt: new Date()
+          }
+        )
+
+        for (const ovi of ov.orderVasItemsPatch) {
+          await tx.getRepository(OrderVasItem).update(
             { id: ovi.id },
             {
-              orderVas: {id: orderVas.id},
-              adjustedVasRemark: undefined,
-              adjustedVasQty: undefined,
+              orderVas: { id: orderVas.id },
               itemEditType: undefined,
               updater: user,
               updatedAt: new Date()
-            })
-            break;
-
-          case ORDER_VAS_STATUS.REMOVED:
-            await tx.getRepository(OrderVasItem).update(
-              { id: ovi.id },
-              {
-                itemEditType: undefined,
-                updater: user,
-                updatedAt: new Date()
-              })
+            }
+          )
         }
-      }
-      break;
-
-    case ORDER_VAS_STATUS.REMOVED:
-      await tx.getRepository(OrderVas).update(
-      { id: orderVas.id },
-      {
-        status: await _getNewStatus(releaseGood),
-        editType: undefined,
-        updater: user,
-        updatedAt: new Date()
-      })
-
-      for (const ovi of ov.orderVasItemsPatch) {
-        await tx.getRepository(OrderVasItem).update(
-        { id: ovi.id },
-        {
-          orderVas: {id: orderVas.id},
-          itemEditType: undefined,
-          updater: user,
-          updatedAt: new Date()
-        })
-      }
     }
   }
   return true
@@ -651,10 +648,10 @@ async function _getNewStatus(releaseGood) {
   switch (releaseGood.status) {
     case ORDER_STATUS.PENDING:
       orderVasStatus = ORDER_VAS_STATUS.PENDING
-      break;
+      break
     case ORDER_STATUS.PENDING_RECEIVE:
       orderVasStatus = ORDER_VAS_STATUS.PENDING_RECEIVE
-      break;
+      break
     case ORDER_STATUS.PENDING_WORKSHEET:
     case ORDER_STATUS.READY_TO_PICK:
     case ORDER_STATUS.PICKING: