@things-factory/sales-base 4.3.513 → 4.3.514

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

@@ -60,6 +60,10 @@ export class OrderVas {
   @Field({ nullable: true })
   batchId: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  adjustedBatchId: String
+
   // not used for restrructure VAS anymore
   @Column({ nullable: true })
   @Field({ nullable: true })
@@ -89,6 +93,20 @@ export class OrderVas {
   @RelationId((orderVas: OrderVas) => orderVas.product)
   productId: string
 
+  @ManyToOne(type => Product)
+  @Field(type => Product, { nullable: true })
+  adjustedProduct: Product
+
+  @RelationId((orderVas: OrderVas) => orderVas.adjustedProduct)
+  adjustedProductId: string
+
+  @ManyToOne(type => ProductDetail)
+  @Field({ nullable: true })
+  adjustedProductDetail: ProductDetail
+
+  @RelationId((orderVas: OrderVas) => orderVas.adjustedProduct)
+  adjustedProductDetailId: string
+
   // moved to order vas item
   // used to be productDetail
   @ManyToOne(type => ProductDetail, { nullable: true })
@@ -99,6 +117,10 @@ export class OrderVas {
   @Field({ nullable: true })
   outputQty: number
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  adjustedOutputQty: number
+
   @ManyToOne(type => OrderInventory)
   @Field(type => OrderInventory, { nullable: true })
   orderInventory: OrderInventory
@@ -120,6 +142,20 @@ export class OrderVas {
   @RelationId((orderVas: OrderVas) => orderVas.newProductDetail)
   newProductDetailId: string
 
+  @ManyToOne(type => Product)
+  @Field(type => Product, { nullable: true })
+  adjustedNewProduct: Product
+
+  @RelationId((orderVas: OrderVas) => orderVas.adjustedNewProduct)
+  adjustedNewProductId: string
+
+  @ManyToOne(type => ProductDetail, { nullable: true })
+  @Field({ nullable: true })
+  adjustedNewProductDetail: ProductDetail
+
+  @RelationId((orderVas: OrderVas) => orderVas.adjustedNewProductDetail)
+  adjustedNewProductDetailId: string
+
   // not used for restrructure VAS anymore
   @Column({ nullable: true })
   @Field({ nullable: true })
@@ -129,6 +165,10 @@ export class OrderVas {
   @Field({ nullable: true })
   qty: number
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  adjustedQty?: number
+
   // not used for restrructure VAS anymore
   @Column({ nullable: true })
   @Field({ nullable: true })
@@ -143,6 +183,14 @@ export class OrderVas {
   @Field({ nullable: true })
   uomValue: number
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  adjustedUom: String
+
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
+  adjustedUomValue: Number
+
   // not used for restrructure VAS anymore
   @Column('float', { nullable: true })
   @Field({ nullable: true })
@@ -157,6 +205,10 @@ export class OrderVas {
   @Field({ nullable: true })
   packingType: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  adjustedPackingType: String
+
   @ManyToOne(type => ArrivalNotice)
   @Field(type => ArrivalNotice, { nullable: true })
   arrivalNotice: ArrivalNotice
@@ -256,18 +308,34 @@ export class OrderVas {
   @Field({ nullable: true })
   newBatchId: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  adjustedNewBatchId: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   newPackingType: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  adjustedNewPackingType: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   newUom: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  adjustedNewUom: string
+
   @Column('float', { nullable: true })
   @Field({ nullable: true })
   newUomValue: number
 
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
+  adjustedNewUomValue: number
+
   @OneToMany(type => OrderVasItem, orderVasItem => orderVasItem.orderVas)
   @Field(type => [OrderVasItem])
   orderVasItems: OrderVasItem[]
@@ -313,4 +381,8 @@ export class OrderVas {
 
   @Field({ nullable: true })
   vasRemark?: string
+
+  @Column({ nullable: true})
+  @Field({ nullable: true })
+  editType?: string
 }

package/server/service/order-vas-item/order-vas-item-type.ts

@@ -63,8 +63,18 @@ export class OrderVasItemPatch {
   @Field({ nullable: true })
   vasRemark?: string
 
-  @Field()
-  cuFlag: string
+  @Field({ nullable: true })
+  cuFlag?: string
+
+  @Field({ nullable: true })
+  adjustedVasRemark?: string
+
+  @Field({ nullable: true })
+  adjustedVasQty?: number
+
+  @Field({ nullable: true })
+  itemEditType?: string
+
 }
 
 @ObjectType()

package/server/service/order-vas-item/order-vas-item.ts

@@ -1,29 +1,31 @@
 import {
+  Field,
+  ID,
+  ObjectType,
+  registerEnumType
+} from 'type-graphql'
+import {
+  Column,
   CreateDateColumn,
-  UpdateDateColumn,
   Entity,
   Index,
-  Column,
-  RelationId,
   ManyToOne,
-  PrimaryGeneratedColumn
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
 } from 'typeorm'
-import { ObjectType, Field, Int, ID, registerEnumType } from 'type-graphql'
 
-import { Domain } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+
+import { OrderVas } from '../order-vas/order-vas'
+import { Vas } from '../vas/vas'
 
 export enum OrderVasItemStatus {
   STATUS_A = 'STATUS_A',
   STATUS_B = 'STATUS_B'
 }
 
-import { OrderInventory } from '../order-inventory/order-inventory'
-import { Product, ProductDetail } from '@things-factory/product-base'
-import { OrderVas } from '../order-vas/order-vas'
-import { Bizplace } from '@things-factory/biz-base'
-import { Vas } from '../vas/vas'
-
 registerEnumType(OrderVasItemStatus, {
   name: 'OrderVasItemStatus',
   description: 'state enumeration of a orderVasItem'
@@ -123,6 +125,18 @@ export class OrderVasItem {
   @Field({ nullable: true })
   updater?: User
 
-  @RelationId((orderVasItem: OrderVasItem) => orderVasItem.creator)
+  @RelationId((orderVasItem: OrderVasItem) => orderVasItem.updater)
   updaterId?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  adjustedVasRemark?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  adjustedVasQty?: number
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  itemEditType?: string
 }

package/server/service/release-good/release-good-mutation.ts

@@ -1197,7 +1197,9 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
   await tx.getRepository(OrderInventory).save(foundOIs)
 
   // 2. Update status of order vass
-  if (foundOVs && foundOVs.length) {
+  if (foundOVs && foundOVs.length 
+    && foundOVs.some( vas => vas.status != ORDER_VAS_STATUS.PENDING_APPROVE )
+  ) {
     foundOVs = foundOVs.map((orderVas: OrderVas) => {
       return {
         ...orderVas,
@@ -1284,7 +1286,9 @@ export async function receiveReleaseGood(name: string, context: any, tx: EntityM
   await tx.getRepository(OrderInventory).save(foundOIs)
 
   // 2. Update status of order vass
-  if (foundOVs && foundOVs.length) {
+  if (foundOVs && foundOVs.length 
+    && foundOVs.some( vas => vas.status != ORDER_VAS_STATUS.PENDING_APPROVE )
+  ) {
     foundOVs = foundOVs.map((orderVas: OrderVas) => {
       return {
         ...orderVas,

package/server/service/release-good/release-good-query.ts

@@ -1,19 +1,61 @@
-import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { EntityManager, getRepository, In, Repository, SelectQueryBuilder } from 'typeorm'
+import {
+  Arg,
+  Args,
+  Ctx,
+  Directive,
+  FieldResolver,
+  Query,
+  Resolver,
+  Root
+} from 'type-graphql'
+import {
+  EntityManager,
+  getRepository,
+  In,
+  Repository,
+  SelectQueryBuilder
+} from 'typeorm'
 
 import { Attachment } from '@things-factory/attachment-base'
-import { checkUserBelongsDomain, User } from '@things-factory/auth-base'
-import { Bizplace, getCompanyBizplace, getMyBizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
+import {
+  checkUserBelongsDomain,
+  User
+} from '@things-factory/auth-base'
+import {
+  Bizplace,
+  getCompanyBizplace,
+  getMyBizplace,
+  getPermittedBizplaceIds
+} from '@things-factory/biz-base'
 import { logger } from '@things-factory/env'
-import { buildQuery, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
-import { Inventory, LOCATION_TYPE } from '@things-factory/warehouse-base'
-
-import { ATTACHMENT_TYPE, ORDER_INVENTORY_STATUS, ORDER_STATUS } from '../../constants'
+import {
+  buildQuery,
+  Domain,
+  Filter,
+  ListParam,
+  Pagination,
+  Sorting
+} from '@things-factory/shell'
+import {
+  Inventory,
+  LOCATION_TYPE
+} from '@things-factory/warehouse-base'
+
+import {
+  ATTACHMENT_TYPE,
+  ORDER_INVENTORY_STATUS,
+  ORDER_STATUS,
+  ORDER_VAS_STATUS
+} from '../../constants'
 import { OrderInventory } from '../order-inventory/order-inventory'
 import { OrderPackage } from '../order-package/order-package'
 import { ShippingOrder } from '../shipping-order/shipping-order'
 import { ReleaseGood } from './release-good'
-import { NewReleaseGood, ReleasableInventoryList, ReleaseGoodList } from './release-good-types'
+import {
+  NewReleaseGood,
+  ReleasableInventoryList,
+  ReleaseGoodList
+} from './release-good-types'
 
 @Resolver(ReleaseGood)
 export class ReleaseGoodQuery {
@@ -191,8 +233,12 @@ export class ReleaseGoodQuery {
           'orderVass.vas',
           'orderVass.newProduct',
           'orderVass.newProductDetail',
+          'orderVass.adjustedNewProduct',
+          'orderVass.adjustedNewProductDetail',
           'orderVass.product',
           'orderVass.productDetail',
+          'orderVass.adjustedProduct',
+          'orderVass.adjustedProductDetail',
           'orderVass.inventory',
           'orderVass.orderVasItems',
           'orderVass.orderVasItems.vas',
@@ -311,6 +357,7 @@ export class ReleaseGoodQuery {
       const { domain, user }: { domain: Domain; user: User } = context.state
 
       const statusFilter = params.filters.some(e => e.name === 'status')
+      const vasStatusFilter = params.filters.find(e => e.name === 'vasStatus')
       const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId')
       const noOfItemsFilter = params.filters.find(param => param.name === 'noOfItems')
       const transporterFilter = params.filters.find(param => param.name === 'transporter')
@@ -323,6 +370,17 @@ export class ReleaseGoodQuery {
       const lmdFilter = params.filters.find(param => param.name === 'lmdOption')
       const priorityDeliveryFilter = params.filters.find(param => param.name === 'priorityDelivery')
       const platformCodeFilter = params.filters.find(param => param.name === 'platformCode')
+      const hasVas = params.filters.find(param => param.name === 'hasVas')
+      //remove vas from params
+      if (hasVas) {
+        const vasIdx = params.filters.findIndex(param => param.name === 'hasVas')
+        params.filters.splice(vasIdx, 1)
+      }
+
+      if (vasStatusFilter) {
+        const vasStatusIdx = params.filters.findIndex(param => param.name === 'vasStatus')
+        params.filters.splice(vasStatusIdx, 1)
+      }
 
       if (await checkUserBelongsDomain(domain, user)) {
         if (!statusFilter && !params.filters.some(e => e.name === 'name')) {
@@ -500,6 +558,7 @@ export class ReleaseGoodQuery {
       qb.leftJoinAndSelect('rg.acceptedBy', 'acceptedBy')
       qb.leftJoinAndSelect('rg.draftReleaseGood', 'draftReleaseGood')
       qb.leftJoinAndSelect('rg.deliverTo', 'deliverTo')
+      qb.leftJoinAndSelect('rg.orderVass', 'ov')
       qb.leftJoin(
         subQuery => {
           return subQuery
@@ -514,6 +573,37 @@ export class ReleaseGoodQuery {
         'cc.status = rg.status'
       )
 
+      if (hasVas) {
+        if (hasVas.value == true) {
+          qb.andWhere(
+            `ov.release_good_id notnull`
+          )
+        } else if (hasVas.value == false && !vasStatusFilter) {
+          qb.andWhere(
+            `ov.release_good_id is null`
+          )
+        }
+      }
+
+      if (vasStatusFilter) {
+        if (vasStatusFilter.value === ORDER_VAS_STATUS.PENDING_APPROVE) {
+          qb.andWhere(`ov.status = :vasStatus`, { vasStatus: vasStatusFilter.value })
+        } else {
+          qb.andWhere(
+            `
+              ov.status = :vasStatus
+                AND rg.id not IN (
+                  SELECT 
+                    rg2.id 
+                  FROM 
+                    release_goods rg2
+                  LEFT JOIN order_vass ov2 on ov2.release_good_id = rg2.id
+                  WHERE ov2.status = 'PENDING_APPROVE'
+                )`, { vasStatus: vasStatusFilter.value}
+          )
+        }
+      }
+
       if (transporterFilter) {
         qb.andWhere(
           `exists (select id from order_packages op where