@things-factory/sales-base 4.0.23 → 4.0.27

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

@@ -1,5 +1,7 @@
+import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
+
 import { ObjectRef } from '@things-factory/shell'
-import { Field, InputType, Int, ObjectType } from 'type-graphql'
+
 import { NewOrderProduct } from '../order-product/order-product-types'
 import { NewOrderVas } from '../order-vas/order-vas-types'
 import { ArrivalNotice } from './arrival-notice'
@@ -89,6 +91,36 @@ export class NewArrivalNotice {
 
   @Field({ nullable: true })
   partnerBizplaceId: string
+
+  @Field({ nullable: true })
+  sku: string
+
+  @Field({ nullable: true })
+  batchId?: string
+
+  @Field({ nullable: true })
+  packingType?: string
+
+  @Field(type => Float, { nullable: true })
+  packingSize?: number
+
+  @Field(type => Int, { nullable: true })
+  packQty?: number
+
+  @Field(type => Float, { nullable: true })
+  uomValue?: number
+
+  @Field({ nullable: true })
+  uom?: string
+
+  @Field(type => Int, { nullable: true })
+  palletQty?: number
+
+  @Field(type => Float, { nullable: true })
+  unitPrice?: number
+
+  @Field(type => Int, { nullable: true })
+  manufactureYear?: number
 }
 
 @InputType()
@@ -171,3 +203,90 @@ export class ArrivalNoticePatch {
   @Field({ nullable: true })
   deliveryOrderNo: string
 }
+
+@ObjectType()
+export class RawArrivalNotice {
+  @Field({ nullable: true })
+  id?: string
+
+  @Field({ nullable: true })
+  name?: string
+
+  @Field({ nullable: true })
+  refNo?: string
+
+  @Field({ nullable: true })
+  refNo2?: string
+
+  @Field({ nullable: true })
+  refNo3?: string
+
+  @Field({ nullable: true })
+  etaDate?: string
+
+  @Field({ nullable: true })
+  truckNo?: string
+
+  @Field()
+  ownTransport: boolean
+
+  @Field({ nullable: true })
+  productId?: string
+
+  @Field({ nullable: true })
+  container?: boolean
+
+  @Field({ nullable: true })
+  containerNo?: string
+
+  @Field({ nullable: true })
+  containerSize?: string
+
+  @Field({ nullable: true })
+  looseItem?: boolean
+
+  @Field({ nullable: true })
+  importCargo?: boolean
+
+  @Field({ nullable: true })
+  productDetailId?: string
+
+  @Field({ nullable: true })
+  sku?: string
+
+  @Field({ nullable: true })
+  productInfo?: string
+
+  @Field({ nullable: true })
+  batchId?: string
+
+  @Field({ nullable: true })
+  packingType?: string
+
+  @Field(type => Float, { nullable: true })
+  packingSize?: number
+
+  @Field(type => Int, { nullable: true })
+  packQty?: number
+
+  @Field(type => Float, { nullable: true })
+  uomValue?: number
+
+  @Field({ nullable: true })
+  totalUomValue?: string
+
+  @Field({ nullable: true })
+  uom?: string
+
+  @Field(type => Int, { nullable: true })
+  palletQty?: number
+
+  @Field(type => Float, { nullable: true })
+  unitPrice?: number
+
+  @Field(type => Int, { nullable: true })
+  manufactureYear?: number
+
+  @Field({ nullable: true })
+  remark?: string
+}

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

@@ -42,7 +42,7 @@ export class NewDeliveryOrder {
   @Field({ nullable: true })
   from: string
 
-  @Field(type => Float, { nullable: false })
+  @Field(type => Float, { nullable: true })
   loadWeight: number
 
   @Field({ nullable: true })

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

@@ -1,5 +1,6 @@
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
+import { Attachment } from '@things-factory/attachment-base'
 import { Domain } from '@things-factory/shell'
 import { Field, ID, ObjectType } from 'type-graphql'
 import {
@@ -88,4 +89,7 @@ export class GoodsReceivalNote {
 
   @RelationId((grn: GoodsReceivalNote) => grn.updater)
   updaterId: string
+
+  @Field(type => [Attachment], { nullable: true })
+  attachments: Attachment[]
 }

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

@@ -1,13 +1,14 @@
 import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { buildQuery, Domain, Filter, Pagination, Sorting } from '@things-factory/shell'
-import { Arg, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
+import { Arg, Ctx, FieldResolver, Query, Resolver, Root, Directive } from 'type-graphql'
 import { EntityManager, getRepository, SelectQueryBuilder } from 'typeorm'
 import { ArrivalNotice, JobSheetList } from '../'
 import { JobSheet } from './job-sheet'
 
 @Resolver(JobSheet)
 export class JobSheetQuery {
+  @Directive('@transaction')
   @Query(returns => JobSheetList)
   async jobSheets(
     @Ctx() context: any,
@@ -65,6 +66,7 @@ export class JobSheetQuery {
     return { items, total }
   }
 
+  @Directive('transaction')
   @Query(returns => JobSheet)
   async jobSheet(@Arg('arrivalNoticeRefNo') arrivalNoticeRefNo: string, @Ctx() context: any): Promise<JobSheet> {
     const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state

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

@@ -106,6 +106,7 @@ export class OrderInventory {
   product: Product
 
   @RelationId((orderInventory: OrderInventory) => orderInventory.product)
+  @Field({ nullable: true })
   productId: string
 
   @Column({ nullable: true })
@@ -138,6 +139,9 @@ export class OrderInventory {
   @RelationId((orderInventory: OrderInventory) => orderInventory.releaseGood)
   releaseGoodId: string
 
+  @Field({ nullable: true })
+  releaseGoodName: string
+
   @ManyToOne(type => InventoryCheck)
   @Field(type => InventoryCheck, { nullable: true })
   inventoryCheck: InventoryCheck
@@ -242,6 +246,9 @@ export class OrderInventory {
   @Field({ nullable: true })
   releaseUomValue: number
 
+  @Field({ nullable: true })
+  releaseUomValueWithUom: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   uom: string
@@ -249,9 +256,15 @@ export class OrderInventory {
   @Field({ nullable: true })
   productName: string
 
+  @Field({ nullable: true })
+  productBrand: string
+
   @Field({ nullable: true })
   pallet: string
 
+  @Field({ nullable: true })
+  palletId: string
+
   @Field({ nullable: true })
   extraJsonData: string
 
@@ -275,6 +288,9 @@ export class OrderInventory {
   @Field({ nullable: true })
   actualPalletQty: number
 
+  @Field({ nullable: true })
+  systemRemark: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   crossDocking: boolean
@@ -284,7 +300,7 @@ export class OrderInventory {
   serialNumber: string
 
   @Column()
-  @Field()
+  @Field({ nullable: true })
   status: string
 
   @CreateDateColumn()