@things-factory/sales-base 4.3.137 → 4.3.138

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

@@ -17,7 +17,7 @@ import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder, MarketplaceProductVariation } from '@things-factory/marketplace-base'
 // import { sendNotification } from '@things-factory/notification'
-import { Product, ProductBundleSetting } from '@things-factory/product-base'
+import { Product, ProductBundleSetting, ProductDetail } from '@things-factory/product-base'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
@@ -87,7 +87,8 @@ export class ReleaseGoodMutation {
               ...Object.fromEntries(
                 Object.entries(releaseGoods[i]).filter(([_, val]) => !/^\s*$/.test(val) && _ != 'orderInventories')
               ),
-              domain
+              domain,
+              status: Not('REJECTED')
             }
           })
           if (existingReleaseGood) throw new Error('this order is already exist in the system')
@@ -159,7 +160,7 @@ export class ReleaseGoodMutation {
               childTx
             )
           }
-        } catch (error) { }
+        } catch (error) {}
     })
 
     if (errorsCaught.length)
@@ -652,8 +653,8 @@ export async function generateReleaseGoodFunction(
       orderMethod: releaseGood?.orderMethod
         ? releaseGood.orderMethod
         : releaseGood.orderInventories[0]?.inventory?.id
-          ? ORDER_METHOD.SELECT_BY_PALLET
-          : ORDER_METHOD.SELECT_BY_PRODUCT,
+        ? ORDER_METHOD.SELECT_BY_PALLET
+        : ORDER_METHOD.SELECT_BY_PRODUCT,
       status: ORDER_STATUS.PENDING,
       packageId: releaseGood?.packageId,
       storeName: releaseGood?.storeName,
@@ -700,7 +701,7 @@ export async function generateReleaseGoodFunction(
 
           const pbSettings: ProductBundleSetting[] = await tx.getRepository(ProductBundleSetting).find({
             where: { productBundle: oi.product.id },
-            relations: ['product', 'productBundle']
+            relations: ['product', 'productBundle', 'productDetail']
           })
 
           pbSettings.forEach(pbs => {
@@ -714,6 +715,9 @@ export async function generateReleaseGoodFunction(
                 id: pbs.product.id,
                 name: pbs.product.name,
                 groupType: PRODUCT_GROUP_TYPE.SINGLE
+              },
+              productDetail: {
+                id: pbs.productDetail.id
               }
             }
             splitBundleOIs.push(splitOI)
@@ -728,6 +732,10 @@ export async function generateReleaseGoodFunction(
     newReleaseGood = await tx.getRepository(ReleaseGood).save(newReleaseGood)
 
     for (let oi of orderInventories) {
+      let productDetail: any = await tx
+        .getRepository(ProductDetail)
+        .findOne(oi.productDetail.id, { relations: ['product'] })
+
       let newOrderInv: OrderInventory = Object.assign({}, oi)
       newOrderInv = {
         ...newOrderInv,
@@ -736,7 +744,8 @@ export async function generateReleaseGoodFunction(
         status: ORDER_INVENTORY_STATUS.PENDING,
         name: OrderNoGenerator.orderInventory(),
         releaseGood: newReleaseGood,
-        product: await tx.getRepository(Product).findOne(oi.product.id),
+        product: productDetail.product,
+        productDetail,
         creator: user,
         updater: user
       }
@@ -774,9 +783,9 @@ export async function generateReleaseGoodFunction(
         }
 
         let assignedOrderInventories: OrderInventory[] = await InventoryUtil.autoAssignInventoryForRelease(
-          newOrderInv.product,
           oi,
-          oi.packingType,
+          productDetail.product,
+          productDetail,
           locationSortingRules,
           bizplace,
           warehouseDomain,
@@ -931,7 +940,6 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
 
   const orderSource: string = foundReleaseGood.source
   switch (orderSource) {
-
     case ApplicationType.MMS:
       // find for any existing marketplace store connections
       let marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
@@ -1385,12 +1393,17 @@ export async function bulkGenerateReleaseGood(
         }
       }
 
-      const product: Product = await tx.getRepository(Product).findOne(oi.productId)
+      let productDetail = oi.orderProduct?.productDetail
+      let product = oi.orderProduct?.product
+      if (!productDetail) {
+        productDetail = await tx.getRepository(ProductDetail).findOne(oi.productDetailId, { relations: ['product'] })
+        product = productDetail.product
+      }
 
       let assignedResult = await InventoryUtil.autoAssignInventoryForRelease(
-        product,
         oi,
-        oi.packingType,
+        product,
+        productDetail,
         locationSortingRules,
         bizplace,
         warehouseDomain,
@@ -1492,7 +1505,10 @@ export async function bulkConfirmOrReceiveReleaseGoods(
   let orderStatus =
     partnerDirectReceiveSettingValue == 1 ? ORDER_STATUS.PENDING_RECEIVE : ORDER_STATUS.PENDING_WORKSHEET
 
-  let orderInventoryStatus = partnerDirectReceiveSettingValue == 1 ? ORDER_INVENTORY_STATUS.PENDING_RECEIVE : ORDER_INVENTORY_STATUS.PENDING_WORKSHEET
+  let orderInventoryStatus =
+    partnerDirectReceiveSettingValue == 1
+      ? ORDER_INVENTORY_STATUS.PENDING_RECEIVE
+      : ORDER_INVENTORY_STATUS.PENDING_WORKSHEET
 
   await tx
     .getRepository(ReleaseGood)
@@ -1500,10 +1516,7 @@ export async function bulkConfirmOrReceiveReleaseGoods(
 
   await tx
     .getRepository(OrderInventory)
-    .update(
-      { id: In(foundOrderInventories.map(oi => oi.id)) },
-      { status: orderInventoryStatus, updater: user }
-    )
+    .update({ id: In(foundOrderInventories.map(oi => oi.id)) }, { status: orderInventoryStatus, updater: user })
 
   if (context?.state?.type != 'api') {
     const users: any[] = await tx

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

@@ -197,6 +197,7 @@ export class ReleaseGoodQuery {
           .createQueryBuilder('oi')
           .leftJoinAndSelect('oi.inventory', 'inventory')
           .leftJoinAndSelect('oi.product', 'product')
+          .leftJoinAndSelect('oi.productDetail', 'productDetail')
           .leftJoinAndSelect('inventory.location', 'location')
           .where('oi.domain_id = :domainId', { domainId: domain.id })
           .andWhere('oi.release_good_id = :releaseGoodId', { releaseGoodId: releaseGood.id })
@@ -227,6 +228,7 @@ export class ReleaseGoodQuery {
                 batchIdRef: inventory.batchIdRef,
                 palletId: inventory.palletId,
                 product: orderInv.product,
+                productDetail: orderInv.productDetail,
                 productIdRef: orderInv.product.id,
                 productName: `${orderInv.product.name} (${orderInv.product.description})`,
                 packingType: orderInv.packingType,

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

@@ -1,6 +1,6 @@
 import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
 
-import { Product } from '@things-factory/product-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import { ObjectRef } from '@things-factory/shell'
 import { Location } from '@things-factory/warehouse-base'
 
@@ -77,6 +77,9 @@ export class InventoryInfos {
   @Field(type => Product, { nullable: true })
   product?: Product
 
+  @Field(type => ProductDetail, { nullable: true })
+  productDetail?: ProductDetail
+
   @Field({ nullable: true })
   packingType?: string
 
@@ -185,8 +188,6 @@ export class NewReleaseGood {
   @Field({ nullable: true })
   orderMethod: string
 
-
-
   @Field({ nullable: true })
   collectionOrderNo: string
 

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

@@ -50,6 +50,7 @@ export enum DispatchmentStatus {
 @Index('ix_release-good_1', (releaseGood: ReleaseGood) => [releaseGood.domain, releaseGood.refNo])
 @Index('ix_release-good_2', (releaseGood: ReleaseGood) => [releaseGood.domain, releaseGood.refNo2])
 @Index('ix_release-good_3', (releaseGood: ReleaseGood) => [releaseGood.domain, releaseGood.remark])
+@Index('ix_release-good_4', (releaseGood: ReleaseGood) => [releaseGood.domain, releaseGood.bizplace])
 @ObjectType()
 export class ReleaseGood {
   @PrimaryGeneratedColumn('uuid')

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

@@ -6,7 +6,7 @@ import { Attachment, createAttachments } from '@things-factory/attachment-base'
 import { Role, User } from '@things-factory/auth-base'
 import { Bizplace, getDomainUsers } from '@things-factory/biz-base'
 import { sendNotification } from '@things-factory/notification'
-import { Product } from '@things-factory/product-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
@@ -59,6 +59,7 @@ export class ReturnOrderMutation {
         itm =>
           itm.product.id === curr.product.id &&
           itm.packingType === curr.packingType &&
+          itm.productDetailId === curr.product.productDetailId &&
           itm.batchId === curr.batchId &&
           itm.packingSize === curr.packingSize
       )
@@ -68,6 +69,7 @@ export class ReturnOrderMutation {
       } else {
         existingItem.returnQty = existingItem.returnQty + curr.returnQty
         existingItem.returnUomValue = existingItem.returnUomValue + curr.returnUomValue
+        existingItem.remark = `${existingItem.remark} | ${curr.remark}`
       }
 
       return acc
@@ -99,6 +101,7 @@ export class ReturnOrderMutation {
       newOrderInv.name = OrderNoGenerator.orderInventory()
       newOrderInv.returnOrder = createdReturnOrder
       newOrderInv.product = await tx.getRepository(Product).findOne(moi.product.id)
+      newOrderInv.productDetail = await tx.getRepository(ProductDetail).findOne(moi.productDetail.id)
       newOrderInv.creator = user
       newOrderInv.updater = user
 

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

@@ -115,6 +115,7 @@ export class NewReturnOrder {
   @Field({ nullable: true })
   truckNo: string
 
+
   @Field({ nullable: true })
   deliveryOrderNo: string
 

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

@@ -12,7 +12,7 @@ import {
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Product } from '@things-factory/product-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
@@ -127,6 +127,10 @@ export class ReverseKittingOrderInventory {
   @Field({ nullable: true })
   updatedAt?: Date
 
+  @ManyToOne(type => ProductDetail, { nullable: true })
+  @Field({ nullable: true })
+  productDetail: ProductDetail
+
   @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true })
   creator?: User