@things-factory/sales-base 4.3.62 → 4.3.67

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

@@ -181,10 +181,14 @@ export class ArrivalNoticeMutation {
         url: context.header.referer,
         data: { url: context.header.referer }
       }
-      await sendNotification({
-        receivers,
-        message: { ...msg }
-      })
+      /**
+       * @notes Temporary off sendNotification due to suspect of causing wms down
+       */
+
+      // await sendNotification({
+      //   receivers,
+      //   message: { ...msg }
+      // })
     }
 
     return true
@@ -668,10 +672,14 @@ export async function confirmArrivalNoticeFunction(
         data: { url: context.header.referer }
       }
 
-      await sendNotification({
-        receivers,
-        message: { ...msg }
-      })
+      /**
+       * @notes Temporary off sendNotification due to suspect of causing wms down
+       */
+
+      // await sendNotification({
+      //   receivers,
+      //   message: { ...msg }
+      // })
     }
   }
 
@@ -767,10 +775,15 @@ export async function receiveArrivalNoticeFunction(_: any, name: String, context
         url: context.header.referer,
         data: { url: context.header.referer }
       }
-      await sendNotification({
-        receivers,
-        message: { ...msg }
-      })
+
+      /**
+       * @notes Temporary off sendNotification due to suspect of causing wms down
+       */
+
+      // await sendNotification({
+      //   receivers,
+      //   message: { ...msg }
+      // })
     }
 
     // 4. Update status of arrival notice (PENDING_RECEIVE => INTRANSIT)
@@ -857,10 +870,15 @@ export async function checkArrivedNoticeFunction(
         url: context.header.referer,
         data: { url: context.header.referer }
       }
-      await sendNotification({
-        receivers,
-        message: { ...msg }
-      })
+
+      /**
+       * @notes Temporary off sendNotification due to suspect of causing wms down
+       */
+
+      // await sendNotification({
+      //   receivers,
+      //   message: { ...msg }
+      // })
     }
 
     return foundArrivalNotice
@@ -935,10 +953,14 @@ export async function rejectArrivalNotice(
       data: { url: context.header.referer }
     }
 
-    await sendNotification({
-      receivers,
-      message: { ...msg }
-    })
+    /**
+     * @notes Temporary off sendNotification due to suspect of causing wms down
+     */
+
+    // await sendNotification({
+    //   receivers,
+    //   message: { ...msg }
+    // })
   }
 
   return foundArrivalNotice

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

@@ -143,8 +143,8 @@ export class DeliveryOrderQuery {
           [arrChildSortData.indexOf(sort.name) >= 0
             ? 'releaseGood.' + sort.name
             : arrNameSortData.indexOf(sort.name) >= 0
-              ? sort.name + '.name'
-              : 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
+            ? sort.name + '.name'
+            : 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
         }),
         params.sortings.length < 1 ? { rank: 'ASC', 'do.createdAt': 'DESC' } : {}
       )
@@ -155,13 +155,15 @@ export class DeliveryOrderQuery {
 
       console.time('orderProductsApiFilter')
       if (orderProductsApiFilter?.value) {
-
         items = await Promise.all(
           items.map(async itm => {
             const qb: any = getRepository(OrderInventory).createQueryBuilder('OrderInventory')
 
             let orderInventories: any[] = await qb
               .leftJoinAndSelect('OrderInventory.product', 'Product')
+              .leftJoinAndSelect('OrderInventory.orderToteItems', 'OrderToteItems')
+              .leftJoinAndSelect('OrderToteItems.orderTote', 'OrderTote')
+              .leftJoinAndSelect('OrderTote.orderToteSeals', 'OrderToteSeals')
               .where('OrderInventory.delivery_order_id = :deliveryOrderId', { deliveryOrderId: itm.id })
               .andWhere('OrderInventory.domain_id = :domainId', { domainId: domain.id })
               .getMany()
@@ -172,7 +174,6 @@ export class DeliveryOrderQuery {
             }
           })
         )
-
       }
 
       return { items, total }
@@ -322,12 +323,12 @@ export class DeliveryOrderQuery {
         systemRemark: prod?.remark
           ? prod.remark
           : prod.crossDocking
-            ? prod.pallet === ''
-              ? `${prod.palletQty} PALLET(S) [C/D]`
-              : `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
-            : prod.pallet === ''
-              ? `${prod.palletQty} PALLET(S)`
-              : `${prod.palletQty} PALLET(S) (${prod.pallet})`
+          ? prod.pallet === ''
+            ? `${prod.palletQty} PALLET(S) [C/D]`
+            : `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
+          : prod.pallet === ''
+          ? `${prod.palletQty} PALLET(S)`
+          : `${prod.palletQty} PALLET(S) (${prod.pallet})`
       }
     })
 
@@ -414,12 +415,12 @@ export class DeliveryOrderQuery {
         systemRemark: prod?.remark
           ? prod.remark
           : prod.crossDocking
-            ? prod.pallet === ''
-              ? `${prod.palletQty} PALLET(S) [C/D]`
-              : `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
-            : prod.pallet === ''
-              ? `${prod.palletQty} PALLET(S)`
-              : `${prod.palletQty} PALLET(S) (${prod.pallet})`
+          ? prod.pallet === ''
+            ? `${prod.palletQty} PALLET(S) [C/D]`
+            : `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
+          : prod.pallet === ''
+          ? `${prod.palletQty} PALLET(S)`
+          : `${prod.palletQty} PALLET(S) (${prod.pallet})`
       }
     })
 
@@ -547,8 +548,8 @@ export class DeliveryOrderQuery {
           [arrChildSortData.indexOf(sort.name) >= 0
             ? 'releaseGood.' + sort.name
             : arrNameSortData.indexOf(sort.name) >= 0
-              ? sort.name + '.name'
-              : 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
+            ? sort.name + '.name'
+            : 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
         }),
         params.sortings.length < 1 ? { rank: 'ASC', 'do.createdAt': 'DESC' } : {}
       )

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

@@ -5,6 +5,7 @@ import {
   Entity,
   Index,
   ManyToOne,
+  OneToMany,
   PrimaryGeneratedColumn,
   RelationId,
   UpdateDateColumn
@@ -20,6 +21,7 @@ import { ArrivalNotice } from '../arrival-notice/arrival-notice'
 import { DeliveryOrder } from '../delivery-order/delivery-order'
 import { InventoryCheck } from '../inventory-check/inventory-check'
 import { OrderProduct } from '../order-product/order-product'
+import { OrderToteItem } from '../order-tote-item/order-tote-item'
 import { ReleaseGood } from '../release-good/release-good'
 import { ReturnOrder } from '../return-order/return-order'
 import { TransferOrder } from '../transfer-order/transfer-order'
@@ -62,9 +64,7 @@ import { TransferOrder } from '../transfer-order/transfer-order'
   orderInventory.releaseQty,
   orderInventory.uom
 ])
-@Index('ix_order-inventory_5', (orderInventory: OrderInventory) => [
-  orderInventory.releaseGood
-])
+@Index('ix_order-inventory_5', (orderInventory: OrderInventory) => [orderInventory.releaseGood])
 @ObjectType()
 export class OrderInventory {
   @PrimaryGeneratedColumn('uuid')
@@ -185,6 +185,10 @@ export class OrderInventory {
   @RelationId((orderInventory: OrderInventory) => orderInventory.orderProduct)
   orderProductId: string
 
+  @OneToMany(type => OrderToteItem, orderToteItem => orderToteItem.orderInventory, { nullable: true })
+  @Field(type => [OrderToteItem], { nullable: true })
+  orderToteItems: OrderToteItem[]
+
   @Column({ type: 'uuid', nullable: true })
   @Field({ nullable: true })
   refWorksheetId: string

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

@@ -1,11 +1,21 @@
 import { Field, ObjectType } from 'type-graphql'
-import { Column, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
+import {
+  Column,
+  Entity,
+  Index,
+  ManyToOne,
+  OneToMany,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
 import { Tote } from '@things-factory/warehouse-base'
-import { ReleaseGood } from '../release-good/release-good'
+
 import { OrderToteSeal } from '../order-tote-seal/order-tote-seal'
+import { ReleaseGood } from '../release-good/release-good'
 
 @Entity()
 @Index('ix_order_tote_0', (orderTote: OrderTote) => [orderTote.id], { unique: true })
@@ -57,6 +67,7 @@ export class OrderTote {
   @RelationId((orderTote: OrderTote) => orderTote.updater)
   updaterId: string
 
+  @OneToMany(type => OrderToteSeal, orderToteSeal => orderToteSeal.orderTote, { nullable: true })
   @Field(type => [OrderToteSeal], { nullable: true })
   orderToteSeals?: OrderToteSeal[]
 }

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

@@ -136,7 +136,7 @@ export class ReleaseGoodMutation {
           context,
           tx
         )
-      } catch (error) { }
+      } catch (error) {}
 
     if (errorsCaught.length)
       throw new ValidationError({
@@ -624,8 +624,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,
@@ -1026,10 +1026,15 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
         url: context.header.referer,
         data: { url: context.header.referer }
       }
-      await sendNotification({
-        receivers,
-        message: { ...msg }
-      })
+
+      /**
+       * @notes Temporary off sendNotification due to suspect of causing wms down
+       */
+
+      // await sendNotification({
+      //   receivers,
+      //   message: { ...msg }
+      // })
     }
   }
 
@@ -1109,10 +1114,14 @@ export async function receiveReleaseGood(name: string, context: any, tx: EntityM
         data: { url: context.header.referer }
       }
 
-      await sendNotification({
-        receivers,
-        message: { ...msg }
-      })
+      /**
+       * @notes Temporary off sendNotification due to suspect of causing wms down
+       */
+
+      // await sendNotification({
+      //   receivers,
+      //   message: { ...msg }
+      // })
     }
   }
 
@@ -1232,10 +1241,14 @@ export async function rejectReleaseGood(
       data: { url: context.header.referer }
     }
 
-    await sendNotification({
-      receivers,
-      message: { ...msg }
-    })
+    /**
+     * @notes Temporary off sendNotification due to suspect of causing wms down
+     */
+
+    // await sendNotification({
+    //   receivers,
+    //   message: { ...msg }
+    // })
   }
 
   return releaseGood
@@ -1247,7 +1260,7 @@ export async function bulkGenerateReleaseGood(
   roNoSetting: any,
   domain: Domain,
   user: User,
-  tx?: EntityManager,
+  tx?: EntityManager
 ): Promise<ReleaseGood> {
   try {
     let warehouseDomain: Domain = domain
@@ -1288,7 +1301,6 @@ export async function bulkGenerateReleaseGood(
 
     newReleaseGood = await tx.getRepository(ReleaseGood).save(newReleaseGood)
 
-
     /** Generate Shipping Order */
     if (shippingOrder) {
       shippingOrder.remark = shippingOrder.exportRemark
@@ -1466,10 +1478,15 @@ export async function bulkConfirmReleaseGoods(
         url: context.header.referer,
         data: { url: context.header.referer }
       }
-      await sendNotification({
-        receivers,
-        message
-      })
+
+      /**
+       * @notes Temporary off sendNotification due to suspect of causing wms down
+       */
+
+      // await sendNotification({
+      //   receivers,
+      //   message
+      // })
     }
   }
 

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

@@ -284,11 +284,14 @@ export async function confirmReturnOrder(tx: EntityManager, name: string, contex
       url: context.header.referer,
       data: { url: context.header.referer }
     }
-
-    await sendNotification({
-      receivers,
-      message: { ...msg }
-    })
+    /**
+     * @notes Temporary off sendNotification due to suspect of causing wms down
+     */
+
+    // await sendNotification({
+    //   receivers,
+    //   message: { ...msg }
+    // })
   }
 
   return returnOrder
@@ -349,10 +352,14 @@ export async function receiveReturnOrder(tx: EntityManager, name: string, contex
       data: { url: context.header.referer }
     }
 
-    await sendNotification({
-      receivers,
-      message: { ...msg }
-    })
+    /**
+     * @notes Temporary off sendNotification due to suspect of causing wms down
+     */
+
+    // await sendNotification({
+    //   receivers,
+    //   message: { ...msg }
+    // })
   }
 
   return returnOrder
@@ -416,10 +423,14 @@ export async function rejectReturnOrder(
       data: { url: context.header.referer }
     }
 
-    await sendNotification({
-      receivers,
-      message: { ...msg }
-    })
+    /**
+     * @notes Temporary off sendNotification due to suspect of causing wms down
+     */
+
+    // await sendNotification({
+    //   receivers,
+    //   message: { ...msg }
+    // })
   }
 
   return foundReturnOrder
@@ -476,10 +487,14 @@ export async function checkReturnOrder(tx: EntityManager, name: string, context:
       data: { url: context.header.referer }
     }
 
-    await sendNotification({
-      receivers,
-      message: { ...msg }
-    })
+    /**
+     * @notes Temporary off sendNotification due to suspect of causing wms down
+     */
+
+    // await sendNotification({
+    //   receivers,
+    //   message: { ...msg }
+    // })
   }
 
   return foundReturnOrder

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

@@ -164,10 +164,15 @@ export class VasOrderMutation {
         url: context.header.referer,
         data: { url: context.header.referer }
       }
-      await sendNotification({
-        receivers,
-        message: { ...msg }
-      })
+
+      /**
+       * @notes Temporary off sendNotification due to suspect of causing wms down
+       */
+
+      // await sendNotification({
+      //   receivers,
+      //   message: { ...msg }
+      // })
     }
 
     return vasOrder
@@ -235,10 +240,14 @@ export class VasOrderMutation {
           data: { url: context.header.referer }
         }
 
-        await sendNotification({
-          receivers,
-          message: { ...msg }
-        })
+        /**
+         * @notes Temporary off sendNotification due to suspect of causing wms down
+         */
+
+        // await sendNotification({
+        //   receivers,
+        //   message: { ...msg }
+        // })
       }
 
       return vasOrder