@things-factory/sales-base 4.0.29 → 4.0.33

package/dist-server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory.js

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var _a, _b, _c, _d, _e;
+var _a, _b, _c, _d, _e, _f;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReverseKittingOrderInventory = void 0;
 const type_graphql_1 = require("type-graphql");
@@ -17,6 +17,8 @@ const auth_base_1 = require("@things-factory/auth-base");
 const biz_base_1 = require("@things-factory/biz-base");
 const shell_1 = require("@things-factory/shell");
 const warehouse_base_1 = require("@things-factory/warehouse-base");
+const product_base_1 = require("@things-factory/product-base");
+const vas_1 = require("../vas/vas");
 const reverse_kitting_order_1 = require("../reverse-kitting-order/reverse-kitting-order");
 let ReverseKittingOrderInventory = class ReverseKittingOrderInventory {
 };
@@ -100,6 +102,36 @@ __decorate([
     (0, type_graphql_1.Field)(),
     __metadata("design:type", String)
 ], ReverseKittingOrderInventory.prototype, "status", void 0);
+__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], ReverseKittingOrderInventory.prototype, "targetType", void 0);
+__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], ReverseKittingOrderInventory.prototype, "targetBatchId", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => product_base_1.Product, { nullable: true }),
+    (0, type_graphql_1.Field)(type => product_base_1.Product, { nullable: true }),
+    __metadata("design:type", typeof (_d = typeof product_base_1.Product !== "undefined" && product_base_1.Product) === "function" ? _d : Object)
+], ReverseKittingOrderInventory.prototype, "targetProduct", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => vas_1.Vas, { nullable: true }),
+    (0, type_graphql_1.Field)(type => vas_1.Vas, { nullable: true }),
+    __metadata("design:type", vas_1.Vas)
+], ReverseKittingOrderInventory.prototype, "vas", void 0);
+__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], ReverseKittingOrderInventory.prototype, "otherTarget", void 0);
+__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], ReverseKittingOrderInventory.prototype, "description", void 0);
+__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], ReverseKittingOrderInventory.prototype, "issue", void 0);
 __decorate([
     (0, typeorm_1.CreateDateColumn)(),
     (0, type_graphql_1.Field)({ nullable: true }),
@@ -113,7 +145,7 @@ __decorate([
 __decorate([
     (0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
-    __metadata("design:type", typeof (_d = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _d : Object)
+    __metadata("design:type", typeof (_e = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _e : Object)
 ], ReverseKittingOrderInventory.prototype, "creator", void 0);
 __decorate([
     (0, typeorm_1.RelationId)((reverseKittingOrderInventory) => reverseKittingOrderInventory.creator),
@@ -122,7 +154,7 @@ __decorate([
 __decorate([
     (0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
-    __metadata("design:type", typeof (_e = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _e : Object)
+    __metadata("design:type", typeof (_f = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _f : Object)
 ], ReverseKittingOrderInventory.prototype, "updater", void 0);
 __decorate([
     (0, typeorm_1.RelationId)((reverseKittingOrderInventory) => reverseKittingOrderInventory.creator),

package/dist-server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory.js.map

@@ -1 +1 @@
-{"version":3,"file":"reverse-kitting-order-inventory.js","sourceRoot":"","sources":["../../../server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reverse-kitting-order-inventory.js","sourceRoot":"","sources":["../../../server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-base",
-  "version": "4.0.29",
+  "version": "4.0.33",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,16 +24,16 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/attachment-base": "^4.0.28",
-    "@things-factory/auth-base": "^4.0.28",
-    "@things-factory/biz-base": "^4.0.28",
-    "@things-factory/code-base": "^4.0.28",
-    "@things-factory/notification": "^4.0.28",
-    "@things-factory/product-base": "^4.0.29",
-    "@things-factory/setting-base": "^4.0.28",
-    "@things-factory/shell": "^4.0.28",
-    "@things-factory/transport-base": "^4.0.28",
-    "@things-factory/warehouse-base": "^4.0.29"
+    "@things-factory/attachment-base": "^4.0.33",
+    "@things-factory/auth-base": "^4.0.33",
+    "@things-factory/biz-base": "^4.0.33",
+    "@things-factory/code-base": "^4.0.33",
+    "@things-factory/notification": "^4.0.33",
+    "@things-factory/product-base": "^4.0.33",
+    "@things-factory/setting-base": "^4.0.33",
+    "@things-factory/shell": "^4.0.33",
+    "@things-factory/transport-base": "^4.0.33",
+    "@things-factory/warehouse-base": "^4.0.33"
   },
-  "gitHead": "1dd19ce97afe62e2b05e27c3b7781b9468cbd778"
+  "gitHead": "0cd5e3b224feb8d526dd5ebc0ee838ff55e2c91c"
 }

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

@@ -440,7 +440,7 @@ export async function generateArrivalNoticeFunction(
 
   const settingRepo: Repository<Setting> = tx?.getRepository(Setting) || getRepository(Setting)
 
-  if (arrivalNotice.bizplaceId) myBizplace = context.state.bizplace
+  if (arrivalNotice.bizplace) myBizplace = arrivalNotice.bizplace
   else if (arrivalNotice.customerBizplaceId) {
     const permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
     let foundPermittedBizplace: Bizplace = permittedBizplaces.find(biz => biz.id == arrivalNotice.customerBizplaceId)

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

@@ -441,18 +441,21 @@ export async function validateBulkArrivalNoticesFunction(
         tp.pack_qty, 
         pd.uom_value, 
         pd.uom, 
-        CONCAT(COALESCE(ROUND(pd.uom_value :: numeric, 2), 0) * tp.pack_qty, ' ', pd.uom) AS total_uom_value, 
+        CONCAT(COALESCE(ROUND(pd.uom_value :: numeric, 2), 0) * COALESCE(tp.pack_qty, 0), ' ', pd.uom) AS total_uom_value, 
         tp.pallet_qty, 
         tp.unit_price, 
         tp.manufacture_year, 
-        CASE WHEN an.id NOTNULL THEN CONCAT('duplicated with ', an.name) ELSE CASE WHEN pr.id ISNULL OR pd.id ISNULL OR tp.sku ISNULL THEN 'product not found'
-        ELSE CASE WHEN tp.pack_qty <= 0  THEN 'pack qty must be integer'
-        ELSE CASE WHEN tp.batch_id ISNULL THEN 'batch no. is required'
-        ELSE CASE WHEN tp.ref_no ISNULL OR tp.ref_no = '' THEN 'ref no. is required'
-        ELSE CASE WHEN tp.eta_date ISNULL OR tp.eta_date = '' THEN 'eta date is required'
-        ELSE CASE WHEN tp.eta_date::date < now()::date THEN 'backdate is not allowed'
-        ELSE CASE WHEN tp.container_no NOTNULL AND tp.container_size ISNULL OR tp.container_no ISNULL AND tp.container_size NOTNULL THEN 'incomplete container information'
-        ELSE '' END END END END END END END END AS remark 
+        CASE WHEN an.id NOTNULL THEN CONCAT('duplicated with ', an.name) 
+        WHEN pr.id ISNULL OR pd.id ISNULL OR tp.sku ISNULL THEN 'product not found'
+        WHEN tp.pack_qty ISNULL OR tp.pack_qty <= 0 THEN 'invalid pack qty'
+        WHEN tp.batch_id ISNULL THEN 'batch no. is required'
+        WHEN tp.ref_no ISNULL OR tp.ref_no = '' THEN 'ref no. is required'
+        WHEN tp.eta_date ISNULL OR tp.eta_date = '' THEN 'eta date is required'
+        WHEN tp.eta_date::date < now()::date THEN 'backdate is not allowed'
+        WHEN tp.container_no NOTNULL AND tp.container_size ISNULL OR tp.container_no ISNULL AND tp.container_size NOTNULL THEN 'incomplete container information'
+        WHEN tp.unit_price < 0 THEN 'invalid unit price'
+        WHEN tp.pallet_qty < 0 THEN 'invalid pallet qty'
+        ELSE '' END AS errorMsg 
       FROM 
         temp_order_products tp 
         LEFT JOIN arrival_notices an ON tp.ref_no = an.ref_no 
@@ -465,13 +468,15 @@ export async function validateBulkArrivalNoticesFunction(
         AND CASE WHEN tp.container_size NOTNULL THEN tp.container_size = an.container_size ELSE 1 = 1 END 
         AND CASE WHEN tp.loose_item NOTNULL THEN tp.loose_item = an.loose_item ELSE 1 = 1 END 
         AND CASE WHEN tp.import_cargo NOTNULL THEN tp.import_cargo = an.import_cargo ELSE 1 = 1 END 
-        LEFT JOIN products pr ON pr.sku = tp.sku 
-        LEFT JOIN product_details pd ON pr.id = pd.product_id 
-        AND CASE WHEN tp.packing_type NOTNULL 
-        AND tp.packing_size NOTNULL 
-        AND tp.uom NOTNULL THEN pd.packing_type = tp.packing_type 
-        AND pd.packing_size = tp.packing_size 
-        AND pd.uom = tp.uom ELSE pd.is_default = TRUE END 
+        LEFT JOIN products pr ON LOWER(pr.sku) = LOWER(tp.sku)
+        LEFT JOIN product_details pd ON pr.id = pd.product_id
+        AND CASE WHEN tp.packing_type NOTNULL AND tp.packing_size NOTNULL AND tp.uom NOTNULL
+          THEN pd.packing_type = tp.packing_type AND pd.packing_size = tp.packing_size AND pd.uom = tp.uom 
+          WHEN tp.packing_type NOTNULL AND tp.packing_size NOTNULL AND tp.uom ISNULL
+            THEN pd.packing_type = tp.packing_type AND pd.packing_size = tp.packing_size AND pd.is_default IS TRUE
+            WHEN tp.packing_type ISNULL AND tp.packing_size ISNULL AND tp.uom NOTNULL
+              THEN pd.uom = tp.uom AND pd.is_default IS TRUE ELSE pd.is_default IS TRUE
+        END
       WHERE 
         pr.bizplace_id = $1
 
@@ -482,6 +487,12 @@ export async function validateBulkArrivalNoticesFunction(
   await trxMgr.query('DROP TABLE temp_order_products')
 
   return validatedItems.map(item => {
+    let manufactureYear = item.manufacture_year
+
+    const regExp = /^(181[2-9]|18[2-9]\d|19\d\d|2\d{3}|30[0-3]\d|304[0-8])$/
+
+    if (manufactureYear && !regExp.test(manufactureYear) && !item.errorMsg) item.errorMsg = 'invalid manufacture year'
+
     return {
       refNo: item.ref_no,
       refNo2: item.ref_no_2,
@@ -508,7 +519,7 @@ export async function validateBulkArrivalNoticesFunction(
       palletQty: item.pallet_qty,
       unitPrice: item.unit_price,
       manufactureYear: item.manufacture_year,
-      remark: item.remark
+      errorMsg: item.errorMsg
     }
   })
 }

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

@@ -121,6 +121,9 @@ export class NewArrivalNotice {
 
   @Field(type => Int, { nullable: true })
   manufactureYear?: number
+
+  @Field({ nullable: true })
+  errorMsg: string
 }
 
 @InputType()
@@ -288,5 +291,5 @@ export class RawArrivalNotice {
   manufactureYear?: number
 
   @Field({ nullable: true })
-  remark?: string
+  errorMsg?: string
 }

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

@@ -145,7 +145,7 @@ export class ArrivalNotice {
 
   @OneToOne(type => PurchaseOrder, { nullable: true })
   @JoinColumn()
-  @Field(type => [PurchaseOrder], { nullable: true })
+  @Field(type => PurchaseOrder, { nullable: true })
   purchaseOrder: PurchaseOrder
 
   @CreateDateColumn()

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

@@ -256,6 +256,9 @@ export class OrderInventory {
   @Field({ nullable: true })
   productName: string
 
+  @Field({ nullable: true })
+  productSKU: string
+
   @Field({ nullable: true })
   productBrand: string
 
@@ -303,6 +306,21 @@ export class OrderInventory {
   @Field({ nullable: true })
   status: string
 
+  @Field({ nullable: true })
+  remainQty: number
+
+  @Field({ nullable: true })
+  remainUomValue: string
+
+  @Field({ nullable: true })
+  remainUomValueWithUom: string
+
+  @Field({ nullable: true })
+  isError: boolean
+
+  @Field({ nullable: true })
+  groupType: string
+
   @CreateDateColumn()
   @Field()
   createdAt: Date

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

@@ -1,11 +1,11 @@
 import orderBy from 'lodash/orderBy'
-import { Arg, Ctx, Directive, Query, Resolver } from 'type-graphql'
+import { Arg, Args, Ctx, Directive, Query, Resolver } from 'type-graphql'
 import { EntityManager } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace, getPermittedBizplaces } from '@things-factory/biz-base'
 import { Product, ProductDetail } from '@things-factory/product-base'
-import { Domain, Filter, Pagination, Sorting } from '@things-factory/shell'
+import { Domain, ListParam } from '@things-factory/shell'
 
 import { InventoryProductGroupList, NewOrderInventory, NewOrderProduct, OrderInventory, OrderProduct } from '../'
 import { InventoryUtil } from '../../utils'
@@ -15,13 +15,7 @@ export class OtherQuery {
   @Directive('@privilege(category: "inventory", privilege: "query")')
   @Directive('@transaction')
   @Query(returns => InventoryProductGroupList)
-  async inventoryProductGroup(
-    @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[],
-    @Arg('locationSortingRules', type => [Sorting], { nullable: true }) locationSortingRules?: Sorting[]
-  ): Promise<InventoryProductGroupList> {
+  async inventoryProductGroup(@Ctx() context: any, @Args() params: ListParam): Promise<InventoryProductGroupList> {
     const {
       domain,
       user,
@@ -31,7 +25,7 @@ export class OtherQuery {
 
     let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
 
-    let bizplaceId: any = filters.find(filter => filter.name === 'bizplace_id').value
+    let bizplaceId: any = params.filters.find(filter => filter.name === 'bizplace_id').value
     let foundPermittedBizplace: Bizplace
     let companyBizplace: Bizplace
 
@@ -52,12 +46,7 @@ export class OtherQuery {
     const bizplaces: Bizplace[] = [foundPermittedBizplace, companyBizplace]
     if (bizplace) bizplaces.push(bizplace)
 
-    const { items, total } = await InventoryUtil.bizplaceInventoryProductGroup(
-      bizplaces,
-      { filters, pagination, sortings },
-      context,
-      tx
-    )
+    const { items, total } = await InventoryUtil.bizplaceInventoryProductGroup(bizplaces, params, context, tx)
 
     return { items, total }
   }

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

@@ -40,7 +40,7 @@ export class PurchaseOrderMutation {
   async upsertPurchaseOrder(
     @Ctx() context: any,
     @Arg('purchaseOrder', type => PurchaseOrderPatch) purchaseOrder: PurchaseOrderPatch,
-    @Arg('file', type => GraphQLUpload, { nullable: true }) file?: FileUpload
+    @Arg('file', type => [GraphQLUpload], { nullable: true }) file?: FileUpload
   ): Promise<PurchaseOrder> {
     try {
       const { tx }: { tx: EntityManager } = context.state

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

@@ -3,7 +3,7 @@ import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from
 import { EntityManager, getRepository, In, Repository, SelectQueryBuilder } from 'typeorm'
 
 import { Attachment } from '@things-factory/attachment-base'
-import { User } from '@things-factory/auth-base'
+import { checkUserBelongsDomain, User } from '@things-factory/auth-base'
 import { Bizplace, getCompanyBizplace, getMyBizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { Product } from '@things-factory/product-base'
 import { buildQuery, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
@@ -209,6 +209,8 @@ export class ReleaseGoodQuery {
                 packingSize: inventory.packingSize,
                 location: inventory.location,
                 qty: inventory.qty,
+                lockedQty: inventory.lockedQty,
+                lockedUomValue: inventory.lockedUomValue,
                 uom: inventory.uom,
                 uomValue: inventory.uomValue,
                 releaseQty: orderInv.releaseQty,
@@ -265,13 +267,15 @@ export class ReleaseGoodQuery {
       const statusFilter = params.filters.some(e => e.name === 'status')
       const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId')
 
-      if (!statusFilter) {
-        params.filters.push({
-          name: 'status',
-          operator: 'notin',
-          value: [ORDER_STATUS.PENDING, ORDER_STATUS.EDITING],
-          relation: false
-        })
+      if (await checkUserBelongsDomain(domain, user)) {
+        if (!statusFilter && !params.filters.some(e => e.name === 'name')) {
+          params.filters.push({
+            name: 'status',
+            operator: 'notin',
+            value: [ORDER_STATUS.PENDING, ORDER_STATUS.EDITING, ''],
+            relation: false
+          })
+        }
       }
 
       if (!bizplaceFilter) {
@@ -628,7 +632,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
         CASE WHEN js.packing_type NOTNULL AND js.packing_size NOTNULL THEN js.packing_size ELSE pd.packing_size END,
         CASE WHEN js.uom NOTNULL THEN js.uom ELSE pd.uom END
         FROM JSON_POPULATE_RECORDSET(NULL::raw_release_goods, $1) js
-        LEFT JOIN products p ON js.sku = p.sku AND p.bizplace_id = $2
+        LEFT JOIN products p ON LOWER(js.sku) = LOWER(p.sku) AND p.bizplace_id = $2
         LEFT JOIN product_details pd ON p.id = pd.product_id
         AND CASE WHEN js.packing_type NOTNULL AND js.packing_size NOTNULL AND js.uom NOTNULL
           THEN pd.packing_type = js.packing_type AND pd.packing_size = js.packing_size AND pd.uom = js.uom 
@@ -689,6 +693,8 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
     [domain.id, bizplaceId, LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
   )
 
+  await tx.query(`DROP TABLE raw_release_goods`)
+
   availableItems = availableItems.map(item => {
     return {
       productId: item.product_id,
@@ -697,7 +703,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
       sku: item.sku,
       batchId: item.batch_id,
       packingType: item.packing_type,
-      packingSize: item.packing_size,
+      packingSize: Number(item.packing_size || 0),
       uom: item.uom,
       remainQty: item.remain_qty,
       remainUomValue: item.remain_uom_value
@@ -725,7 +731,7 @@ function _extractData(rawData, validatedData) {
       a = JSON.stringify(Object.fromEntries(Object.entries(a).sort()))
       b = JSON.stringify(Object.fromEntries(Object.entries(b).sort()))
 
-      return val.sku == raw.sku && a === b
+      return val.sku.toLowerCase() == raw.sku.toLowerCase() && a === b
     })
 
     let releaseUomValue = 0
@@ -773,7 +779,7 @@ function _extractData(rawData, validatedData) {
       releaseUomValue,
       errorMsg:
         !raw.productId || !raw.productDetailId
-          ? 'product not found'
+          ? 'inventory or product not found'
           : raw.releaseQty <= 0
           ? 'invalid release qty'
           : raw.assignedQty < raw.releaseQty

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

@@ -10,12 +10,13 @@ import {
   InventoryHistory,
   InventoryNoGenerator,
   InventoryPatch,
-  InventoryUtil,
   Location,
   LOCATION_TYPE,
   Warehouse
 } from '@things-factory/warehouse-base'
 
+import { InventoryUtil } from '../../utils'
+
 import { ORDER_STATUS, ORDER_TYPES, ORDER_VAS_STATUS } from '../../constants'
 import { OrderNoGenerator } from '../../utils/order-no-generator'
 import { ReverseKittingOrderInventory } from '../reverse-kitting-order-inventory/reverse-kitting-order-inventory'

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

@@ -34,14 +34,13 @@ export class ReverseKittingOrderQuery {
         'reverseKittingOrderInventories.inventory.product',
         'reverseKittingOrderInventories.inventory.location',
         'reverseKittingOrderInventories.inventory.warehouse',
-        'reverseKittingOrderInventories.targetProduct',
         'creator',
         'updater'
       ]
     })
   }
 
-  @Query(returns => ReverseKittingOrder, { description: 'To fetch a ReverseKittingOrder' })
+  @Query(returns => [ReverseKittingOrder], { description: 'To fetch a ReverseKittingOrder' })
   async reverseKittingInventories(
     @Arg('reverseKittingOIName') reverseKittingOIName: string,
     @Arg('productDetailId') productDetailId: string,

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

@@ -13,8 +13,8 @@ import { ReverseKittingOrder } from './reverse-kitting-order'
 
 @InputType()
 export class NewReverseKittingOrder {
-  @Field()
-  name: string
+  @Field({ nullable: true })
+  name?: string
 
   @Field({ nullable: true })
   customerBizplaceId?: string

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

@@ -1,4 +1,4 @@
-import { Field, ID, ObjectType } from 'type-graphql'
+import { Field, ID, ObjectType, Float, Int } from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -14,6 +14,8 @@ import {
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { Domain } from '@things-factory/shell'
+import { Location } from '@things-factory/warehouse-base'
+import { Product } from '@things-factory/product-base'
 
 import { ReverseKittingOrderInventory } from '../reverse-kitting-order-inventory/reverse-kitting-order-inventory'
 
@@ -37,6 +39,7 @@ export class ReverseKittingOrder {
   domainId?: string
 
   @ManyToOne(type => Bizplace)
+  @Field(type => Bizplace, { nullable: true })
   bizplace: Bizplace
 
   @RelationId((reverseKittingOrder: ReverseKittingOrder) => reverseKittingOrder.bizplace)
@@ -57,9 +60,42 @@ export class ReverseKittingOrder {
   @Field({ nullable: true })
   remark?: string
 
-  @Column({ nullable: true })
   @Field({ nullable: true })
-  status: string
+  batchId?: string
+
+  @Field({ nullable: true })
+  packingType?: string
+
+  @Field(type => Float, { nullable: true })
+  packingSize?: number
+
+  @Column()
+  @Field({ nullable: true })
+  status?: string
+
+  @Field({ nullable: true })
+  batchIdRef?: string
+
+  @Field({ nullable: true })
+  palletId?: string
+
+  @Field({ nullable: true })
+  cartonId?: string
+
+  @Field(type => Int, { nullable: true })
+  qty?: number
+
+  @Field({ nullable: true })
+  expirationDate?: string
+
+  @Field(type => Location, { nullable: true })
+  location?: Location
+
+  @Field(type => Product, { nullable: true })
+  product?: Product
+
+  @Field({ nullable: true })
+  productDetailId?: string
 
   @CreateDateColumn()
   @Field({ nullable: true })

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

@@ -27,7 +27,13 @@ export class NewReverseKittingOrderInventory {
   @Field(type => Float, { nullable: true })
   uomValue?: number
 
-  @Field(type => ObjectRef)
+  @Field({ nullable: true })
+  productName?: string
+
+  @Field({ nullable: true })
+  packingType?: string
+
+  @Field(type => ObjectRef, { nullable: true })
   reverseKittingOrder?: ObjectRef
 
   @Field(type => ObjectRef)

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

@@ -14,6 +14,8 @@ import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
+import { Product } from '@things-factory/product-base'
+import { Vas } from '../vas/vas'
 
 import { ReverseKittingOrder } from '../reverse-kitting-order/reverse-kitting-order'
 
@@ -93,6 +95,29 @@ export class ReverseKittingOrderInventory {
   @Field()
   status: string
 
+  @Field({ nullable: true })
+  targetType?: string
+
+  @Field({ nullable: true })
+  targetBatchId?: string
+
+  @ManyToOne(type => Product, { nullable: true })
+  @Field(type => Product, { nullable: true })
+  targetProduct?: Product
+
+  @ManyToOne(type => Vas, { nullable: true })
+  @Field(type => Vas, { nullable: true })
+  vas?: Vas
+
+  @Field({ nullable: true })
+  otherTarget?: string
+
+  @Field({ nullable: true })
+  description?: string
+
+  @Field({ nullable: true })
+  issue?: string
+
   @CreateDateColumn()
   @Field({ nullable: true })
   createdAt?: Date