@things-factory/sales-base 4.0.35 → 4.0.39

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

@@ -371,9 +371,13 @@ 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
@@ -648,7 +652,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
   let availableItems = await tx.query(
     `
         WITH inv AS (
-        SELECT i.product_id, foo.product_detail_id, foo.sku, foo.product_info, i.batch_id, i.packing_type, i.packing_size, i.uom,
+        SELECT i.product_id, foo.product_detail_id, foo.sku, foo.product_info, i.packing_type, i.packing_size, i.uom,
           SUM(i.qty - COALESCE(i.locked_qty, 0)) - COALESCE(
             (
               SELECT SUM(oi.release_qty) FROM order_inventories oi 
@@ -686,7 +690,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
         AND i.domain_id = $1
         AND i.bizplace_id = $2
         WHERE l.type NOT IN ($3, $4)
-        GROUP BY i.product_id, foo.product_detail_id, foo.sku,foo.product_info, i.batch_id, i.packing_type, i.packing_size, i.uom
+        GROUP BY i.product_id, foo.product_detail_id, foo.sku,foo.product_info, i.packing_type, i.packing_size, i.uom
         ORDER BY foo.sku, remain_qty
       ) SELECT * FROM inv WHERE remain_qty > 0
       `,
@@ -701,7 +705,6 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
       productDetailId: item.product_detail_id,
       productInfo: item.product_info,
       sku: item.sku,
-      batchId: item.batch_id,
       packingType: item.packing_type,
       packingSize: Number(item.packing_size || 0),
       uom: item.uom,
@@ -762,10 +765,10 @@ function _extractData(rawData, validatedData) {
 
       raw.productId = validatedData[idx].productId
       raw.productDetailId = validatedData[idx].productDetailId
+      raw.productInfo = validatedData[idx].productInfo
       raw.packingType = validatedData[idx].packingType
       raw.packingSize = validatedData[idx].packingSize
       raw.uom = validatedData[idx].uom
-      raw.batchId = validatedData[idx].batchId
     } else {
       raw.assignedQty = 0
       raw.assignedUomValue = 0
@@ -795,9 +798,7 @@ function _extractData(rawData, validatedData) {
   })
 }
 
-function getConditionValues(
-  conditions: Filter[]
-): {
+function getConditionValues(conditions: Filter[]): {
   batchId?: string
   containerNo?: string
   product?: string[]

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

@@ -6,6 +6,7 @@ import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 import { FileUpload, GraphQLUpload } from 'graphql-upload'
+import { TransferOrderMutation } from 'server'
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 import { EntityManager, In } from 'typeorm'
 import { NewOrderInventory, NewReturnOrder, OrderInventory, OrderVas, ReturnOrderPatch } from '../'
@@ -48,9 +49,31 @@ export class ReturnOrderMutation {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
 
     const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne(returnOrder.customerBizplaceId)
+
     let orderInventories: NewOrderInventory[] = returnOrder.orderInventories
     let foundInv = Inventory
 
+    const mergedOrderInventories = orderInventories.reduce((acc, curr) => {
+      let existingItem = acc.find(
+        itm =>
+          itm.product.id === curr.product.id &&
+          itm.packingType === curr.packingType &&
+          itm.batchId === curr.batchId &&
+          itm.packingSize === curr.packingSize
+      )
+
+      if (!existingItem) {
+        acc.push(curr)
+      } else {
+        existingItem.returnQty = existingItem.returnQty + curr.returnQty
+        existingItem.returnUomValue = existingItem.returnUomValue + curr.returnUomValue
+      }
+
+      return acc
+    }, [])
+
+    returnOrder.orderInventories = mergedOrderInventories
+
     let newReturnOrder: NewReturnOrder = {
       ...returnOrder,
       name: OrderNoGenerator.returnOrder(),
@@ -67,14 +90,14 @@ export class ReturnOrderMutation {
 
     let createdReturnOrder: ReturnOrder = await tx.getRepository(ReturnOrder).save(newReturnOrder)
 
-    for (let oi of orderInventories) {
-      let newOrderInv: OrderInventory = Object.assign({}, oi) as any
+    for (let moi of mergedOrderInventories) {
+      let newOrderInv: OrderInventory = Object.assign({}, moi) as any
       newOrderInv.domain = domain
       newOrderInv.bizplace = bizplace
       newOrderInv.status = ORDER_INVENTORY_STATUS.PENDING
       newOrderInv.name = OrderNoGenerator.orderInventory()
       newOrderInv.returnOrder = createdReturnOrder
-      newOrderInv.product = await tx.getRepository(Product).findOne(oi.product.id)
+      newOrderInv.product = await tx.getRepository(Product).findOne(moi.product.id)
       newOrderInv.creator = user
       newOrderInv.updater = user
 

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

@@ -48,10 +48,10 @@ export class ReverseKittingOrderInventoryPatch {
   @Field(type => ID, { nullable: true })
   id?: string
 
-  @Field()
+  @Field({ nullable: true })
   name: string
 
-  @Field(type => Int)
+  @Field(type => Int, { nullable: true })
   set: number
 
   @Field({ nullable: true })
@@ -69,17 +69,20 @@ export class ReverseKittingOrderInventoryPatch {
   @Field(type => Float, { nullable: true })
   uomValue?: number
 
-  @Field(type => ObjectRef)
+  @Field(type => ObjectRef, { nullable: true })
   reverseKittingOrder: ObjectRef
 
-  @Field(type => ObjectRef)
+  @Field(type => ObjectRef, { nullable: true })
   inventory: ObjectRef
 
   @Field({ nullable: true })
   status: string
 
-  @Field()
+  @Field({ nullable: true })
   cuFlag: string
+
+  @Field({ nullable: true })
+  issue: string
 }
 
 @ObjectType()

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

@@ -12,12 +12,12 @@ import {
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
+import { Product } from '@things-factory/product-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'
+import { Vas } from '../vas/vas'
 
 @Entity()
 @Index(
@@ -115,6 +115,7 @@ export class ReverseKittingOrderInventory {
   @Field({ nullable: true })
   description?: string
 
+  @Column({ nullable: true })
   @Field({ nullable: true })
   issue?: string