@things-factory/sales-base 4.0.30 → 4.0.31

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

@@ -455,7 +455,7 @@ export async function validateBulkArrivalNoticesFunction(
         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 remark 
+        ELSE '' END AS errorMsg 
       FROM 
         temp_order_products tp 
         LEFT JOIN arrival_notices an ON tp.ref_no = an.ref_no 
@@ -468,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
 
@@ -489,7 +491,7 @@ export async function validateBulkArrivalNoticesFunction(
 
     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.remark) item.remark = 'invalid manufacture year'
+    if (manufactureYear && !regExp.test(manufactureYear) && !item.errorMsg) item.errorMsg = 'invalid manufacture year'
 
     return {
       refNo: item.ref_no,
@@ -517,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/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, checkUserBelongsDomain } 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,
@@ -369,13 +371,9 @@ export class ReleaseGoodQuery {
     const PROD_ALIAS = 'PROD'
     const GAN_ALIAS = 'GAN'
     const conditions = filters
-    let {
-      batchId = null,
-      containerNo = null,
-      product = [],
-      packingType = null,
-      inventory = []
-    } = getConditionValues(conditions)
+    let { batchId = null, containerNo = null, product = [], packingType = null, inventory = [] } = getConditionValues(
+      conditions
+    )
 
     const SELECT: string = `
       SELECT
@@ -634,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 
@@ -695,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,
@@ -703,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
@@ -731,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
@@ -779,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
@@ -795,7 +795,9 @@ function _extractData(rawData, validatedData) {
   })
 }
 
-function getConditionValues(conditions: Filter[]): {
+function getConditionValues(
+  conditions: Filter[]
+): {
   batchId?: string
   containerNo?: string
   product?: string[]

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 '@things-factory/sales-base'
 
 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