@things-factory/sales-base 4.0.0-beta.2 → 4.0.2

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

@@ -1,8 +1,3 @@
-import { Attachment } from '@things-factory/attachment-base'
-import { User } from '@things-factory/auth-base'
-import { Bizplace } from '@things-factory/biz-base'
-import { Domain } from '@things-factory/shell'
-import { TransportDriver, TransportVehicle } from '@things-factory/transport-base'
 import { Field, ID, ObjectType } from 'type-graphql'
 import {
   Column,
@@ -15,6 +10,13 @@ import {
   RelationId,
   UpdateDateColumn
 } from 'typeorm'
+
+import { Attachment } from '@things-factory/attachment-base'
+import { User } from '@things-factory/auth-base'
+import { Bizplace } from '@things-factory/biz-base'
+import { Domain } from '@things-factory/shell'
+import { TransportDriver, TransportVehicle } from '@things-factory/transport-base'
+
 import { OrderInventory, ReleaseGood, RetailReplenishmentOrder, TransferOrder } from '../'
 
 @Entity()
@@ -63,6 +65,9 @@ export class DeliveryOrder {
   @Field({ nullable: true })
   truckNo: string
 
+  @Field({ nullable: true })
+  truck?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   ownCollection: Boolean
@@ -92,6 +97,9 @@ export class DeliveryOrder {
   @Field(type => OrderInventory, { nullable: true })
   orderInventories: OrderInventory[]
 
+  @Field(type => [OrderInventory], { nullable: true })
+  targetInventories?: OrderInventory[]
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   looseItem: Boolean

package/server/service/delivery-order/index.ts

@@ -4,3 +4,6 @@ import { DeliveryOrderQuery } from './delivery-order-query'
 
 export const entities = [DeliveryOrder]
 export const resolvers = [DeliveryOrderQuery, DeliveryOrderMutation]
+
+export * from './delivery-order-mutation'
+export * from './delivery-order-query'

package/server/service/goods-receival-note/index.ts

@@ -4,3 +4,6 @@ import { GoodsReceivalNoteQuery } from './goods-receival-note-query'
 
 export const entities = [GoodsReceivalNote]
 export const resolvers = [GoodsReceivalNoteQuery, GoodsReceivalNoteMutation]
+
+export * from './goods-receival-note-mutation'
+export * from './goods-receival-note-query'

package/server/service/index.ts

@@ -1,6 +1,12 @@
 /* IMPORT ENTITIES AND RESOLVERS */
-import { entities as ReverseKittingOrderInventoryEntities, resolvers as ReverseKittingOrderInventoryResolvers } from './reverse-kitting-order-inventory'
-import { entities as ReverseKittingOrderEntities, resolvers as ReverseKittingOrderResolvers } from './reverse-kitting-order'
+import {
+  entities as ReverseKittingOrderInventoryEntities,
+  resolvers as ReverseKittingOrderInventoryResolvers
+} from './reverse-kitting-order-inventory'
+import {
+  entities as ReverseKittingOrderEntities,
+  resolvers as ReverseKittingOrderResolvers
+} from './reverse-kitting-order'
 import { entities as ArrivalNoticeEntity, resolvers as ArrivalNoticeResolvers } from './arrival-notice'
 import { entities as ClaimEntity, resolvers as ClaimResolvers } from './claim'
 import { entities as ClaimDetailEntity, resolvers as ClaimDetailResolvers } from './claim-detail'
@@ -82,10 +88,59 @@ export * from './transfer-order/transfer-order-types'
 export * from './vas-order/vas-order-types'
 export * from './vas/vas-types'
 
+/* EXPORT MUTATIONS */
+export * from './arrival-notice/arrival-notice-mutation'
+export * from './claim-detail/claim-detail-mutation'
+export * from './claim-order/claim-order-mutation'
+export * from './claim/claim-mutation'
+export * from './collection-order/collection-order-mutation'
+export * from './delivery-order/delivery-order-mutation'
+export * from './goods-receival-note/goods-receival-note-mutation'
+export * from './inventory-check/inventory-check-mutation'
+export * from './invoice/invoice-mutation'
+export * from './job-sheet/job-sheet-mutation'
+export * from './order-inventory/order-inventory-mutation'
+export * from './order-product/order-product-mutation'
+export * from './order-vas/order-vas-mutation'
+export * from './purchase-order-other-charge/purchase-order-other-charge-mutation'
+export * from './purchase-order/purchase-order-mutation'
+export * from './release-good/release-good-mutation'
+export * from './retail-replenishment-order/retail-replenishment-order-mutation'
+export * from './return-order/return-order-mutation'
+export * from './shipping-order/shipping-order-mutation'
+export * from './transfer-order/transfer-order-mutation'
+export * from './vas-order/vas-order-mutation'
+export * from './vas/vas-mutation'
+
+/* EXPORT QUERIES */
+export * from './arrival-notice/arrival-notice-query'
+export * from './claim-detail/claim-detail-query'
+export * from './claim-order/claim-order-query'
+export * from './claim/claim-query'
+export * from './collection-order/collection-order-query'
+export * from './delivery-order/delivery-order-query'
+export * from './goods-receival-note/goods-receival-note-query'
+export * from './inventory-check/inventory-check-query'
+export * from './invoice/invoice-query'
+export * from './job-sheet/job-sheet-query'
+export * from './order-inventory/order-inventory-query'
+export * from './order-product/order-product-query'
+export * from './order-vas/order-vas-query'
+export * from './others/other-query'
+export * from './purchase-order-other-charge/purchase-order-other-charge-query'
+export * from './purchase-order/purchase-order-query'
+export * from './release-good/release-good-query'
+export * from './retail-replenishment-order/retail-replenishment-order-query'
+export * from './return-order/return-order-query'
+export * from './shipping-order/shipping-order-query'
+export * from './transfer-order/transfer-order-query'
+export * from './vas-order/vas-order-query'
+export * from './vas/vas-query'
+
 export const entities = [
   /* ENTITIES */
-	...ReverseKittingOrderInventoryEntities,
-	...ReverseKittingOrderEntities,
+  ...ReverseKittingOrderInventoryEntities,
+  ...ReverseKittingOrderEntities,
   ...ArrivalNoticeEntity,
   ...ClaimEntity,
   ...ClaimDetailEntity,
@@ -113,8 +168,8 @@ export const entities = [
 export const schema = {
   resolverClasses: [
     /* RESOLVER CLASSES */
-		...ReverseKittingOrderInventoryResolvers,
-		...ReverseKittingOrderResolvers,
+    ...ReverseKittingOrderInventoryResolvers,
+    ...ReverseKittingOrderResolvers,
     ...ArrivalNoticeResolvers,
     ...ClaimResolvers,
     ...ClaimDetailResolvers,

package/server/service/inventory-check/index.ts

@@ -4,3 +4,6 @@ import { InventoryCheckQuery } from './inventory-check-query'
 
 export const entities = [InventoryCheck]
 export const resolvers = [InventoryCheckQuery, InventoryCheckMutation]
+
+export * from './inventory-check-mutation'
+export * from './inventory-check-query'

package/server/service/invoice/index.ts

@@ -4,3 +4,6 @@ import { InvoiceQuery } from './invoice-query'
 
 export const entities = [Invoice]
 export const resolvers = [InvoiceQuery, InvoiceMutation]
+
+export * from './invoice-mutation'
+export * from './invoice-query'

package/server/service/job-sheet/index.ts

@@ -4,3 +4,6 @@ import { JobSheetQuery } from './job-sheet-query'
 
 export const entities = [JobSheet]
 export const resolvers = [JobSheetQuery, JobSheetMutation]
+
+export * from './job-sheet-mutation'
+export * from './job-sheet-query'

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

@@ -4,3 +4,6 @@ import { OrderInventoryQuery } from './order-inventory-query'
 
 export const entities = [OrderInventory]
 export const resolvers = [OrderInventoryQuery, OrderInventoryMutation]
+
+export * from './order-inventory-mutation'
+export * from './order-inventory-query'

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

@@ -4,3 +4,6 @@ import { OrderProductQuery } from './order-product-query'
 
 export const entities = [OrderProduct]
 export const resolvers = [OrderProductQuery, OrderProductMutation]
+
+export * from './order-product-mutation'
+export * from './order-product-query'

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

@@ -4,3 +4,6 @@ import { OrderVasMutation } from './order-vas-mutation'
 
 export const entities = [OrderVas]
 export const resolvers = [OrderVasQuery, OrderVasMutation]
+
+export * from './order-vas-mutation'
+export * from './order-vas-query'

package/server/service/others/index.ts

@@ -1,3 +1,5 @@
 import { OtherQuery } from './other-query'
 
 export const resolvers = [OtherQuery]
+
+export * from './other-query'

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

@@ -13,6 +13,7 @@ import { InventoryUtil } from '../../utils'
 @Resolver()
 export class OtherQuery {
   @Directive('@privilege(category: "inventory", privilege: "query")')
+  @Directive('@transaction')
   @Query(returns => InventoryProductGroupList)
   async inventoryProductGroup(
     @Ctx() context: any,

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

@@ -2,7 +2,7 @@ import { Field, Float, Int, ObjectType } from 'type-graphql'
 
 @ObjectType()
 export class InventoryProductGroupList {
-  @Field(type => InventoryProductGroup, { nullable: true })
+  @Field(type => [InventoryProductGroup], { nullable: true })
   items: InventoryProductGroup[]
 
   @Field(type => Int, { nullable: true })

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

@@ -4,3 +4,6 @@ import { PurchaseOrderQuery } from './purchase-order-query'
 
 export const entities = [PurchaseOrder]
 export const resolvers = [PurchaseOrderQuery, PurchaseOrderMutation]
+
+export * from './purchase-order-mutation'
+export * from './purchase-order-query'

package/server/service/purchase-order-other-charge/index.ts

@@ -4,3 +4,6 @@ import { PurchaseOrderOtherChargeQuery } from './purchase-order-other-charge-que
 
 export const entities = [PurchaseOrderOtherCharge]
 export const resolvers = [PurchaseOrderOtherChargeQuery, PurchaseOrderOtherChargeMutation]
+
+export * from './purchase-order-other-charge-mutation'
+export * from './purchase-order-other-charge-query'

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

@@ -4,3 +4,6 @@ import { ReleaseGoodQuery } from './release-good-query'
 
 export const entities = [ReleaseGood]
 export const resolvers = [ReleaseGoodQuery, ReleaseGoodMutation]
+
+export * from './release-good-mutation'
+export * from './release-good-query'

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

@@ -74,7 +74,7 @@ export class ReleaseGoodMutation {
   @Mutation(returns => ReleaseGood)
   async generateReleaseGood(
     @Ctx() context: any,
-    @Arg('attachments', type => [GraphQLUpload]) attachments: FileUpload[],
+    @Arg('attachments', type => [GraphQLUpload], { nullable: true }) attachments?: FileUpload[],
     @Arg('releaseGood', type => NewReleaseGood, { nullable: true }) releaseGood?: NewReleaseGood,
     @Arg('shippingOrder', type => ShippingOrderPatch, { nullable: true }) shippingOrder?: ShippingOrderPatch
   ): Promise<ReleaseGood> {

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

@@ -9,7 +9,7 @@ import { Product } from '@things-factory/product-base'
 import { buildQuery, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
-import { OrderInventory, ReleasableInventoryList, ReleaseGoodList, ShippingOrder } from '../'
+import { InventoryInfos, OrderInventory, ReleasableInventoryList, ReleaseGoodList, ShippingOrder } from '../'
 import { ATTACHMENT_TYPE, ORDER_INVENTORY_STATUS, ORDER_STATUS } from '../../constants'
 import { ReleaseGood } from './release-good'
 
@@ -132,6 +132,7 @@ export class ReleaseGoodQuery {
   }
 
   @Directive('@privilege(category: "order", privilege: "query")')
+  @Directive('@transaction')
   @Query(returns => ReleaseGood)
   async releaseGoodDetail(
     @Ctx() context: any,
@@ -239,7 +240,7 @@ export class ReleaseGoodQuery {
           containerArrivalDate: shippingOrder?.containerArrivalDate || '',
           shipName: shippingOrder?.shipName || ''
         },
-        inventoryInfos: orderBy(invInfos, ['product.sku'], ['asc'])
+        inventoryInfos: orderBy<InventoryInfos>(invInfos, ['product.sku'], ['asc'])
       }
 
       dropOITempTable(domain, tx)

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

@@ -1,7 +1,9 @@
+import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
+
 import { Product } from '@things-factory/product-base'
 import { ObjectRef } from '@things-factory/shell'
 import { Location } from '@things-factory/warehouse-base'
-import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
+
 import { ArrivalNoticePatch } from '../arrival-notice/arrival-notice-types'
 import { NewOrderInventory } from '../order-inventory/order-inventory-types'
 import { NewOrderVas } from '../order-vas/order-vas-types'
@@ -52,94 +54,94 @@ export class ReleasableInventory {
 @ObjectType()
 export class InventoryInfos {
   @Field({ nullable: true })
-  id: string
+  id?: string
 
   @Field({ nullable: true })
-  name: string
+  name?: string
 
   @Field({ nullable: true })
-  batchId: string
+  batchId?: string
 
   @Field({ nullable: true })
-  batchIdRef: string
+  batchIdRef?: string
 
   @Field({ nullable: true })
-  palletId: string
+  palletId?: string
 
   @Field({ nullable: true })
-  productIdRef: string
+  productIdRef?: string
 
   @Field({ nullable: true })
-  productName: string
+  productName?: string
 
   @Field(type => Product, { nullable: true })
-  product: Product
+  product?: Product
 
   @Field({ nullable: true })
-  packingType: string
+  packingType?: string
 
   @Field(type => Float, { nullable: true })
-  packingSize: number
+  packingSize?: number
 
   @Field(type => Int, { nullable: false })
-  qty: number
+  qty?: number
 
   @Field(type => Float, { nullable: true })
-  weight: number
+  weight?: number
 
   @Field(type => Float, { nullable: true })
-  releaseQty: number
+  releaseQty?: number
 
   @Field(type => Float, { nullable: true })
-  releaseWeight: number
+  releaseWeight?: number
 
   @Field({ nullable: true })
-  inventoryName: string
+  inventoryName?: string
 
   @Field(type => Location, { nullable: true })
-  location: Location
+  location?: Location
 
   @Field({ nullable: true })
-  status: string
+  status?: string
 
   @Field(type => Float, { nullable: true })
-  releaseUomValue: number
+  releaseUomValue?: number
 
   @Field(type => Float, { nullable: true })
-  uomValue: number
+  uomValue?: number
 
   @Field({ nullable: true })
-  uom: string
+  uom?: string
 
   @Field(type => Float, { nullable: true })
-  returnQty: number
+  returnQty?: number
 
   @Field(type => Float, { nullable: true })
-  returnUomValue: number
+  returnUomValue?: number
 
   @Field({ nullable: true })
-  remark: string
+  remark?: string
 }
 
 @ObjectType()
 export class ShippingOrderInfo {
   @Field({ nullable: true })
-  containerNo: string
+  containerNo?: string
 
   @Field({ nullable: true })
-  containerLeavingDate: string
+  containerLeavingDate?: string
 
   @Field({ nullable: true })
-  containerArrivalDate: string
+  containerArrivalDate?: string
 
   @Field({ nullable: true })
-  containerLeavingDateTime: string
+  containerLeavingDateTime?: string
 
   @Field({ nullable: true })
-  containerArrivalDateTime: string
+  containerArrivalDateTime?: string
 
   @Field({ nullable: true })
-  shipName: string
+  shipName?: string
 }
 
 @InputType()

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

@@ -1,7 +1,3 @@
-import { User } from '@things-factory/auth-base'
-import { Bizplace, ContactPoint } from '@things-factory/biz-base'
-import { config } from '@things-factory/env'
-import { Domain } from '@things-factory/shell'
 import { Field, ID, ObjectType } from 'type-graphql'
 import {
   Column,
@@ -16,7 +12,23 @@ import {
   RelationId,
   UpdateDateColumn
 } from 'typeorm'
-import { ArrivalNotice, DeliveryOrder, OrderInventory, OrderProduct, OrderVas, ShippingOrder } from '../'
+
+import { Attachment } from '@things-factory/attachment-base'
+import { User } from '@things-factory/auth-base'
+import { Bizplace, ContactPoint } from '@things-factory/biz-base'
+import { config } from '@things-factory/env'
+import { Domain } from '@things-factory/shell'
+
+import {
+  ArrivalNotice,
+  DeliveryOrder,
+  InventoryInfos,
+  OrderInventory,
+  OrderProduct,
+  OrderVas,
+  ShippingOrder,
+  ShippingOrderInfo
+} from '../'
 
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
@@ -116,8 +128,8 @@ export class ReleaseGood {
   shippingOrderId: string
 
   @OneToMany(type => OrderVas, orderVas => orderVas.releaseGood)
-  @Field(type => OrderVas, { nullable: true })
-  orderVass: OrderVas[]
+  @Field(type => [OrderVas], { nullable: true })
+  orderVass?: OrderVas[]
 
   @OneToMany(type => OrderInventory, orderInventory => orderInventory.releaseGood)
   @Field(type => [OrderInventory], { nullable: true })
@@ -294,4 +306,13 @@ export class ReleaseGood {
 
   @RelationId((releaseGood: ReleaseGood) => releaseGood.updater)
   updaterId: string
+
+  @Field(type => [Attachment], { nullable: true })
+  attachment?: Attachment[]
+
+  @Field(type => [InventoryInfos], { nullable: true })
+  inventoryInfos?: InventoryInfos[]
+
+  @Field(type => ShippingOrderInfo, { nullable: true })
+  shippingOrderInfo?: ShippingOrderInfo
 }

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

@@ -4,3 +4,6 @@ import { RetailReplenishmentOrderQuery } from './retail-replenishment-order-quer
 
 export const entities = [RetailReplenishmentOrder]
 export const resolvers = [RetailReplenishmentOrderQuery, RetailReplenishmentOrderMutation]
+
+export * from './retail-replenishment-order-mutation'
+export * from './retail-replenishment-order-query'

package/server/service/return-order/index.ts

@@ -4,3 +4,6 @@ import { ReturnOrderQuery } from './return-order-query'
 
 export const entities = [ReturnOrder]
 export const resolvers = [ReturnOrderQuery, ReturnOrderMutation]
+
+export * from './return-order-mutation'
+export * from './return-order-query'

package/server/service/reverse-kitting-order/index.ts

@@ -4,3 +4,6 @@ import { ReverseKittingOrderMutation } from './reverse-kitting-order-mutation'
 
 export const entities = [ReverseKittingOrder]
 export const resolvers = [ReverseKittingOrderQuery, ReverseKittingOrderMutation]
+
+export * from './reverse-kitting-order-mutation'
+export * from './reverse-kitting-order-query'

package/server/service/reverse-kitting-order-inventory/index.ts

@@ -4,3 +4,6 @@ import { ReverseKittingOrderInventoryMutation } from './reverse-kitting-order-in
 
 export const entities = [ReverseKittingOrderInventory]
 export const resolvers = [ReverseKittingOrderInventoryQuery, ReverseKittingOrderInventoryMutation]
+
+export * from './reverse-kitting-order-inventory-mutation'
+export * from './reverse-kitting-order-inventory-query'

package/server/service/shipping-order/index.ts

@@ -4,3 +4,6 @@ import { ShippingOrderQuery } from './shipping-order-query'
 
 export const entities = [ShippingOrder]
 export const resolvers = [ShippingOrderQuery, ShippingOrderMutation]
+
+export * from './shipping-order-mutation'
+export * from './shipping-order-query'

package/server/service/transfer-order/index.ts

@@ -4,3 +4,6 @@ import { TransferOrderQuery } from './transfer-order-query'
 
 export const entities = [TransferOrder]
 export const resolvers = [TransferOrderQuery, TransferOrderMutation]
+
+export * from './transfer-order-mutation'
+export * from './transfer-order-query'

package/server/service/vas/index.ts

@@ -4,3 +4,6 @@ import { VasQuery } from './vas-query'
 
 export const entities = [Vas]
 export const resolvers = [VasQuery, VasMutation]
+
+export * from './vas-mutation'
+export * from './vas-query'

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

@@ -4,3 +4,6 @@ import { VasOrderQuery } from './vas-order-query'
 
 export const entities = [VasOrder]
 export const resolvers = [VasOrderQuery, VasOrderMutation]
+
+export * from './vas-order-mutation'
+export * from './vas-order-query'