@things-factory/sales-base 5.0.13 → 6.0.0-alpha.1

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

@@ -127,6 +127,9 @@ export class InventoryInfos {
 
   @Field({ nullable: true })
   lockedUomValue?: number
+
+  @Field({ nullable: true })
+  refWorksheetId?: string
 }
 
 @ObjectType()
@@ -137,12 +140,18 @@ export class ShippingOrderInfo {
   @Field({ nullable: true })
   containerNo?: string
 
+  @Field({ nullable: true })
+  containerSize?: string
+
   @Field({ nullable: true })
   containerLeavingDate?: string
 
   @Field({ nullable: true })
   containerArrivalDate?: string
 
+  @Field({ nullable: true })
+  containerClosureDate?: string
+
   @Field({ nullable: true })
   containerLeavingDateTime?: string
 
@@ -151,6 +160,12 @@ export class ShippingOrderInfo {
 
   @Field({ nullable: true })
   shipName?: string
+
+  @Field({ nullable: true })
+  remark?: string
+
+  @Field({ nullable: true })
+  remindContainerDeparture: boolean
 }
 
 @InputType()
@@ -168,7 +183,9 @@ export class NewReleaseGood {
   type: string
 
   @Field({ nullable: true })
-  releaseDateTime: string
+  orderMethod: string
+
+
 
   @Field({ nullable: true })
   collectionOrderNo: string
@@ -359,6 +376,21 @@ export class NewReleaseGood {
 
   @Field({ nullable: true })
   stopId: string
+
+  @Field({ nullable: true })
+  billingCity: string
+
+  @Field({ nullable: true })
+  billingPostalCode: string
+
+  @Field({ nullable: true })
+  billingCountry: string
+
+  @Field({ nullable: true })
+  billingState: string
+
+  @Field({ nullable: true })
+  recall: boolean
 }
 
 @InputType()
@@ -372,9 +404,6 @@ export class ReleaseGoodPatch {
   @Field({ nullable: true })
   releaseDate: string
 
-  @Field({ nullable: true })
-  releaseDateTime: string
-
   @Field({ nullable: true })
   collectionOrderNo: string
 
@@ -387,6 +416,9 @@ export class ReleaseGoodPatch {
   @Field({ nullable: true })
   type: string
 
+  @Field({ nullable: true })
+  orderMethod: string
+
   @Field({ nullable: true })
   truckNo: string
 
@@ -528,3 +560,99 @@ export class ReleaseGoodPatch {
   @Field({ nullable: true })
   stopId: string
 }
+
+@InputType()
+export class ExportInformationPatch {
+  @Field({ nullable: true })
+  id?: string
+
+  @Field({ nullable: true })
+  containerNo?: string
+
+  @Field({ nullable: true })
+  containerLeavingDate?: string
+
+  @Field({ nullable: true })
+  containerArrivalDate?: string
+
+  @Field({ nullable: true })
+  containerLeavingDateTime?: string
+
+  @Field({ nullable: true })
+  containerArrivalDateTime?: string
+
+  @Field({ nullable: true })
+  shipName?: string
+}
+
+@InputType()
+export class ShippingOrderInfoPatch {
+  @Field({ nullable: true })
+  billingAddress: string
+
+  @Field({ nullable: true })
+  billingCity: string
+
+  @Field({ nullable: true })
+  billingPostalCode: string
+
+  @Field({ nullable: true })
+  billingState: string
+
+  @Field({ nullable: true })
+  billingCountry: string
+
+  @Field({ nullable: true })
+  companyName: string
+
+  @Field({ nullable: true })
+  contact: string
+
+  @Field({ nullable: true })
+  deliveryAddress: string
+
+  @Field({ nullable: true })
+  deliveryCity: string
+
+  @Field({ nullable: true })
+  deliveryCountry: string
+
+  @Field({ nullable: true })
+  deliveryPostalCode: string
+
+  @Field({ nullable: true })
+  deliveryState: string
+
+  @Field({ nullable: true })
+  attentionTo: string
+
+  @Field({ nullable: true })
+  deliveryAddress1: string
+
+  @Field({ nullable: true })
+  country: string
+
+  @Field({ nullable: true })
+  city: string
+
+  @Field({ nullable: true })
+  state: string
+
+  @Field({ nullable: true })
+  phone1: string
+
+  @Field({ nullable: true })
+  postalCode: string
+
+  @Field({ nullable: true })
+  attentionCompany: string
+
+  @Field({ nullable: true })
+  collectionOrderNo: string
+
+  @Field({ nullable: true })
+  billingFullAddress: string
+
+  @Field({ nullable: true })
+  deliveryFullAddress: string
+}

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

@@ -1,9 +1,4 @@
-import {
-  Field,
-  Float,
-  ID,
-  ObjectType
-} from 'type-graphql'
+import { Field, Float, ID, ObjectType } from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -20,10 +15,7 @@ import {
 
 import { Attachment } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
-import {
-  Bizplace,
-  ContactPoint
-} from '@things-factory/biz-base'
+import { Bizplace, ContactPoint } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
 import { Domain } from '@things-factory/shell'
 
@@ -36,9 +28,8 @@ import {
   OrderProduct,
   OrderVas,
   ShippingOrder,
-  ShippingOrderInfo,
+  ShippingOrderInfo
 } from '../'
-
 import { ReleaseOrderType } from '../../constants'
 
 const ORMCONFIG = config.get('ormconfig', {})
@@ -104,8 +95,8 @@ export class ReleaseGood {
       DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
-          ? 'varchar2'
-          : 'smallint',
+        ? 'varchar2'
+        : 'smallint',
     enum: ReleaseOrderType,
     default: ReleaseOrderType.B2B
   })
@@ -132,6 +123,10 @@ export class ReleaseGood {
   @Field()
   crossDocking: Boolean
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  orderMethod: string
+
   @ManyToOne(type => ArrivalNotice)
   @Field(type => ArrivalNotice, { nullable: true })
   arrivalNotice: ArrivalNotice
@@ -172,8 +167,8 @@ export class ReleaseGood {
       DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
-          ? 'varchar2'
-          : 'smallint',
+        ? 'varchar2'
+        : 'smallint',
     enum: DispatchmentStatus,
     default: DispatchmentStatus.READY_TO_DISPATCH
   })
@@ -181,19 +176,15 @@ export class ReleaseGood {
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  releaseDateTime: Date
-
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  refNo: String
+  refNo: string
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  refNo2: String
+  refNo2: string
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  refNo3: String
+  refNo3: string
 
   @Column({ nullable: true })
   @Field({ nullable: true })
@@ -211,6 +202,22 @@ export class ReleaseGood {
   @Field({ nullable: true })
   billingAddress: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingCountry: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingPostalCode: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingState: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingCity: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   pickupAddress: string
@@ -303,6 +310,10 @@ export class ReleaseGood {
   @Field({ nullable: true })
   invoice: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  recall: boolean
+
   @Column({ nullable: true })
   bundleInfo: string
 
@@ -430,9 +441,29 @@ export class ReleaseGood {
   @Field({ nullable: true })
   stopId: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  manifestedAt: Date
+
+  @ManyToOne(type => User)
+  @Field(type => User, { nullable: true })
+  manifestedBy: User
+
+  @RelationId((releaseGood: ReleaseGood) => releaseGood.manifestedBy)
+  manifestedById: string
+
   @Field({ nullable: true })
   orderRemark: Boolean
 
-  @Field({nullable:true})
+  @Field({ nullable:true })
+  totalInventoriesByBin: Number
+
+  @Field({ nullable:true })
+  isOrderInventoryBin: Boolean
+
+  @Field({ nullable: true })
   invStatus: String
+
+  @Field({ nullable: true })
+  matchDeliveryAddress: Boolean
 }

package/server/service/retail-replenishment-order/retail-replenishment-order-mutation.ts

@@ -1,11 +1,13 @@
+import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
+import { EntityManager, In, Repository } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Bizplace, getOutletBizplace } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
 import { Product } from '@things-factory/product-base'
 import { Setting } from '@things-factory/setting-base'
-import { Domain } from '@things-factory/shell'
-import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, getRepository, In, Repository } from 'typeorm'
+import { Domain, getRepository } from '@things-factory/shell'
+
 import {
   NewOrderProduct,
   NewRetailReplenishmentOrder,
@@ -31,9 +33,9 @@ export class RetailReplenishmentOrderMutation {
   async addRetailReplenishmentOrderProducts(
     @Arg('sroNo') sroNo: string,
     @Arg('orderProducts', type => [NewOrderProduct]) orderProducts: NewOrderProduct[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<boolean> {
-    const { tx, user, domain }: { tx: EntityManager; user: User; domain: Domain } = context.state
+    const { tx, user, domain } = context.state
     const retailReplenishmentOrder: RetailReplenishmentOrder = await tx
       .getRepository(RetailReplenishmentOrder)
       .findOne({
@@ -49,15 +51,15 @@ export class RetailReplenishmentOrderMutation {
   @Mutation(returns => RetailReplenishmentOrder)
   async cancelRetailReplenishmentOrder(
     @Arg('patch', type => RetailReplenishmentOrderPatch) patch: RetailReplenishmentOrderPatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<RetailReplenishmentOrder> {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    const { tx, domain, user } = context.state
     const bizplace: Bizplace = await getOutletBizplace(patch.warehouseId)
 
     const retailReplenishmentOrder: RetailReplenishmentOrder = await tx
       .getRepository(RetailReplenishmentOrder)
       .findOne({
-        where: { domain, bizplace, name: patch.name },
+        where: { domain: { id: domain.id }, bizplace, name: patch.name },
         relations: ['orderProducts']
       })
 
@@ -92,12 +94,12 @@ export class RetailReplenishmentOrderMutation {
   async createRetailReplenishmentOrder(
     @Arg('retailReplenishmentOrder', type => NewRetailReplenishmentOrder)
     retailReplenishmentOrder: NewRetailReplenishmentOrder,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<RetailReplenishmentOrder> {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    const { tx, domain, user } = context.state
     const settingRepo: Repository<Setting> = tx?.getRepository(Setting) || getRepository(Setting)
 
-    let orderVass: OrderVas[] = retailReplenishmentOrder.orderVass
+    let orderVass: OrderVas[] = retailReplenishmentOrder.orderVass as any
     const myBizplace: Bizplace = await getOutletBizplace(retailReplenishmentOrder.warehouseId)
 
     // #1 check for allocated qty to identify the status: APPROVED or PENDING
@@ -116,7 +118,7 @@ export class RetailReplenishmentOrderMutation {
 
     const rrNoSetting: Setting = await settingRepo.findOne({
       where: {
-        domain,
+        domain: { id: domain.id },
         name: ORDER_NUMBER_SETTING_KEY.RR_NUMBER_RULE
       }
     })
@@ -185,9 +187,9 @@ export class RetailReplenishmentOrderMutation {
   @Mutation(returns => RetailReplenishmentOrder)
   async completeRetailReplenishmentOrder(
     @Arg('patch', type => RetailReplenishmentOrderPatch) patch: RetailReplenishmentOrderPatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<RetailReplenishmentOrder> {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    const { tx, domain, user } = context.state
 
     const myBizplace: Bizplace = await getOutletBizplace(patch.warehouseId)
     let targetOPs: NewOrderProduct[] = patch.orderProducts
@@ -195,7 +197,7 @@ export class RetailReplenishmentOrderMutation {
 
     // #1 Find Retail Replenishment Order
     const foundRRO: RetailReplenishmentOrder = await tx.getRepository(RetailReplenishmentOrder).findOne({
-      where: { domain, name: patch.name, bizplace: myBizplace },
+      where: { domain: { id: domain.id }, name: patch.name, bizplace: myBizplace },
       relations: ['orderProducts']
     })
 
@@ -206,7 +208,7 @@ export class RetailReplenishmentOrderMutation {
 
     // #2 Find related order inventories
     let foundOPs: OrderProduct[] = await tx.getRepository(OrderProduct).find({
-      where: { domain, transferOrder: foundRRO }
+      where: { domain: { id: domain.id } /* CONFIRMME regarding TYPEORM , transferOrder: foundRRO */ }
     })
     if (!foundOPs) throw new Error(`Order products were not found.`)
 
@@ -237,9 +239,9 @@ export class RetailReplenishmentOrderMutation {
   async updateRetailReplenishmentOrder(
     @Arg('name') name: string,
     @Arg('patch', type => RetailReplenishmentOrderPatch) patch: RetailReplenishmentOrderPatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<RetailReplenishmentOrder> {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    const { tx, domain, user } = context.state
 
     const bizplace: Bizplace = await getOutletBizplace(patch.warehouseId)
     const repository = tx.getRepository(RetailReplenishmentOrder)
@@ -247,7 +249,7 @@ export class RetailReplenishmentOrderMutation {
     delete patch.warehouseId //exclude warehouse Id from patch
 
     const retailReplenishmentOrder = await repository.findOne({
-      where: { domain, name, bizplace },
+      where: { domain: { id: domain.id }, name, bizplace },
       relations: ['orderProducts', 'orderProducts.product']
     })
 
@@ -267,9 +269,9 @@ export class RetailReplenishmentOrderMutation {
   @Mutation(returns => [RetailReplenishmentOrder])
   async updateMultipleRetailReplenishmentOrder(
     @Arg('patches', type => [RetailReplenishmentOrderPatch]) patches: RetailReplenishmentOrderPatch[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<RetailReplenishmentOrder[]> {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    const { tx, domain, user } = context.state
 
     let results: RetailReplenishmentOrder[] = []
     const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
@@ -294,7 +296,7 @@ export class RetailReplenishmentOrderMutation {
     if (_updateRecords.length > 0) {
       for (let i = 0; i < _updateRecords.length; i++) {
         const newRecord = _updateRecords[i]
-        const retailReplenishmentOrder = await retailReplenishmentOrderRepo.findOne(newRecord.id)
+        const retailReplenishmentOrder = await retailReplenishmentOrderRepo.findOneBy({ id: newRecord.id })
 
         const result = await retailReplenishmentOrderRepo.save({
           ...retailReplenishmentOrder,
@@ -311,8 +313,8 @@ export class RetailReplenishmentOrderMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async deleteRetailReplenishmentOrder(@Arg('name') name: string, @Ctx() context: any): Promise<boolean> {
-    const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state
+  async deleteRetailReplenishmentOrder(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<boolean> {
+    const { tx, domain } = context.state
     await tx.getRepository(RetailReplenishmentOrder).delete({ domain, name })
     return true
   }
@@ -321,11 +323,11 @@ export class RetailReplenishmentOrderMutation {
   @Mutation(returns => Boolean)
   async deleteRetailReplenishmentOrders(
     @Arg('names', type => [String]) names: string[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<boolean> {
-    const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state
+    const { tx, domain } = context.state
     await tx.getRepository(RetailReplenishmentOrder).delete({
-      domain,
+      domain: { id: domain.id },
       name: In(names)
     })
     return true
@@ -343,14 +345,18 @@ export async function addRetailReplenishmentOrderProducts(
 
   if (!retailReplenishmentOrder?.bizplace || !retailReplenishmentOrder?.orderProducts?.length) {
     retailReplenishmentOrder = await tx.getRepository(RetailReplenishmentOrder).findOne({
-      where: { ...retailReplenishmentOrder },
+      where: { id: retailReplenishmentOrder.id },
       relations: ['bizplace', 'orderProducts']
     })
   }
 
   orderProducts = await Promise.all(
     orderProducts.map(async (op: OrderProduct) => {
-      const foundProduct = await productRepo.findOne({ domain, sku: op.product.sku, name: op.product.name })
+      const foundProduct = await productRepo.findOneBy({
+        domain: { id: domain.id },
+        sku: op.product.sku,
+        name: op.product.name
+      })
       if (!foundProduct) throw new Error(`Product ${op.product.name} (${op.product.sku}) is not exist.`)
 
       return {

package/server/service/retail-replenishment-order/retail-replenishment-order-query.ts

@@ -1,7 +1,8 @@
-import { User } from '@things-factory/auth-base'
-import { convertListParams, Domain, Filter, Pagination, Sorting } from '@things-factory/shell'
 import { Arg, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { getRepository } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { convertListParams, Domain, Filter, getRepository, Pagination, Sorting } from '@things-factory/shell'
+
 import { RetailReplenishmentOrderList } from '../'
 import { RetailReplenishmentOrder } from './retail-replenishment-order'
 
@@ -22,29 +23,32 @@ export class RetailReplenishmentOrderQuery {
   }
 
   @Query(returns => RetailReplenishmentOrder)
-  async retailReplenishmentOrder(@Arg('name') name: string, @Ctx() context: any): Promise<RetailReplenishmentOrder> {
-    const { domain }: { domain: Domain } = context.state
+  async retailReplenishmentOrder(
+    @Arg('name') name: string,
+    @Ctx() context: ResolverContext
+  ): Promise<RetailReplenishmentOrder> {
+    const { domain } = context.state
 
     const repository = getRepository(RetailReplenishmentOrder)
 
     return await repository.findOne({
-      where: { domain, name },
+      where: { domain: { id: domain.id }, name },
       relations: ['domain', 'orderProducts', 'orderProducts.product', 'creator', 'updater']
     })
   }
 
   @FieldResolver(type => Domain)
   async domain(@Root() retailReplenishmentOrder: RetailReplenishmentOrder): Promise<Domain> {
-    return await getRepository(Domain).findOne(retailReplenishmentOrder.domainId)
+    return await getRepository(Domain).findOneBy({ id: retailReplenishmentOrder.domainId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() retailReplenishmentOrder: RetailReplenishmentOrder): Promise<User> {
-    return await getRepository(User).findOne(retailReplenishmentOrder.creatorId)
+    return await getRepository(User).findOneBy({ id: retailReplenishmentOrder.creatorId })
   }
 
   @FieldResolver(type => User)
   async updater(@Root() retailReplenishmentOrder: RetailReplenishmentOrder): Promise<User> {
-    return await getRepository(User).findOne(retailReplenishmentOrder.updaterId)
+    return await getRepository(User).findOneBy({ id: retailReplenishmentOrder.updaterId })
   }
 }

package/server/service/retail-replenishment-order/retail-replenishment-order-types.ts

@@ -1,5 +1,7 @@
-import { ObjectRef } from '@things-factory/shell'
 import { Field, InputType, Int, ObjectType } from 'type-graphql'
+
+import { ObjectRef } from '@things-factory/shell'
+
 import { NewOrderProduct } from '../order-product/order-product-types'
 import { RetailReplenishmentOrder } from './retail-replenishment-order'
 
@@ -30,11 +32,11 @@ export class NewRetailReplenishmentOrder {
   @Field({ nullable: true })
   status: string
 
-  @Field(type => ObjectRef, { nullable: true })
-  orderVass: [ObjectRef]
+  @Field(type => [ObjectRef], { nullable: true })
+  orderVass: ObjectRef[]
 
-  @Field(type => NewOrderProduct, { nullable: true })
-  orderProducts: [NewOrderProduct]
+  @Field(type => [NewOrderProduct], { nullable: true })
+  orderProducts: NewOrderProduct[]
 
   @Field(type => ObjectRef, { nullable: true })
   deliveryOrder: ObjectRef