@things-factory/sales-base 4.0.37 → 4.0.41

package/server/service/invoice-product/invoice-product-query.ts

@@ -0,0 +1,55 @@
+import { Arg, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
+import { getRepository } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { buildQuery, Domain, Filter, Pagination, Sorting } from '@things-factory/shell'
+
+import { InvoiceProduct } from './invoice-product'
+import { InvoiceProductList } from './invoice-product-types'
+
+@Resolver(InvoiceProduct)
+export class InvoiceProductQuery {
+  @Query(returns => InvoiceProductList)
+  async invoiceProducts(
+    @Ctx() context: any,
+    @Arg('filters', type => [Filter], { nullable: true }) filters?: Filter[],
+    @Arg('pagination', type => Pagination, { nullable: true }) pagination?: Pagination,
+    @Arg('sortings', type => [Sorting], { nullable: true }) sortings?: Sorting[]
+  ): Promise<InvoiceProductList> {
+    const queryBuilder = getRepository(InvoiceProduct).createQueryBuilder()
+    buildQuery(queryBuilder, { filters, pagination, sortings }, context)
+    const [items, total] = await queryBuilder
+      .leftJoinAndSelect('InvoiceProduct.domain', 'Domain')
+      .leftJoinAndSelect('InvoiceProduct.invoice', 'Invoice')
+      .leftJoinAndSelect('InvoiceProduct.creator', 'Creator')
+      .leftJoinAndSelect('InvoiceProduct.updater', 'Updater')
+      .getManyAndCount()
+
+    return { items, total }
+  }
+
+  @Query(returns => InvoiceProduct)
+  async invoiceProduct(@Arg('name') name: string, @Ctx() context: any): Promise<InvoiceProduct> {
+    const { domain }: { domain: Domain } = context.state
+
+    return await getRepository(InvoiceProduct).findOne({
+      where: { domain, name },
+      relations: ['domain', 'invoice', 'creator', 'updater']
+    })
+  }
+
+  @FieldResolver(type => Domain)
+  async domain(@Root() invoiceProduct: InvoiceProduct): Promise<Domain> {
+    return await getRepository(Domain).findOne(invoiceProduct.domainId)
+  }
+
+  @FieldResolver(type => User)
+  async creator(@Root() invoiceProduct: InvoiceProduct): Promise<User> {
+    return await getRepository(User).findOne(invoiceProduct.creatorId)
+  }
+
+  @FieldResolver(type => User)
+  async updater(@Root() invoiceProduct: InvoiceProduct): Promise<User> {
+    return await getRepository(User).findOne(invoiceProduct.updaterId)
+  }
+}

package/server/service/invoice-product/invoice-product-types.ts

@@ -0,0 +1,80 @@
+import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
+
+import { ObjectRef } from '@things-factory/shell'
+
+import { InvoiceProduct } from './invoice-product'
+
+@ObjectType()
+export class InvoiceProductList {
+  @Field(type => [InvoiceProduct], { nullable: true })
+  items: InvoiceProduct[]
+
+  @Field(type => Int, { nullable: true })
+  total: number
+}
+
+@InputType()
+export class ProductInput {
+  @Field()
+  sku: string
+}
+
+@InputType()
+export class NewInvoiceProduct {
+  @Field({ nullable: true })
+  name: string
+
+  @Field({ nullable: true })
+  sku: string
+
+  @Field({ nullable: true })
+  description: string
+
+  @Field(type => ObjectRef)
+  invoice: ObjectRef
+
+  @Field(type => ProductInput)
+  product: ProductInput
+
+  @Field(type => Int)
+  qty: number
+
+  @Field(type => Float, { nullable: false })
+  otherCharges: number
+
+  @Field(type => Float)
+  unitPrice: number
+
+  @Field(type => Float)
+  paidPrice: number
+}
+
+@InputType()
+export class InvoiceProductPatch {
+  @Field({ nullable: true })
+  name: string
+
+  @Field({ nullable: true })
+  sku: string
+
+  @Field({ nullable: true })
+  description: string
+
+  @Field(type => ObjectRef)
+  invoice: ObjectRef
+
+  @Field(type => ProductInput)
+  product: ProductInput
+
+  @Field(type => Int)
+  qty: number
+
+  @Field(type => Float, { nullable: false })
+  otherCharges: number
+
+  @Field(type => Float)
+  unitPrice: number
+
+  @Field(type => Float)
+  paidPrice: number
+}

package/server/service/invoice-product/invoice-product.ts

@@ -0,0 +1,93 @@
+import { Field, ID, ObjectType } from 'type-graphql'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Product } from '@things-factory/product-base'
+import { Domain } from '@things-factory/shell'
+
+import { Invoice } from '../invoice/invoice'
+
+@Entity()
+@Index('ix_invoice_product_0', (invoiceProduct: InvoiceProduct) => [invoiceProduct.id], {
+  unique: true
+})
+@ObjectType()
+export class InvoiceProduct {
+  @PrimaryGeneratedColumn('uuid')
+  @Field(type => ID)
+  readonly id: string
+
+  @ManyToOne(type => Domain)
+  @Field(type => Domain, { nullable: true })
+  domain: Domain
+
+  @RelationId((invoiceProduct: InvoiceProduct) => invoiceProduct.domain)
+  domainId: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  sku: string
+
+  @Column()
+  @Field()
+  name: string
+
+  @Column({ nullable: true })
+  @Field()
+  description: string
+
+  @ManyToOne(type => Invoice)
+  @Field(type => Invoice)
+  invoice: Invoice
+
+  @ManyToOne(type => Product, { nullable: true })
+  @Field(type => Product, { nullable: true })
+  product: Product
+
+  @Column('int', { default: 0 })
+  @Field()
+  qty: number
+
+  @Column('float', { default: 0 })
+  @Field({ nullable: true })
+  otherCharges: number
+
+  @Column('float', { default: 0 })
+  @Field()
+  unitPrice: number
+
+  @Column('float', { default: 0 })
+  @Field()
+  paidPrice: number
+
+  @CreateDateColumn()
+  @Field()
+  createdAt: Date
+
+  @UpdateDateColumn()
+  @Field({ nullable: true })
+  updatedAt: Date
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field(type => User, { nullable: true })
+  creator: User
+
+  @RelationId((invoiceProduct: InvoiceProduct) => invoiceProduct.creator)
+  creatorId: string
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field(type => User, { nullable: true })
+  updater: User
+
+  @RelationId((invoiceProduct: InvoiceProduct) => invoiceProduct.updater)
+  updaterId: string
+}

package/server/service/order-inventory/order-inventory-query.ts

@@ -6,7 +6,9 @@ import { getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { Product } from '@things-factory/product-base'
 import { buildQuery, convertListParams, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
 
-import { ArrivalNotice, OrderInventoryList, ReleaseGood } from '../'
+import { ArrivalNotice } from '../arrival-notice/arrival-notice'
+import { OrderInventoryList } from '../order-inventory/order-inventory-types'
+import { ReleaseGood } from '../release-good/release-good'
 import { OrderInventory } from './order-inventory'
 
 interface filterInterface {

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

@@ -16,15 +16,13 @@ import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, Location } from '@things-factory/warehouse-base'
 
-import {
-  ArrivalNotice,
-  DeliveryOrder,
-  InventoryCheck,
-  OrderProduct,
-  ReleaseGood,
-  ReturnOrder,
-  TransferOrder
-} from '../'
+import { ArrivalNotice } from '../arrival-notice/arrival-notice'
+import { DeliveryOrder } from '../delivery-order/delivery-order'
+import { InventoryCheck } from '../inventory-check/inventory-check'
+import { OrderProduct } from '../order-product/order-product'
+import { ReleaseGood } from '../release-good/release-good'
+import { ReturnOrder } from '../return-order/return-order'
+import { TransferOrder } from '../transfer-order/transfer-order'
 
 @Entity()
 @Index('ix_order-inventory_0', (orderInventory: OrderInventory) => [orderInventory.domain, orderInventory.name], {
@@ -57,7 +55,7 @@ import {
 @ObjectType()
 export class OrderInventory {
   @PrimaryGeneratedColumn('uuid')
-  @Field(type => ID)
+  @Field(type => ID, { nullable: true })
   readonly id: string
 
   @ManyToOne(type => Domain)
@@ -75,7 +73,7 @@ export class OrderInventory {
   bizplaceId: string
 
   @Column()
-  @Field()
+  @Field({ nullable: true })
   name: string
 
   @Column({ nullable: true })
@@ -122,8 +120,8 @@ export class OrderInventory {
   packingType: string
 
   @Column('float', { default: 1 })
-  @Field()
-  packingSize: number
+  @Field({ nullable: true })
+  packingSize?: number
 
   @ManyToOne(type => ArrivalNotice)
   @Field(type => ArrivalNotice, { nullable: true })

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

@@ -1,8 +1,3 @@
-import { User } from '@things-factory/auth-base'
-import { Bizplace } from '@things-factory/biz-base'
-import { Product } from '@things-factory/product-base'
-import { Domain } from '@things-factory/shell'
-import { Inventory } from '@things-factory/warehouse-base'
 import { Field, ID, ObjectType } from 'type-graphql'
 import {
   Column,
@@ -14,14 +9,19 @@ import {
   RelationId,
   UpdateDateColumn
 } from 'typeorm'
-import {
-  ArrivalNotice,
-  CollectionOrder,
-  DeliveryOrder,
-  PurchaseOrder,
-  ReleaseGood,
-  RetailReplenishmentOrder
-} from '../'
+
+import { User } from '@things-factory/auth-base'
+import { Bizplace } from '@things-factory/biz-base'
+import { Product } from '@things-factory/product-base'
+import { Domain } from '@things-factory/shell'
+import { Inventory } from '@things-factory/warehouse-base'
+
+import { ArrivalNotice } from '../arrival-notice/arrival-notice'
+import { CollectionOrder } from '../collection-order/collection-order'
+import { DeliveryOrder } from '../delivery-order/delivery-order'
+import { PurchaseOrder } from '../purchase-order/purchase-order'
+import { ReleaseGood } from '../release-good/release-good'
+import { RetailReplenishmentOrder } from '../retail-replenishment-order/retail-replenishment-order'
 
 @Entity()
 @Index('ix_order-product_0', (orderProduct: OrderProduct) => [orderProduct.domain, orderProduct.name], {

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

@@ -1,8 +1,3 @@
-import { User } from '@things-factory/auth-base'
-import { Bizplace } from '@things-factory/biz-base'
-import { Product } from '@things-factory/product-base'
-import { Domain } from '@things-factory/shell'
-import { Inventory } from '@things-factory/warehouse-base'
 import { Field, ID, ObjectType } from 'type-graphql'
 import {
   Column,
@@ -14,16 +9,21 @@ import {
   RelationId,
   UpdateDateColumn
 } from 'typeorm'
-import {
-  ArrivalNotice,
-  ReleaseGood,
-  RetailReplenishmentOrder,
-  ReturnOrder,
-  ShippingOrder,
-  TransferOrder,
-  Vas,
-  VasOrder
-} from '../'
+
+import { User } from '@things-factory/auth-base'
+import { Bizplace } from '@things-factory/biz-base'
+import { Product } from '@things-factory/product-base'
+import { Domain } from '@things-factory/shell'
+import { Inventory } from '@things-factory/warehouse-base'
+
+import { ArrivalNotice } from '../arrival-notice/arrival-notice'
+import { ReleaseGood } from '../release-good/release-good'
+import { RetailReplenishmentOrder } from '../retail-replenishment-order/retail-replenishment-order'
+import { ReturnOrder } from '../return-order/return-order'
+import { ShippingOrder } from '../shipping-order/shipping-order'
+import { TransferOrder } from '../transfer-order/transfer-order'
+import { VasOrder } from '../vas-order/vas-order'
+import { Vas } from '../vas/vas'
 
 @Entity('order_vass')
 @Index('ix_order-vas_0', (orderVas: OrderVas) => [orderVas.domain, orderVas.name], { unique: true })

package/server/service/others/other-query.ts

@@ -7,7 +7,7 @@ import { Bizplace, getPermittedBizplaces } from '@things-factory/biz-base'
 import { Product, ProductDetail } from '@things-factory/product-base'
 import { Domain, ListParam } from '@things-factory/shell'
 
-import { InventoryProductGroupList, NewOrderInventory, NewOrderProduct, OrderInventory, OrderProduct } from '../'
+import { InventoryProductGroup, InventoryProductGroupList, NewOrderInventory, NewOrderProduct, OrderInventory, OrderProduct } from '../'
 import { InventoryUtil } from '../../utils'
 
 @Resolver()
@@ -16,12 +16,8 @@ export class OtherQuery {
   @Directive('@transaction')
   @Query(returns => InventoryProductGroupList)
   async inventoryProductGroup(@Ctx() context: any, @Args() params: ListParam): Promise<InventoryProductGroupList> {
-    const {
-      domain,
-      user,
-      tx,
-      bizplace
-    }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } = context.state
+    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } =
+      context.state
 
     let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
 
@@ -52,7 +48,8 @@ export class OtherQuery {
   }
 
   @Directive('@privilege(category: "order_customer", privilege: "query")')
-  @Query(returns => OrderInventory)
+  @Directive('@transaction')
+  @Query(returns => [OrderInventory])
   async bulkUploadValidateWarehousePartnersProductsQuantity(
     @Ctx() context: any,
     @Arg('partnerBizplaceId') partnerBizplaceId: string,
@@ -197,18 +194,15 @@ export class OtherQuery {
   }
 
   @Directive('@privilege(category: "order_customer", privilege: "query")')
-  @Query(returns => InventoryProductGroupList)
+  @Directive('@transaction')
+  @Query(returns => [InventoryProductGroup])
   async bulkUploadValidateOrderProducts(
     @Ctx() context: any,
     @Arg('partnerBizplaceId') partnerBizplaceId: string,
     @Arg('orderProducts', type => [NewOrderProduct], { nullable: true }) orderProducts: NewOrderProduct[]
   ): Promise<OrderProduct[]> {
-    const {
-      domain,
-      user,
-      tx,
-      bizplace
-    }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } = context.state
+    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } =
+      context.state
 
     const productDetailRepo = tx.getRepository(ProductDetail)
 

package/server/service/others/other-types.ts

@@ -1,4 +1,5 @@
 import { Field, Float, Int, ObjectType } from 'type-graphql'
+import { Product } from '@things-factory/product-base'
 
 @ObjectType()
 export class InventoryProductGroupList {
@@ -11,6 +12,9 @@ export class InventoryProductGroupList {
 
 @ObjectType()
 export class InventoryProductGroup {
+  @Field({ nullable: true })
+  id: string
+
   @Field({ nullable: true })
   productId: string
 
@@ -35,6 +39,12 @@ export class InventoryProductGroup {
   @Field(type => Float, { nullable: true })
   packingSize: number
 
+  @Field(type => Int, { nullable: true })
+  packQty: number
+
+  @Field(type => Int, { nullable: true })
+  palletQty: number
+
   @Field(type => Float, { nullable: true })
   remainQty: number
 
@@ -50,6 +60,27 @@ export class InventoryProductGroup {
   @Field({ nullable: true })
   uom: string
 
+  @Field(type => Float, { nullable: true })
+  uomValue: number
+
+  @Field({ nullable: true })
+  totalUomValue: String
+
   @Field({ nullable: true })
   groupType: string
+
+  @Field(type => Int, { nullable: true })
+  manufactureYear: number
+
+  @Field(type => Float, { nullable: true })
+  unitPrice: number
+
+  @Field({ nullable: true })
+  remark: string
+
+  @Field(type => Float, { nullable: true })
+  isError: Boolean
+
+  @Field(type => Product, { nullable: true })
+  product: Product
 }

package/server/service/purchase-order/purchase-order-mutation.ts

@@ -1,4 +1,8 @@
-import { Attachment, createAttachments, deleteAttachment } from '@things-factory/attachment-base'
+import { FileUpload, GraphQLUpload } from 'graphql-upload'
+import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
+import { EntityManager, getRepository, Repository } from 'typeorm'
+
+import { Attachment, createAttachments, deleteAttachmentsByRef } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint, getPermittedBizplaces } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
@@ -6,9 +10,7 @@ import { Product } from '@things-factory/product-base'
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Location } from '@things-factory/warehouse-base'
-import { FileUpload, GraphQLUpload } from 'graphql-upload'
-import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, getRepository, Repository } from 'typeorm'
+
 import {
   ArrivalNotice,
   NewPurchaseOrder,
@@ -40,14 +42,14 @@ export class PurchaseOrderMutation {
   async upsertPurchaseOrder(
     @Ctx() context: any,
     @Arg('purchaseOrder', type => PurchaseOrderPatch) purchaseOrder: PurchaseOrderPatch,
-    @Arg('file', type => [GraphQLUpload], { nullable: true }) file?: FileUpload
+    @Arg('files', type => [GraphQLUpload], { nullable: true }) files?: FileUpload
   ): Promise<PurchaseOrder> {
     try {
       const { tx }: { tx: EntityManager } = context.state
       const createdPurchaseOrder: PurchaseOrder = await upsertPurchaseOrderFunction(
         null,
         purchaseOrder,
-        file,
+        files,
         context,
         tx
       )
@@ -197,17 +199,14 @@ export class PurchaseOrderMutation {
 export async function upsertPurchaseOrderFunction(
   _: any,
   purchaseOrder: any,
-  file: Attachment,
+  files: FileUpload[],
   context: any,
   tx?: EntityManager
 ): Promise<PurchaseOrder> {
-  const { domain, user }: { domain: Domain; user: User } = context.state
-  let orderProducts: OrderProduct[] = purchaseOrder.orderProducts
-
   if (!purchaseOrder.id) {
-    purchaseOrder = await createPurchaseOrderFunction(_, purchaseOrder, file, context, tx)
+    purchaseOrder = await createPurchaseOrderFunction(_, purchaseOrder, files, context, tx)
   } else {
-    purchaseOrder = await updatePurchaseOrderFunction(_, purchaseOrder, file, context, tx)
+    purchaseOrder = await updatePurchaseOrderFunction(_, purchaseOrder, files, context, tx)
   }
 
   return purchaseOrder
@@ -216,7 +215,7 @@ export async function upsertPurchaseOrderFunction(
 export async function createPurchaseOrderFunction(
   _: any,
   purchaseOrder: any,
-  file: Attachment,
+  files: FileUpload[],
   context: any,
   tx?: EntityManager
 ): Promise<PurchaseOrder> {
@@ -297,8 +296,8 @@ export async function createPurchaseOrderFunction(
   }
 
   // // 4. Create Attacments
-  if (file?.length) {
-    const attachments: Attachment[] = file.map(attachment => {
+  if (files?.length) {
+    const attachments: Attachment[] = files.map(attachment => {
       return {
         file: attachment,
         refBy: createdPurchaseOrder.id,
@@ -314,7 +313,7 @@ export async function createPurchaseOrderFunction(
 export async function updatePurchaseOrderFunction(
   _: any,
   purchaseOrder: any,
-  file: Attachment,
+  files: FileUpload[],
   context: any,
   tx?: EntityManager
 ): Promise<PurchaseOrder> {
@@ -386,14 +385,13 @@ export async function updatePurchaseOrderFunction(
   })
 
   // // 6. Remove All Attachment
-  for await (const file of foundAttachments.filter(attachment => !file.find(file => file.id == attachment.id))) {
-    await deleteAttachment(_, { id: file.id }, context)
+  if (foundAttachments?.length) {
+    await deleteAttachmentsByRef(_, { refBys: foundAttachments.map(file => file.refBy) }, context)
   }
 
   // // 7. Add New Attachment
-  const newAttachments = file.filter(attachment => !attachment.id)
-  if (newAttachments.length > 0) {
-    const attachments: Attachment[] = newAttachments.map(attachment => {
+  if (files?.length > 0) {
+    const attachments: Attachment[] = files.map(attachment => {
       return {
         file: attachment,
         refBy: updatePurchaseOrder.id,