@things-factory/sales-base 7.0.1-beta.14 → 7.0.1-beta.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-base",
-  "version": "7.0.1-beta.14",
+  "version": "7.0.1-beta.18",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,17 +24,17 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/attachment-base": "^7.0.1-beta.14",
-    "@things-factory/auth-base": "^7.0.1-beta.14",
-    "@things-factory/biz-base": "^7.0.1-beta.14",
-    "@things-factory/code-base": "^7.0.1-beta.14",
-    "@things-factory/integration-sftp": "^7.0.1-beta.14",
-    "@things-factory/notification": "^7.0.1-beta.14",
-    "@things-factory/product-base": "^7.0.1-beta.14",
-    "@things-factory/setting-base": "^7.0.1-beta.14",
-    "@things-factory/shell": "^7.0.1-beta.14",
-    "@things-factory/transport-base": "^7.0.1-beta.14",
-    "@things-factory/warehouse-base": "^7.0.1-beta.14"
+    "@things-factory/attachment-base": "^7.0.1-beta.18",
+    "@things-factory/auth-base": "^7.0.1-beta.18",
+    "@things-factory/biz-base": "^7.0.1-beta.18",
+    "@things-factory/code-base": "^7.0.1-beta.18",
+    "@things-factory/integration-sftp": "^7.0.1-beta.18",
+    "@things-factory/notification": "^7.0.1-beta.18",
+    "@things-factory/product-base": "^7.0.1-beta.18",
+    "@things-factory/setting-base": "^7.0.1-beta.18",
+    "@things-factory/shell": "^7.0.1-beta.18",
+    "@things-factory/transport-base": "^7.0.1-beta.18",
+    "@things-factory/warehouse-base": "^7.0.1-beta.18"
   },
-  "gitHead": "f98cf5cb94295657c43465d39cf55162f5566c59"
+  "gitHead": "44f0df6a133577bad8d184a529796c69249a8296"
 }

package/server/service/arrival-notice/arrival-notice-query.ts

@@ -115,7 +115,10 @@ export class ArrivalNoticeQuery {
 
   @Directive('@privilege(category: "order_customer", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => ArrivalNoticeList)
-  async arrivalNotices(@Ctx() context: ResolverContext, @Args() params: ListParam): Promise<ArrivalNoticeList> {
+  async arrivalNotices(
+    @Ctx() context: ResolverContext,
+    @Args(type => ListParam) params: ListParam
+  ): Promise<ArrivalNoticeList> {
     const { domain, user } = context.state
 
     if (await checkUserBelongsDomain(domain, user)) {
@@ -205,7 +208,10 @@ export class ArrivalNoticeQuery {
 
   @Directive('@privilege(category: "order_warehouse", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => ArrivalNoticeList)
-  async arrivalNoticeRequests(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ArrivalNoticeList> {
+  async arrivalNoticeRequests(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<ArrivalNoticeList> {
     try {
       const { domain, user } = context.state
       const statusFilter = params.filters.some(e => e.name === 'status')

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

@@ -29,7 +29,10 @@ const debug = require('debug')('things-factory:sales-base:delivery-orders')
 @Resolver(DeliveryOrder)
 export class DeliveryOrderQuery {
   @Query(returns => DeliveryOrderList)
-  async deliveryOrders(@Ctx() context: ResolverContext, @Args() params: ListParam): Promise<DeliveryOrderList> {
+  async deliveryOrders(
+    @Ctx() context: ResolverContext,
+    @Args(type => ListParam) params: ListParam
+  ): Promise<DeliveryOrderList> {
     try {
       const { domain, user, tx } = context.state
 
@@ -444,7 +447,10 @@ export class DeliveryOrderQuery {
   }
 
   @Query(returns => DeliveryOrderList)
-  async deliveryOrderReport(@Ctx() context: ResolverContext, @Args() params: ListParam): Promise<DeliveryOrderList> {
+  async deliveryOrderReport(
+    @Ctx() context: ResolverContext,
+    @Args(type => ListParam) params: ListParam
+  ): Promise<DeliveryOrderList> {
     try {
       const { domain, user } = context.state
 
@@ -460,7 +466,7 @@ export class DeliveryOrderQuery {
 
       const releaseGoodParam = params.filters.find(param => param.name === 'releaseGoodNo')
       if (releaseGoodParam) {
-        let arrFilters = []          
+        let arrFilters = []
         params.filters.splice(
           params.filters.findIndex(item => item.name == 'releaseGoodNo'),
           1

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

@@ -32,7 +32,10 @@ export class DraftReleaseGoodQuery {
 
   @Directive('@transaction')
   @Query(returns => DraftReleaseGoodList, { description: 'To fetch multiple DraftReleaseGoods' })
-  async draftReleaseGoods(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DraftReleaseGoodList> {
+  async draftReleaseGoods(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<DraftReleaseGoodList> {
     try {
       const { domain, user, tx } = context.state
 

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

@@ -15,7 +15,10 @@ import { GoodsReceivalNote } from './goods-receival-note'
 @Resolver(GoodsReceivalNote)
 export class GoodsReceivalNoteQuery {
   @Query(returns => GoodsReceivalNoteList)
-  async goodsReceivalNotes(@Ctx() context: ResolverContext, @Args() params: ListParam): Promise<GoodsReceivalNoteList> {
+  async goodsReceivalNotes(
+    @Ctx() context: ResolverContext,
+    @Args(type => ListParam) params: ListParam
+  ): Promise<GoodsReceivalNoteList> {
     const { domain, user } = context.state
 
     const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
@@ -127,12 +130,12 @@ export class GoodsReceivalNoteQuery {
         [arrChildSortData.indexOf(sort.name) >= 0
           ? 'arrivalNotice.' + sort.name
           : arrNameSortData.indexOf(sort.name) >= 0
-          ? sort.name + '.name'
-          : arrGanStatusSortData.indexOf(sort.name) >= 0
-          ? 'arrivalNotice.status'
-          : arrGrnStatuSortData.indexOf(sort.name) >= 0
-          ? 'grn.status'
-          : 'grn.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
+            ? sort.name + '.name'
+            : arrGanStatusSortData.indexOf(sort.name) >= 0
+              ? 'arrivalNotice.status'
+              : arrGrnStatuSortData.indexOf(sort.name) >= 0
+                ? 'grn.status'
+                : 'grn.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
       }),
       !params.sortings.some(e => e.name === 'status') ? { rank: 'ASC' } : {}
     )

package/server/service/manifest/manifest-query.ts

@@ -66,7 +66,7 @@ export class ManifestQuery {
   }
 
   @Query(returns => ManifestList, { description: 'To fetch multiple Manifests' })
-  async manifests(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ManifestList> {
+  async manifests(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<ManifestList> {
     const { domain } = context.state
 
     let orderInfoFilter

package/server/service/manifest/manifest.ts

@@ -93,14 +93,14 @@ export class Manifest {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((manifest: Manifest) => manifest.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((manifest: Manifest) => manifest.updater)

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

@@ -31,7 +31,10 @@ interface filterInterface {
 @Resolver(OrderInventory)
 export class OrderInventoryQuery {
   @Query(returns => OrderInventoryList)
-  async orderInventories(@Ctx() context: ResolverContext, @Args() params: ListParam): Promise<OrderInventoryList> {
+  async orderInventories(
+    @Ctx() context: ResolverContext,
+    @Args(type => ListParam) params: ListParam
+  ): Promise<OrderInventoryList> {
     const { domain } = context.state
     const arrivalNoticeNoParam: any = params.filters.find((param: any) => param.name === 'arrivalNoticeNo')
     const releaseGoodNoParam: any = params.filters.find((param: any) => param.name === 'releaseGoodNo')
@@ -253,7 +256,10 @@ export class OrderInventoryQuery {
   }
 
   @Query(returns => OrderInventoryList)
-  async inventoriesByOrder(@Ctx() context: ResolverContext, @Args() params: ListParam): Promise<OrderInventoryList> {
+  async inventoriesByOrder(
+    @Ctx() context: ResolverContext,
+    @Args(type => ListParam) params: ListParam
+  ): Promise<OrderInventoryList> {
     const { domain, user } = context.state
 
     let permittedBizplaceIds: string[] = await getPermittedBizplaceIds(domain, user)
@@ -663,7 +669,7 @@ export class OrderInventoryQuery {
   @Query(returns => OrderInventoryList)
   async orderInventoriesForReleaseGood(
     @Ctx() context: ResolverContext,
-    @Args() params: ListParam,
+    @Args(type => ListParam) params: ListParam,
     @Arg('productTypes', type => [String], { nullable: true }) productTypes?: string[]
   ): Promise<OrderInventoryList> {
     const { domain } = context.state

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

@@ -61,7 +61,7 @@ export class OrderTote {
   @ManyToOne(type => User, {
     nullable: true
   })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((orderTote: OrderTote) => orderTote.updater)

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

@@ -25,7 +25,7 @@ export class OtherQuery {
   @Query(returns => InventoryProductGroupList)
   async allBizplaceProductInventory(
     @Ctx() context: ResolverContext,
-    @Args() params: ListParam
+    @Args(type => ListParam) params: ListParam
   ): Promise<InventoryProductGroupList> {
     const { domain, user, tx, bizplace } = context.state
 
@@ -63,7 +63,7 @@ export class OtherQuery {
   @Query(returns => InventoryProductGroupList)
   async inventoryProductGroup(
     @Ctx() context: ResolverContext,
-    @Args() params: ListParam
+    @Args(type => ListParam) params: ListParam
   ): Promise<InventoryProductGroupList> {
     const { domain, user, tx, bizplace } = context.state
 
@@ -100,7 +100,7 @@ export class OtherQuery {
   @Query(returns => InventoryProductGroupList)
   async inventoryProductGroupOpenAPI(
     @Ctx() context: ResolverContext,
-    @Args() params: ListParam
+    @Args(type => ListParam) params: ListParam
   ): Promise<InventoryProductGroupList> {
     const { domain, user, tx, bizplace } = context.state
 

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

@@ -18,7 +18,10 @@ import { NewReleaseGood, ReleasableInventory, ReleasableInventoryList, ReleaseGo
 export class ReleaseGoodQuery {
   @Directive('@privilege(category: "order_customer", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => ReleaseGoodList)
-  async releaseGoods(@Ctx() context: ResolverContext, @Args() params: ListParam): Promise<ReleaseGoodList> {
+  async releaseGoods(
+    @Ctx() context: ResolverContext,
+    @Args(type => ListParam) params: ListParam
+  ): Promise<ReleaseGoodList> {
     try {
       const { domain, user } = context.state
 
@@ -272,7 +275,10 @@ export class ReleaseGoodQuery {
 
   @Directive('@privilege(category: "order_warehouse", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => ReleaseGoodList)
-  async releaseGoodRequests(@Ctx() context: ResolverContext, @Args() params: ListParam): Promise<ReleaseGoodList> {
+  async releaseGoodRequests(
+    @Ctx() context: ResolverContext,
+    @Args(type => ListParam) params: ListParam
+  ): Promise<ReleaseGoodList> {
     try {
       console.time('t1')
       const { domain, user } = context.state

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

@@ -157,7 +157,7 @@ export class ReverseKittingOrderQuery {
 
   @Query(returns => ReverseKittingOrderList, { description: 'To fetch multiple ReverseKittingOrders' })
   async reverseKittingOrders(
-    @Args() params: ListParam,
+    @Args(type => ListParam) params: ListParam,
     @Ctx() context: ResolverContext
   ): Promise<ReverseKittingOrderList> {
     const { domain, user } = context.state

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

@@ -106,14 +106,14 @@ export class ReverseKittingOrder {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((reverseKittingOrder: ReverseKittingOrder) => reverseKittingOrder.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((reverseKittingOrder: ReverseKittingOrder) => reverseKittingOrder.updater)

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

@@ -24,7 +24,7 @@ export class ReverseKittingOrderInventoryQuery {
     description: 'To fetch multiple ReverseKittingOrderInventories'
   })
   async reverseKittingOrderInventories(
-    @Args() params: ListParam,
+    @Args(type => ListParam) params: ListParam,
     @Ctx() context: ResolverContext
   ): Promise<ReverseKittingOrderInventoryList> {
     const { domain } = context.state

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

@@ -128,14 +128,14 @@ export class ReverseKittingOrderInventory {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((reverseKittingOrderInventory: ReverseKittingOrderInventory) => reverseKittingOrderInventory.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((reverseKittingOrderInventory: ReverseKittingOrderInventory) => reverseKittingOrderInventory.updater)