@things-factory/sales-base 4.3.769 → 4.3.770

package/server/service/loading-packages/loading-packages.ts

@@ -0,0 +1,110 @@
+import {
+  CreateDateColumn,
+  UpdateDateColumn,
+  Entity,
+  Index,
+  Column,
+  RelationId,
+  OneToMany,
+  ManyToOne,
+  PrimaryGeneratedColumn
+} from 'typeorm'
+import { ObjectType, Field, Int, ID, registerEnumType } from 'type-graphql'
+
+import { Domain } from '@things-factory/shell'
+import { User } from '@things-factory/auth-base'
+import { Bizplace } from '@things-factory/biz-base'
+import { ReleaseGood } from '../'
+import { LoadingPackageItems } from '../loading-package-items/loading-package-items'
+
+@Entity()
+@Index('ix_loading_packages_0', (loadingPackages: LoadingPackages) => [loadingPackages.domain, loadingPackages.name], { unique: true })
+@ObjectType({ description: 'Entity for LoadingPackages' })
+export class LoadingPackages {
+  @PrimaryGeneratedColumn('uuid')
+  @Field(type => ID)
+  readonly id: string
+
+  @Column()
+  @Field()
+  name: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  status: string
+
+  @ManyToOne(type => Domain)
+  @Field({ nullable: true })
+  domain?: Domain
+
+  @RelationId((loadingPackages: LoadingPackages) => loadingPackages.domain)
+  domainId?: string
+
+  @ManyToOne(type => Bizplace)
+  @Field(type => Bizplace, { nullable: true })
+  bizplace?: Bizplace
+
+  @RelationId((loadingPackages: LoadingPackages) => loadingPackages.bizplace)
+  bizplaceId?: string
+
+  @ManyToOne(type => ReleaseGood)
+  @Field(type => ReleaseGood, { nullable: true })
+  releaseGood?: ReleaseGood
+
+  @OneToMany(type => LoadingPackageItems, loadingPackageItems => loadingPackageItems.loadingPackage)
+  @Field(type => [LoadingPackageItems], { nullable: true })
+  loadingPackageItems: LoadingPackageItems[]
+  
+  @CreateDateColumn()
+  @Field({ nullable: true })
+  createdAt?: Date
+
+  @UpdateDateColumn()
+  @Field({ nullable: true })
+  updatedAt?: Date
+
+  @ManyToOne(type => User, {
+    nullable: true
+  })
+  @Field({ nullable: true })
+  creator?: User
+
+  @RelationId((loadingPackages: LoadingPackages) => loadingPackages.creator)
+  creatorId?: string
+
+  @ManyToOne(type => User, {
+    nullable: true
+  })
+  @Field({ nullable: true })
+  updater?: User
+
+  @RelationId((loadingPackages: LoadingPackages) => loadingPackages.updater)
+  updaterId?: string
+
+  @ManyToOne(type => User, {
+    nullable: true
+  })
+  @Field({ nullable: true })
+  printedBy?: User
+
+  @RelationId((loadingPackages: LoadingPackages) => loadingPackages.printedBy)
+  printedById?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  printedAt?: Date
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deletedAt?: Date
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field({ nullable: true })
+  deletedBy?: User
+
+  @RelationId((loadingPackages: LoadingPackages) => loadingPackages.deletedBy)
+  deletedById?: string
+
+  @Field(type => Int, { nullable: true })
+  displayNumber?: number
+}

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

@@ -227,6 +227,7 @@ export class OrderInventory {
   orderProduct: OrderProduct
 
   @RelationId((orderInventory: OrderInventory) => orderInventory.orderProduct)
+  @Field({ nullable: true })
   orderProductId: string
 
   @OneToMany(type => OrderToteItem, orderToteItem => orderToteItem.orderInventory, { nullable: true })

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

@@ -8,6 +8,7 @@ import { logger } from '@things-factory/env'
 import { buildQuery, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
 import { Inventory, LOCATION_TYPE } from '@things-factory/warehouse-base'
 
+// import { Worksheet, WORKSHEET_TYPE, WORKSHEET_STATUS } from '@things-factory/worksheet-base'
 import { ATTACHMENT_TYPE, ORDER_INVENTORY_STATUS, ORDER_STATUS, ORDER_VAS_STATUS } from '../../constants'
 import { convertExcelDateToISO } from '../../utils/datetime-util'
 import { OrderInventory } from '../order-inventory/order-inventory'
@@ -657,6 +658,61 @@ export class ReleaseGoodQuery {
 
       let [items, total] = await qb.getManyAndCount()
 
+      const releaseGoodIds = items.map(item => item.id)
+      
+      // Original entity-based approach (requires @things-factory/worksheet-base dependency)
+      // const allWorksheetsRaw: any[] = releaseGoodIds.length > 0
+      //   ? await getRepository(Worksheet)
+      //       .createQueryBuilder('ws')
+      //       .leftJoin('ws.releaseGood', 'rg')
+      //       .where('ws.domain_id = :domainId', { domainId: domain.id })
+      //       .andWhere('rg.id IN (:...releaseGoodIds)', { releaseGoodIds })
+      //       .select([
+      //         'ws.id as id',
+      //         'ws.type as type',
+      //         'ws.status as status',
+      //         'ws.name as name',
+      //         'ws.updated_at as updated_at',
+      //         'rg.id as releaseGoodId'
+      //       ])
+      //       .orderBy('ws.updated_at', 'DESC')
+      //       .getRawMany()
+      //   : []
+
+      // Direct table query (no dependency needed)
+      const allWorksheetsRaw: any[] = releaseGoodIds.length > 0
+        ? await getRepository(ReleaseGood).query(
+            `
+            SELECT
+              ws.id as id,
+              ws.type as type,
+              ws.status as status,
+              ws.name as name,
+              ws.updated_at as updated_at,
+              rg.id as "releaseGoodId"
+            FROM worksheets ws
+            LEFT JOIN release_goods rg ON ws.release_good_id = rg.id
+            WHERE ws.domain_id = $1 AND rg.id = ANY($2)
+            ORDER BY ws.updated_at DESC
+            `,
+            [domain.id, releaseGoodIds]
+          )
+        : []
+
+      const worksheetMap = new Map<string, { id: string; type: string; status: string; name: string }>()
+      for (const ws of allWorksheetsRaw) {
+        const releaseGoodId = ws.releaseGoodId
+        const key = `${releaseGoodId}_${ws.type}`
+        if (!worksheetMap.has(key)) {
+          worksheetMap.set(key, {
+            id: ws.id,
+            type: ws.type,
+            status: ws.status,
+            name: ws.name
+          })
+        }
+      }
+
       items = await Promise.all(
         items
           .filter(item => {
@@ -667,43 +723,53 @@ export class ReleaseGoodQuery {
               where: { releaseGood: item, domain, bizplace: item.bizplace }
             })
 
-            let newPlatformCode
-
-            if (item.platformCode) {
-              if (item.platformCode == 'LZD') {
-                newPlatformCode = 'Lazada'
-              } else if (item.platformCode == 'SHP') {
-                newPlatformCode = 'Shopee'
-              } else if (item.platformCode == 'TTK') {
-                newPlatformCode = 'Tiktok'
-              } else if (item.platformCode == 'SPF') {
-                newPlatformCode = 'Shopify'
-              }
+          let newPlatformCode
+
+          if (item.platformCode) {
+            if (item.platformCode == 'LZD') {
+              newPlatformCode = 'Lazada'
+            } else if (item.platformCode == 'SHP') {
+              newPlatformCode = 'Shopee'
+            } else if (item.platformCode == 'TTK') {
+              newPlatformCode = 'Tiktok'
+            } else if (item.platformCode == 'SPF') {
+              newPlatformCode = 'Shopify'
             }
+          }
 
-            if (
-              item.lastMileDelivery &&
-              item.lastMileDelivery.isTms &&
-              item.lastMileDelivery.platform === 'VERSA_FLEET'
-            ) {
-              item.refNo2 = item.vehicleNo ? item.vehicleNo : item.refNo2
-            }
+          if (
+            item.lastMileDelivery &&
+            item.lastMileDelivery.isTms &&
+            item.lastMileDelivery.platform === 'VERSA_FLEET'
+          ) {
+            item.refNo2 = item.vehicleNo ? item.vehicleNo : item.refNo2
+          }
 
-            return {
-              ...item,
-              platformCode: newPlatformCode ? newPlatformCode : item.platformCode,
-              transporter: orderPackages?.length
-                ? [
-                    ...new Set(
-                      orderPackages.map(op => {
-                        return op.transporter
-                      })
-                    )
-                  ].join(', ')
-                : null,
-              orderRemark: item?.remark ? true : false
-            }
-          })
+          const worksheetStatus = (item.status === 'PROCESSING' || item.status === 'PARTIAL_PROCESSING') ? 'LOADING' : item.status
+          const worksheetKey = `${item.id}_${worksheetStatus}`
+          const worksheet = worksheetMap.get(worksheetKey) || null
+
+          return {
+            ...item,
+            platformCode: newPlatformCode ? newPlatformCode : item.platformCode,
+            transporter: orderPackages?.length
+              ? [
+                  ...new Set(
+                    orderPackages.map(op => {
+                      return op.transporter
+                    })
+                  )
+                ].join(', ')
+              : null,
+            orderRemark: item?.remark ? true : false,
+            activeWorksheet: worksheet
+              ? {
+                  type: worksheet.type,
+                  status: worksheet.status
+                }
+              : null
+          }
+        })
       )
       console.timeEnd('t1')
       return { items, total }

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

@@ -184,6 +184,15 @@ export class ItemCounts {
   pending: number
 }
 
+@ObjectType()
+export class WorksheetBasicInfo {
+  @Field({ nullable: true })
+  type?: string
+
+  @Field({ nullable: true })
+  status?: string
+}
+
 @ObjectType()
 export class TabCountItem {
   @Field()

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

@@ -35,7 +35,8 @@ import {
   ShippingOrder,
   ShippingOrderInfo,
   ItemCounts,
-  TabCounts
+  TabCounts,
+  WorksheetBasicInfo
 } from '../'
 import { ReleaseOrderType } from '../../constants'
 
@@ -678,4 +679,7 @@ export class ReleaseGood {
 
   @Field(() => TabCounts, { nullable: true })
   tabCounts: TabCounts
+
+  @Field(() => WorksheetBasicInfo, { nullable: true })
+  activeWorksheet?: WorksheetBasicInfo
 }

package/server/utils/order-no-generator.ts

@@ -78,6 +78,18 @@ export class OrderNoGenerator {
     return `OPKI-${uuidv4()}`
   }
 
+  static loadingPackage() {
+    const currentDate = new Date()
+    const randomString = Math.random().toString(36).slice(2, 5)
+    return `LPK${currentDate.getFullYear()}${
+      currentDate.getMonth() + 1
+    }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}${randomString}`
+  }
+
+  static loadingPackageItem() {
+    return `LPKI-${uuidv4()}`
+  }
+
   static invoiceProduct() {
     return `IP-${uuidv4()}`
   }